August 2022 - Devel - libvirt List Archives

[PATCH] conf: Add USB redirect devices to domain capabilities
by Jim Fehlig 31 Aug '22

31 Aug '22

As qemu becomes more modularized, it is important for libvirt to advertise availability of the modularized functionality through capabilities. This change adds USB redirect devices to domain capabilities, allowing clients such as virt-install to avoid using redirdev devices when not supported by the target qemu. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/formatdomaincaps.rst | 22 +++++++++++++++++++ src/conf/domain_capabilities.c | 13 +++++++++++ src/conf/domain_capabilities.h | 8 +++++++ src/conf/schemas/domaincaps.rng | 10 +++++++++ src/qemu/qemu_capabilities.c | 17 ++++++++++++++ src/qemu/qemu_capabilities.h | 3 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 +++++ tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 +++++ .../qemu_6.2.0-virt.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 +++++ .../qemu_7.0.0-virt.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 +++++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 +++++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 +++++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 +++++ 54 files changed, 265 insertions(+) diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 70f46b972a..557b61bf26 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -529,6 +529,28 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance: ``backendVersion`` Options for the ``version`` attribute of the ``<tpm><backend/>`` element. +USB redirect device +^^^^^^^^^^^^^^^^^^^ + +USB redirdev device capabilities are exposed under the ``redirdev`` element. For instance: + +:: + + <domainCapabilities> + ... + <devices> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> + ... + </devices> + </domainCapabilities> + +``bus`` + Options for the ``bus`` attribute of the ``<redirdev/>`` element. + Features ~~~~~~~~ diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 653123f293..9cb1dbe7bd 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -559,6 +559,18 @@ virDomainCapsDeviceFilesystemFormat(virBuffer *buf, } +static void +virDomainCapsDeviceRedirdevFormat(virBuffer *buf, + const virDomainCapsDeviceRedirdev *redirdev) +{ + FORMAT_PROLOGUE(redirdev); + + ENUM_PROCESS(redirdev, bus, virDomainRedirdevBusTypeToString); + + FORMAT_EPILOGUE(redirdev); +} + + /** * virDomainCapsFeatureGICFormat: * @buf: target buffer @@ -672,6 +684,7 @@ virDomainCapsFormat(const virDomainCaps *caps) virDomainCapsDeviceRNGFormat(&buf, &caps->rng); virDomainCapsDeviceFilesystemFormat(&buf, &caps->filesystem); virDomainCapsDeviceTPMFormat(&buf, &caps->tpm); + virDomainCapsDeviceRedirdevFormat(&buf, &caps->redirdev); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</devices>\n"); diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index a526969cda..de2a89c963 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -130,6 +130,13 @@ struct _virDomainCapsDeviceTPM { virDomainCapsEnum backendVersion; /* virDomainTPMVersion */ }; +STATIC_ASSERT_ENUM(VIR_DOMAIN_REDIRDEV_BUS_LAST); +typedef struct _virDomainCapsDeviceRedirdev virDomainCapsDeviceRedirdev; +struct _virDomainCapsDeviceRedirdev { + virTristateBool supported; + virDomainCapsEnum bus; /* virDomainRedirdevBus */ +}; + STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST); typedef struct _virDomainCapsDeviceFilesystem virDomainCapsDeviceFilesystem; struct _virDomainCapsDeviceFilesystem { @@ -225,6 +232,7 @@ struct _virDomainCaps { virDomainCapsDeviceRNG rng; virDomainCapsDeviceFilesystem filesystem; virDomainCapsDeviceTPM tpm; + virDomainCapsDeviceRedirdev redirdev; /* add new domain devices here */ virDomainCapsFeatureGIC gic; diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng index 9cbc2467ab..8da3fbb352 100644 --- a/src/conf/schemas/domaincaps.rng +++ b/src/conf/schemas/domaincaps.rng @@ -195,6 +195,9 @@ <optional> <ref name="tpm"/> </optional> + <optional> + <ref name="redirdev"/> + </optional> </element> </define> @@ -247,6 +250,13 @@ </element> </define> + <define name="redirdev"> + <element name="redirdev"> + <ref name="supported"/> + <ref name="enum"/> + </element> + </define> + <define name="features"> <element name="features"> <optional> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c5338f6830..e54df1788e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6349,6 +6349,21 @@ virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, } +void +virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceRedirdev *redirdev) +{ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR)) { + redirdev->supported = VIR_TRISTATE_BOOL_YES; + redirdev->bus.report = true; + VIR_DOMAIN_CAPS_ENUM_SET(redirdev->bus, VIR_DOMAIN_REDIRDEV_BUS_USB); + } else { + redirdev->supported = VIR_TRISTATE_BOOL_NO; + } +} + + + /** * virQEMUCapsSupportsGICVersion: * @qemuCaps: QEMU capabilities @@ -6484,6 +6499,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceRNG *rng = &domCaps->rng; virDomainCapsDeviceFilesystem *filesystem = &domCaps->filesystem; virDomainCapsDeviceTPM *tpm = &domCaps->tpm; + virDomainCapsDeviceRedirdev *redirdev = &domCaps->redirdev; virDomainCapsMemoryBacking *memoryBacking = &domCaps->memoryBacking; virQEMUCapsFillDomainFeaturesFromQEMUCaps(qemuCaps, domCaps); @@ -6516,6 +6532,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps, virQEMUCapsFillDomainDeviceRNGCaps(qemuCaps, rng); virQEMUCapsFillDomainDeviceFSCaps(qemuCaps, filesystem); virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, tpm); + virQEMUCapsFillDomainDeviceRedirdevCaps(qemuCaps, redirdev); virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps); virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8e777297f6..b2de931e2d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -830,6 +830,9 @@ void virQEMUCapsFillDomainDeviceFSCaps(virQEMUCaps *qemuCaps, void virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps, virDomainCapsDeviceTPM *tpm); +void virQEMUCapsFillDomainDeviceRedirdevCaps(virQEMUCaps *qemuCaps, + virDomainCapsDeviceRedirdev *redirdev); + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index 0ec4c570ac..a39ada0182 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -216,6 +216,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index 4e0cb08b72..e054993aaf 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -231,6 +231,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml index 05d606967b..579ca0eed7 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -165,6 +165,7 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml index f19ad5e6db..1632c85d7a 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -163,6 +163,7 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml index 8ea7ad5714..909feac47c 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -136,6 +136,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index fb162ea578..1c3877ec0c 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -238,6 +238,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index d8793bb38a..666a974489 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -216,6 +216,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 036e446c64..e6625bcdbc 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -218,6 +218,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index 4df4e86cf1..9e1ffe3a4d 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml index bb8500baa6..631bb6b15f 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -177,6 +177,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml index e7227d092f..dcf8d22806 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -175,6 +175,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml index cac329fd08..fcfc2266d2 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -142,6 +142,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index e901d12918..f08278cfbf 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -218,6 +218,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index df1572c901..814f81defc 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 3a6dc7b5fc..6391383da7 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml index 5c1c0c4680..ea4d1d28dd 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -105,6 +105,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index e0e8e0ed12..5dd7efe165 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 6a49f568be..8b4c1dd954 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index f41f47c346..3306a14ba0 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -233,6 +233,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index dfd792c031..4571622c4c 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -177,6 +177,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index e7227d092f..dcf8d22806 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -175,6 +175,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index 88e4837ec3..bc43fb6a38 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -142,6 +142,7 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 2a2ca8abcf..041c1ede15 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -240,6 +240,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 0a6f72df7e..6147fc84b8 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -219,6 +219,11 @@ <value>1.2</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index 40df34edf0..3e36847385 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -221,6 +221,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index e563b0cb59..d622f67ef3 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 958c40437f..9bf854869f 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -179,6 +179,7 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 4164bf49f7..fbd48cac00 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -177,6 +177,7 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index 13fa3a637e..880ea5062a 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -241,6 +241,11 @@ </enum> </filesystem> <tpm supported='no'/> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index eb60a2105f..84e575829d 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -221,6 +221,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index 0480a086c6..a25fa7bacc 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 7baecb0c73..2972e119e7 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 9cbe93ad46..60da420044 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 07b951b81f..61d43e6599 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index 367e656b31..057a67c034 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -236,6 +236,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index 99c0fc03fd..2843599b57 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -181,6 +181,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index 8e04508694..45806a8f10 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -179,6 +179,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index 0bbe501383..cc3a45618c 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -141,6 +141,7 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='no'/> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index f363cf1b79..56fae62434 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index 136dadaeb4..5e4d4d48da 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -223,6 +223,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index c684759356..8a18d45fca 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -237,6 +237,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 1d6f29db9f..8e3313f383 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -180,6 +180,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='yes'> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 73097470f8..f25ab0b796 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -178,6 +178,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 7765c941c5..c43c63c741 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -142,6 +142,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 0f9a65ef1b..410cc84977 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -223,6 +223,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 30082712f4..3b5a846342 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index bcca02f0a4..dd7b8c2ab9 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -235,6 +235,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index f377b8e3a9..d8c83e03f3 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -222,6 +222,11 @@ <value>2.0</value> </enum> </tpm> + <redirdev supported='yes'> + <enum name='bus'> + <value>usb</value> + </enum> + </redirdev> </devices> <features> <gic supported='no'/> -- 2.37.1

1 0

[libvirt][PATCH v15 1/9] domain_capabilities: Define SGX capabilities structs
by Lin Yang 31 Aug '22

31 Aug '22

From: Haibin Huang <haibin.huang(a)intel.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Haibin Huang <haibin.huang(a)intel.com> --- src/conf/domain_capabilities.c | 11 +++++++++++ src/conf/domain_capabilities.h | 21 +++++++++++++++++++++ src/libvirt_private.syms | 1 + 3 files changed, 33 insertions(+) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 653123f293..869b5d68e6 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -76,6 +76,17 @@ virSEVCapabilitiesFree(virSEVCapability *cap) } +void +virSGXCapabilitiesFree(virSGXCapability *cap) +{ + if (!cap) + return; + + g_free(cap->sgxSections); + g_free(cap); +} + + static void virDomainCapsDispose(void *obj) { diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index a526969cda..ae93622777 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -193,6 +193,21 @@ struct _virSEVCapability { unsigned int max_es_guests; }; +typedef struct _virSGXSection virSGXSection; +struct _virSGXSection { + unsigned long long size; + unsigned int node; +}; + +typedef struct _virSGXCapability virSGXCapability; +struct _virSGXCapability { + bool flc; + bool sgx1; + bool sgx2; + size_t nSgxSections; + virSGXSection *sgxSections; +}; + typedef enum { VIR_DOMAIN_CAPS_FEATURE_IOTHREADS = 0, VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, @@ -229,6 +244,7 @@ struct _virDomainCaps { virDomainCapsFeatureGIC gic; virSEVCapability *sev; + virSGXCapability *sgx; /* add new domain features here */ virTristateBool features[VIR_DOMAIN_CAPS_FEATURE_LAST]; @@ -277,3 +293,8 @@ void virSEVCapabilitiesFree(virSEVCapability *capabilities); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSEVCapability, virSEVCapabilitiesFree); + +void +virSGXCapabilitiesFree(virSGXCapability *capabilities); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSGXCapability, virSGXCapabilitiesFree); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ac2802095e..bb539e62fb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -218,6 +218,7 @@ virDomainCapsEnumSet; virDomainCapsFormat; virDomainCapsNew; virSEVCapabilitiesFree; +virSGXCapabilitiesFree; # conf/domain_conf.h -- 2.25.1

