qemu: capabilitity: Introduce QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE

The patch adds a capability for spapr-pci-host-bridge.numa_node.

Signed-off-by: Shivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Shivaprasad G Bhat 2017-07-21 13:32:32 +05:30 committed by Andrea Bolognani
parent eb56cc6f88
commit 11b2ebf3e1
5 changed files with 162 additions and 20 deletions

View File

@ -431,6 +431,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"virtio.ats",
"loadparm",
"spapr-pci-host-bridge",
"spapr-pci-host-bridge.numa_node",
);
@ -1702,6 +1703,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioNet[] = {
{ "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSpaprPCIHostBridge[] = {
{ "numa_node", QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioSCSI[] = {
{ "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD },
};
@ -1902,6 +1907,9 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
{ "intel-iommu", virQEMUCapsObjectPropsIntelIOMMU,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIntelIOMMU),
QEMU_CAPS_DEVICE_INTEL_IOMMU},
{ "spapr-pci-host-bridge", virQEMUCapsObjectPropsSpaprPCIHostBridge,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSpaprPCIHostBridge),
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE },
};
struct virQEMUCapsPropTypeObjects {

View File

@ -417,6 +417,7 @@ typedef enum {
QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */
QEMU_CAPS_LOADPARM, /* -machine loadparm */
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */
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;

View File

@ -3809,6 +3809,52 @@
"id": "libvirt-40"
}
{
"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-41"
}
{
"return": [
{
@ -3878,7 +3924,7 @@
"cpu-max": 255
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -5180,12 +5226,6 @@
"name": "MPC8541E_v11"
}
],
"id": "libvirt-42"
}
{
"return": [
],
"id": "libvirt-43"
}
@ -5195,6 +5235,12 @@
"id": "libvirt-44"
}
{
"return": [
],
"id": "libvirt-45"
}
{
"return": [
{
@ -6159,7 +6205,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -6193,7 +6239,7 @@
"capability": "postcopy-ram"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -14198,7 +14244,7 @@
"meta-type": "array"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{

View File

@ -4271,6 +4271,92 @@
"id": "libvirt-40"
}
{
"return": [
{
"name": "dynamic-reconfiguration",
"type": "bool"
},
{
"name": "ddw",
"type": "bool"
},
{
"name": "dma_win_size",
"type": "uint64"
},
{
"name": "numa_node",
"type": "uint32"
},
{
"name": "pre-2.8-migration",
"type": "bool"
},
{
"name": "mem64_win_size",
"type": "uint64"
},
{
"name": "pgsz",
"type": "uint64"
},
{
"name": "liobn64",
"type": "uint32"
},
{
"name": "dma_win_addr",
"type": "uint64"
},
{
"name": "io_win_size",
"type": "uint64"
},
{
"name": "mem_win_size",
"type": "uint64"
},
{
"name": "buid",
"type": "uint64"
},
{
"name": "dma64_win_addr",
"type": "uint64"
},
{
"name": "mem64_win_addr",
"type": "uint64"
},
{
"name": "pcie-extended-configuration-space",
"type": "bool"
},
{
"name": "io_win_addr",
"type": "uint64"
},
{
"name": "liobn",
"type": "uint32"
},
{
"name": "mem_win_addr",
"type": "uint64"
},
{
"name": "mem64_win_pciaddr",
"type": "uint64"
},
{
"name": "index",
"type": "uint32"
}
],
"id": "libvirt-41"
}
{
"return": [
{
@ -4381,7 +4467,7 @@
"cpu-max": 1
}
],
"id": "libvirt-41"
"id": "libvirt-42"
}
{
@ -6557,12 +6643,6 @@
"static": false
}
],
"id": "libvirt-42"
}
{
"return": [
],
"id": "libvirt-43"
}
@ -6572,6 +6652,12 @@
"id": "libvirt-44"
}
{
"return": [
],
"id": "libvirt-45"
}
{
"return": [
{
@ -7679,7 +7765,7 @@
"option": "drive"
}
],
"id": "libvirt-45"
"id": "libvirt-46"
}
{
@ -7721,7 +7807,7 @@
"capability": "release-ram"
}
],
"id": "libvirt-46"
"id": "libvirt-47"
}
{
@ -17007,7 +17093,7 @@
"meta-type": "object"
}
],
"id": "libvirt-47"
"id": "libvirt-48"
}
{

View File

@ -168,6 +168,7 @@
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.9.0)</package>