Patchwork q35: usb keyboard trouble

login
register
mail settings
Submitter Gabriel L. Somlo
Date Oct. 28, 2012, 3:37 p.m.
Message ID <20121028153717.GD29280@hedwig.ini.cmu.edu>
Download mbox | patch
Permalink /patch/194713/
State New
Headers show

Comments

Gabriel L. Somlo - Oct. 28, 2012, 3:37 p.m.
On Fri, Oct 26, 2012 at 04:24:44PM -0400, Jason Baron wrote:
> Thanks for the bug report! What OS are you running? I'm not seeing any
> issue with -usbdevice keyboard on Fedora.

I was using this:

bin/qemu-system-x86_64 \
   -M pc_q35 -L q35-seabios/out \
   -usbdevice keyboard \
   -hdd ./Fedora-14-x86_64-netinst.iso

> Paolo pointed out that I was missing some ich9 specific initialization
> from docs/ich9-ehci-uhci.cfg. I've added that in the patch below. I have
> no idea if that will resolve this issue for you.

This patch does indeed fix the problem for me, thanks for sending it !
The only small observation I have is that you seem to name all three
UHCI devices "ich9-usb-uhci1". There's probably a better way than my
patch below (on top of the one you just sent), but here's the general
idea :)

Thanks,
--Gabriel

         }

Patch

--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -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);