qemu: add capabilities bit for device x3130-upstream

This is the upstream part of a PCIe switch. It connects to a PCIe port
(but not PCI) on the upstream side, and can have up to 31
xio3130-downstream controllers (but no other types of devices)
connected to its downstream side.

This device will be used to implement the "pcie-switch-upstream-port"
model of pci controller.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a9b0b61b43b92e2bca1eb53b4cf9e482e9b048b5..2c284eb5f3f66d842e6ec22f53f3e9d93f02d6de 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -290,6 +290,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "migration-event",
               "gpex-pcihost",
               "ioh3420",
+              "x3130-upstream",
     );
 
 
@@ -1572,6 +1573,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL },
     { "gpex-pcihost", QEMU_CAPS_OBJECT_GPEX},
     { "ioh3420", QEMU_CAPS_DEVICE_IOH3420 },
+    { "x3130-upstream", QEMU_CAPS_DEVICE_X3130_UPSTREAM },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 892e9c33d4d17af86a13341e82babbcacc93a3ee..300b1887c333fd42d280d10fc81ef9dacc7276f3 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -233,6 +233,7 @@ typedef enum {
     QEMU_CAPS_MIGRATION_EVENT    = 191, /* MIGRATION event */
     QEMU_CAPS_OBJECT_GPEX        = 192, /* have generic PCI host controller */
     QEMU_CAPS_DEVICE_IOH3420     = 193, /* -device ioh3420 */
+    QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
index a1fafa61a76f431743e2345c2329396a561f8c52..78d7b82f60b26f0bcf7eb2deee71e563452bdd0d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
@@ -121,4 +121,5 @@
     <flag name='qxl.vgamem_mb'/>
     <flag name='qxl-vga.vgamem_mb'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
index 824ef02ad0ee58915502d4dd399cac17b6910f23..7cec7f9e7a8a7b7c0563e6f8703be7d6ec62fc43 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -136,4 +136,5 @@
     <flag name='qxl-vga.vgamem_mb'/>
     <flag name='pci-serial'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index 7ef5199686811d05f47441fd4d4a2245a406e6c4..f5f00347c5ce3609ef03f9d661a531bb3bcf46e3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -137,4 +137,5 @@
     <flag name='qxl-vga.vgamem_mb'/>
     <flag name='pci-serial'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index 8c3d48e304e96a22e8ac8efd71e19a60109705d4..9f0461adbfffe164744c131c911c45edf63d1b53 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -146,4 +146,5 @@
     <flag name='qxl-vga.vgamem_mb'/>
     <flag name='pci-serial'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index 72f7625fe10c086d69477da59fa69cc4a5e031f9..1b23b82ef5eed4ffd5d4ceb6ba3b227544fb282a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -152,4 +152,5 @@
     <flag name='qxl-vga.vgamem_mb'/>
     <flag name='pci-serial'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index d81c80cb2598b8957d816a5a7abacdfc1cde19b4..ff0427fbb9a52d1f86a563e3f22881d750ae35c9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -152,4 +152,5 @@
     <flag name='qxl-vga.vgamem_mb'/>
     <flag name='pci-serial'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index 1a39dce90cf41526739c111622cb2eb1fad8f391..56b27e5c6c597f3fe337b66b6c1573302fe9f501 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -168,4 +168,5 @@
     <flag name='pc-dimm'/>
     <flag name='pci-serial'/>
     <flag name='ioh3420'/>
+    <flag name='x3130-upstream'/>
   </qemuCaps>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 621164015ee26e80ffd1c37ee9b2faf5f1adb9c4..62b9a0cb56cdeac59e2a86a5b59ab40a2bd257b9 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -754,7 +754,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_USB_STORAGE,
             QEMU_CAPS_SPLASH_TIMEOUT,
             QEMU_CAPS_DEVICE_IVSHMEM,
-            QEMU_CAPS_DEVICE_IOH3420);
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_X3130_UPSTREAM);
     DO_TEST("qemu-1.1.0", 1001000, 0, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
@@ -855,7 +856,8 @@ mymain(void)
             QEMU_CAPS_OBJECT_USB_AUDIO,
             QEMU_CAPS_SPLASH_TIMEOUT,
             QEMU_CAPS_DEVICE_IVSHMEM,
-            QEMU_CAPS_DEVICE_IOH3420);
+            QEMU_CAPS_DEVICE_IOH3420,
+            QEMU_CAPS_DEVICE_X3130_UPSTREAM);
     DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED,
             QEMU_CAPS_LAST);
     DO_TEST_FULL("qemu-kvm-1.2.0", 1002000, 1, 0, VIR_ERR_CONFIG_UNSUPPORTED,