@@ -185,23 +185,25 @@
if (usb_enabled) {
int i;
PCIDevice *usb;
DeviceState *usb_qdev;
+ char devname[] = "ich9-usb-uhciX";
/* Should we create 6 UHCI according to ich9 spec? */
usb = pci_create_multifunction(
host_bus, PCI_DEVFN(ICH9_USB_DEV, ICH9_USB_EHCI1_FUNC),
true, "ich9-usb-ehci1");
usb_qdev = &usb->qdev;
usb_qdev->id = g_strdup("ich9-usb-bus");
qdev_init_nofail(usb_qdev);
for (i = 0; i < 3; i++) {
+ sprintf(devname, "ich9-usb-uhci%d", i + 1);
usb = pci_create_multifunction(
host_bus, PCI_DEVFN(ICH9_USB_DEV, ICH9_USB_UHCI1_FUNC + i),
- true, "ich9-usb-uhci1");
+ true, devname);
usb_qdev = &usb->qdev;
qdev_prop_set_string(usb_qdev, "masterbus",
"ich9-usb-bus.0");
qdev_prop_set_uint32(usb_qdev, "firstport", i * 2);
qdev_init_nofail(usb_qdev);