[libvirt] [PATCH 0/3] qemu: support configuring usb3 controller port count
This adds support for configuring the amount of usb ports on qemu's usb3 controller. The default port count is 4 which is kind of low, and when virt-manager starts using usb3 by default we will likely up the port count to something like 8. Cole Robinson (3): qemu: parse: Use virControllerDefNew qemu: caps: introduce QEMU_CAPS_NEC_USB_XHCI_PORTS qemu: support configuring usb3 controller port count docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 8 ++++- src/conf/domain_conf.c | 41 ++++++++++++++-------- src/conf/domain_conf.h | 9 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 7 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +++++++ src/qemu/qemu_parse_command.c | 8 ++--- tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 11 ++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 29 +++++++++++++++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 29 +++++++++++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 29 +++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 29 +++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 29 +++++++++++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 33 +++++++++++++++++ tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 41 ++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 41 ++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 41 ++++++++++++++++++++++ .../qemuxml2argv-usb-controller-xhci.args | 22 ++++++++++++ .../qemuxml2argv-usb-controller-xhci.xml | 16 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 31 files changed, 434 insertions(+), 22 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml -- 2.7.4
Rather than reimplement it. This will be needed in upcoming patches --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_parse_command.c | 8 +++----- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b46cd2a..04817bd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1637,7 +1637,7 @@ virDomainDiskSetFormat(virDomainDiskDefPtr def, int format) } -static virDomainControllerDefPtr +virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type) { virDomainControllerDefPtr def; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ee66e6d..d98f052 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2558,6 +2558,8 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, int bus, char *dst); void virDomainControllerDefFree(virDomainControllerDefPtr def); +virDomainControllerDefPtr +virDomainControllerDefNew(virDomainControllerType type); void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0de35ef..4d09dae 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -186,6 +186,7 @@ virDomainClockOffsetTypeToString; virDomainConfigFile; virDomainControllerAliasFind; virDomainControllerDefFree; +virDomainControllerDefNew; virDomainControllerFind; virDomainControllerFindByType; virDomainControllerInsert; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 79f5b92..455d515 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2351,13 +2351,11 @@ qemuParseCommandLine(virCapsPtr caps, /* ignore, generted on the fly */ } else if (STREQ(arg, "-usb")) { virDomainControllerDefPtr ctldef; - if (VIR_ALLOC(ctldef) < 0) + ctldef = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB); + if (!ctldef) goto error; - ctldef->type = VIR_DOMAIN_CONTROLLER_TYPE_USB; - ctldef->idx = 0; - ctldef->model = -1; if (virDomainControllerInsert(def, ctldef) < 0) { - VIR_FREE(ctldef); + virDomainControllerDefFree(ctldef); goto error; } } else if (STREQ(arg, "-pidfile")) { -- 2.7.4
On 04/27/2016 02:29 PM, Cole Robinson wrote:
Rather than reimplement it. This will be needed in upcoming patches --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_parse_command.c | 8 +++----- 4 files changed, 7 insertions(+), 6 deletions(-)
ACK for what's here... kudos for even considering qemu_parse_command - it's certainly the forgotten step-child. Would it be worth modifying qemuDomainFindOrCreateSCSIDiskController too? I was just searching on other places where a VIR_ALLOC() was done for a virDomainControllerDefPtr. John
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b46cd2a..04817bd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1637,7 +1637,7 @@ virDomainDiskSetFormat(virDomainDiskDefPtr def, int format) }
-static virDomainControllerDefPtr +virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type) { virDomainControllerDefPtr def; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ee66e6d..d98f052 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2558,6 +2558,8 @@ virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, int bus, char *dst); void virDomainControllerDefFree(virDomainControllerDefPtr def); +virDomainControllerDefPtr +virDomainControllerDefNew(virDomainControllerType type); void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0de35ef..4d09dae 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -186,6 +186,7 @@ virDomainClockOffsetTypeToString; virDomainConfigFile; virDomainControllerAliasFind; virDomainControllerDefFree; +virDomainControllerDefNew; virDomainControllerFind; virDomainControllerFindByType; virDomainControllerInsert; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 79f5b92..455d515 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2351,13 +2351,11 @@ qemuParseCommandLine(virCapsPtr caps, /* ignore, generted on the fly */ } else if (STREQ(arg, "-usb")) { virDomainControllerDefPtr ctldef; - if (VIR_ALLOC(ctldef) < 0) + ctldef = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB); + if (!ctldef) goto error; - ctldef->type = VIR_DOMAIN_CONTROLLER_TYPE_USB; - ctldef->idx = 0; - ctldef->model = -1; if (virDomainControllerInsert(def, ctldef) < 0) { - VIR_FREE(ctldef); + virDomainControllerDefFree(ctldef); goto error; } } else if (STREQ(arg, "-pidfile")) {
On 05/02/2016 07:44 PM, John Ferlan wrote:
On 04/27/2016 02:29 PM, Cole Robinson wrote:
Rather than reimplement it. This will be needed in upcoming patches --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_parse_command.c | 8 +++----- 4 files changed, 7 insertions(+), 6 deletions(-)
ACK for what's here... kudos for even considering qemu_parse_command - it's certainly the forgotten step-child.
In truth I didn't intentionally consider it... later patches break the test suite without this :)
Would it be worth modifying qemuDomainFindOrCreateSCSIDiskController too? I was just searching on other places where a VIR_ALLOC() was done for a virDomainControllerDefPtr.
It's the 'more correct' thing to do but won't have any real functional impact, since ControllerDefNew is only needed for virtio-serial and (now) usb controllers - Cole
Reports whether we support -device nec-usb-xhci,p3=XXX value, which has been available since qemu 1.3.0 --- src/qemu/qemu_capabilities.c | 7 ++++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 11 +++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 33 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 41 ++++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 41 ++++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 41 ++++++++++++++++++++++++ 21 files changed, 329 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index de54788..188ddd1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -325,6 +325,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "pxb", "pxb-pcie", /* 220 */ + "nec-usb-xhci-ports", ); @@ -1683,6 +1684,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsICH9[] = { { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4 }, }; +static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBNECXHCI[] = { + { "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS }, +}; + struct virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; @@ -1746,6 +1751,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, { "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, + { "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI) }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 83b8be3..b4b75a5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -356,6 +356,7 @@ typedef enum { /* 220 */ QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */ + QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports settin */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies index fbddf3d..2aa13f1 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies @@ -1668,6 +1668,17 @@ } } + +{ + "return": [ + { + "name": "msi", + "type": "uint32" + } + ] +} + + { "return": [ { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index 8c237ef..7c12521 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -128,4 +128,5 @@ <flag name='virtio-net'/> <flag name='qxl.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies index 2542b67..d130ad7 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies @@ -1849,6 +1849,35 @@ { "return": [ { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ + "return": [ + { "name": "xenpv" }, { diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index fe98a57..528f2fe 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -129,4 +129,5 @@ <flag name='virtio-net'/> <flag name='qxl.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies index 46c3292..93e705f 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies @@ -1897,6 +1897,35 @@ { "return": [ { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ + "return": [ + { "name": "xenpv" }, { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 6e9ec3e..9f4b8cd 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -138,4 +138,5 @@ <flag name='virtio-net'/> <flag name='qxl.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies index 37a735f..878d5ef 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies @@ -1968,6 +1968,35 @@ { "return": [ { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ + "return": [ + { "name": "pc-q35-1.4", "cpu-max": 255 }, diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index da371a4..b0ec7a9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -144,4 +144,5 @@ <flag name='virtio-net'/> <flag name='qxl.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies index 8932702..070bc62 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies @@ -2030,6 +2030,35 @@ { "return": [ { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ + "return": [ + { "name": "xenpv", "cpu-max": 1 }, diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 1e2fb6a..bf9b53f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -144,4 +144,5 @@ <flag name='virtio-net'/> <flag name='qxl.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies index b9bb9a3..0a37e12 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies @@ -1994,6 +1994,35 @@ { "return": [ { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ + "return": [ + { "name": "xenpv", "cpu-max": 1 }, diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 8175743..f0c141a 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -162,4 +162,5 @@ <flag name='qxl.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/> <flag name='debug-threads'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies index fabda55..02f1f4e 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies @@ -2450,6 +2450,39 @@ } { + "return": [ + { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "superspeed-ports-first", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ "return": [ { "name": "pc-1.3", diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps index 2cdf961..32e9304 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps @@ -174,4 +174,5 @@ <flag name='qxl-vga.vram64_size_mb'/> <flag name='debug-threads'/> <flag name='pxb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies index 299fdfc..fd17a0b 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies @@ -2969,6 +2969,47 @@ } { + "return": [ + { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "superspeed-ports-first", + "type": "on/off" + }, + { + "name": "force-pcie-endcap", + "type": "on/off" + }, + { + "name": "streams", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ "return": [ { "name": "pc-i440fx-2.4", diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps index ecaa165..d572971 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps @@ -175,4 +175,5 @@ <flag name='qxl-vga.vram64_size_mb'/> <flag name='debug-threads'/> <flag name='pxb'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies index 7b692b5..f25b105 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies @@ -2989,6 +2989,47 @@ } { + "return": [ + { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "superspeed-ports-first", + "type": "on/off" + }, + { + "name": "force-pcie-endcap", + "type": "on/off" + }, + { + "name": "streams", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ "return": [ { "name": "pc-i440fx-2.4", diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps index e243f8a..75e7919 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps @@ -180,4 +180,5 @@ <flag name='secret'/> <flag name='pxb'/> <flag name='pxb-pcie'/> + <flag name='nec-usb-xhci-ports'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies index 8a4c3fe..d80fe31 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies @@ -2995,6 +2995,47 @@ } { + "return": [ + { + "name": "msi", + "type": "on/off" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "superspeed-ports-first", + "type": "on/off" + }, + { + "name": "force-pcie-endcap", + "type": "on/off" + }, + { + "name": "streams", + "type": "on/off" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "2", + "type": "uint32" + }, + { + "name": "p3", + "type": "uint32" + } + ] +} + +{ "return": [ { "name": "pc-i440fx-2.4", -- 2.7.4
On 04/27/2016 02:29 PM, Cole Robinson wrote:
Reports whether we support -device nec-usb-xhci,p3=XXX value, which has been available since qemu 1.3.0 --- src/qemu/qemu_capabilities.c | 7 ++++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 11 +++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 29 +++++++++++++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 33 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 41 ++++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 41 ++++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 41 ++++++++++++++++++++++++ 21 files changed, 329 insertions(+)
ACK - although you have some merge work ahead of you. John (as will I once this goes in)
This adds a ports= attribute to usb controller XML, like <controller type='usb' model='nec-xhci' ports='8'/> This maps to: qemu -device nec-usb-xhci,p2=8,p3=8 Meaning, 8 ports that support both usb2 and usb3 devices. Gerd suggested to just expose them as one knob. https://bugzilla.redhat.com/show_bug.cgi?id=1271408 --- docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 8 ++++- src/conf/domain_conf.c | 39 ++++++++++++++-------- src/conf/domain_conf.h | 7 ++++ src/qemu/qemu_command.c | 13 ++++++++ .../qemuxml2argv-usb-controller-xhci.args | 22 ++++++++++++ .../qemuxml2argv-usb-controller-xhci.xml | 16 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 8 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d2db53b..dc15664 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3028,8 +3028,10 @@ <span class="since">since 0.10.0</span>, if the USB bus needs to be explicitly disabled for the guest, <code>model='none'</code> may be used. <span class="since">Since 1.0.5</span>, no default USB controller - will be built on s390. The PowerPC64 "spapr-vio" addresses do not have an - associated controller. + will be built on s390. <span class="since">Since 1.3.5</span>, USB + controllers accept a <code>ports</code> attribute to configure how + many devices can be connected to the controller. 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 f77bbcf..2deea34 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1743,7 +1743,8 @@ </attribute> </optional> </group> - <!-- usb has an optional attribute "model", and optional subelement "master" --> + <!-- usb has an optional attribute "model", + and optional subelements "master" and "ports" --> <group> <attribute name="type"> <value>usb</value> @@ -1768,6 +1769,11 @@ <optional> <ref name="usbmaster"/> </optional> + <optional> + <attribute name="ports"> + <ref name="unsignedInt"/> + </attribute> + </optional> </group> <!-- pci has an optional attribute "model" --> <group> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04817bd..fa560f3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1654,6 +1654,9 @@ virDomainControllerDefNew(virDomainControllerType type) def->opts.vioserial.ports = -1; def->opts.vioserial.vectors = -1; break; + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + def->opts.usbopts.ports = -1; + break; case VIR_DOMAIN_CONTROLLER_TYPE_PCI: def->opts.pciopts.chassisNr = -1; def->opts.pciopts.chassis = -1; @@ -1666,7 +1669,6 @@ virDomainControllerDefNew(virDomainControllerType type) case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: case VIR_DOMAIN_CONTROLLER_TYPE_SATA: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: - case VIR_DOMAIN_CONTROLLER_TYPE_USB: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; } @@ -7824,6 +7826,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *busNr = NULL; int numaNode = -1; char *ioeventfd = NULL; + char *portsStr = NULL; + int ports = -1; xmlNodePtr saved = ctxt->node; int rc; @@ -7936,20 +7940,19 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } + portsStr = virXMLPropString(node, "ports"); + if (portsStr) { + int r = virStrToLong_i(portsStr, NULL, 10, &ports); + if (r != 0 || ports < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid ports: %s"), portsStr); + goto error; + } + } + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: { - char *ports = virXMLPropString(node, "ports"); - if (ports) { - int r = virStrToLong_i(ports, NULL, 10, - &def->opts.vioserial.ports); - if (r != 0 || def->opts.vioserial.ports < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid ports: %s"), ports); - VIR_FREE(ports); - goto error; - } - } - VIR_FREE(ports); + def->opts.vioserial.ports = ports; char *vectors = virXMLPropString(node, "vectors"); if (vectors) { @@ -7985,6 +7988,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->info.mastertype = VIR_DOMAIN_CONTROLLER_MASTER_USB; def->info.master.usb.startport = masterPort; } + + def->opts.usbopts.ports = ports; break; } case VIR_DOMAIN_CONTROLLER_TYPE_PCI: @@ -8112,6 +8117,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, VIR_FREE(port); VIR_FREE(busNr); VIR_FREE(ioeventfd); + VIR_FREE(portsStr); return def; @@ -19429,6 +19435,13 @@ virDomainControllerDefFormat(virBufferPtr buf, } break; + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + if (def->opts.usbopts.ports != -1) { + virBufferAsprintf(buf, " ports='%d'", + def->opts.usbopts.ports); + } + break; + case VIR_DOMAIN_CONTROLLER_TYPE_PCI: if (def->opts.pciopts.pcihole64) pcihole64 = true; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d98f052..9071fe0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -845,6 +845,12 @@ struct _virDomainPCIControllerOpts { int numaNode; }; +typedef struct _virDomainUSBControllerOpts virDomainUSBControllerOpts; +typedef virDomainUSBControllerOpts *virDomainUSBControllerOptsPtr; +struct _virDomainUSBControllerOpts { + int ports; /* -1 == undef */ +}; + /* Stores the virtual disk controller configuration */ struct _virDomainControllerDef { int type; @@ -857,6 +863,7 @@ struct _virDomainControllerDef { union { virDomainVirtioSerialOpts vioserial; virDomainPCIControllerOpts pciopts; + virDomainUSBControllerOpts usbopts; } opts; virDomainDeviceInfo info; }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9597b30..7530c4a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2180,6 +2180,19 @@ qemuBuildUSBControllerDevStr(const virDomainDef *domainDef, virBufferAsprintf(buf, "%s", smodel); + if (def->opts.usbopts.ports != -1) { + if (model != VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI || + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI_PORTS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("usb controller type %s doesn't support 'ports' " + "with this QEMU binary"), smodel); + return -1; + } + + virBufferAsprintf(buf, ",p2=%d,p3=%d", + def->opts.usbopts.ports, def->opts.usbopts.ports); + } + if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) virBufferAsprintf(buf, ",masterbus=%s.0,firstport=%d", def->info.alias, def->info.master.usb.startport); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args new file mode 100644 index 0000000..b91adc4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml new file mode 100644 index 0000000..f5b7c56 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml @@ -0,0 +1,16 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0' model='nec-xhci' ports='8'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8842b2f..31a0ce1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1172,6 +1172,9 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI); + DO_TEST("usb-controller-xhci", + QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS); DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); -- 2.7.4
On 04/27/2016 02:29 PM, Cole Robinson wrote:
This adds a ports= attribute to usb controller XML, like
<controller type='usb' model='nec-xhci' ports='8'/>
This maps to:
qemu -device nec-usb-xhci,p2=8,p3=8
Meaning, 8 ports that support both usb2 and usb3 devices. Gerd suggested to just expose them as one knob.
https://bugzilla.redhat.com/show_bug.cgi?id=1271408 --- docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 8 ++++- src/conf/domain_conf.c | 39 ++++++++++++++-------- src/conf/domain_conf.h | 7 ++++ src/qemu/qemu_command.c | 13 ++++++++ .../qemuxml2argv-usb-controller-xhci.args | 22 ++++++++++++ .../qemuxml2argv-usb-controller-xhci.xml | 16 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 8 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml
Do you need any virDomainControllerDefCheckABIStability checks with these changes? w/r/t ports value Other than that things looked fine to me (couldn't run through normal building process because I didn't want to deal with patch2 merges). ACK - I trust you'll make the right check if you need it. John
On 05/02/2016 07:49 PM, John Ferlan wrote:
On 04/27/2016 02:29 PM, Cole Robinson wrote:
This adds a ports= attribute to usb controller XML, like
<controller type='usb' model='nec-xhci' ports='8'/>
This maps to:
qemu -device nec-usb-xhci,p2=8,p3=8
Meaning, 8 ports that support both usb2 and usb3 devices. Gerd suggested to just expose them as one knob.
https://bugzilla.redhat.com/show_bug.cgi?id=1271408 --- docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 8 ++++- src/conf/domain_conf.c | 39 ++++++++++++++-------- src/conf/domain_conf.h | 7 ++++ src/qemu/qemu_command.c | 13 ++++++++ .../qemuxml2argv-usb-controller-xhci.args | 22 ++++++++++++ .../qemuxml2argv-usb-controller-xhci.xml | 16 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 8 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.xml
Do you need any virDomainControllerDefCheckABIStability checks with these changes? w/r/t ports value
Other than that things looked fine to me (couldn't run through normal building process because I didn't want to deal with patch2 merges).
ACK - I trust you'll make the right check if you need it.
Thanks, added that check and pushed now - Cole
participants (2)
-
Cole Robinson -
John Ferlan