August 2022 - Devel - libvirt List Archives

[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 25 Aug '22

25 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 25 Aug '22

25 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