qemu: caps: introduce QEMU_CAPS_NEC_USB_XHCI_PORTS

Reports whether we support -device nec-usb-xhci,p3=XXX value,
which has been available since qemu 1.3.0

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c081e840062d2fbafea41ea5410d6d6fa9905e7c..748ec3160bce054a6d52de49ee03c53f804b3627 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -326,6 +326,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
 
               "pxb-pcie", /* 220 */
               "device-tray-moved-event",
+              "nec-usb-xhci-ports",
     );
 
 
@@ -1685,6 +1686,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;
@@ -1748,6 +1753,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 705dfb11c4c6c2b2f0ce3f20aaabbdbead81c88f..d747fa9a73feb178d45f20fd0fd9cf490cda79c8 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -357,6 +357,7 @@ typedef enum {
     /* 220 */
     QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
     QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
+    QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
 
     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 fbddf3db309284fc088f003e073b08c90e272e77..2aa13f103021d9bf408b262547ba6123f1aa3625 100644 (file)
--- 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 de4ee0156a7771df64aae497bf5fcc58242c291f..fff215dcd0fd862b17f7eb7bca4bc578f3523f35 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -129,4 +129,5 @@
     <flag name='qxl.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='device-tray-moved-event'/>
+    <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 2542b67b49cd3b0b553a95844b1cd9f8b2d7cd10..d130ad7811de8023004e0522dcfb9d0b466f1c1c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
@@ -1846,6 +1846,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": [
         {

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index 1dcf2fa67c3367dcef3b134c64a45c5dcf45beb6..5aec5254d5dd547be8516c98220e746167a2cf2c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -130,4 +130,5 @@
     <flag name='qxl.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='device-tray-moved-event'/>
+    <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 46c329272f29c23c0b0dad9f7f03a7d60bf51860..93e705f348ca04891f9910ecf57d452d530fec5d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
@@ -1894,6 +1894,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": [
         {

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index 67ea419d1f436a4d8c99225ee35f83fbc3a49d8c..5a97958e97a72cadd8982e3e2522888cba2157cb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -139,4 +139,5 @@
     <flag name='qxl.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='device-tray-moved-event'/>
+    <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 37a735f6c1630fcf7763f36abe7483fb56c3379d..878d5efec4126375473552b334961eb849f5c733 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
@@ -1965,6 +1965,35 @@
     "id": "libvirt-36"
 }
 
+{
+    "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": [
         {

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index fb91111a61f4e0be8fa600f78e88770f54f2f981..ac3282576244f42f9a19600031737089842a181f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -145,4 +145,5 @@
     <flag name='qxl.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='device-tray-moved-event'/>
+    <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 89327022ba9d5c048bcac12e6638ca72deb4f514..070bc6205442f5773f10d3c019639ddedbf96d46 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
@@ -2027,6 +2027,35 @@
     "id": "libvirt-36"
 }
 
+{
+    "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": [
         {

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index 60dbe52fa0f59460194e083425651b135e97522e..7bf94e7fe2a14dbed2521b4b50de2114a3df1b59 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -145,4 +145,5 @@
     <flag name='qxl.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='device-tray-moved-event'/>
+    <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 b9bb9a327d76787bf78ed453f1f4629bf9530d82..0a37e12db601964146cb270b95f6c8af746a28e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
@@ -1991,6 +1991,35 @@
     "id": "libvirt-36"
 }
 
+{
+    "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": [
         {

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index 922167439092a7b0e26ae9be3d6396d0272060ce..729000f3e8dd82ab49dd3dabb6ac475019196d75 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -163,4 +163,5 @@
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='debug-threads'/>
     <flag name='device-tray-moved-event'/>
+    <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 fabda5572f5d7eb17015cfaf9ff667bef9a1bd29..02f1f4eefa311169e96130de06d8ff9023a9192d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
@@ -2449,6 +2449,39 @@
   "id": "libvirt-36"
 }
 
+{
+    "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": [
     {

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index d52f7f3a5a6d82156e50ba9c49a0942c27ea92cf..ad999570630320938be97025738111602e340515 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
@@ -175,4 +175,5 @@
     <flag name='debug-threads'/>
     <flag name='pxb'/>
     <flag name='device-tray-moved-event'/>
+    <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 299fdfc58c2a8a20e2ad0dc39da4f27500fa91ca..fd17a0b4ebd10ee6b35d8ee990c341fcefcb2edd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.replies
@@ -2968,6 +2968,47 @@
   "id": "libvirt-36"
 }
 
+{
+    "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": [
     {

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index e9750e42a1b07821c3b3d7a794661eb033d77b7f..8de8395d12a2588476bf27ed70698f4923075f37 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
@@ -176,4 +176,5 @@
     <flag name='debug-threads'/>
     <flag name='pxb'/>
     <flag name='device-tray-moved-event'/>
+    <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 7b692b5017a35f40cc9b59bf2e354277a88c84b8..f25b1053037841005a5338de99319500942df5e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies
@@ -2988,6 +2988,47 @@
   "id": "libvirt-36"
 }
 
+{
+    "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": [
     {

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index 208f06364b696d5d48f76bfc5d4449c65371640e..84b96c777922dfc3978a3c505f16c58db94901da 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -181,4 +181,5 @@
     <flag name='pxb'/>
     <flag name='pxb-pcie'/>
     <flag name='device-tray-moved-event'/>
+    <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 8a4c3fe3c8261adf43f2674170d5efcbafba2e69..d80fe31ff6119990ffe7f6cc925c3ff874f46093 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.replies
@@ -2994,6 +2994,47 @@
   "id": "libvirt-36"
 }
 
+{
+    "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": [
     {