diff options
| author | Gonglei <arei.gonglei@huawei.com> | 2014-10-07 16:00:36 +0800 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-10-15 10:46:01 +0200 |
| commit | d749e10c4f97a0239180215c6d7d18712361a430 (patch) | |
| tree | 9772a48a6a203f4e21ab1ad2166f6473bfd053d1 /hw/usb | |
| parent | d2b186f96d19c1f8a6b7e528ff32c24096d5b204 (diff) | |
bootindex: move calling add_boot_device_patch to bootindex setter function
On this way, we can assure the new bootindex take effect
during vm rebooting.
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/dev-network.c | 2 | ||||
| -rw-r--r-- | hw/usb/host-libusb.c | 1 | ||||
| -rw-r--r-- | hw/usb/redirect.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index f341b3317b..5b95d5c382 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1371,8 +1371,6 @@ static void usb_net_realize(USBDevice *dev, Error **errrp) s->conf.macaddr.a[4], s->conf.macaddr.a[5]); usb_desc_set_string(dev, STRING_ETHADDR, s->usbstring_mac); - - add_boot_device_path(s->conf.bootindex, &dev->qdev, "/ethernet@0"); } static void usb_net_instance_init(Object *obj) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 906e4298e9..d2d161bc6e 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -978,7 +978,6 @@ static void usb_host_realize(USBDevice *udev, Error **errp) qemu_add_exit_notifier(&s->exit); QTAILQ_INSERT_TAIL(&hostdevs, s, next); - add_boot_device_path(s->bootindex, &udev->qdev, NULL); usb_host_auto_check(NULL); } diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 95f1aa2494..9fbd59e5ee 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1401,7 +1401,6 @@ static void usbredir_realize(USBDevice *udev, Error **errp) usbredir_chardev_read, usbredir_chardev_event, dev); qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev); - add_boot_device_path(dev->bootindex, &udev->qdev, NULL); } static void usbredir_cleanup_device_queues(USBRedirDevice *dev) |