1 8

[PATCH] NEWS: Fix spelling of 'subelment'
by Jim Fehlig 31 Aug '22

31 Aug '22

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing as trivial NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index ff618d5848..82389b48dd 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -25,7 +25,7 @@ v8.7.0 (unreleased) * qemu: Add support for specifying vCPU physical address size in bits Users can now specify the number of vCPU physical address bits with - the `<maxphysaddr>` subelment of the `<cpu>` element. + the `<maxphysaddr>` subelement of the `<cpu>` element. * **Improvements** -- 2.37.1

1 0

[PATCH] qemuValidateDomainDef: Clarify error message when S390 PV launch security is unsupported by the kernel
by Peter Krempa 30 Aug '22

30 Aug '22

Split up the condition and report a different error message when the host or host config results in S390 PV launch security being unavailable. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2122534 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_validate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 6403266559..63f3459c90 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1454,11 +1454,14 @@ qemuValidateDomainDef(const virDomainDef *def, break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT) || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST) || - !virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps)) { + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("S390 PV launch security is not supported with " - "this QEMU binary")); + _("S390 PV launch security is not supported with this QEMU binary")); + return -1; + } + if (!virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("S390 PV launch security is not supported by this host or kernel")); return -1; } break; -- 2.37.1

2 2

Entering freeze for libvirt-8.7.0
by Jiri Denemark 30 Aug '22

30 Aug '22

I have just tagged v8.7.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH] conf: Add more checks for VDS interface parameters
by Martin Kletzander 30 Aug '22

30 Aug '22

Add some checks that commit 0225483adce9 forgot to include. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6950f7ec1d8f..970cc85ded6c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9336,6 +9336,27 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, goto error; } + if (!portid) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source portid for interface type '%s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + + if (!connectionid) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source connectionid for interface type '%s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + + if (!portgroup) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing source portgroup for interface type '%s'"), + virDomainNetTypeToString(def->type)); + goto error; + } + if (virUUIDParse(switchid, def->data.vds.switch_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse switchid '%s'"), switchid); -- 2.37.2

2 1

[PATCH 0/5] Add "support" for VMWare Distributed Switch
by Martin Kletzander 30 Aug '22

30 Aug '22

Previously (but still in this release) such interfaces were represented as dummy ones, but hopefully we can properly represent them still in the same release. Martin Kletzander (5): tests: Fix vmx/xml filenames conf: Rewrite virNetDevVPortProfileCopy vmx: Require networkName for bridged and custom NICs conf, docs, schemas: Add support for interface type vds vmx: Add support for VDS interface docs/formatdomain.rst | 30 ++++++-- src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 73 ++++++++++++++++-- src/conf/domain_conf.h | 7 ++ src/conf/netdev_bandwidth_conf.c | 1 + src/conf/schemas/domaincommon.rng | 23 ++++++ src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 + src/lxc/lxc_process.c | 2 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_interface.c | 2 + src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 1 + src/util/virnetdevvportprofile.c | 18 +++-- src/util/virnetdevvportprofile.h | 5 +- src/vmx/vmx.c | 77 +++++++++++++++---- ...unmanaged-nodev.vmx => ethernet-dummy.vmx} | 0 ...unmanaged-nodev.xml => ethernet-dummy.xml} | 0 tests/vmx2xmldata/ethernet-vds.vmx | 11 +++ tests/vmx2xmldata/ethernet-vds.xml | 24 ++++++ tests/vmx2xmltest.c | 3 +- ...d-nodev.vmx => xml2vmx-ethernet-dummy.vmx} | 0 ...d-nodev.xml => xml2vmx-ethernet-dummy.xml} | 0 tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx | 18 +++++ tests/xml2vmxdata/xml2vmx-ethernet-vds.xml | 15 ++++ tests/xml2vmxtest.c | 3 +- tools/virsh-domain.c | 1 + 31 files changed, 292 insertions(+), 39 deletions(-) rename tests/vmx2xmldata/{ethernet-unmanaged-nodev.vmx => ethernet-dummy.vmx} (100%) rename tests/vmx2xmldata/{ethernet-unmanaged-nodev.xml => ethernet-dummy.xml} (100%) create mode 100644 tests/vmx2xmldata/ethernet-vds.vmx create mode 100644 tests/vmx2xmldata/ethernet-vds.xml rename tests/xml2vmxdata/{xml2vmx-ethernet-unmanaged-nodev.vmx => xml2vmx-ethernet-dummy.vmx} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-unmanaged-nodev.xml => xml2vmx-ethernet-dummy.xml} (100%) create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vds.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vds.xml -- 2.37.2

3 9

[libvirt PATCH] tests: add better QEMU capabilities example
by Daniel P. Berrangé 30 Aug '22

30 Aug '22

Updated example covers: * UUID * CPU model, vendor, microcode, signature, counters, topology, maxphysaddr, features, * Power management * NUMA page size info, multiple nodes, CPU topology IDs, distances * CPU cache bank info * Multiple secmodels Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/capabilityschemadata/caps-qemu-kvm.xml | 95 ++++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index 65c3bba7c4..acdbb362cc 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -1,9 +1,50 @@ <capabilities> <host> + <uuid>a25c794c-34ad-11b2-a85c-b030533115b8</uuid> <cpu> <arch>x86_64</arch> + <model>Haswell-noTSX</model> + <vendor>Intel</vendor> + <microcode version='45'/> + <counter name='tsc' frequency='2596991000' scaling='no'/> + <topology sockets='1' dies='1' cores='8' threads='1'/> + <maxphysaddr mode='emulate' bits='39'/> + <feature name='vme'/> + <feature name='ds'/> + <feature name='acpi'/> + <feature name='ss'/> + <feature name='ht'/> + <feature name='tm'/> + <feature name='pbe'/> + <feature name='dtes64'/> + <feature name='ds_cpl'/> + <feature name='vmx'/> + <feature name='smx'/> + <feature name='est'/> + <feature name='tm2'/> + <feature name='xtpr'/> + <feature name='pdcm'/> + <feature name='dca'/> + <feature name='osxsave'/> + <feature name='f16c'/> + <feature name='rdrand'/> + <feature name='arat'/> + <feature name='tsc_adjust'/> + <feature name='cmt'/> + <feature name='xsaveopt'/> + <feature name='pdpe1gb'/> + <feature name='abm'/> + <feature name='invtsc'/> + <pages unit='KiB' size='4'/> + <pages unit='KiB' size='2048'/> + <pages unit='KiB' size='1048576'/> </cpu> + <power_management> + <suspend_mem/> + <suspend_disk/> + <suspend_hybrid/> + </power_management> <migration_features> <live/> <uri_transports> @@ -12,23 +53,65 @@ </uri_transports> </migration_features> <topology> - <cells num='1'> + <cells num='2'> <cell id='0'> - <cpus num='4'> - <cpu id='0'/> - <cpu id='1'/> - <cpu id='2'/> - <cpu id='3'/> + <memory unit='KiB'>16175540</memory> + <pages unit='KiB' size='4'>4043885</pages> + <pages unit='KiB' size='2048'>0</pages> + <pages unit='KiB' size='1048576'>0</pages> + <distances> + <sibling id='0' value='10'/> + <sibling id='1' value='21'/> + </distances> + <cpus num='8'> + <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/> + <cpu id='2' socket_id='0' die_id='0' core_id='1' siblings='2'/> + <cpu id='4' socket_id='0' die_id='0' core_id='2' siblings='4'/> + <cpu id='6' socket_id='0' die_id='0' core_id='3' siblings='6'/> + <cpu id='8' socket_id='0' die_id='0' core_id='4' siblings='8'/> + <cpu id='10' socket_id='0' die_id='0' core_id='5' siblings='10'/> + <cpu id='12' socket_id='0' die_id='0' core_id='6' siblings='12'/> + <cpu id='14' socket_id='0' die_id='0' core_id='7' siblings='14'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>16510060</memory> + <pages unit='KiB' size='4'>4127515</pages> + <pages unit='KiB' size='2048'>0</pages> + <pages unit='KiB' size='1048576'>0</pages> + <distances> + <sibling id='0' value='21'/> + <sibling id='1' value='10'/> + </distances> + <cpus num='8'> + <cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/> + <cpu id='3' socket_id='1' die_id='0' core_id='1' siblings='3'/> + <cpu id='5' socket_id='1' die_id='0' core_id='2' siblings='5'/> + <cpu id='7' socket_id='1' die_id='0' core_id='3' siblings='7'/> + <cpu id='9' socket_id='1' die_id='0' core_id='4' siblings='9'/> + <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/> + <cpu id='13' socket_id='1' die_id='0' core_id='6' siblings='13'/> + <cpu id='15' socket_id='1' die_id='0' core_id='7' siblings='15'/> </cpus> </cell> </cells> </topology> + <cache> + <bank id='0' level='3' type='both' size='20' unit='MiB' cpus='0,2,4,6,8,10,12,14'/> + <bank id='1' level='3' type='both' size='20' unit='MiB' cpus='1,3,5,7,9,11,13,15'/> + </cache> <secmodel> <model>selinux</model> <doi>0</doi> <baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel> <baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel> </secmodel> + <secmodel> + <model>dac</model> + <doi>0</doi> + <baselabel type='kvm'>+107:+107</baselabel> + <baselabel type='qemu'>+107:+107</baselabel> + </secmodel> </host> <guest> -- 2.37.2

