qemu: add capabilities bit for device "pxb"

The pxb device is a PCI expander bus that can be added to any
440fx-based machinetype. The PCI bus that is created has 32 standard
PCI slots (hotpluggable). It can have a NUMA node number associated
with it, as well as a bus number.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b73c296bad2a8ce255cf505f4d30c005ed1087d3..98e9950e9bf1cf48f0ed8f79d19237c3c91f88c1 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -322,6 +322,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "chardev-logfile",
               "debug-threads",
               "secret",
+              "pxb",
     );
 
 
@@ -1577,6 +1578,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST },
     { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 },
     { "secret", QEMU_CAPS_OBJECT_SECRET },
+    { "pxb", QEMU_CAPS_DEVICE_PXB },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ae0d9b3c1915de90caba326b003c976d5797364d..f5e783e2e6de5cb1817804b6b95b182efb78374f 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -352,6 +352,7 @@ typedef enum {
     QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
     QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
     QEMU_CAPS_OBJECT_SECRET, /* -object secret */
+    QEMU_CAPS_DEVICE_PXB, /* -device pxb */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index efbf9af6e4f23e941f5586b5c8214a4f7af6acb4..0423e9cdd78ad219b98eff618d9de291b76cd7b8 100644 (file)
--- 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.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='debug-threads'/>
+    <flag name='pxb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index 5fd3bcea68114a81fa972419785ee1da5046bb2d..060ae2511bb3e7b6ba2b4f0e79cabb2549949697 100644 (file)
--- 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.vram64_size_mb'/>
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='debug-threads'/>
+    <flag name='pxb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index a43293d6a7c873b38de669f72e4b534879ad9f41..32046bf0dfea1f91da2319644655f58491502fe8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -179,4 +179,5 @@
     <flag name='qxl-vga.vram64_size_mb'/>
     <flag name='debug-threads'/>
     <flag name='secret'/>
+    <flag name='pxb'/>
   </qemuCaps>