<div dir="ltr"><div><div>Hi Eric,<br><br></div>This is also one bug-fix, could you help review and push to 1.0.3?<br><br></div>Thanks. :-)<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Feb 27, 2013 at 7:52 PM, Li Zhang <span dir="ltr"><<a href="mailto:zhlcindy@gmail.com" target="_blank">zhlcindy@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Li Zhang <<a href="mailto:zhlcindy@linux.vnet.ibm.com">zhlcindy@linux.vnet.ibm.com</a>><br>
<br>
Currently, PIIX3/PIIX4_USB capabilities are enabled for other platforms.<br>
Actually, it is only supported for X86.<br>
<br>
So this patch is to clear the capabilities for non-X86 platforms.<br>
<br>
Signed-off-by: Li Zhang <<a href="mailto:zhlcindy@linux.vnet.ibm.com">zhlcindy@linux.vnet.ibm.com</a>><br>
---<br>
src/conf/domain_conf.c | 1 +<br>
src/qemu/qemu_capabilities.c | 3 +++<br>
src/qemu/qemu_command.c | 2 ++<br>
3 files changed, 6 insertions(+)<br>
<br>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c<br>
index 995cf0c..d57334a 100644<br>
--- a/src/conf/domain_conf.c<br>
+++ b/src/conf/domain_conf.c<br>
@@ -10453,6 +10453,7 @@ virDomainDefParseXML(virCapsPtr caps,<br>
VIR_FREE(nodes);<br>
<br>
/* If graphics are enabled, there's an implicit PS2 mouse */<br>
+ /* Todo: Add implicit USB mouse and keyboard for ppc64 */<br>
if (def->ngraphics > 0) {<br>
virDomainInputDefPtr input;<br>
<br>
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c<br>
index 40022c1..ef5c69a 100644<br>
--- a/src/qemu/qemu_capabilities.c<br>
+++ b/src/qemu/qemu_capabilities.c<br>
@@ -1307,8 +1307,11 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {<br>
{ "hda-micro", QEMU_CAPS_HDA_MICRO },<br>
{ "ccid-card-emulated", QEMU_CAPS_CCID_EMULATED },<br>
{ "ccid-card-passthru", QEMU_CAPS_CCID_PASSTHRU },<br>
+#if defined (__x86_64__) || \<br>
+ defined (__i386__)<br>
{ "piix3-usb-uhci", QEMU_CAPS_PIIX3_USB_UHCI },<br>
{ "piix4-usb-uhci", QEMU_CAPS_PIIX4_USB_UHCI },<br>
+#endif<br>
{ "usb-ehci", QEMU_CAPS_USB_EHCI },<br>
{ "ich9-usb-ehci1", QEMU_CAPS_ICH9_USB_EHCI1 },<br>
{ "vt82c686b-usb-uhci", QEMU_CAPS_VT82C686B_USB_UHCI },<br>
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c<br>
index 1c9bfc9..0b18be0 100644<br>
--- a/src/qemu/qemu_command.c<br>
+++ b/src/qemu/qemu_command.c<br>
@@ -5784,6 +5784,8 @@ qemuBuildCommandLine(virConnectPtr conn,<br>
} else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&<br>
cont->model == -1 &&<br>
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) {<br>
+ /* usblegacy is used for ppc64 temporarily */<br>
+ /* Todo: support -device xxx on ppc64 platform */<br>
if (usblegacy) {<br>
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",<br>
_("Multiple legacy USB controllers are "<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.10.1<br>
<br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div><br></div>Best Regards<div>-Li</div>
</div>