2 1

[PATCH] qemu: command: Don't use deprecated chardev backend drivers 'tty' and 'parport'
by Peter Krempa 30 Aug '22

30 Aug '22

The replacement is 'serial' and 'parallel' respectively introduced at least in qemu-2.9 and the old versions are deprecated since qemu-6.0. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 12 ++++++++---- .../qemuxml2argvdata/name-escape.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/parallel-parport-chardev.args | 2 +- .../parallel-parport-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +- .../pci-serial-dev-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev-iobase.args | 2 +- .../serial-dev-chardev-iobase.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../serial-dev-chardev.x86_64-latest.args | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a31b8ee438..da04537234 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1314,12 +1314,16 @@ qemuBuildChardevStr(const virDomainChrSourceDef *dev, virBufferAsprintf(&buf, "pty,id=%s", charAlias); break; - case VIR_DOMAIN_CHR_TYPE_DEV: - virBufferAsprintf(&buf, "%s,id=%s,path=", - STRPREFIX(charAlias, "charparallel") ? "parport" : "tty", - charAlias); + case VIR_DOMAIN_CHR_TYPE_DEV: { + const char *backend = "serial"; + + if (STRPREFIX(charAlias, "charparallel")) + backend = "parallel"; + + virBufferAsprintf(&buf, "%s,id=%s,path=", backend, charAlias); virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); break; + } case VIR_DOMAIN_CHR_TYPE_FILE: virBufferAsprintf(&buf, "file,id=%s", charAlias); diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args index b8ac17eee6..42b0ad3230 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-foo=1,bar=2/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"smartcard0","bus":"ccid0.0"}' \ --chardev tty,id=charserial0,path=/dev/ttyS2,,foo \ +-chardev serial,id=charserial0,path=/dev/ttyS2,,foo \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":1}' \ -add-fd set=0,fd=1750,opaque=serial1-source \ -chardev file,id=charserial1,path=/dev/fdset/0,append=on \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args index e3d3d6f3db..66b398fe64 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev parport,id=charparallel0,path=/dev/parport0 \ +-chardev parallel,id=charparallel0,path=/dev/parport0 \ -device isa-parallel,chardev=charparallel0,id=parallel0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args index 2ce2e381bb..6200251f1e 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --chardev parport,id=charparallel0,path=/dev/parport0 \ +-chardev parallel,id=charparallel0,path=/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args index 651b2732f5..0cc0ef2c14 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args index c513ae0316..94d90b215c 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args index 735dcd053a..32218842ef 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args index a22237b680..3b5ce0a59b 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0,"iobase":1016,"irq":4}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args index 52f9c3d0bb..ba8832f64f 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0,index=0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args index a19d3bb209..ffa9bac136 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ --chardev tty,id=charserial0,path=/dev/ttyS2 \ +-chardev serial,id=charserial0,path=/dev/ttyS2 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -- 2.37.1

2 1

[PATCH] NEWS: Mention bumping of minimum qemu version to 4.2
by Peter Krempa 29 Aug '22

29 Aug '22

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index bd848a8867..ff618d5848 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -15,6 +15,11 @@ v8.7.0 (unreleased) * **Removed features** + * qemu: Remove support for QEMU < 4.2 + + In accordance with our platform support policy, the oldest supported QEMU + version is now bumped from 3.1 to 4.2. + * **New features** * qemu: Add support for specifying vCPU physical address size in bits -- 2.37.1

2 1

[libvirt PATCH] NEWS: memtion vdpa/vfio memlock bump in release notes
by Jonathon Jongsma 27 Aug '22

27 Aug '22

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2e0a4a7b94..8ebf67581f 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -31,6 +31,12 @@ v8.7.0 (unreleased) * **Bug fixes** + * qemu: increase memlock limit for a domain with multiple vfio/vdpa devices + + When multiple vfio or vdpa devices are assigned to a domain, the memory + limit could be too low to map memory for all devices. The memlock limit has + been increased to be proportional to the number of vdpa/vfio devices. + v8.6.0 (2022-08-01) =================== -- 2.37.1

2 1

[PATCH v1 00/10] Dirty page rate limit support
by huangy81＠chinatelecom.cn 27 Aug '22

27 Aug '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> Ping How about this series? hoping to get comments if anyone has played with it. Thanks very much sincerely. Yong v1: - rebase on master and fix conflicts - filter out dirty page limit info for hotpluggable vcpu but not active - drop the documents patch, which can be post later after main series being reviewed. - code clean Abstract ======== Qemu introduced dirty page rate limit feature in 7.1.0, see the details in the following link: https://lore.kernel.org/qemu-devel/cover.1656177590.git.huangy81@chinatelec… So may be it's the right time to enabling this feature in libvirt meanwhile so that upper user can play with it. Expecting the upper app can use this feature to do a vcpu Qos or whatever else. This patch add 2 new apis to implement dirty page rate limit: 1. virDomainSetVcpuDirtyLimit, which set vcpu dirty page rate limit. virsh command 'vcpudirtylimit' also implemented correspondingly. 2. virDomainCancelVcpuDirtyLimit, which cancel vcpu dirty page rate limit. 'cancel' option was introduced to 'vcpudirtylimit' to cancel the limit correspondingly. In addition, function 'qemuMonitorQueryVcpuDirtyLimit' was implemented to query dirty page rate limit, virsh command 'vcpuinfo' was extended so that user can query dirty page rate limit info via 'vcpuinfo'. This series make main modifications as the following: - introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability so that libvirt can probe before using dirty page rate limit feature. - implement virsh command 'vcpudirtylimit' to set/cancel dirty page rate limit. - extend vcpuinfo api so that it can display dirtylimit info. Please review, thanks! Best regards! Hyman Huang(黄勇) (10): qemu_capabilities: Introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability libvirt: Add virDomainSetVcpuDirtyLimit API qemu_driver: Implement qemuDomainSetVcpuDirtyLimit virsh: Introduce vcpudirtylimit api qemu_monitor: Implement qemuMonitorQueryVcpuDirtyLimit qemu_driver: Extend qemuDomainGetVcpus for dirtylimit virsh: Extend vcpuinfo api to display dirtylimit info libvirt: Add virDomainCancelVcpuDirtyLimit API qemu_driver: Implement qemuDomainCancelVcpuDirtyLimit virsh: Add cancel option to vcpudirtylimit api include/libvirt/libvirt-domain.h | 22 ++++ src/driver-hypervisor.h | 13 ++ src/libvirt-domain.c | 94 ++++++++++++++ src/libvirt_public.syms | 6 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 156 +++++++++++++++++++++++ src/qemu/qemu_monitor.c | 36 ++++++ src/qemu/qemu_monitor.h | 26 ++++ src/qemu/qemu_monitor_json.c | 138 ++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 13 ++ src/remote/remote_daemon_dispatch.c | 2 + src/remote/remote_driver.c | 4 + src/remote/remote_protocol.x | 30 ++++- src/remote_protocol-structs | 13 ++ tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 + tools/virsh-domain.c | 112 ++++++++++++++++ 17 files changed, 667 insertions(+), 2 deletions(-) -- 1.8.3.1

1 10

[PATCH] lib: Drop needless ret variables
by Michal Privoznik 26 Aug '22

26 Aug '22

