[libvirt] [PATCH 1/2] qemu: capabilitity: Introduce QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE
Shivaprasad G Bhat
sbhat at linux.vnet.ibm.com
Tue Nov 8 12:05:04 UTC 2016
The patch adds a capability for spapr-pci-host-bridge.numa_node.
Signed-off-by: Shivaprasad G Bhat <sbhat at linux.vnet.ibm.com>
---
src/qemu/qemu_capabilities.c | 7 ++
src/qemu/qemu_capabilities.h | 1
.../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 22 +++++--
.../caps_2.6.0-gicv2.aarch64.replies | 22 +++++--
.../caps_2.6.0-gicv3.aarch64.replies | 24 +++++---
.../caps_2.6.0.ppc64le.replies | 60 ++++++++++++++++++--
.../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 22 +++++--
.../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 22 +++++--
16 files changed, 257 insertions(+), 99 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 747226c..5fe63a3 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -350,6 +350,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"ivshmem-plain",
"ivshmem-doorbell", /* 240 */
+ "spapr-pci-host-bridge.numa_node",
);
@@ -1614,6 +1615,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioNet[] = {
{ "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE },
};
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSpaprPCIHostBridge[] = {
+ { "numa_node", QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE },
+};
+
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioSCSI[] = {
{ "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD },
};
@@ -1766,6 +1771,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) },
{ "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI) },
+ { "spapr-pci-host-bridge", virQEMUCapsObjectPropsSpaprPCIHostBridge,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsSpaprPCIHostBridge) },
};
struct virQEMUCapsPropTypeObjects {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d104404..ebab9ea 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -385,6 +385,7 @@ typedef enum {
/* 240 */
QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */
+ QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.numa_node= */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
index dff9788..b4f7b9e 100644
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
@@ -1701,6 +1701,14 @@
}
{
+ "id": "libvirt-39",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "isapc"
@@ -1738,7 +1746,7 @@
"name": "none"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -1810,7 +1818,7 @@
"name": "Opteron_G4"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -1818,11 +1826,11 @@
"enabled": false,
"present": true
},
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
- "id": "libvirt-42",
+ "id": "libvirt-43",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found"
@@ -1830,7 +1838,7 @@
}
{
- "id": "libvirt-43",
+ "id": "libvirt-44",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found"
@@ -1838,7 +1846,7 @@
}
{
- "id": "libvirt-44",
+ "id": "libvirt-45",
"error": {
"class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found"
@@ -1852,5 +1860,5 @@
"capability": "xbzrle"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
index c40f9fe..a5c2310 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
@@ -1921,6 +1921,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "q35-next",
@@ -1965,7 +1973,7 @@
"name": "none"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -2043,7 +2051,7 @@
"name": "Opteron_G5"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -2051,11 +2059,11 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
- "id": "libvirt-43",
+ "id": "libvirt-44",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found"
@@ -2063,7 +2071,7 @@
}
{
- "id": "libvirt-44",
+ "id": "libvirt-45",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found"
@@ -2071,7 +2079,7 @@
}
{
- "id": "libvirt-45",
+ "id": "libvirt-46",
"error": {
"class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found"
@@ -2085,5 +2093,5 @@
"capability": "xbzrle"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
index 7e86cff..20c4051 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
@@ -1968,6 +1968,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-q35-1.4",
@@ -2015,7 +2023,7 @@
"name": "none"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -2093,7 +2101,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -2101,11 +2109,11 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
- "id": "libvirt-43",
+ "id": "libvirt-44",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found"
@@ -2113,7 +2121,7 @@
}
{
- "id": "libvirt-44",
+ "id": "libvirt-45",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found"
@@ -2121,7 +2129,7 @@
}
{
- "id": "libvirt-45",
+ "id": "libvirt-46",
"error": {
"class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found"
@@ -2135,5 +2143,5 @@
"capability": "xbzrle"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 7486579..b7a7c04 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -2069,6 +2069,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-q35-1.4",
@@ -2138,7 +2146,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -2216,7 +2224,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -2224,19 +2232,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -2937,7 +2945,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -2947,5 +2955,5 @@
"capability": "xbzrle"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index aad28ca..8a9e8a2 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -2114,6 +2114,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-q35-1.4",
@@ -2191,7 +2199,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -2269,7 +2277,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -2277,19 +2285,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -2892,7 +2900,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -2914,5 +2922,5 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index b44d5f1..a1bba52 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -2131,6 +2131,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-q35-1.4",
@@ -2216,7 +2224,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -2294,7 +2302,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -2302,19 +2310,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -3107,7 +3115,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -3129,5 +3137,5 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index a7d8f36..46cfd84 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -2548,6 +2548,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-1.3",
@@ -2649,7 +2657,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -2730,7 +2738,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -2738,21 +2746,21 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -3612,7 +3620,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -3634,5 +3642,5 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index c483c48..5a84934 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -3113,6 +3113,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-i440fx-2.4",
@@ -3238,7 +3246,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -3328,7 +3336,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -3336,21 +3344,21 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -4358,7 +4366,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -4388,5 +4396,5 @@
"capability": "events"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 75a00ce..88801a5 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -3276,6 +3276,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-i440fx-2.4",
@@ -3409,7 +3417,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -3499,7 +3507,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -3507,21 +3515,21 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -4566,7 +4574,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -4600,5 +4608,5 @@
"capability": "x-postcopy-ram"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
index 35095b5..f046fc9 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
@@ -3654,6 +3654,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "integratorcp",
@@ -3825,7 +3833,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -3921,7 +3929,7 @@
"name": "pxa270"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -3929,19 +3937,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -4947,7 +4955,7 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -4963,5 +4971,5 @@
"kernel": true
}
],
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
index 0009f8f..a1979a2 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
@@ -3654,6 +3654,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "integratorcp",
@@ -3825,7 +3833,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -3921,7 +3929,7 @@
"name": "pxa270"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -3929,19 +3937,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -4913,7 +4921,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -4947,7 +4955,7 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -4963,5 +4971,5 @@
"kernel": false
}
],
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
index 1835b6d..901f526 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
@@ -3803,6 +3803,52 @@
{
"return": [
{
+ "name": "dynamic-reconfiguration",
+ "type": "bool"
+ },
+ {
+ "name": "dma_win_size",
+ "type": "uint64"
+ },
+ {
+ "name": "dma_win_addr",
+ "type": "uint64"
+ },
+ {
+ "name": "io_win_size",
+ "type": "uint64"
+ },
+ {
+ "name": "mem_win_size",
+ "type": "uint64"
+ },
+ {
+ "name": "buid",
+ "type": "uint64"
+ },
+ {
+ "name": "io_win_addr",
+ "type": "uint64"
+ },
+ {
+ "name": "liobn",
+ "type": "uint32"
+ },
+ {
+ "name": "mem_win_addr",
+ "type": "uint64"
+ },
+ {
+ "name": "index",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-40"
+}
+
+{
+ "return": [
+ {
"name": "ref405ep",
"cpu-max": 1
},
@@ -3869,7 +3915,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -5165,7 +5211,7 @@
"name": "MPC8541E_v11"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -5173,19 +5219,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -6152,7 +6198,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -6186,5 +6232,5 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 5db3f5a..443b2d6 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -3358,6 +3358,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"name": "pc-0.12",
@@ -3467,7 +3475,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -3557,7 +3565,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -3565,21 +3573,21 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -4673,7 +4681,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -4707,5 +4715,5 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index c525f66..c81fa85 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -3549,6 +3549,14 @@
}
{
+ "id": "libvirt-40",
+ "error": {
+ "class": "DeviceNotFound",
+ "desc": "Device 'spapr-pci-host-bridge' not found"
+ }
+}
+
+{
"return": [
{
"hotpluggable-cpus": true,
@@ -3694,7 +3702,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -3787,7 +3795,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -3795,21 +3803,21 @@
"enabled": false,
"present": true
},
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -4907,7 +4915,7 @@
"option": "drive"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -4941,5 +4949,5 @@
"capability": "postcopy-ram"
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
More information about the libvir-list
mailing list