From: Dipankar Sarma <dipankar@in.ibm.com>
Date: Tue, 19 Jun 2012 10:21:47 +0000 (+0530)
Subject: Fix default USB controller for ppc64
X-Git-Tag: v0.9.11.5~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=340ab1c91c71b029309e3a03af375ac0ad2616b4;p=thirdparty%2Flibvirt.git

Fix default USB controller for ppc64

Fix the default usb controller for pseries systems if none
specified.

Signed-off-by: Dipankar Sarma <dipankar@in.ibm.com>
(cherry picked from commit d1778b71480ff76e22be3ab47936b919deb27145)
---

diff --git a/AUTHORS b/AUTHORS
index 068f24beaa..9efac2e29f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -236,6 +236,7 @@ Patches have also been contributed by:
   Radu Caragea         <dmns_serp@yahoo.com>
   Beat Jörg            <Beat.Joerg@ssatr.ch>
   Gao feng             <gaofeng@cn.fujitsu.com>
+  Dipankar Sarma       <dipankar@in.ibm.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 55e772fd1c..af5ff5b929 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2555,7 +2555,8 @@ qemuControllerModelUSBToCaps(int model)
 
 
 static int
-qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def,
+qemuBuildUSBControllerDevStr(virDomainDefPtr domainDef,
+                             virDomainControllerDefPtr def,
                              virBitmapPtr qemuCaps,
                              virBuffer *buf)
 {
@@ -2564,8 +2565,12 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def,
 
     model = def->model;
 
-    if (model == -1)
-        model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
+    if (model == -1) {
+        if (STREQ(domainDef->os.arch, "ppc64"))
+            model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
+        else
+            model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
+    }
 
     smodel = qemuControllerModelUSBTypeToString(model);
     caps = qemuControllerModelUSBToCaps(model);
@@ -2651,7 +2656,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
         break;
 
     case VIR_DOMAIN_CONTROLLER_TYPE_USB:
-        if (qemuBuildUSBControllerDevStr(def, qemuCaps, &buf) == -1)
+        if (qemuBuildUSBControllerDevStr(domainDef, def, qemuCaps, &buf) == -1)
             goto error;
 
         if (nusbcontroller)