This patch was generated using the following spatch: @@ type T; constant C; expression f; identifier ret; @@ ( -T ret = C; | -T ret; ) ... when != ret when strict ( -ret = f; -return ret; +return f; | -return ret; +return C; ) Basically, if there's a variable declared at the beginning of a function and the variable is not changed until the very last moment, just before return, such variable is useless. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/checkpoint_conf.c | 4 +--- src/conf/domain_addr.c | 6 +----- src/conf/domain_conf.c | 8 ++------ src/esx/esx_driver.c | 5 +---- src/libxl/libxl_domain.c | 4 +--- src/libxl/xen_xl.c | 5 +---- src/openvz/openvz_conf.c | 3 +-- src/qemu/qemu_driver.c | 6 ++---- src/qemu/qemu_process.c | 5 +---- src/test/test_driver.c | 18 +++++++----------- src/util/virbitmap.c | 4 +--- src/util/virerror.c | 3 +-- src/util/virxml.c | 5 +---- tests/genericxml2xmltest.c | 10 ++++------ tests/interfacexml2xmltest.c | 5 +---- tests/libxlxml2domconfigtest.c | 5 +---- tests/lxcconf2xmltest.c | 10 ++-------- tests/lxcxml2xmltest.c | 11 ++++------- tests/networkxml2conftest.c | 5 +---- tests/networkxml2firewalltest.c | 5 +---- tests/networkxml2xmltest.c | 7 ++----- tests/networkxml2xmlupdatetest.c | 9 +++------ tests/nodedevxml2xmltest.c | 5 +---- tests/nwfilterxml2firewalltest.c | 5 +---- tests/nwfilterxml2xmltest.c | 5 +---- tests/secretxml2xmltest.c | 5 +---- tests/vboxsnapshotxmltest.c | 5 +---- tests/virnwfilterbindingxml2xmltest.c | 5 +---- tests/vmx2xmltest.c | 5 +---- tests/xml2vmxtest.c | 5 +---- 30 files changed, 48 insertions(+), 135 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 338cf10d12..17aa98dc2a 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -119,7 +119,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, void *parseOpaque, unsigned int flags) { - virDomainCheckpointDef *ret = NULL; size_t i; int n; g_autofree xmlNodePtr *nodes = NULL; @@ -177,8 +176,7 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, return NULL; } - ret = g_steal_pointer(&def); - return ret; + return g_steal_pointer(&def); } static virDomainCheckpointDef * diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 76f9c12ca6..f7b2acdcc9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1429,11 +1429,7 @@ virDomainCCWAddressSetCreateFromDomain(virDomainDef *def) static virDomainVirtioSerialAddrSet * virDomainVirtioSerialAddrSetCreate(void) { - virDomainVirtioSerialAddrSet *ret = NULL; - - ret = g_new0(virDomainVirtioSerialAddrSet, 1); - - return ret; + return g_new0(virDomainVirtioSerialAddrSet, 1); } static void diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6950f7ec1d..bc74965d91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28728,7 +28728,6 @@ virSecurityLabelDef * virDomainDefGetSecurityLabelDef(const virDomainDef *def, const char *model) { size_t i; - virSecurityLabelDef *seclabel = NULL; if (def == NULL || model == NULL) return NULL; @@ -28740,7 +28739,7 @@ virDomainDefGetSecurityLabelDef(const virDomainDef *def, const char *model) return def->seclabels[i]; } - return seclabel; + return NULL; } @@ -30592,7 +30591,6 @@ virDomainObjGetMessages(virDomainObj *vm, size_t i = 0; size_t n = 0; int nmsgs = 0; - int rv = -1; *msgs = NULL; @@ -30623,9 +30621,7 @@ virDomainObjGetMessages(virDomainObj *vm, if (*msgs) (*msgs)[nmsgs] = NULL; - rv = nmsgs; - - return rv; + return nmsgs; } bool diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 9dc5489411..a0540f585d 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2671,7 +2671,6 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, virVMXContext ctx; esxVMX_Data data; g_autoptr(virDomainDef) def = NULL; - char *vmx = NULL; virCheckFlags(0, NULL); @@ -2705,9 +2704,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, ctx.datacenterPath = NULL; ctx.moref = NULL; - vmx = virVMXFormatConfig(&ctx, priv->xmlopt, def, virtualHW_version); - - return vmx; + return virVMXFormatConfig(&ctx, priv->xmlopt, def, virtualHW_version); } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 52e0aa1e60..1cbb007f13 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -712,11 +712,9 @@ libxlDomainEventHandler(void *data, libxl_event *event) char * libxlDomainManagedSavePath(libxlDriverPrivate *driver, virDomainObj *vm) { - char *ret; g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); - ret = g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); - return ret; + return g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); } /* diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 6919325623..188cecb98e 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1318,7 +1318,6 @@ xenFormatXLVnuma(virConfValue *list, size_t node, size_t nr_nodes) { - int ret = -1; size_t i; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virConfValue *numaVnode; @@ -1365,9 +1364,7 @@ xenFormatXLVnuma(virConfValue *list, tmp->next = numaVnode; else list->list = numaVnode; - ret = 0; - - return ret; + return 0; } static int diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c94f9b8577..368e747a34 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -772,7 +772,6 @@ static int openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) { char *confdir; - int ret = 0; confdir = openvzLocateConfDir(); if (confdir == NULL) @@ -781,7 +780,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile, const char *ext) *conffile = g_strdup_printf("%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); VIR_FREE(confdir); - return ret; + return 0; } static char * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 707f4cc1bb..3f9638bc8e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6029,7 +6029,6 @@ qemuDomainRestoreParams(virConnectPtr conn, { const char *path = NULL; const char *dxml = NULL; - int ret = -1; if (virTypedParamsValidate(params, nparams, VIR_DOMAIN_SAVE_PARAM_FILE, VIR_TYPED_PARAM_STRING, @@ -6050,9 +6049,8 @@ qemuDomainRestoreParams(virConnectPtr conn, return -1; } - ret = qemuDomainRestoreInternal(conn, path, dxml, flags, - virDomainRestoreParamsEnsureACL); - return ret; + return qemuDomainRestoreInternal(conn, path, dxml, flags, + virDomainRestoreParamsEnsureACL); } static char * diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 32f03ff79a..f7cf56904b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2974,7 +2974,6 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, virDomainObj *vm, int asyncJob) { - int ret = -1; ssize_t i; qemuDomainObjPrivate *priv = vm->privateData; virDomainVideoDef *video = NULL; @@ -3035,9 +3034,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); cfg = virQEMUDriverGetConfig(driver); - ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); - - return ret; + return virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); error: qemuDomainObjExitMonitor(vm); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 641a141b6a..15fe9404e4 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7751,7 +7751,6 @@ testNodeDeviceCreateXML(virConnectPtr conn, static int testNodeDeviceDestroy(virNodeDevicePtr dev) { - int ret = 0; testDriver *driver = dev->conn->privateData; virNodeDeviceObj *obj = NULL; virNodeDeviceObj *parentobj = NULL; @@ -7794,7 +7793,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) cleanup: virNodeDeviceObjEndAPI(&obj); virObjectEventStateQueue(driver->eventState, event); - return ret; + return 0; } @@ -9547,25 +9546,24 @@ testDomainChgIOThread(virDomainObj *vm, unsigned int flags) { virDomainDef *def; - int ret = -1; if (!(def = virDomainObjGetOneDef(vm, flags))) - return ret; + return -1; if (def) { switch (action) { case VIR_DOMAIN_IOTHREAD_ACTION_ADD: if (virDomainDriverAddIOThreadCheck(def, iothread_id) < 0) - return ret; + return -1; if (!virDomainIOThreadIDAdd(def, iothread_id)) - return ret; + return -1; break; case VIR_DOMAIN_IOTHREAD_ACTION_DEL: if (virDomainDriverDelIOThreadCheck(def, iothread_id) < 0) - return ret; + return -1; virDomainIOThreadIDDel(def, iothread_id); @@ -9576,16 +9574,14 @@ testDomainChgIOThread(virDomainObj *vm, virReportError(VIR_ERR_INVALID_ARG, _("cannot find IOThread '%u' in iothreadids"), iothread_id); - return ret; + return -1; } break; } } - ret = 0; - - return ret; + return 0; } static int diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 5b9204cbd7..786b9adb06 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -330,9 +330,7 @@ virBitmapFormat(virBitmap *bitmap) int start, cur, prev; if (!bitmap || (cur = virBitmapNextSetBit(bitmap, -1)) < 0) { - char *ret; - ret = g_strdup(""); - return ret; + return g_strdup(""); } start = prev = cur; diff --git a/src/util/virerror.c b/src/util/virerror.c index d114c0a346..e41544cdb8 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -199,7 +199,6 @@ static int virCopyError(virErrorPtr from, virErrorPtr to) { - int ret = 0; if (!to) return 0; virResetError(to); @@ -217,7 +216,7 @@ virCopyError(virErrorPtr from, /* * Deliberately not setting 'conn', 'dom', 'net' references */ - return ret; + return 0; } diff --git a/src/util/virxml.c b/src/util/virxml.c index d6e2e5dd91..1f64cf151b 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1591,13 +1591,10 @@ virXMLValidateAgainstSchema(const char *schemafile, int virXMLValidateNodeAgainstSchema(const char *schemafile, xmlNodePtr node) { - int ret; g_autoptr(xmlDoc) copy = xmlNewDoc(NULL); xmlDocSetRootElement(copy, xmlCopyNode(node, true)); - ret = virXMLValidateAgainstSchema(schemafile, copy); - - return ret; + return virXMLValidateAgainstSchema(schemafile, copy); } diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 3501eadf55..70b69101d8 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -27,18 +27,16 @@ testCompareXMLToXMLHelper(const void *data) const struct testInfo *info = data; g_autofree char *xml_in = NULL; g_autofree char *xml_out = NULL; - int ret = -1; xml_in = g_strdup_printf("%s/genericxml2xmlindata/%s.xml", abs_srcdir, info->name); xml_out = g_strdup_printf("%s/genericxml2xmloutdata/%s.xml", abs_srcdir, info->name); - ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, - info->different ? xml_out : xml_in, - info->active_only, 0, - info->expectResult); - return ret; + return testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, + info->different ? xml_out : xml_in, + info->active_only, 0, + info->expectResult); } diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index b23e0f589b..95fee4d744 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -38,15 +38,12 @@ testCompareXMLToXMLFiles(const char *xml) static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *xml = NULL; xml = g_strdup_printf("%s/interfaceschemadata/%s.xml", abs_srcdir, (const char *)data); - result = testCompareXMLToXMLFiles(xml); - - return result; + return testCompareXMLToXMLFiles(xml); } diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index a7080e0fa2..7d59bfe886 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -139,7 +139,6 @@ struct testInfo { static int testCompareXMLToDomConfigHelper(const void *data) { - int ret = -1; const struct testInfo *info = data; g_autofree char *xmlfile = NULL; g_autofree char *jsonfile = NULL; @@ -147,9 +146,7 @@ testCompareXMLToDomConfigHelper(const void *data) xmlfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name); jsonfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name); - ret = testCompareXMLToDomConfig(xmlfile, jsonfile); - - return ret; + return testCompareXMLToDomConfig(xmlfile, jsonfile); } diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 09f6465567..f384264e59 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -58,7 +58,6 @@ struct testInfo { static int testCompareXMLToConfigHelperLegacy(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *config = NULL; @@ -68,15 +67,12 @@ testCompareXMLToConfigHelperLegacy(const void *data) config = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.config", abs_srcdir, info->name); - result = testCompareXMLToConfigFiles(xml, config, info->expectError); - - return result; + return testCompareXMLToConfigFiles(xml, config, info->expectError); } static int testCompareXMLToConfigHelperV3(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *config = NULL; @@ -86,9 +82,7 @@ testCompareXMLToConfigHelperV3(const void *data) config = g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", abs_srcdir, info->name); - result = testCompareXMLToConfigFiles(xml, config, info->expectError); - - return result; + return testCompareXMLToConfigFiles(xml, config, info->expectError); } diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 2c5d294f18..abb48ff993 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -30,19 +30,16 @@ testCompareXMLToXMLHelper(const void *data) const struct testInfo *info = data; g_autofree char *xml_in = NULL; g_autofree char *xml_out = NULL; - int ret = -1; xml_in = g_strdup_printf("%s/lxcxml2xmldata/lxc-%s.xml", abs_srcdir, info->name); xml_out = g_strdup_printf("%s/lxcxml2xmloutdata/lxc-%s.xml", abs_srcdir, info->name); - ret = testCompareDomXML2XMLFiles(driver->caps, driver->xmlopt, xml_in, - info->different ? xml_out : xml_in, - info->active_only, - info->parse_flags, - TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); - return ret; + return testCompareDomXML2XMLFiles(driver->caps, driver->xmlopt, xml_in, + info->different ? xml_out : xml_in, + info->active_only, info->parse_flags, + TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); } diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index bbeb849a39..81f2b4b9ae 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -93,7 +93,6 @@ typedef struct { static int testCompareXMLToConfHelper(const void *data) { - int result = -1; const testInfo *info = data; g_autofree char *inxml = NULL; g_autofree char *outconf = NULL; @@ -103,9 +102,7 @@ testCompareXMLToConfHelper(const void *data) outconf = g_strdup_printf("%s/networkxml2confdata/%s.conf", abs_srcdir, info->name); outhostsfile = g_strdup_printf("%s/networkxml2confdata/%s.hostsfile", abs_srcdir, info->name); - result = testCompareXMLToConfFiles(inxml, outconf, outhostsfile, info->caps); - - return result; + return testCompareXMLToConfFiles(inxml, outconf, outhostsfile, info->caps); } static void diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index ca793fd4ea..9cf00d9369 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -125,7 +125,6 @@ struct testInfo { static int testCompareXMLToIPTablesHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *args = NULL; @@ -135,9 +134,7 @@ testCompareXMLToIPTablesHelper(const void *data) args = g_strdup_printf("%s/networkxml2firewalldata/%s-%s.args", abs_srcdir, info->name, RULESTYPE); - result = testCompareXMLToArgvFiles(xml, args, info->baseargs); - - return result; + return testCompareXMLToArgvFiles(xml, args, info->baseargs); } diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 521f058acc..86a9cdd137 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -81,17 +81,14 @@ static int testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info = data; - int result = -1; g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; inxml = g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, info->name); outxml = g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_srcdir, info->name); - result = testCompareXMLToXMLFiles(inxml, outxml, info->flags, - info->expectResult); - - return result; + return testCompareXMLToXMLFiles(inxml, outxml, info->flags, + info->expectResult); } static int diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c index 58b6f70c96..392507cc5c 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -71,7 +71,6 @@ static int testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info = data; - int result = -1; g_autofree char *netxml = NULL; g_autofree char *updatexml = NULL; g_autofree char *outxml = NULL; @@ -83,11 +82,9 @@ testCompareXMLToXMLHelper(const void *data) outxml = g_strdup_printf("%s/networkxml2xmlupdateout/%s.xml", abs_srcdir, info->outxml); - result = testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->flags, - info->command, info->section, - info->parentIndex, info->expectFailure); - - return result; + return testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->flags, + info->command, info->section, + info->parentIndex, info->expectFailure); } static int diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index f82027fb87..6f67ffd73f 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -64,7 +64,6 @@ testCompareXMLToXMLFiles(const char *xml, const char *outfile) static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *xml = NULL; g_autofree char *outfile = NULL; @@ -74,9 +73,7 @@ testCompareXMLToXMLHelper(const void *data) outfile = g_strdup_printf("%s/nodedevxml2xmlout/%s.xml", abs_srcdir, (const char *)data); - result = testCompareXMLToXMLFiles(xml, outfile); - - return result; + return testCompareXMLToXMLFiles(xml, outfile); } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 1514002b8f..6c540f90af 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -389,7 +389,6 @@ struct testInfo { static int testCompareXMLToIPTablesHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *args = NULL; @@ -399,9 +398,7 @@ testCompareXMLToIPTablesHelper(const void *data) args = g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args", abs_srcdir, info->name, RULESTYPE); - result = testCompareXMLToArgvFiles(xml, args); - - return result; + return testCompareXMLToArgvFiles(xml, args); } diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index c2b6dc575b..1924cfdbde 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -51,7 +51,6 @@ typedef struct test_parms { static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; const test_parms *tp = data; g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; @@ -59,9 +58,7 @@ testCompareXMLToXMLHelper(const void *data) inxml = g_strdup_printf("%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->name); outxml = g_strdup_printf("%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->name); - result = testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); - - return result; + return testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); } static int diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 828e44a32b..4aa7463e83 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -33,7 +33,6 @@ struct testInfo { static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *inxml = NULL; g_autofree char *outxml = NULL; const struct testInfo *info = data; @@ -44,9 +43,7 @@ testCompareXMLToXMLHelper(const void *data) info->different ? "out" : "in", info->name); - result = testCompareXMLToXMLFiles(inxml, outxml); - - return result; + return testCompareXMLToXMLFiles(inxml, outxml); } static int diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 3ad8298895..ed9bb92018 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -87,15 +87,12 @@ testCompareXMLtoXMLFiles(const char *xml) static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; g_autofree char *xml = NULL; xml = g_strdup_printf("%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, (const char *)data); - result = testCompareXMLtoXMLFiles(xml); - - return result; + return testCompareXMLtoXMLFiles(xml); } static int diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c index 0c93b58a0c..afde2e3a4d 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -64,16 +64,13 @@ typedef struct test_parms { static int testCompareXMLToXMLHelper(const void *data) { - int result = -1; const test_parms *tp = data; g_autofree char *xml = NULL; xml = g_strdup_printf("%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdir, tp->name); - result = testCompareXMLToXMLFiles(xml); - - return result; + return testCompareXMLToXMLFiles(xml); } static int diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index a43cab3108..d864843c19 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -89,7 +89,6 @@ struct testInfo { static int testCompareHelper(const void *data) { - int ret = -1; const struct testInfo *info = data; g_autofree char *vmx = NULL; g_autofree char *xml = NULL; @@ -99,9 +98,7 @@ testCompareHelper(const void *data) xml = g_strdup_printf("%s/vmx2xmldata/%s.xml", abs_srcdir, info->file); - ret = testCompareFiles(vmx, xml, info->should_fail); - - return ret; + return testCompareFiles(vmx, xml, info->should_fail); } static int diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 1cadb9500a..be9d5f3e6b 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -83,7 +83,6 @@ struct testInfo { static int testCompareHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *vmx = NULL; @@ -93,9 +92,7 @@ testCompareHelper(const void *data) vmx = g_strdup_printf("%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, info->output); - result = testCompareFiles(xml, vmx, info->virtualHW_version); - - return result; + return testCompareFiles(xml, vmx, info->virtualHW_version); } static int -- 2.35.1

2 1

[PATCH 00/10] virDomainControllerDef(Validate|Parse|Format): Refactor and fix several problems
by Peter Krempa 26 Aug '22

26 Aug '22

A relatively simple-looking bug report (see 10/10) lead me looking and finding few more problems. Peter Krempa (10): virDomainControllerDefValidate: Un-break lines in error messages virDomainControllerDefFormat: Use proper type for enum virDomainControllerDefFormat: Split out formatting of PCI controller virDomainControllerDefFormatPCI: Refactor formatting of '<target>' subelement virDomainControllerDefParseXML: Fix broken code indentation when parsing PCI contoller target virDomainControllerDefParseXML: Fix broken error reporting when parsing 'index' virDomainControllerDefParseXML: Remove explicit checks for negative value virDomainControllerDefParseXML: Parse 'index' by virXMLPropInt virDomainControllerDefParseXML: Return early if there's unexpectedly many elements virDomainControllerDefParseXML: Reject '-1' for PCI controller target properties src/conf/domain_conf.c | 286 ++++++++---------- src/conf/domain_validate.c | 24 +- .../pci-bridge-negative-index-invalid.err | 2 +- 3 files changed, 132 insertions(+), 180 deletions(-) -- 2.37.1

2 11

[PATCH] docs: formatdomain: Fix small typos and syntax errors
by Carlos Bilbao 26 Aug '22

26 Aug '22

Fix some small typos and syntax errors in file formatdomain.rs. Signed-off-by: Carlos Bilbao <carlos.bilbao(a)amd.com> --- docs/formatdomain.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 1c4700ac37..34e4906eb4 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -188,7 +188,7 @@ harddisk, cdrom, network) determining where to obtain/find the boot image. features required by selected firmware. Accepted values are ``bios`` and ``efi``. The selection process scans for files describing installed firmware images in - specified location and uses the most specific one which fulfils domain + specified location and uses the most specific one which fulfills domain requirements. The locations in order of preference (from generic to most specific one) are: @@ -1511,7 +1511,7 @@ In case no restrictions need to be put on CPU model and its features, a simpler rather then trying to mimic the host CPU model. If an application does not care about a specific CPU, just wants the - best featureset without a need for migration compatibility, the + best feature set without a need for migration compatibility, the ``maximum`` model is a good choice on hypervisors where it is available. ``model`` @@ -2148,7 +2148,7 @@ are: ``nested-hv`` Configure nested HV availability for pSeries guests. This needs to be enabled from the host (L0) in order to be effective; having HV support in the (L1) - guest is very desiderable if it's planned to run nested (L2) guests inside + guest is very desirable if it's planned to run nested (L2) guests inside it, because it will result in those nested guests having much better performance than they would when using KVM PR or TCG. Possible values for the ``state`` attribute are ``on`` and ``off``. If the attribute is not defined, @@ -2380,7 +2380,7 @@ event name Description ``page_faults_min`` the count of minor page faults, that is, where the page was present in the page cache, and therefore the fault avoided loading it from storage, by applications running on the platform ``perf.page_faults_min`` ``page_faults_maj`` the count of major page faults, that is, where the page was not present in the page cache, and therefore had to be fetched from storage, by applications running on the platform ``perf.page_faults_maj`` ``alignment_faults`` the count of alignment faults, that is when the load or store is not aligned properly, by applications running on the platform ``perf.alignment_faults`` -``emulation_faults`` the count of emulation faults, that is when the kernel traps on unimplemented instrucions and emulates them for user space, by applications running on the platform ``perf.emulation_faults`` +``emulation_faults`` the count of emulation faults, that is when the kernel traps on unimplemented instructions and emulates them for user space, by applications running on the platform ``perf.emulation_faults`` =========================== ======================================================================================================================================================================================= ================================ @@ -3109,7 +3109,7 @@ paravirtualized driver is specified via the ``disk`` element. :since:`Throughput limits since 1.2.11 and QEMU 1.7` ``group_name`` - The optional ``group_name`` provides the cability to share I/O throttling + The optional ``group_name`` provides the ability to share I/O throttling quota between multiple drives. This prevents end-users from circumventing a hosting provider's throttling policy by splitting 1 large drive in N small drives and getting N times the normal throttling quota. Any name may @@ -5670,7 +5670,7 @@ be the "native" VLAN for this interface, and the ``nativeMode`` attribute determines whether or not traffic for that VLAN will be tagged. -Isolating guests's network traffic from each other +Isolating guests' network traffic from each other ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: @@ -8379,7 +8379,7 @@ spec <https://support.amd.com/TechDocs/55766_SEV-KM_API_Specification.pdf>`__ capabilities. ``reducedPhysBits`` The required ``reducedPhysBits`` element provides the physical address bit - reducation. Similar to ``cbitpos`` the value of ``reduced-phys-bit`` is + reduction. Similar to ``cbitpos`` the value of ``reduced-phys-bit`` is hypervisor dependent and can be obtained through the ``sev`` element from the domain capabilities. ``policy`` -- 2.34.1

