qemu: Add xhci support

qemu 1.1 features a xhci controller,
this patch adds support for it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/AUTHORS b/AUTHORS
index c89ea3d97ae8eea1dc17441b9da2bcfceacd8845..195a00760a86cb6daffe203179b231878e6ce658 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -243,6 +243,7 @@ Patches have also been contributed by:
   Beat Jörg            <Beat.Joerg@ssatr.ch>
   Gao feng             <gaofeng@cn.fujitsu.com>
   Dipankar Sarma       <dipankar@in.ibm.com>
+  Gerd Hoffmann        <kraxel@redhat.com>
 
   [....send patches to get your name here....]
 

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 1f307724857ecd8ac7a6c5def42306bde6ac362c..e1c0af52243353740fcc400062eea1a63a9d2ee9 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1820,8 +1820,8 @@
       A "usb" controller has an optional attribute <code>model</code>,
       which is one of "piix3-uhci", "piix4-uhci", "ehci",
       "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3",
-      "vt82c686b-uhci" or "pci-ohci".  The PowerPC64 "spapr-vio"
-      addresses do not have an associated controller.
+      "vt82c686b-uhci", "pci-ohci" or "nec-xhci".  The PowerPC64
+      "spapr-vio" addresses do not have an associated controller.
     </p>
 
     <p>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 46e539da0ec82560f9fdbdd73e60740b6191e2b8..86306252d8b72087ee809051d1aad3f09da40f53 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1201,6 +1201,7 @@
             <value>ich9-uhci3</value>
             <value>vt82c686b-uhci</value>
             <value>pci-ohci</value>
+            <value>nec-xhci</value>
           </choice>
         </attribute>
       </optional>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 81c63080b8cf40bbd869c164dfab74bf3a715fb3..46517652b8a7995fb596c3da8cb715f8cd9673c9 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -257,7 +257,8 @@ VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
               "ich9-uhci2",
               "ich9-uhci3",
               "vt82c686b-uhci",
-              "pci-ohci")
+              "pci-ohci",
+              "nec-xhci")
 
 VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST,
               "mount",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 44280bae8ee75fc9f87510e5e8805ac61abcb9e3..371278586c2fb2efc41e2de54d71b210caef1a2a 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -631,6 +631,7 @@ enum virDomainControllerModelUSB {
     VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3,
     VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI,
     VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI,
+    VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI,
 
     VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST
 };

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 43088331702af45978c0e96f27b46b5a50764a85..578daebdb4b54c5347c64444b963b11d09f2bab9 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -165,6 +165,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
 
               "hda-micro", /* 95 */
               "dump-guest-memory",
+              "nec-usb-xhci",
 
     );
 
@@ -1421,6 +1422,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags)
         qemuCapsSet(flags, QEMU_CAPS_VT82C686B_USB_UHCI);
     if (strstr(str, "name \"pci-ohci\""))
         qemuCapsSet(flags, QEMU_CAPS_PCI_OHCI);
+    if (strstr(str, "name \"nec-usb-xhci\""))
+        qemuCapsSet(flags, QEMU_CAPS_NEC_USB_XHCI);
     if (strstr(str, "name \"usb-redir\""))
         qemuCapsSet(flags, QEMU_CAPS_USB_REDIR);
     if (strstr(str, "name \"usb-hub\""))

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 640f7f52b882c9477c2f4cdc70b42a53f9670748..83c135b7fe8fde7d4790bf2fd14a6de288b8cae9 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -132,6 +132,7 @@ enum qemuCapsFlags {
     QEMU_CAPS_NO_USER_CONFIG     = 94, /* -no-user-config */
     QEMU_CAPS_HDA_MICRO          = 95, /* -device hda-micro */
     QEMU_CAPS_DUMP_GUEST_MEMORY  = 96, /* dump-guest-memory command */
+    QEMU_CAPS_NEC_USB_XHCI       = 97, /* -device nec-usb-xhci */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bd4f96af9237da593b485b093c900b9d2df3d6c0..6549f577019225d9ff8fa1629c24f00306a3169b 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -106,7 +106,8 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
               "ich9-usb-uhci2",
               "ich9-usb-uhci3",
               "vt82c686b-usb-uhci",
-              "pci-ohci");
+              "pci-ohci",
+              "nec-usb-xhci");
 
 VIR_ENUM_DECL(qemuDomainFSDriver)
 VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
@@ -2598,6 +2599,8 @@ qemuControllerModelUSBToCaps(int model)
         return QEMU_CAPS_VT82C686B_USB_UHCI;
     case VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI:
         return QEMU_CAPS_PCI_OHCI;
+    case VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI:
+        return QEMU_CAPS_NEC_USB_XHCI;
     default:
         return -1;
     }

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index b7192c07768a05224f841efc12e84ed24f1bcedf..012ba2695d304aefaaeb392faa0b6b5b711233ec 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -753,7 +753,8 @@ mymain(void)
             QEMU_CAPS_SCSI_CD,
             QEMU_CAPS_IDE_CD,
             QEMU_CAPS_NO_USER_CONFIG,
-            QEMU_CAPS_HDA_MICRO);
+            QEMU_CAPS_HDA_MICRO,
+            QEMU_CAPS_NEC_USB_XHCI);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }