diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2011-08-22 09:09:51 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-04-17 10:23:21 +0200 |
| commit | eeb0cf9abf5992f35eca18c4cc63300df30521a4 (patch) | |
| tree | 4da9091f1d93730507375385e0417846359c646d /hw | |
| parent | 158fd3ce98afd21f2e2639600f6414ea703a9121 (diff) | |
| download | qemu-eeb0cf9abf5992f35eca18c4cc63300df30521a4.zip qemu-eeb0cf9abf5992f35eca18c4cc63300df30521a4.tar.gz qemu-eeb0cf9abf5992f35eca18c4cc63300df30521a4.tar.bz2 | |
usb/vmstate: add parent dev path
... to make vmstate id string truely unique with multiple host
controllers, i.e. move from "1/usb-ptr" to "0000:00:01.3/1/usb-ptr"
(usb tabled connected to piix3 uhci).
This obviously breaks migration. To handle this the usb bus
property "full-path" is added. When setting this to false old
behavior is maintained. This way current qemu will be compatible
with old versions when started using '-M pc-$oldversion'.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pc_piix.c | 4 | ||||
| -rw-r--r-- | hw/usb.h | 5 | ||||
| -rw-r--r-- | hw/usb/bus.c | 17 |
3 files changed, 25 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 907d723..6a75718 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -377,6 +377,10 @@ static QEMUMachine pc_machine_v1_1 = { .driver = "apic",\ .property = "vapic",\ .value = "off",\ + },{\ + .driver = "USB",\ + .property = "full-path",\ + .value = "no",\ } static QEMUMachine pc_machine_v1_0 = { @@ -182,12 +182,17 @@ struct USBEndpoint { QTAILQ_HEAD(, USBPacket) queue; }; +enum USBDeviceFlags { + USB_DEV_FLAG_FULL_PATH, +}; + /* definition of a USB device */ struct USBDevice { DeviceState qdev; USBPort *port; char *port_path; void *opaque; + uint32_t flags; /* Actual connected speed */ int speed; diff --git a/hw/usb/bus.c b/hw/usb/bus.c index d3f8358..2068640 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -19,6 +19,8 @@ static struct BusInfo usb_bus_info = { .get_fw_dev_path = usb_get_fw_dev_path, .props = (Property[]) { DEFINE_PROP_STRING("port", USBDevice, port_path), + DEFINE_PROP_BIT("full-path", USBDevice, flags, + USB_DEV_FLAG_FULL_PATH, true), DEFINE_PROP_END_OF_LIST() }, }; @@ -460,7 +462,20 @@ static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent) static char *usb_get_dev_path(DeviceState *qdev) { USBDevice *dev = USB_DEVICE(qdev); - return g_strdup(dev->port->path); + DeviceState *hcd = qdev->parent_bus->parent; + char *id = NULL; + + if ((dev->flags & (1 << USB_DEV_FLAG_FULL_PATH)) && + hcd && hcd->parent_bus && hcd->parent_bus->info->get_dev_path) { + id = hcd->parent_bus->info->get_dev_path(hcd); + } + if (id) { + char *ret = g_strdup_printf("%s/%s", id, dev->port->path); + g_free(id); + return ret; + } else { + return g_strdup(dev->port->path); + } } static char *usb_get_fw_dev_path(DeviceState *qdev) |