2 1

[PATCH 0/8] qemu: Retire logic for setting 'disable-modern'/'disable-legacy' props of virtio devices
by Peter Krempa 26 Aug '22

26 Aug '22

The virtio-*-(non-)-transitional device models which replace the properties were introduced in qemu-4.0, so we can remove the logic for the old-style syntax. In addition this series modernizes the tests meant for the virtio devices in question. Peter Krempa (8): qemu: address: Use PCIe for virtio devices also with QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL qemuxml2*test: Use QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL for macos hfv tests qemuxml2argvtest: Add DO_TEST_CAPS_LATEST versions of tests which assert QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemuxml2argvtest: Convert all test cases asserting QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemuxml2*test: Remove 'q35-virtio-pci' test case qemuxml2xmltest: Convert all test cases asserting QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemu: Remove extra logic around QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY src/qemu/qemu_capabilities.c | 13 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 23 +-- src/qemu/qemu_domain_address.c | 2 +- .../caps_4.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - .../caps_5.0.0.riscv64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - .../caps_5.2.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - .../caps_7.0.0.x86_64.xml | 1 - .../caps_7.1.0.x86_64.xml | 1 - ...h64-virtio-pci-default.aarch64-4.2.0.args} | 17 +- ...h64-virtio-pci-default.aarch64-latest.args | 55 ++++++ ...ev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} | 4 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 35 ++++ ...35-default-devices-only.x86_64-4.2.0.args} | 12 +- ...35-default-devices-only.x86_64-latest.args | 37 +++++ tests/qemuxml2argvdata/q35-multifunction.args | 49 ------ .../q35-multifunction.x86_64-4.2.0.args | 51 ++++++ .../q35-multifunction.x86_64-latest.args | 52 ++++++ ...rgs => q35-pcie-autoadd.x86_64-4.2.0.args} | 36 ++-- .../q35-pcie-autoadd.x86_64-latest.args | 66 ++++++++ ...5-pcie.args => q35-pcie.x86_64-4.2.0.args} | 34 ++-- .../q35-pcie.x86_64-latest.args | 67 ++++++++ ... q35-virt-manager-basic.x86_64-4.2.0.args} | 21 ++- .../q35-virt-manager-basic.x86_64-latest.args | 63 +++++++ tests/qemuxml2argvdata/q35-virtio-pci.args | 64 ------- tests/qemuxml2argvdata/q35-virtio-pci.xml | 1 - tests/qemuxml2argvtest.c | 157 +++--------------- ...h64-virtio-pci-default.aarch64-latest.xml} | 12 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.xml} | 3 + ...35-default-devices-only.x86_64-latest.xml} | 11 +- ...ml => q35-multifunction.x86_64-latest.xml} | 41 ++--- ...xml => q35-pcie-autoadd.x86_64-latest.xml} | 31 ++-- ...35-pcie.xml => q35-pcie.x86_64-latest.xml} | 29 ++-- ... q35-virt-manager-basic.x86_64-latest.xml} | 15 +- tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 154 ----------------- tests/qemuxml2xmltest.c | 142 +--------------- 56 files changed, 610 insertions(+), 714 deletions(-) rename tests/qemuxml2argvdata/{aarch64-virtio-pci-default.args => aarch64-virtio-pci-default.aarch64-4.2.0.args} (71%) create mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pcie.args => hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} (88%) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-default-devices-only.args => q35-default-devices-only.x86_64-4.2.0.args} (67%) create mode 100644 tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-multifunction.args create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-pcie-autoadd.args => q35-pcie-autoadd.x86_64-4.2.0.args} (59%) create mode 100644 tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-pcie.args => q35-pcie.x86_64-4.2.0.args} (62%) create mode 100644 tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-virt-manager-basic.args => q35-virt-manager-basic.x86_64-4.2.0.args} (75%) create mode 100644 tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.args delete mode 120000 tests/qemuxml2argvdata/q35-virtio-pci.xml rename tests/qemuxml2xmloutdata/{aarch64-virtio-pci-default.xml => aarch64-virtio-pci-default.aarch64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-pcie.xml => hostdev-scsi-vhost-scsi-pcie.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{q35-default-devices-only.xml => q35-default-devices-only.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{q35-multifunction.xml => q35-multifunction.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{q35-pcie-autoadd.xml => q35-pcie-autoadd.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{q35-pcie.xml => q35-pcie.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{q35-virt-manager-basic.xml => q35-virt-manager-basic.x86_64-latest.xml} (93%) delete mode 100644 tests/qemuxml2xmloutdata/q35-virtio-pci.xml -- 2.37.1

2 9

[libvirt PATCH] nodedev: wait a bit longer for new node devices
by Jonathon Jongsma 25 Aug '22

25 Aug '22

Openstack developers reported that newly-created mdevs were not recognized by libvirt until after a libvirt daemon restart. The source of the problem appears to be that when libvirt gets the udev 'add' event, the sysfs tree for that device might not be ready and so libvirt waits 100ms for it to appear (max 100 waits of 1ms each). But in the OpenStack environment, the sysfs tree for new mediated devices was taking closer to 250ms to appear and therefore libvirt gave up waiting and didn't add these new devices to its list of nodedevs. By changing the wait time to 1 second (max 100 waits of 10ms each), this should provide enough time to enable these deployments to recognize newly-created mediated devices, but it shouldn't increase the delay for more traditional deployments too much. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2109450 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Alternatively, we could switch to triggering off of the udev 'bind' event rather than the 'add' event, but I wasn't able to convince myself that this would result in 100% compatible behavior, so this felt like the safest solution. If others can convince me that switching to 'bind' is safe, I can re-submit this patch. src/node_device/node_device_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index e76c1a36b8..a06eaade5d 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1058,7 +1058,7 @@ udevProcessMediatedDevice(struct udev_device *dev, linkpath = g_strdup_printf("%s/mdev_type", udev_device_get_syspath(dev)); - if (virFileWaitForExists(linkpath, 1, 100) < 0) { + if (virFileWaitForExists(linkpath, 10, 100) < 0) { virReportSystemError(errno, _("failed to wait for file '%s' to appear"), linkpath); -- 2.37.1

3 7

[PATCH RFC 0/5] storage: Drop the sheepdog storage driver backend
by Peter Krempa 25 Aug '22

25 Aug '22

The sheepdog project is abandoned, with last commit in 2018. QEMU already removed the storage backend in qemu-6.1 This series removes the libvirt storage driver backend. This series is RFC as of: 1/5: I'm not 100% sure whether 'Obsoletes:' is the correct way to deprecate a subpackage in Fedora, but it certainly does the correct thing. 4/5: I personally don't mind that the build option will be kept to prevent breakage of builds, but I can see the value in dropping it and anyone building libvirt having to knowingly acknowledge that they don't need sheepdog any more. (This patch intentionally omits the S-o-b line as the commit message will need to be rewritten if it's going to be pushed) This series does _not_ remove the ability to use qemu-6.0 and older with sheepdog as the qemu driver bits are left untouched. Peter Krempa (5): spec: Drop libvirt-daemon-driver-storage-sheepdog package tests: Remove storage pool/vol tests for sheepdog Remove support for building the sheepdog storage driver backend build: Drop the 'storage_sheepdog' build option completely storage: Remove the sheepdog storage driver backend source code docs/formatstorage.rst | 6 +- docs/kbase/rpm-deployment.rst | 6 +- docs/storage.rst | 3 +- libvirt.spec.in | 38 +- meson.build | 11 - meson_options.txt | 1 - po/POTFILES | 1 - src/storage/meson.build | 25 -- src/storage/storage_backend.c | 6 - src/storage/storage_backend_sheepdog.c | 376 ------------------ src/storage/storage_backend_sheepdog.h | 25 -- src/storage/storage_backend_sheepdog_priv.h | 30 -- tests/meson.build | 6 - tests/storagebackendsheepdogtest.c | 205 ---------- tests/storagepoolxml2argvtest.c | 1 - tests/storagepoolxml2xmlin/pool-sheepdog.xml | 8 - tests/storagepoolxml2xmlout/pool-sheepdog.xml | 11 - tests/storagepoolxml2xmltest.c | 1 - tests/storagevolxml2xmlin/vol-sheepdog.xml | 10 - tests/storagevolxml2xmlout/vol-sheepdog.xml | 8 - tests/storagevolxml2xmltest.c | 1 - tools/virsh.c | 3 - 22 files changed, 12 insertions(+), 770 deletions(-) delete mode 100644 src/storage/storage_backend_sheepdog.c delete mode 100644 src/storage/storage_backend_sheepdog.h delete mode 100644 src/storage/storage_backend_sheepdog_priv.h delete mode 100644 tests/storagebackendsheepdogtest.c delete mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml delete mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml delete mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml delete mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml -- 2.37.1

5 10

[PATCH 0/3] qemuxml2argvtest: Convert 'boot*' cases to DO_TEST_CAPS_LATEST
by Peter Krempa 25 Aug '22

25 Aug '22

As explained in: https://listman.redhat.com/archives/libvir-list/2022-August/233812.html Peter Krempa (3): qemuxml2argvtest: Use different network storage protocol for boot order tests tests: qemuxml2argv: Use x86_64 arch and emulator in all boot* test files tests: qemuxml2argv: Convert all 'boot*' cases to DO_TEST_CAPS_LATEST ...rom.args => boot-cdrom.x86_64-latest.args} | 13 +++++--- tests/qemuxml2argvdata/boot-cdrom.xml | 4 +-- ...x.args => boot-complex.x86_64-latest.args} | 29 +++++++++-------- tests/qemuxml2argvdata/boot-complex.xml | 4 +-- .../boot-dev+order.x86_64-latest.err | 1 + tests/qemuxml2argvdata/boot-dev+order.xml | 6 ++-- ...rgs => boot-floppy-q35.x86_64-latest.args} | 14 +++++--- ...py.args => boot-floppy.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-floppy.xml | 4 +-- ...oot-menu-disable-drive.x86_64-latest.args} | 15 +++++---- .../boot-menu-disable-drive.xml | 4 +-- .../boot-menu-disable-with-timeout.xml | 4 +-- ...s => boot-menu-disable.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-menu-disable.xml | 4 +-- ...ble-with-timeout-invalid.x86_64-latest.err | 1 + .../boot-menu-enable-with-timeout-invalid.xml | 4 +-- ...nu-enable-with-timeout.x86_64-latest.args} | 15 +++++---- .../boot-menu-enable-with-timeout.xml | 4 +-- ...gs => boot-menu-enable.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-menu-enable.xml | 4 +-- ...lti.args => boot-multi.x86_64-latest.args} | 15 +++++---- tests/qemuxml2argvdata/boot-multi.xml | 4 +-- ...k.args => boot-network.x86_64-latest.args} | 13 +++++--- tests/qemuxml2argvdata/boot-network.xml | 4 +-- ...der.args => boot-order.x86_64-latest.args} | 25 ++++++++------- tests/qemuxml2argvdata/boot-order.xml | 6 ++-- tests/qemuxml2argvtest.c | 32 ++++++++----------- tests/qemuxml2xmloutdata/boot-cdrom.xml | 4 +-- tests/qemuxml2xmloutdata/boot-floppy.xml | 4 +-- .../boot-menu-disable-with-timeout.xml | 4 +-- .../qemuxml2xmloutdata/boot-menu-disable.xml | 4 +-- .../boot-menu-enable-with-timeout.xml | 4 +-- tests/qemuxml2xmloutdata/boot-multi.xml | 4 +-- tests/qemuxml2xmloutdata/boot-network.xml | 4 +-- tests/qemuxml2xmloutdata/boot-order.xml | 6 ++-- 35 files changed, 171 insertions(+), 137 deletions(-) rename tests/qemuxml2argvdata/{boot-cdrom.args => boot-cdrom.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{boot-complex.args => boot-complex.x86_64-latest.args} (63%) create mode 100644 tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err rename tests/qemuxml2argvdata/{boot-floppy-q35.args => boot-floppy-q35.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{boot-floppy.args => boot-floppy.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{boot-menu-disable-drive.args => boot-menu-disable-drive.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-menu-disable.args => boot-menu-disable.x86_64-latest.args} (59%) create mode 100644 tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x86_64-latest.err rename tests/qemuxml2argvdata/{boot-menu-enable-with-timeout.args => boot-menu-enable-with-timeout.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-menu-enable.args => boot-menu-enable.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-multi.args => boot-multi.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{boot-network.args => boot-network.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{boot-order.args => boot-order.x86_64-latest.args} (55%) -- 2.37.1

2 4

[libvirt PATCH v2 0/2] nwfilter: Fix timeout data type reported by coverity
by Erik Skultety 25 Aug '22

25 Aug '22

Since v1: - instead of time_t, store the timeout as unsigned long long and typecast any affected time_t variables on relevant places here's a successfull CI build: https://gitlab.com/eskultety/libvirt/-/pipelines/620752689 Erik Skultety (2): nwfilter: Replace a redundant 'now' variable with a direct time(0) call nwfilter: Fix timeout data type reported by coverity src/nwfilter/nwfilter_dhcpsnoop.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.37.2

2 6

[PATCH] Rename iterface type='dummy' to type='null'
by Martin Kletzander 25 Aug '22

25 Aug '22

When commit bac6b266fb6a added this "functionality" this was the only naming I could think of, but after discussion with Dan we found the name 'null' fits a bit better, so change it before we make a release with the old name. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- NEWS.rst | 2 +- docs/formatdomain.rst | 4 ++-- src/ch/ch_monitor.c | 2 +- src/conf/domain_conf.c | 20 +++++++++---------- src/conf/domain_conf.h | 2 +- src/conf/netdev_bandwidth_conf.c | 2 +- src/conf/schemas/domaincommon.rng | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/xen_common.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 6 +++--- src/lxc/lxc_process.c | 4 ++-- src/qemu/qemu_command.c | 8 ++++---- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 6 +++--- src/qemu/qemu_interface.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_validate.c | 2 +- src/vmx/vmx.c | 4 ++-- .../{ethernet-dummy.vmx => ethernet-null.vmx} | 0 .../{ethernet-dummy.xml => ethernet-null.xml} | 2 +- tests/vmx2xmltest.c | 2 +- ...et-dummy.vmx => xml2vmx-ethernet-null.vmx} | 0 ...et-dummy.xml => xml2vmx-ethernet-null.xml} | 2 +- tests/xml2vmxtest.c | 2 +- tools/virsh-domain.c | 2 +- 26 files changed, 45 insertions(+), 45 deletions(-) rename tests/vmx2xmldata/{ethernet-dummy.vmx => ethernet-null.vmx} (100%) rename tests/vmx2xmldata/{ethernet-dummy.xml => ethernet-null.xml} (95%) rename tests/xml2vmxdata/{xml2vmx-ethernet-dummy.vmx => xml2vmx-ethernet-null.vmx} (100%) rename tests/xml2vmxdata/{xml2vmx-ethernet-dummy.xml => xml2vmx-ethernet-null.xml} (90%) diff --git a/NEWS.rst b/NEWS.rst index 468b41c1fd9a..2e0a4a7b945b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -26,7 +26,7 @@ v8.7.0 (unreleased) * esx: Domain XMLs can now be dumped for VMs with two new interface types - One is when the interface is not connected anywhere `type='dummy'` and one + One is when the interface is not connected anywhere `type='null'` and one when it is connected to VMWare Distributed Switch `type='vds'`. * **Bug fixes** diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 212104fe1f96..1c4700ac3736 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5240,7 +5240,7 @@ which the UDP socket packets will originate from the QEMU host. :since:`Since </devices> ... -Dummy network interface +Null network interface ^^^^^^^^^^^^^^^^^^^^^^^ An unconnected network interface sounds pretty pointless, but can show up for @@ -5251,7 +5251,7 @@ example with VMWare without any specified network to be connected to. ... <devices> - <interface type='dummy'> + <interface type='null'> <mac address='52:54:00:22:c9:42'/> </interface> </devices> diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 03f051edf67e..8d8654332f39 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -301,7 +301,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 610bbcfd5831..6950f7ec1d8f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -573,7 +573,7 @@ VIR_ENUM_IMPL(virDomainNet, "hostdev", "udp", "vdpa", - "dummy", + "null", "vds", ); @@ -2497,7 +2497,7 @@ virDomainActualNetDefFree(virDomainActualNetDef *def) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -2629,7 +2629,7 @@ virDomainNetDefFree(virDomainNetDef *def) case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9360,7 +9360,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -9539,7 +9539,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_VDPA: break; @@ -23746,7 +23746,7 @@ virDomainNetDefFormat(virBuffer *buf, } case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -28362,7 +28362,7 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -28377,7 +28377,7 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -29375,7 +29375,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -29638,7 +29638,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unexpected network port type %s"), diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a1f6cf7a6fd0..2b1497d78dd8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -939,7 +939,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_HOSTDEV, VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_VDPA, - VIR_DOMAIN_NET_TYPE_DUMMY, + VIR_DOMAIN_NET_TYPE_NULL, VIR_DOMAIN_NET_TYPE_VDS, VIR_DOMAIN_NET_TYPE_LAST diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index b1ebfea6ddd7..f7d27fb5af6c 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -295,7 +295,7 @@ bool virNetDevSupportsBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 7f6ea1d8887d..bb6b1058e6f5 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3435,7 +3435,7 @@ <group> <attribute name="type"> - <value>dummy</value> + <value>null</value> </attribute> <ref name="interface-options"/> </group> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6d7a6c58534c..06f338ef904c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1395,7 +1395,7 @@ libxlMakeNic(virDomainDef *def, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 10ac8013739f..6918a4b12167 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1677,7 +1677,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type '%s'"), virDomainNetTypeToString(net->type)); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 9328f242df6a..9be79fa356af 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -422,7 +422,7 @@ static int virLXCControllerGetNICIndexes(virLXCController *ctrl) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type %s"), diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8a7135ff4733..f8e701021003 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3465,7 +3465,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Network device type is not supported")); @@ -3522,7 +3522,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -3966,7 +3966,7 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only bridged veth devices can be detached")); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6b12bff25cb8..fe5cab3df698 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -596,7 +596,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1609,7 +1609,7 @@ virLXCProcessReconnectNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1523ca704794..a31b8ee438e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3961,7 +3961,7 @@ qemuBuildHostNetProps(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_HOSTDEV: /* Should have been handled earlier via PCI/USB hotplug code. */ - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8182,7 +8182,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8281,7 +8281,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ @@ -8321,7 +8321,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* These types don't use a network device on the host, but diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d5fef76211aa..fe3ce023a440 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9784,7 +9784,7 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 751fa84013b0..9b508dc8f04f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1230,7 +1230,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, @@ -3387,7 +3387,7 @@ qemuDomainChangeNetFilter(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filters not supported on interfaces of type %s"), @@ -3740,7 +3740,7 @@ qemuDomainChangeNet(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("unable to change config on '%s' network type"), diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 3ec92fdd7d36..4cc76e07a50b 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -118,7 +118,7 @@ qemuInterfaceStartDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ @@ -206,7 +206,7 @@ qemuInterfaceStopDevice(virDomainNetDef *net) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 68c2f45535df..32f03ff79a02 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3261,7 +3261,7 @@ qemuProcessNotifyNets(virDomainDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -8263,7 +8263,7 @@ void qemuProcessStop(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: /* No special cleanup procedure for these types. */ diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 703d9776a96f..640326655929 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1760,7 +1760,7 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: break; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 191f0b5e83ff..fa5cc5614683 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2880,7 +2880,7 @@ virVMXParseEthernet(virConf *conf, int controller, virDomainNetDef **def) false) < 0) goto cleanup; } else if (connectionType == NULL && networkName == NULL) { - (*def)->type = VIR_DOMAIN_NET_TYPE_DUMMY; + (*def)->type = VIR_DOMAIN_NET_TYPE_NULL; } else if (connectionType == NULL || STRCASEEQ(connectionType, "bridged")) { (*def)->type = VIR_DOMAIN_NET_TYPE_BRIDGE; (*def)->data.bridge.brname = g_steal_pointer(&networkName); @@ -3991,7 +3991,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int controller, controller); break; - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: break; case VIR_DOMAIN_NET_TYPE_VDS: { diff --git a/tests/vmx2xmldata/ethernet-dummy.vmx b/tests/vmx2xmldata/ethernet-null.vmx similarity index 100% rename from tests/vmx2xmldata/ethernet-dummy.vmx rename to tests/vmx2xmldata/ethernet-null.vmx diff --git a/tests/vmx2xmldata/ethernet-dummy.xml b/tests/vmx2xmldata/ethernet-null.xml similarity index 95% rename from tests/vmx2xmldata/ethernet-dummy.xml rename to tests/vmx2xmldata/ethernet-null.xml index a31243033785..9bc1e492e01d 100644 --- a/tests/vmx2xmldata/ethernet-dummy.xml +++ b/tests/vmx2xmldata/ethernet-null.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='dummy'> + <interface type='null'> <mac address='00:50:56:87:65:43' type='generated'/> <model type='e1000e'/> </interface> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 07d7bf24c2b3..a43cab3108b5 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -236,7 +236,7 @@ mymain(void) DO_TEST("ethernet-static"); DO_TEST("ethernet-vpx"); DO_TEST("ethernet-other"); - DO_TEST("ethernet-dummy"); + DO_TEST("ethernet-null"); DO_TEST("ethernet-vds"); DO_TEST("serial-file"); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-null.vmx similarity index 100% rename from tests/xml2vmxdata/xml2vmx-ethernet-dummy.vmx rename to tests/xml2vmxdata/xml2vmx-ethernet-null.vmx diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml b/tests/xml2vmxdata/xml2vmx-ethernet-null.xml similarity index 90% rename from tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml rename to tests/xml2vmxdata/xml2vmx-ethernet-null.xml index a071b2f21513..777c01d09110 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-dummy.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-null.xml @@ -6,7 +6,7 @@ <type>hvm</type> </os> <devices> - <interface type='dummy'> + <interface type='null'> <mac address='00:50:56:87:65:43'/> </interface> </devices> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index c921c8a3b0eb..1cadb9500a7e 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -225,7 +225,7 @@ mymain(void) DO_TEST("ethernet-other", "ethernet-other", 4); DO_TEST("ethernet-mac-type", "ethernet-mac-type", 4); - DO_TEST("ethernet-dummy", "ethernet-dummy", 4); + DO_TEST("ethernet-null", "ethernet-null", 4); DO_TEST("ethernet-vds", "ethernet-vds", 4); DO_TEST("serial-file", "serial-file", 4); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d2ea4d1c7b44..20aadb59f3ef 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1069,7 +1069,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_INTERNAL: - case VIR_DOMAIN_NET_TYPE_DUMMY: + case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: vshError(ctl, _("No support for %s in command 'attach-interface'"), -- 2.37.2

2 1

[PATCH 0/3] vmx: Fix new ethernet config seen in the wild
by Martin Kletzander 24 Aug '22

24 Aug '22

Descriptions in second and third patch ought to be enough. Martin Kletzander (3): vmx: Fix indentation conf, docs: Add support for dummy network interface vmx: Add support for dummy network interface docs/formatdomain.rst | 24 ++++++++++ src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 10 ++++ src/conf/domain_conf.h | 1 + src/conf/netdev_bandwidth_conf.c | 1 + src/conf/schemas/domaincommon.rng | 7 +++ src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 ++ src/lxc/lxc_process.c | 4 +- src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_hotplug.c | 3 ++ src/qemu/qemu_interface.c | 2 + src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 1 + src/vmx/vmx.c | 46 +++++++++++++------ .../vmx2xmldata/ethernet-unmanaged-nodev.vmx | 7 +++ .../vmx2xmldata/ethernet-unmanaged-nodev.xml | 23 ++++++++++ tests/vmx2xmltest.c | 1 + .../xml2vmx-ethernet-unmanaged-nodev.vmx | 13 ++++++ .../xml2vmx-ethernet-unmanaged-nodev.xml | 13 ++++++ tests/xml2vmxtest.c | 2 + tools/virsh-domain.c | 1 + 25 files changed, 157 insertions(+), 16 deletions(-) create mode 100644 tests/vmx2xmldata/ethernet-unmanaged-nodev.vmx create mode 100644 tests/vmx2xmldata/ethernet-unmanaged-nodev.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-unmanaged-nodev.xml -- 2.35.1

3 10

[PATCH] qemu: Do not keep swtmp pidfile around after stopping
by Martin Kletzander 24 Aug '22

24 Aug '22

Just like the socket, remove the pidfile when TPM emulator is being stopped. In order to make this a bit cleaner, try to remove it even if swtpm_ioctl does not exist. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_tpm.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 584c787b700b..50e8c19f3a0b 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -795,28 +795,25 @@ qemuTPMEmulatorStop(const char *swtpmStateDir, g_autofree char *pathname = NULL; g_autofree char *errbuf = NULL; g_autofree char *swtpm_ioctl = virTPMGetSwtpmIoctl(); + g_autofree char *pidfile = qemuTPMEmulatorPidFileBuildPath(swtpmStateDir, + shortName); + if (swtpm_ioctl && + (pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName)) && + virFileExists(pathname) && + (cmd = virCommandNew(swtpm_ioctl))) { - if (!swtpm_ioctl) - return; - - if (!(pathname = qemuTPMEmulatorSocketBuildPath(swtpmStateDir, shortName))) - return; - - if (!virFileExists(pathname)) - return; - - cmd = virCommandNew(swtpm_ioctl); - if (!cmd) - return; + virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL); - virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL); + virCommandSetErrorBuffer(cmd, &errbuf); - virCommandSetErrorBuffer(cmd, &errbuf); + ignore_value(virCommandRun(cmd, NULL)); - ignore_value(virCommandRun(cmd, NULL)); + /* clean up the socket */ + unlink(pathname); + } - /* clean up the socket */ - unlink(pathname); + if (pidfile) + virPidFileDeletePath(pidfile); } -- 2.37.2

2 4

[PATCH v4 0/8] qemu: Enable SCHED_CORE for domains and helper processes
by Michal Privoznik 24 Aug '22

24 Aug '22

v4 of: https://listman.redhat.com/archives/libvir-list/2022-August/233683.html diff to v3: - Fixed wording in qemu.conf, - Removed dead code in qemuProcessSetupVcpuSchedCoreHelper(), - Made the dummy child process (qemuDomainSchedCoreStart()) exit early, instead of jumping onto error label. Michal Prívozník (8): virprocess: Core Scheduling support virCommand: Introduce APIs for core scheduling qemu_conf: Introduce a knob to set SCHED_CORE qemu_domain: Introduce qemuDomainSchedCoreStart() qemu_process: Enable SCHED_CORE for QEMU process qemu: Enable SCHED_CORE for helper processes qemu: Enable SCHED_CORE for vCPUs qemu: Enable for vCPUs on hotplug src/libvirt_private.syms | 6 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 16 ++++ src/qemu/qemu_conf.c | 38 +++++++++ src/qemu/qemu_conf.h | 13 +++ src/qemu/qemu_domain.c | 105 ++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 116 ++++++++++++++++++++++++++- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_security.c | 11 +++ src/qemu/qemu_virtiofs.c | 11 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 63 +++++++++++++++ src/util/vircommand.h | 5 ++ src/util/virprocess.c | 124 +++++++++++++++++++++++++++++ src/util/virprocess.h | 8 ++ 17 files changed, 531 insertions(+), 4 deletions(-) -- 2.35.1

1 8

[PATCH v3 0/8] qemu: Enable SCHED_CORE for domains and helper processes
by Michal Privoznik 24 Aug '22

24 Aug '22

v3 of: https://listman.redhat.com/archives/libvir-list/2022-June/232595.html diff to v2: - Instead of opting out, the feature is disabled by default. Until we address CPU pinning (and other points I've raised in v2 cover letter) users might face a performance problems if this was turned on automagically. - Introduced new 'vcpus' state, where only vCPUs are placed into a scheduling group, but not emulator nor any of helper processes. - Reworked how helper processes are placed into scheduling group. Instead of placing them into the group after they were spawned, create a dummy child, let it create new group and then use virCommandRunAmong(). This covers also the case where a helper might have spawned more threads/child processes. - As a result of this rework, we no longer need to expose getXXXPid() functions that I introduced in v2 (never merged them though). Big thanks to Dan and Dario for their review and valuable inputs! Michal Prívozník (8): virprocess: Core Scheduling support virCommand: Introduce APIs for core scheduling qemu_conf: Introduce a knob to set SCHED_CORE qemu_domain: Introduce qemuDomainSchedCoreStart() qemu_process: Enable SCHED_CORE for QEMU process qemu: Enable SCHED_CORE for helper processes qemu: Enable SCHED_CORE for vCPUs qemu: Enable for vCPUs on hotplug src/libvirt_private.syms | 6 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 16 ++++ src/qemu/qemu_conf.c | 38 +++++++++ src/qemu/qemu_conf.h | 13 +++ src/qemu/qemu_domain.c | 105 ++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 118 ++++++++++++++++++++++++++- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_security.c | 11 +++ src/qemu/qemu_virtiofs.c | 11 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 63 +++++++++++++++ src/util/vircommand.h | 5 ++ src/util/virprocess.c | 124 +++++++++++++++++++++++++++++ src/util/virprocess.h | 8 ++ 17 files changed, 533 insertions(+), 4 deletions(-) -- 2.35.1

2 14