From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 15 Oct 2014 20:03:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-bootindex-20141015-1' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=605c690b1b0e4f36c1e3f427322bdfaa80b9dcbe;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-bootindex-20141015-1' into staging

allow changing bootorder via monitor at runtime,
by making bootindex a writable qom property.

* remotes/kraxel/tags/pull-bootindex-20141015-1: (34 commits)
  bootindex: change fprintf to error_report
  bootindex: delete bootindex when device is removed
  bootindex: move calling add_boot_device_patch to bootindex setter function
  ide: add calling add_boot_device_patch in bootindex setter function
  nvma: ide: add bootindex to qom property
  usb-storage: add bootindex to qom property
  virtio-blk: alias bootindex property explicitly for virt-blk-pci/ccw/s390
  block: remove bootindex property from qdev to qom
  virtio-blk: add bootindex to qom property
  ide: add bootindex to qom property
  scsi: add bootindex to qom property
  isa-fdc: remove bootindexA/B property from qdev to qom
  redirect: remove bootindex property from qdev to qom
  vfio: remove bootindex property from qdev to qom
  pci-assign: remove bootindex property from qdev to qom
  host-libusb: remove bootindex property from qdev to qom
  virtio-net: alias bootindex property explicitly for virt-net-pci/ccw/s390
  net: remove bootindex property from qdev to qom
  usb-net: add bootindex to qom property
  vmxnet3: add bootindex to qom property
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

605c690b1b0e4f36c1e3f427322bdfaa80b9dcbe
diff --cc hw/usb/dev-storage.c
index b005783fdf,7406fdd4a9..5bfc72ca45
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@@ -632,7 -634,9 +634,8 @@@ static void usb_msd_realize_storage(USB
          error_propagate(errp, err);
          return;
      }
 -    s->bus.qbus.allow_hotplug = 0;
      usb_msd_handle_reset(dev);
+     s->scsi_dev = scsi_dev;
  
      if (bdrv_key_required(bs)) {
          if (cur_mon) {