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

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>

diff --cc hw/s390x/s390-virtio-bus.c
Simple merge

diff --cc hw/s390x/virtio-ccw.c
Simple merge

diff --cc hw/scsi/scsi-bus.c
Simple merge

diff --cc hw/usb/dev-storage.c
index b005783fdfcec58bb14c25ac56f0ca326fa55dc2,7406fdd4a94ab82d36534dd1cabfc68427f0cf54..5bfc72ca45d72c849ddedd54233ef87e8a7a37c8
--- 1/hw/usb/dev-storage.c
--- 2/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) {

diff --cc hw/virtio/virtio-pci.c
Simple merge