On 06/02/2017 12:07 PM, Andrea Bolognani wrote:
> This new capability can be used to detect whether a QEMU
> binary supports the spapr-pci-host-bridge controller.
> ---
> src/qemu/qemu_capabilities.c | 3 +++
> src/qemu/qemu_capabilities.h | 3 +++
> tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 +
> 3 files changed, 7 insertions(+)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 7ea8505..3efa3ad 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -372,6 +372,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
> "intel-iommu.intremap",
> "intel-iommu.caching-mode",
> "intel-iommu.eim",
> +
> + "spapr-pci-host-bridge", /* 260 */
> );
>
>
> @@ -1621,6 +1623,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
> { "nvdimm", QEMU_CAPS_DEVICE_NVDIMM },
> { "pcie-root-port", QEMU_CAPS_DEVICE_PCIE_ROOT_PORT },
> { "qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI },
> + { "spapr-pci-host-bridge", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE },
> };
>
> static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index eba9814..d07ba0e 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -411,6 +411,9 @@ typedef enum {
> QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, /* intel-iommu.caching-mode */
> QEMU_CAPS_INTEL_IOMMU_EIM, /* intel-iommu.eim */
>
> + /* 260 */
> + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */
> +
> QEMU_CAPS_LAST /* this must always be the last item */
> } virQEMUCapsFlags;
>
> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
> index 425992f..7fa652a 100644
> --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
> @@ -164,6 +164,7 @@
> <flag name='query-named-block-nodes'/>
> <flag name='kernel-irqchip'/>
> <flag name='kernel-irqchip.split'/>
> + <flag name='spapr-pci-host-bridge'/>
> <version>2006000</version>
> <kvmVersion>0</kvmVersion>
> <package></package>
>
Reviewed-by: Laine Stump <laine@xxxxxxxxx>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
