[libvirt PATCH] virsh: fix event registration for single event
by Ján Tomko
Allocate a larger 'data' array than strictly needed
for simplicity and use 'ndata' as the index when
filling it to put the single event at the first unused
place, instead of at its index in the virshDomainEventCallbacks
array.
https://bugzilla.redhat.com/show_bug.cgi?id=2073887
Fixes: c6bb2746933bbe65877a5f8a8d60e100b0bf8a59
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
tools/virsh-domain-event.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c
index 1a2f1cb6e0..6dbb64a655 100644
--- a/tools/virsh-domain-event.c
+++ b/tools/virsh-domain-event.c
@@ -915,23 +915,20 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd)
return false;
}
- if (eventName)
- data = g_new0(virshDomEventData, 1);
- else
- data = g_new0(virshDomEventData, G_N_ELEMENTS(virshDomainEventCallbacks));
+ data = g_new0(virshDomEventData, G_N_ELEMENTS(virshDomainEventCallbacks));
for (i = 0; i < G_N_ELEMENTS(virshDomainEventCallbacks); i++) {
if (eventName &&
STRNEQ(eventName, virshDomainEventCallbacks[i].name))
continue;
- data[i].event = i;
- data[i].ctl = ctl;
- data[i].loop = loop;
- data[i].count = &count;
- data[i].timestamp = timestamp;
- data[i].cb = &virshDomainEventCallbacks[i];
- data[i].id = -1;
+ data[ndata].event = i;
+ data[ndata].ctl = ctl;
+ data[ndata].loop = loop;
+ data[ndata].count = &count;
+ data[ndata].timestamp = timestamp;
+ data[ndata].cb = &virshDomainEventCallbacks[i];
+ data[ndata].id = -1;
ndata++;
}
--
2.35.1
2 years, 7 months
- 2
- 1
[PATCH for 8.3.0 00/17] qemu: Stop supporting Ubuntu 1804-ancient qemus
by Peter Krempa
As of April 23 2022, Ubuntu 20.04 will be out for two years, which per
our platform support policy means we no longer have to support
Ubuntu 18.04.
The supported platforms thus will have the following qemu versions:
Debian 10/Stable: 3.1
OpenSUSE Leap 15.3: 5.2
Ubuntu 20.04: 4.2
RHEL/Centos 8.4: 4.2
This patchset is targetted to be pushed after the release beginning of
April is out so that it's part of the may release.
Changes to the RFC version I've posted earlier:
- cleanup patches were pushed
- added commit removing Ubuntu 1804 from the CI
- added removal of QEMU_CAPS_STORAGE_WERROR/QEMU_CAPS_USB_STORAGE_WERROR
(noticed while dealing with capability update).
- removed commit message bit mentioning Debian backports
- removed patch dropping monitor waiting code (Michal's patches may
change the expectations. I'll re-visit that commit after this is
pushed).
Note that the patches posted to the list are heavily trimmed, fetch
the full version at:
git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprecation
Peter Krempa (17):
ci: Drop Ubuntu 1804
qemuxml2agvtest: Retire tests based on qemu-2.11
qemuxml2agvtest: Retire tests based on qemu-2.12
qemuxml2agvtest: Retire tests based on qemu-3.0
tests: qemucapabilities: Remove qemu-2.11 test data
tests: qemucapabilities: Remove qemu-2.12 test data
tests: qemucapabilities: Remove qemu-3.0 test data
qemu: Formally deprecate support for qemu < 3.1
qemu: capabilities: Remove tautological version checks
qemu: capabilities: Remove probing of QEMU_CAPS_NUMA via
'query-command-line-options'
qemu: Always assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE
qemu: capabilities: Retire QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE
qemu: capabilities: Retire
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE
qemu: command: Always assume QEMU_CAPS_OVERCOMMIT
qemu: capabilities: Retire QEMU_CAPS_OVERCOMMIT
qemu: Always assume QEMU_CAPS_STORAGE_WERROR
qemu: capabilities: Retire QEMU_CAPS_STORAGE_WERROR and
QEMU_CAPS_USB_STORAGE_WERROR
ci/containers/ubuntu-1804.Dockerfile | 108 -
ci/gitlab.yml | 16 -
ci/manifest.yml | 2 -
docs/drvqemu.rst | 6 +-
src/qemu/qemu_capabilities.c | 41 +-
src/qemu/qemu_capabilities.h | 10 +-
src/qemu/qemu_command.c | 44 +-
src/qemu/qemu_command.h | 3 +-
src/qemu/qemu_hotplug.c | 3 +-
src/qemu/qemu_process.c | 14 +-
.../caps_2.11.0.s390x.replies | 18237 ------------
.../caps_2.11.0.s390x.xml | 2593 --
.../caps_2.11.0.x86_64.replies | 19525 -------------
.../caps_2.11.0.x86_64.xml | 953 -
.../caps_2.12.0.aarch64.replies | 19577 -------------
.../caps_2.12.0.aarch64.xml | 329 -
.../caps_2.12.0.ppc64.replies | 23072 ---------------
.../caps_2.12.0.ppc64.xml | 1069 -
.../caps_2.12.0.s390x.replies | 19937 -------------
.../caps_2.12.0.s390x.xml | 2466 --
.../caps_2.12.0.x86_64.replies | 23003 ---------------
.../caps_2.12.0.x86_64.xml | 1263 -
.../caps_3.0.0.ppc64.replies | 23945 ----------------
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1073 -
.../caps_3.0.0.riscv32.replies | 14919 ----------
.../caps_3.0.0.riscv32.xml | 87 -
.../caps_3.0.0.riscv64.replies | 14919 ----------
.../caps_3.0.0.riscv64.xml | 87 -
.../caps_3.0.0.s390x.replies | 20683 -------------
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2677 --
.../caps_3.0.0.x86_64.replies | 23719 ---------------
.../caps_3.0.0.x86_64.xml | 1206 -
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 4 -
.../caps_3.1.0.x86_64.xml | 5 -
.../caps_4.0.0.aarch64.xml | 4 -
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 4 -
.../caps_4.0.0.riscv32.xml | 4 -
.../caps_4.0.0.riscv64.xml | 4 -
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 -
.../caps_4.0.0.x86_64.xml | 5 -
.../caps_4.1.0.x86_64.xml | 5 -
.../caps_4.2.0.aarch64.xml | 4 -
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 4 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 -
.../caps_4.2.0.x86_64.xml | 5 -
.../caps_5.0.0.aarch64.xml | 4 -
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 4 -
.../caps_5.0.0.riscv64.xml | 4 -
.../caps_5.0.0.x86_64.xml | 5 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 3 -
.../caps_5.1.0.x86_64.xml | 5 -
.../caps_5.2.0.aarch64.xml | 4 -
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 4 -
.../caps_5.2.0.riscv64.xml | 4 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 -
.../caps_5.2.0.x86_64.xml | 5 -
.../caps_6.0.0.aarch64.xml | 4 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 3 -
.../caps_6.0.0.x86_64.xml | 5 -
.../caps_6.1.0.x86_64.xml | 5 -
.../caps_6.2.0.aarch64.xml | 4 -
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 4 -
.../caps_6.2.0.x86_64.xml | 5 -
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 4 -
.../caps_7.0.0.x86_64.xml | 5 -
tests/qemuhotplugtest.c | 1 -
.../aarch64-aavmf-virtio-mmio.args | 4 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 4 +-
.../aarch64-cpu-passthrough.args | 4 +-
tests/qemuxml2argvdata/aarch64-gic-host.args | 4 +-
.../aarch64-gic-none-tcg.args | 4 +-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 4 +-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 4 +-
.../aarch64-kvm-32-on-64.args | 4 +-
.../aarch64-noacpi-nouefi.args | 4 +-
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 4 +-
.../qemuxml2argvdata/aarch64-pci-serial.args | 4 +-
.../aarch64-traditional-pci.args | 4 +-
.../aarch64-usb-controller-nec-xhci.args | 4 +-
.../aarch64-usb-controller-qemu-xhci.args | 4 +-
.../aarch64-video-default.args | 4 +-
.../aarch64-video-virtio-gpu-pci.args | 4 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 4 +-
.../aarch64-virt-default-nic.args | 4 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 4 +-
.../aarch64-virtio-pci-default.args | 4 +-
.../aarch64-virtio-pci-manual-addresses.args | 4 +-
tests/qemuxml2argvdata/acpi-table.args | 4 +-
.../arm-vexpressa9-basic.args | 4 +-
.../arm-vexpressa9-nodevs.args | 4 +-
.../arm-vexpressa9-virtio.args | 4 +-
tests/qemuxml2argvdata/arm-virt-virtio.args | 4 +-
tests/qemuxml2argvdata/audio-default-sdl.args | 4 +-
.../qemuxml2argvdata/audio-default-spice.args | 4 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 4 +-
tests/qemuxml2argvdata/autoindex.args | 4 +-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 4 +-
.../qemuxml2argvdata/balloon-device-auto.args | 4 +-
.../balloon-device-deflate-off.args | 4 +-
.../balloon-device-deflate.args | 4 +-
.../balloon-device-period.args | 4 +-
tests/qemuxml2argvdata/balloon-device.args | 4 +-
.../balloon-mmio-deflate.args | 4 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +-
tests/qemuxml2argvdata/bios-nvram.args | 4 +-
tests/qemuxml2argvdata/bios.args | 4 +-
tests/qemuxml2argvdata/blkiotune-device.args | 4 +-
tests/qemuxml2argvdata/blkiotune.args | 4 +-
tests/qemuxml2argvdata/boot-cdrom.args | 4 +-
tests/qemuxml2argvdata/boot-complex.args | 4 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 4 +-
tests/qemuxml2argvdata/boot-floppy.args | 4 +-
.../boot-menu-disable-drive.args | 4 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 4 +-
.../boot-menu-enable-with-timeout.args | 4 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 4 +-
tests/qemuxml2argvdata/boot-multi.args | 4 +-
tests/qemuxml2argvdata/boot-network.args | 4 +-
tests/qemuxml2argvdata/boot-order.args | 4 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 4 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 4 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 4 +-
.../channel-virtio-autoadd.args | 4 +-
.../channel-virtio-autoassign.args | 4 +-
.../channel-virtio-default.args | 4 +-
.../channel-virtio-state.args | 4 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 12 +-
tests/qemuxml2argvdata/channel-virtio.args | 4 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 4 +-
tests/qemuxml2argvdata/clock-catchup.args | 4 +-
tests/qemuxml2argvdata/clock-france.args | 4 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 4 +-
.../clock-localtime-basis-localtime.args | 4 +-
tests/qemuxml2argvdata/clock-localtime.args | 4 +-
tests/qemuxml2argvdata/clock-realtime.args | 4 +-
.../clock-timer-hyperv-rtc.args | 4 +-
tests/qemuxml2argvdata/clock-utc.args | 4 +-
tests/qemuxml2argvdata/clock-variable.args | 4 +-
.../qemuxml2argvdata/console-compat-auto.args | 4 +-
.../console-compat-chardev.args | 4 +-
tests/qemuxml2argvdata/console-compat.args | 4 +-
.../qemuxml2argvdata/console-virtio-ccw.args | 4 +-
.../qemuxml2argvdata/console-virtio-many.args | 4 +-
tests/qemuxml2argvdata/console-virtio.args | 4 +-
tests/qemuxml2argvdata/controller-order.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 4 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 4 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 4 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 4 +-
.../cpu-cache-emulate-l3.args | 4 +-
.../cpu-cache-passthrough.args | 4 +-
.../cpu-cache-passthrough2.args | 4 +-
.../cpu-check-default-none.args | 4 +-
.../cpu-check-default-none2.args | 4 +-
.../cpu-check-default-partial.args | 4 +-
.../cpu-check-default-partial2.args | 4 +-
tests/qemuxml2argvdata/cpu-check-none.args | 4 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 4 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 4 +-
tests/qemuxml2argvdata/cpu-exact1.args | 4 +-
.../cpu-exact2-nofallback.args | 4 +-
tests/qemuxml2argvdata/cpu-exact2.args | 4 +-
tests/qemuxml2argvdata/cpu-fallback.args | 4 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 4 +-
.../cpu-host-model-fallback.args | 4 +-
.../cpu-host-model-vendor.args | 4 +-
tests/qemuxml2argvdata/cpu-host-model.args | 4 +-
.../cpu-host-model.x86_64-2.11.0.args | 36 -
.../cpu-host-model.x86_64-2.12.0.args | 36 -
.../cpu-host-model.x86_64-3.0.0.args | 36 -
.../cpu-host-passthrough-features.args | 4 +-
.../cpu-host-passthrough.args | 4 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 4 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 4 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 4 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 4 +-
.../cpu-no-removed-features.args | 4 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 4 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 4 +-
.../cpu-numa-no-memory-element.args | 4 +-
tests/qemuxml2argvdata/cpu-numa1.args | 4 +-
tests/qemuxml2argvdata/cpu-numa2.args | 4 +-
tests/qemuxml2argvdata/cpu-s390-features.args | 4 +-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 4 +-
tests/qemuxml2argvdata/cpu-strict1.args | 4 +-
tests/qemuxml2argvdata/cpu-topology1.args | 4 +-
tests/qemuxml2argvdata/cpu-topology2.args | 4 +-
tests/qemuxml2argvdata/cpu-topology3.args | 4 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 +-
tests/qemuxml2argvdata/cputune-numatune.args | 4 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 4 +-
tests/qemuxml2argvdata/cputune.args | 4 +-
.../default-kvm-host-arch.args | 4 +-
.../default-qemu-host-arch.args | 4 +-
.../disk-error-policy-s390x.s390x-2.12.0.args | 35 -
.../disk-error-policy.x86_64-2.12.0.args | 37 -
.../fd-memory-no-numa-topology.args | 4 +-
.../fd-memory-numa-topology.args | 4 +-
.../fd-memory-numa-topology2.args | 4 +-
.../fd-memory-numa-topology3.args | 4 +-
.../graphics-egl-headless.args | 4 +-
.../graphics-sdl-fullscreen.args | 4 +-
tests/qemuxml2argvdata/graphics-sdl.args | 4 +-
...ics-vnc-auto-socket-cfg.x86_64-2.11.0.args | 34 -
...raphics-vnc-auto-socket.x86_64-2.11.0.args | 32 -
...aphics-vnc-egl-headless.x86_64-2.11.0.args | 35 -
...hics-vnc-no-listen-attr.x86_64-2.11.0.args | 34 -
.../graphics-vnc-none.x86_64-2.11.0.args | 32 -
.../graphics-vnc-policy.x86_64-2.11.0.args | 34 -
...remove-generated-socket.x86_64-2.11.0.args | 34 -
.../graphics-vnc-sasl.x86_64-2.11.0.args | 35 -
...-vnc-socket-new-cmdline.x86_64-2.11.0.args | 32 -
.../graphics-vnc-socket.x86_64-2.11.0.args | 32 -
.../graphics-vnc-tls.x86_64-2.11.0.args | 34 -
.../graphics-vnc-websocket.x86_64-2.11.0.args | 32 -
.../graphics-vnc.x86_64-2.11.0.args | 34 -
.../hostdev-mdev-precreated.args | 4 +-
.../hostdev-pci-address-device.args | 4 +-
.../hostdev-pci-address-unassigned.args | 4 +-
.../qemuxml2argvdata/hostdev-pci-address.args | 4 +-
.../hostdev-pci-multifunction.args | 4 +-
.../hostdev-scsi-vhost-scsi-ccw.args | 4 +-
.../hostdev-scsi-vhost-scsi-pci.args | 4 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 4 +-
.../hostdev-subsys-mdev-vfio-ccw.args | 4 +-
.../hostdev-usb-address-device-boot.args | 4 +-
.../hostdev-usb-address-device.args | 4 +-
.../qemuxml2argvdata/hostdev-usb-address.args | 4 +-
.../hostdev-vfio-multidomain.args | 4 +-
.../hostdev-vfio-zpci-autogenerate-fids.args | 4 +-
.../hostdev-vfio-zpci-autogenerate-uids.args | 4 +-
.../hostdev-vfio-zpci-autogenerate.args | 4 +-
.../hostdev-vfio-zpci-boundaries.args | 4 +-
.../hostdev-vfio-zpci-ccw-memballoon.args | 4 +-
.../hostdev-vfio-zpci-multidomain-many.args | 4 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 4 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/hotplug-base.args | 4 +-
.../hugepages-default-2M.args | 4 +-
.../hugepages-default-system-size.args | 4 +-
tests/qemuxml2argvdata/hugepages-default.args | 4 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 4 +-
.../hugepages-memaccess2.args | 4 +-
tests/qemuxml2argvdata/hugepages-nodeset.args | 4 +-
.../hugepages-numa-default-2M.args | 4 +-
.../hugepages-numa-default-dimm.args | 4 +-
.../hugepages-numa-default.args | 4 +-
.../hugepages-numa-nodeset-part.args | 4 +-
.../hugepages-numa-nodeset.args | 4 +-
tests/qemuxml2argvdata/hugepages-shared.args | 4 +-
.../hvf-aarch64-virt-headless.args | 6 +-
.../hvf-x86_64-q35-headless.args | 6 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 4 +-
tests/qemuxml2argvdata/input-usbmouse.args | 4 +-
tests/qemuxml2argvdata/input-usbtablet.args | 4 +-
tests/qemuxml2argvdata/input-virtio-ccw.args | 4 +-
.../iothreads-disk-virtio-ccw.args | 4 +-
tests/qemuxml2argvdata/iothreads-disk.args | 4 +-
.../iothreads-ids-partial.args | 4 +-
tests/qemuxml2argvdata/iothreads-ids.args | 4 +-
tests/qemuxml2argvdata/iothreads.args | 4 +-
tests/qemuxml2argvdata/kvm-features-off.args | 4 +-
tests/qemuxml2argvdata/kvm-features.args | 4 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 4 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 4 +-
tests/qemuxml2argvdata/kvmclock.args | 4 +-
...v-missing-platform-info.x86_64-2.12.0.args | 34 -
.../launch-security-sev.x86_64-2.12.0.args | 34 -
.../mach-virt-console-virtio.args | 4 +-
.../mach-virt-serial-native.args | 4 +-
.../mach-virt-serial-pci.args | 4 +-
.../mach-virt-serial-usb.args | 4 +-
.../machine-aeskeywrap-off-cap.args | 4 +-
.../machine-aeskeywrap-off-caps.args | 4 +-
.../machine-aeskeywrap-on-cap.args | 4 +-
.../machine-aeskeywrap-on-caps.args | 4 +-
tests/qemuxml2argvdata/machine-aliases1.args | 4 +-
tests/qemuxml2argvdata/machine-aliases2.args | 4 +-
tests/qemuxml2argvdata/machine-core-off.args | 4 +-
tests/qemuxml2argvdata/machine-core-on.args | 4 +-
.../machine-deakeywrap-off-cap.args | 4 +-
.../machine-deakeywrap-off-caps.args | 4 +-
.../machine-deakeywrap-on-cap.args | 4 +-
.../machine-deakeywrap-on-caps.args | 4 +-
.../machine-keywrap-none-caps.args | 4 +-
.../machine-keywrap-none.args | 4 +-
...ine-loadparm-multiple-disks-nets-s390.args | 4 +-
.../machine-loadparm-net-s390.args | 4 +-
.../machine-loadparm-s390.args | 4 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 4 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 4 +-
tests/qemuxml2argvdata/master-key.args | 4 +-
.../memory-hotplug-dimm-addr.args | 4 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 4 +-
...emory-hotplug-nvdimm-ppc64-abi-update.args | 4 +-
.../memory-hotplug-nvdimm-ppc64.args | 4 +-
...emory-hotplug-ppc64-nonuma-abi-update.args | 4 +-
.../memory-hotplug-ppc64-nonuma.args | 4 +-
tests/qemuxml2argvdata/memory-hotplug.args | 4 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 4 +-
tests/qemuxml2argvdata/memtune.args | 4 +-
.../migrate-numa-unaligned.args | 4 +-
tests/qemuxml2argvdata/migrate.args | 4 +-
tests/qemuxml2argvdata/minimal.args | 4 +-
tests/qemuxml2argvdata/misc-acpi.args | 4 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 4 +-
.../misc-disable-suspends.args | 4 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 4 +-
tests/qemuxml2argvdata/misc-uuid.args | 4 +-
.../mlock-off.x86_64-3.0.0.args | 31 -
.../mlock-on.x86_64-3.0.0.args | 31 -
tests/qemuxml2argvdata/monitor-json.args | 4 +-
.../multifunction-pci-device.args | 4 +-
.../name-escape.x86_64-2.11.0.args | 48 -
tests/qemuxml2argvdata/net-client.args | 4 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 4 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 4 +-
tests/qemuxml2argvdata/net-eth-names.args | 4 +-
.../net-eth-unmanaged-tap.args | 4 +-
tests/qemuxml2argvdata/net-eth.args | 4 +-
.../net-hostdev-bootorder.args | 4 +-
.../net-hostdev-multidomain.args | 4 +-
.../net-hostdev-vfio-multidomain.args | 4 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +-
tests/qemuxml2argvdata/net-hostdev.args | 4 +-
tests/qemuxml2argvdata/net-many-models.args | 4 +-
tests/qemuxml2argvdata/net-mcast.args | 4 +-
tests/qemuxml2argvdata/net-server.args | 4 +-
tests/qemuxml2argvdata/net-udp.args | 4 +-
tests/qemuxml2argvdata/net-user-addr.args | 4 +-
tests/qemuxml2argvdata/net-user.args | 4 +-
.../net-vhostuser-multiq.args | 4 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 4 +-
tests/qemuxml2argvdata/net-virtio-device.args | 4 +-
.../net-virtio-disable-offloads.args | 4 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +-
.../net-virtio-rxtxqueuesize.args | 4 +-
.../net-virtio-teaming-hostdev.args | 4 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 4 +-
tests/qemuxml2argvdata/net-virtio.args | 4 +-
tests/qemuxml2argvdata/nosharepages.args | 4 +-
.../numad-auto-memory-vcpu-cpuset.args | 4 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 4 +-
.../numad-auto-vcpu-static-numatune.args | 4 +-
.../numad-static-memory-auto-vcpu.args | 4 +-
tests/qemuxml2argvdata/numad.args | 4 +-
.../numatune-auto-nodeset-invalid.args | 4 +-
.../numatune-auto-prefer.args | 4 +-
.../qemuxml2argvdata/numatune-distances.args | 4 +-
.../numatune-memnode-no-memory.args | 4 +-
tests/qemuxml2argvdata/numatune-memnode.args | 4 +-
tests/qemuxml2argvdata/numatune-memory.args | 4 +-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 4 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 4 +-
.../pages-discard-hugepages.args | 4 +-
tests/qemuxml2argvdata/pages-discard.args | 4 +-
.../parallel-parport-chardev.args | 4 +-
.../parallel-tcp-chardev.args | 4 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 4 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 4 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 4 +-
.../pci-bridge-many-disks.args | 4 +-
tests/qemuxml2argvdata/pci-bridge.args | 4 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 4 +-
tests/qemuxml2argvdata/pci-many.args | 4 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 4 +-
tests/qemuxml2argvdata/pci-rom.args | 4 +-
.../pci-serial-dev-chardev.args | 4 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 4 +-
.../pcie-root-port-model-generic.args | 4 +-
.../pcie-root-port-model-ioh3420.args | 4 +-
tests/qemuxml2argvdata/pcie-root-port.args | 4 +-
tests/qemuxml2argvdata/pcie-root.args | 4 +-
.../pcie-switch-downstream-port.args | 4 +-
.../pcie-switch-upstream-port.args | 4 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 4 +-
tests/qemuxml2argvdata/pcihole64.args | 4 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 4 +-
tests/qemuxml2argvdata/pmu-feature.args | 4 +-
tests/qemuxml2argvdata/ppc-dtb.args | 4 +-
.../ppc64-usb-controller-legacy.args | 4 +-
.../ppc64-usb-controller-qemu-xhci.args | 4 +-
.../ppc64-usb-controller.args | 4 +-
tests/qemuxml2argvdata/ppce500-serial.args | 4 +-
tests/qemuxml2argvdata/pseries-basic.args | 4 +-
.../pseries-console-virtio.args | 4 +-
.../pseries-cpu-compat-power9.args | 4 +-
.../qemuxml2argvdata/pseries-cpu-compat.args | 4 +-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 4 +-
tests/qemuxml2argvdata/pseries-cpu-le.args | 4 +-
tests/qemuxml2argvdata/pseries-features.args | 4 +-
.../qemuxml2argvdata/pseries-hostdevs-1.args | 4 +-
.../qemuxml2argvdata/pseries-hostdevs-2.args | 4 +-
.../qemuxml2argvdata/pseries-hostdevs-3.args | 4 +-
.../pseries-machine-max-cpu-compat.args | 4 +-
.../pseries-many-buses-1.args | 4 +-
.../pseries-many-buses-2.args | 4 +-
.../pseries-many-devices.args | 4 +-
tests/qemuxml2argvdata/pseries-nvram.args | 4 +-
.../pseries-panic-missing.args | 4 +-
.../pseries-panic-no-address.args | 4 +-
.../pseries-phb-default-missing.args | 4 +-
.../pseries-phb-numa-node.args | 4 +-
.../qemuxml2argvdata/pseries-phb-simple.args | 4 +-
.../pseries-serial-native.args | 4 +-
.../qemuxml2argvdata/pseries-serial-pci.args | 4 +-
.../qemuxml2argvdata/pseries-serial-usb.args | 4 +-
.../qemuxml2argvdata/pseries-usb-default.args | 4 +-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 4 +-
tests/qemuxml2argvdata/pseries-usb-multi.args | 4 +-
.../pseries-vio-user-assigned.args | 4 +-
tests/qemuxml2argvdata/pseries-vio.args | 4 +-
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 4 +-
tests/qemuxml2argvdata/q35-acpi-uefi.args | 4 +-
.../q35-default-devices-only.args | 4 +-
tests/qemuxml2argvdata/q35-multifunction.args | 4 +-
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 4 +-
.../q35-pci-force-address.args | 4 +-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 4 +-
tests/qemuxml2argvdata/q35-pcie.args | 4 +-
.../q35-pm-disable-fallback.args | 4 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 4 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 4 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 4 +-
tests/qemuxml2argvdata/q35-usb2.args | 4 +-
.../q35-virt-manager-basic.args | 6 +-
tests/qemuxml2argvdata/q35-virtio-pci.args | 4 +-
tests/qemuxml2argvdata/q35.args | 4 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 4 +-
.../qemu-ns-commandline-ns0.args | 4 +-
.../qemu-ns-commandline-ns1.args | 4 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 4 +-
.../qemu-ns-domain-commandline-ns0.args | 4 +-
.../qemu-ns-domain-commandline.args | 4 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 4 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +-
.../reboot-timeout-disabled.args | 4 +-
.../reboot-timeout-enabled.args | 4 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 4 +-
tests/qemuxml2argvdata/restore-v2.args | 4 +-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 4 +-
tests/qemuxml2argvdata/riscv64-virt.args | 4 +-
.../qemuxml2argvdata/s390-panic-missing.args | 4 +-
.../s390-panic-no-address.args | 4 +-
tests/qemuxml2argvdata/s390-serial-2.args | 4 +-
.../qemuxml2argvdata/s390-serial-console.args | 4 +-
tests/qemuxml2argvdata/s390-serial.args | 4 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 4 +-
.../seclabel-dynamic-baselabel.args | 4 +-
.../seclabel-dynamic-labelskip.args | 4 +-
.../seclabel-dynamic-override.args | 4 +-
.../seclabel-dynamic-relabel.args | 4 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 4 +-
tests/qemuxml2argvdata/seclabel-none.args | 4 +-
.../seclabel-static-labelskip.args | 4 +-
.../seclabel-static-relabel.args | 4 +-
tests/qemuxml2argvdata/seclabel-static.args | 4 +-
.../serial-dev-chardev-iobase.args | 4 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 4 +-
.../qemuxml2argvdata/serial-file-chardev.args | 4 +-
tests/qemuxml2argvdata/serial-file-log.args | 4 +-
.../qemuxml2argvdata/serial-many-chardev.args | 4 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 4 +-
.../serial-spiceport-nospice.args | 4 +-
tests/qemuxml2argvdata/serial-spiceport.args | 4 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 4 +-
.../serial-tcp-telnet-chardev.args | 4 +-
.../serial-tcp-tlsx509-chardev-notls.args | 4 +-
.../serial-tcp-tlsx509-chardev-verify.args | 4 +-
.../serial-tcp-tlsx509-chardev.args | 4 +-
.../serial-tcp-tlsx509-secret-chardev.args | 4 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 4 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 6 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 4 +-
.../shmem-plain-doorbell.args | 4 +-
tests/qemuxml2argvdata/shmem.args | 4 +-
.../smartcard-controller.args | 4 +-
.../smartcard-host-certificates-database.args | 4 +-
.../smartcard-host-certificates.args | 4 +-
tests/qemuxml2argvdata/smartcard-host.args | 4 +-
.../smartcard-passthrough-spicevmc.args | 4 +-
.../smartcard-passthrough-tcp.args | 4 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 4 +-
tests/qemuxml2argvdata/smbios.args | 4 +-
tests/qemuxml2argvdata/smp-dies.args | 4 +-
tests/qemuxml2argvdata/smp.args | 4 +-
tests/qemuxml2argvdata/sound-device.args | 4 +-
tests/qemuxml2argvdata/sound.args | 4 +-
tests/qemuxml2argvdata/sparc-minimal.args | 4 +-
.../usb-controller-default-q35.args | 4 +-
.../usb-controller-explicit-q35.args | 4 +-
.../usb-controller-qemu-xhci.args | 4 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 4 +-
tests/qemuxml2argvdata/usb-controller.args | 4 +-
.../usb-hub-autoadd-deluxe.args | 4 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 4 +-
tests/qemuxml2argvdata/usb-hub.args | 4 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 4 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 4 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 4 +-
.../qemuxml2argvdata/usb-long-port-path.args | 4 +-
tests/qemuxml2argvdata/usb-none.args | 4 +-
.../usb-piix3-controller.args | 4 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 4 +-
tests/qemuxml2argvdata/usb-port-missing.args | 4 +-
tests/qemuxml2argvdata/usb-ports.args | 4 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 4 +-
.../usb-redir-filter-version.args | 4 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 4 +-
tests/qemuxml2argvdata/usb-redir.args | 4 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 4 +-
tests/qemuxml2argvdata/usb1-usb2.args | 4 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 4 +-
tests/qemuxml2argvdata/user-aliases.args | 6 +-
.../vcpu-placement-static.args | 4 +-
.../video-device-pciaddr-default.args | 4 +-
tests/qemuxml2argvdata/video-none-device.args | 4 +-
.../video-qxl-device-vgamem.args | 4 +-
tests/qemuxml2argvdata/video-qxl-device.args | 4 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 4 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 4 +-
.../video-qxl-resolution.args | 4 +-
.../video-qxl-sec-device-vgamem.args | 4 +-
.../video-qxl-sec-device.args | 4 +-
.../video-vga-device-vgamem.args | 4 +-
tests/qemuxml2argvdata/video-vga-device.args | 4 +-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 4 +-
.../video-virtio-gpu-ccw.args | 4 +-
.../video-virtio-gpu-device.args | 4 +-
.../video-virtio-gpu-sdl-gl.args | 4 +-
.../video-virtio-gpu-secondary.args | 4 +-
.../video-virtio-gpu-spice-gl.args | 4 +-
.../video-virtio-gpu-virgl.args | 4 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 4 +-
.../virtio-input-passthrough.args | 4 +-
tests/qemuxml2argvdata/virtio-input.args | 4 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 4 +-
.../qemuxml2argvdata/virtio-rng-default.args | 4 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 4 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 4 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 4 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 4 +-
tests/qemuxml2argvtest.c | 28 +-
tests/testutilsqemu.c | 3 +-
549 files changed, 956 insertions(+), 237440 deletions(-)
delete mode 100644 ci/containers/ubuntu-1804.Dockerfile
delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-none.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/graphics-vnc.x86_64-2.11.0.args
delete mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
delete mode 100644 tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
delete mode 100644 tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
delete mode 100644 tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
delete mode 100644 tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args
--
2.34.1
2 years, 7 months
- 4
- 22
(no subject)
by Moteen Shah
From: Moteen Shah <moteenshah.02(a)gmail.com>
Subject: [PATCH v2] conf: Move validation checks from
virDomainDiskDefIotuneParse into domain_validate.c
Move validation from virDomainDiskDefIotuneParse into the validation callback
Signed-off-by: Moteen Shah <moteenshah.02(a)gmail.com>
---
src/conf/domain_conf.c | 40 -------------------------------------
src/conf/domain_validate.c | 41 ++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5dd269b283..bd2884088c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8790,46 +8790,6 @@ virDomainDiskDefIotuneParse(virDomainDiskDef *def,
def->blkdeviotune.group_name =
virXPathString("string(./iotune/group_name)", ctxt);
- if ((def->blkdeviotune.total_bytes_sec &&
- def->blkdeviotune.read_bytes_sec) ||
- (def->blkdeviotune.total_bytes_sec &&
- def->blkdeviotune.write_bytes_sec)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write bytes_sec "
- "cannot be set at the same time"));
- return -1;
- }
-
- if ((def->blkdeviotune.total_iops_sec &&
- def->blkdeviotune.read_iops_sec) ||
- (def->blkdeviotune.total_iops_sec &&
- def->blkdeviotune.write_iops_sec)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write iops_sec "
- "cannot be set at the same time"));
- return -1;
- }
-
- if ((def->blkdeviotune.total_bytes_sec_max &&
- def->blkdeviotune.read_bytes_sec_max) ||
- (def->blkdeviotune.total_bytes_sec_max &&
- def->blkdeviotune.write_bytes_sec_max)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write bytes_sec_max "
- "cannot be set at the same time"));
- return -1;
- }
-
- if ((def->blkdeviotune.total_iops_sec_max &&
- def->blkdeviotune.read_iops_sec_max) ||
- (def->blkdeviotune.total_iops_sec_max &&
- def->blkdeviotune.write_iops_sec_max)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write iops_sec_max "
- "cannot be set at the same time"));
- return -1;
- }
-
return 0;
}
#undef PARSE_IOTUNE
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index d6869e8fd8..71dc74abc8 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -651,6 +651,47 @@ virDomainDiskDefValidate(const virDomainDef *def,
}
}
+ /* Validate IotuneParse */
+ if ((disk->blkdeviotune.total_bytes_sec &&
+ disk->blkdeviotune.read_bytes_sec) ||
+ (disk->blkdeviotune.total_bytes_sec &&
+ disk->blkdeviotune.write_bytes_sec)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write bytes_sec "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
+ if ((disk->blkdeviotune.total_iops_sec &&
+ disk->blkdeviotune.read_iops_sec) ||
+ (disk->blkdeviotune.total_iops_sec &&
+ disk->blkdeviotune.write_iops_sec)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write iops_sec "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
+ if ((disk->blkdeviotune.total_bytes_sec_max &&
+ disk->blkdeviotune.read_bytes_sec_max) ||
+ (disk->blkdeviotune.total_bytes_sec_max &&
+ disk->blkdeviotune.write_bytes_sec_max)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write bytes_sec_max "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
+ if ((disk->blkdeviotune.total_iops_sec_max &&
+ disk->blkdeviotune.read_iops_sec_max) ||
+ (disk->blkdeviotune.total_iops_sec_max &&
+ disk->blkdeviotune.write_iops_sec_max)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write iops_sec_max "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
/* Reject disks with a bus type that is not compatible with the
* given address type. The function considers only buses that are
* handled in common code. For other bus types it's not possible
--
2.35.1
2 years, 7 months
- 1
- 0
[PATCH 00/11] docs: Convert some pages to rST and clean up (part 4)
by Peter Krempa
This part focuses on 'internals' documents along comes simplification of
the XSL usage for 'href_base' and conversion of the 'docs/docs'
directory page to RST as I was modifying it in the process.
Additionally this series actually makes use of the 'internals' page
which was not linked previously.
Peter Krempa (11):
kbase: index: Split off 'internals' section
docs: Simplify passing of 'href_base' XSL variable
docs: kbase: Section of 'internals' documents into a subfolder
docs: Convert 'docs' index page to rst
docs: Convert 'internals/command' to rst and move it to
'kbase/internals'
docs: Convert 'internals/eventloop' page to rst and move it to
'kbase/internals'
docs: Convert 'internals/locking' page to rst and move it to
'kbase/internals'
docs: Convert 'internals/rpc' page to RST and move it to
'kbase/internals'
docs: Remove empty 'internals' subfolder
docs: Convert 'internals' to RST and move it to
'kbase/internal/overview.rst'
docs: kbase: internals: Make 'overview' page useful and link to it
docs/api.rst | 2 +-
docs/css/libvirt.css | 17 +-
docs/docs.html.in | 188 ----
docs/docs.rst | 163 ++++
docs/go/meson.build | 5 +-
docs/internals.html.in | 119 ---
docs/internals/command.html.in | 596 ------------
docs/internals/eventloop.html.in | 106 --
docs/internals/locking.html.in | 267 -----
docs/internals/rpc.html.in | 914 ------------------
docs/kbase/index.rst | 34 +-
docs/kbase/internals/command.rst | 465 +++++++++
docs/kbase/internals/eventloop.rst | 84 ++
.../incremental-backup.rst} | 0
docs/kbase/internals/locking.rst | 190 ++++
docs/{ => kbase}/internals/meson.build | 20 +-
.../migration.rst} | 0
docs/kbase/internals/overview.rst | 102 ++
docs/kbase/internals/rpc.rst | 781 +++++++++++++++
docs/kbase/meson.build | 10 +-
docs/manpages/meson.build | 5 +-
docs/meson.build | 16 +-
docs/site.xsl | 12 +-
docs/subsite.xsl | 24 -
24 files changed, 1860 insertions(+), 2260 deletions(-)
delete mode 100644 docs/docs.html.in
create mode 100644 docs/docs.rst
delete mode 100644 docs/internals.html.in
delete mode 100644 docs/internals/command.html.in
delete mode 100644 docs/internals/eventloop.html.in
delete mode 100644 docs/internals/locking.html.in
delete mode 100644 docs/internals/rpc.html.in
create mode 100644 docs/kbase/internals/command.rst
create mode 100644 docs/kbase/internals/eventloop.rst
rename docs/kbase/{incrementalbackupinternals.rst => internals/incremental-backup.rst} (100%)
create mode 100644 docs/kbase/internals/locking.rst
rename docs/{ => kbase}/internals/meson.build (69%)
rename docs/kbase/{migrationinternals.rst => internals/migration.rst} (100%)
create mode 100644 docs/kbase/internals/overview.rst
create mode 100644 docs/kbase/internals/rpc.rst
delete mode 100644 docs/subsite.xsl
--
2.35.1
2 years, 7 months
- 2
- 13
[libvirt PATCH 0/5] Fix error handling in nwfilterStateInitialize
by Tim Wiederhake
See patch 5 for description.
Tim Wiederhake (5):
virNWFilterObjListFree: Prevent null pointer derefernce
virNWFilterSnoopState: Prevent mutex leak
nwfilterDriverRemoveDBusMatches: Prevent unsubscribing from null id
virNWFilterDriverState: Destroy mutex safely
nwfilterStateInitialize: Simplify and fix error handling
src/conf/virnwfilterobj.c | 3 ++
src/conf/virnwfilterobj.h | 1 +
src/nwfilter/nwfilter_dhcpsnoop.c | 15 +++++++--
src/nwfilter/nwfilter_driver.c | 55 ++++++++++++++-----------------
4 files changed, 41 insertions(+), 33 deletions(-)
--
2.31.1
2 years, 7 months
- 2
- 6
[libvirt PATCH 0/2] qemu: Drop QEMU_CAPS_INCOMING_DEFER
by Jiri Denemark
This capability is supported even in QEMU 3.1.0 which is the oldest
supported version of QEMU.
Jiri Denemark (2):
qemu: Simplify qemuProcessIncomingDef
qemu: Drop QEMU_CAPS_INCOMING_DEFER
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_migration.c | 3 +--
src/qemu/qemu_process.c | 22 ++++++-------------
src/qemu/qemu_process.h | 3 +--
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
.../caps_3.1.0.x86_64.xml | 1 -
.../caps_4.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
.../caps_4.0.0.riscv32.xml | 1 -
.../caps_4.0.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
.../caps_4.0.0.x86_64.xml | 1 -
.../caps_4.1.0.x86_64.xml | 1 -
.../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 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.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 -
39 files changed, 11 insertions(+), 56 deletions(-)
--
2.35.1
2 years, 7 months
- 2
- 3
[PATCH 00/17] Use virXMLPropEnum() more (part I)
by Michal Privoznik
I've started rewriting parser to use virXMLPropEnum() functions family
more instead of virXMLPropString() + str2enum. This is what I've done so
far. If these get merged I can continue working on it.
Michal Prívozník (17):
Drop needless typecast to virStorageType enum
virStorageSourceGetActualType: Change type of retval
virDomainBackupDefParse: Switch to virXMLPropEnumDefault()
virDomainDeviceAddressParseXML: Switch to virXMLPropEnumDefault()
virDomainStorageNetworkParseHost: Switch to virXMLPropEnumDefault()
virDomainHostdevSubsysSCSIDefParseXML: Switch to
virXMLPropEnumDefault()
virDomainHostdevSubsysSCSIVHostDefParseXML: Switch to
virXMLPropEnumDefault()
virDomainDiskSourceNVMeParse: Switch to virXMLPropEnumDefault()
virDomainDiskDefMirrorParse: Switch to virXMLPropEnumDefault()
virDomainDiskSourcePoolDefParse: Switch to virXMLPropEnumDefault()
virDomainDiskDefParseSourceXML: Switch to virXMLPropEnumDefault()
virDomainChrDefParseXML: Switch to virXMLPropEnumDefault()
virDomainTPMDefParseXML: Switch to virXMLPropEnumDefault()
virDomainPanicDefParseXML: Switch to virXMLPropEnumDefault()
virDomainInputDefParseXML: Switch to virXMLPropEnumDefault()
virDomainHubDefParseXML: Switch to virXMLPropEnumDefault()
virDomainTimerDefParseXML: Switch to virXMLPropEnumDefault()
src/ch/ch_monitor.c | 2 +-
src/conf/backup_conf.c | 16 +-
src/conf/backup_conf.h | 2 +-
src/conf/device_conf.c | 12 +-
src/conf/device_conf.h | 4 +-
src/conf/domain_audit.c | 2 +-
src/conf/domain_conf.c | 494 ++++++------------
src/conf/domain_conf.h | 54 +-
src/conf/domain_validate.c | 6 +-
src/conf/storage_source_conf.c | 2 +-
src/conf/storage_source_conf.h | 8 +-
src/conf/virchrdev.c | 24 +
src/libxl/libxl_conf.c | 28 +-
src/libxl/libxl_domain.c | 2 +-
src/libxl/xen_common.c | 25 +-
src/libxl/xen_xl.c | 7 +-
src/libxl/xen_xm.c | 3 +
src/locking/domain_lock.c | 2 +-
src/lxc/lxc_cgroup.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/qemu/qemu_backup.c | 2 +-
src/qemu/qemu_block.c | 14 +-
src/qemu/qemu_cgroup.c | 12 +
src/qemu/qemu_command.c | 49 +-
src/qemu/qemu_domain.c | 40 +-
src/qemu/qemu_domain_address.c | 4 +-
src/qemu/qemu_driver.c | 4 +-
src/qemu/qemu_hotplug.c | 4 +-
src/qemu/qemu_migration.c | 6 +-
src/qemu/qemu_monitor.c | 54 +-
src/qemu/qemu_monitor_json.c | 4 +-
src/qemu/qemu_process.c | 10 +-
src/qemu/qemu_snapshot.c | 16 +-
src/qemu/qemu_validate.c | 19 +-
src/security/security_apparmor.c | 6 +-
src/security/security_dac.c | 8 +-
src/security/security_selinux.c | 24 +-
.../storage_file_backend_gluster.c | 2 +-
src/storage_file/storage_source.c | 4 +-
.../storage_source_backingstore.c | 16 +-
src/vmx/vmx.c | 22 +
tests/qemuxml2argvtest.c | 2 +-
tests/testutilsqemu.c | 2 +-
43 files changed, 532 insertions(+), 489 deletions(-)
--
2.35.1
2 years, 7 months
- 1
- 17
[PATCH v2] conf: Move validation from virDomainDiskDefIotuneParse into the validation callback
by Moteen Shah
From: Moteen Shah <moteenshah.02(a)gmail.com>
all the option collision total and... error messages in
virDomainDiskDefIotuneParse shifted to validation callback
Signed-off-by: Moteen Shah <moteenshah.02(a)gmail.com>
---
src/conf/domain_conf.c | 55 +++-----------------------------------
src/conf/domain_validate.c | 42 ++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f2480f37f6..48132c2f97 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1408,7 +1408,6 @@ VIR_ENUM_IMPL(virDomainSnapshotLocation,
"no",
"internal",
"external",
- "manual",
);
/* Internal mapping: subset of block job types that can be present in
@@ -6229,51 +6228,6 @@ virDomainDefPostParseCheckFailure(virDomainDef *def,
return 0;
}
-static int
-virDomainDefPostParseCheck(virDomainDiskDef *def)
-{
- if ((def->blkdeviotune.total_bytes_sec &&
- def->blkdeviotune.read_bytes_sec) ||
- (def->blkdeviotune.total_bytes_sec &&
- def->blkdeviotune.write_bytes_sec)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write bytes_sec "
- "cannot be set at the same time"));
- return -1;
- }
-
- if ((def->blkdeviotune.total_iops_sec &&
- def->blkdeviotune.read_iops_sec) ||
- (def->blkdeviotune.total_iops_sec &&
- def->blkdeviotune.write_iops_sec)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write iops_sec "
- "cannot be set at the same time"));
- return -1;
- }
-
- if ((def->blkdeviotune.total_bytes_sec_max &&
- def->blkdeviotune.read_bytes_sec_max) ||
- (def->blkdeviotune.total_bytes_sec_max &&
- def->blkdeviotune.write_bytes_sec_max)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write bytes_sec_max "
- "cannot be set at the same time"));
- return -1;
- }
-
- if ((def->blkdeviotune.total_iops_sec_max &&
- def->blkdeviotune.read_iops_sec_max) ||
- (def->blkdeviotune.total_iops_sec_max &&
- def->blkdeviotune.write_iops_sec_max)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("total and read/write iops_sec_max "
- "cannot be set at the same time"));
- return -1;
- }
- return 0;
-}
-
int
virDomainDefPostParse(virDomainDef *def,
unsigned int parseFlags,
@@ -8826,9 +8780,9 @@ virDomainDiskDefIotuneParse(virDomainDiskDef *def,
PARSE_IOTUNE(write_iops_sec_max_length);
def->blkdeviotune.group_name =
- virXPathString("string(./iotune/group_name)", ctxt);
-
- return virDomainDefPostParseCheck(def);
+ virXPathString("string(./iotune/group_name)", ctxt);
+
+ return 0;
}
#undef PARSE_IOTUNE
@@ -9278,8 +9232,7 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt,
return NULL;
}
- if (virDomainDiskDefIotuneParse(def, ctxt) < 0)
- return NULL;
+ virDomainDiskDefIotuneParse(def, ctxt);
def->domain_name = virXPathString("string(./backenddomain/@name)", ctxt);
def->serial = virXPathString("string(./serial)", ctxt);
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index d6869e8fd8..4bdb95aa13 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -597,7 +597,6 @@ virDomainDiskDefSourceLUNValidate(const virStorageSource *src)
return 0;
}
-
static int
virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk)
@@ -651,6 +650,47 @@ virDomainDiskDefValidate(const virDomainDef *def,
}
}
+ /* Validate IotuneParse */
+ if ((disk->blkdeviotune.total_bytes_sec &&
+ disk->blkdeviotune.read_bytes_sec) ||
+ (disk->blkdeviotune.total_bytes_sec &&
+ disk->blkdeviotune.write_bytes_sec)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write bytes_sec "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
+ if ((disk->blkdeviotune.total_iops_sec &&
+ disk->blkdeviotune.read_iops_sec) ||
+ (disk->blkdeviotune.total_iops_sec &&
+ disk->blkdeviotune.write_iops_sec)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write iops_sec "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
+ if ((disk->blkdeviotune.total_bytes_sec_max &&
+ disk->blkdeviotune.read_bytes_sec_max) ||
+ (disk->blkdeviotune.total_bytes_sec_max &&
+ disk->blkdeviotune.write_bytes_sec_max)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write bytes_sec_max "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
+ if ((disk->blkdeviotune.total_iops_sec_max &&
+ disk->blkdeviotune.read_iops_sec_max) ||
+ (disk->blkdeviotune.total_iops_sec_max &&
+ disk->blkdeviotune.write_iops_sec_max)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("total and read/write iops_sec_max "
+ "cannot be set at the same time"));
+ return -1;
+ }
+
/* Reject disks with a bus type that is not compatible with the
* given address type. The function considers only buses that are
* handled in common code. For other bus types it's not possible
--
2.35.1
2 years, 7 months
- 2
- 1
[libvirt PATCH] drivers: Group global feature together
by Andrea Bolognani
All these features are supposed to be handled by the call to
virDriverFeatureIsGlobal() placed right above the switch
statement, so group them together and add a comment. If any of
these features is actually encountered as part of the switch
statements, that means there's a bug in the driver and we should
error out.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Applies on top of
[PATCH 0/8] driver: Fix handling of driver feature flags
https://listman.redhat.com/archives/libvir-list/2022-February/msg00644.html
src/ch/ch_driver.c | 13 +++++++------
src/esx/esx_driver.c | 21 +++++++++++----------
src/libxl/libxl_driver.c | 16 +++++++++-------
src/lxc/lxc_driver.c | 11 ++++++-----
src/network/bridge_driver.c | 15 ++++++++-------
src/openvz/openvz_driver.c | 16 +++++++++-------
src/qemu/qemu_driver.c | 16 +++++++++-------
7 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index ac9298c0b5..9cbd7b71df 100644
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -928,23 +928,24 @@ chConnectSupportsFeature(virConnectPtr conn,
return supported;
switch ((virDrvFeature) feature) {
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
- return 1;
+ case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
case VIR_DRV_FEATURE_MIGRATION_V2:
case VIR_DRV_FEATURE_MIGRATION_V3:
case VIR_DRV_FEATURE_MIGRATION_P2P:
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
- case VIR_DRV_FEATURE_FD_PASSING:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_V1:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
default:
return 0;
}
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 3149f3e963..6e5f9c8cc1 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -1024,7 +1024,17 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature)
return supported;
switch ((virDrvFeature) feature) {
- case VIR_DRV_FEATURE_MIGRATION_V1:
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
+ case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
+ case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
+ case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
+
+ case VIR_DRV_FEATURE_MIGRATION_V1:
supportsVMotion = esxSupportsVMotion(priv);
if (supportsVMotion == esxVI_Boolean_Undefined)
@@ -1034,10 +1044,6 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature)
return priv->vCenter &&
supportsVMotion == esxVI_Boolean_True ? 1 : 0;
- case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
- return 1;
-
- case VIR_DRV_FEATURE_FD_PASSING:
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
@@ -1045,11 +1051,6 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature)
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
case VIR_DRV_FEATURE_MIGRATION_V2:
case VIR_DRV_FEATURE_MIGRATION_V3:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
- case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
default:
return 0;
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 478ab3e941..46596978d4 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -5706,22 +5706,24 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature)
return supported;
switch ((virDrvFeature) feature) {
- case VIR_DRV_FEATURE_MIGRATION_V3:
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
+ case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
+ case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
+ case VIR_DRV_FEATURE_MIGRATION_V3:
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
case VIR_DRV_FEATURE_MIGRATION_P2P:
- case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
return 1;
- case VIR_DRV_FEATURE_FD_PASSING:
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
case VIR_DRV_FEATURE_MIGRATION_V1:
case VIR_DRV_FEATURE_MIGRATION_V2:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
default:
return 0;
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 020ec257ae..023292a75a 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1627,10 +1627,15 @@ lxcConnectSupportsFeature(virConnectPtr conn, int feature)
return supported;
switch ((virDrvFeature) feature) {
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
- return 1;
case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
@@ -1639,10 +1644,6 @@ lxcConnectSupportsFeature(virConnectPtr conn, int feature)
case VIR_DRV_FEATURE_MIGRATION_V1:
case VIR_DRV_FEATURE_MIGRATION_V2:
case VIR_DRV_FEATURE_MIGRATION_V3:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
default:
return 0;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index d6ae05360b..559600d2af 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -866,23 +866,24 @@ networkConnectSupportsFeature(virConnectPtr conn, int feature)
return supported;
switch ((virDrvFeature) feature) {
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
+ case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
- return 1;
+ case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
case VIR_DRV_FEATURE_MIGRATION_V2:
case VIR_DRV_FEATURE_MIGRATION_V3:
case VIR_DRV_FEATURE_MIGRATION_P2P:
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
- case VIR_DRV_FEATURE_FD_PASSING:
- case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_V1:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
default:
return 0;
}
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index aa1db09540..c034fd5af9 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1944,22 +1944,24 @@ openvzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature)
return supported;
switch ((virDrvFeature) feature) {
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
+ case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
+ case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
+ case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
case VIR_DRV_FEATURE_MIGRATION_V3:
- case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
return 1;
- case VIR_DRV_FEATURE_FD_PASSING:
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
case VIR_DRV_FEATURE_MIGRATION_P2P:
case VIR_DRV_FEATURE_MIGRATION_V1:
case VIR_DRV_FEATURE_MIGRATION_V2:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
- case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
default:
return 0;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f1f708e511..433ba09745 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1182,23 +1182,25 @@ qemuConnectSupportsFeature(virConnectPtr conn, int feature)
return supported;
switch ((virDrvFeature) feature) {
+ case VIR_DRV_FEATURE_REMOTE:
+ case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
+ case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
+ case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
+ case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
+ case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
+ case VIR_DRV_FEATURE_FD_PASSING:
+ /* Should have already been handled by virDriverFeatureIsGlobal() */
+ return -1;
case VIR_DRV_FEATURE_MIGRATION_V2:
case VIR_DRV_FEATURE_MIGRATION_V3:
case VIR_DRV_FEATURE_MIGRATION_P2P:
case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION:
- case VIR_DRV_FEATURE_FD_PASSING:
- case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
case VIR_DRV_FEATURE_XML_MIGRATABLE:
case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
- case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER:
return 1;
case VIR_DRV_FEATURE_MIGRATION_DIRECT:
case VIR_DRV_FEATURE_MIGRATION_V1:
- case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
- case VIR_DRV_FEATURE_REMOTE:
- case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK:
- case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK:
default:
return 0;
}
--
2.35.1
2 years, 7 months
- 2
- 4
[libvirt PATCH] ci: Refresh Dockerfiles and vars files
by Erik Skultety
In this batch:
- dnsmasq is dropped as build dependency
- Alpine Edge rpcgen package collision fix
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
corresponding pipeline:
https://gitlab.com/eskultety/libvirt/-/pipelines/510287873
ci/cirrus/freebsd-12.vars | 2 +-
ci/cirrus/freebsd-13.vars | 2 +-
ci/cirrus/freebsd-current.vars | 2 +-
ci/cirrus/macos-11.vars | 2 +-
ci/containers/almalinux-8.Dockerfile | 1 -
ci/containers/alpine-314.Dockerfile | 1 -
ci/containers/alpine-edge.Dockerfile | 2 +-
ci/containers/centos-stream-8.Dockerfile | 3 +--
ci/containers/centos-stream-9.Dockerfile | 3 +--
ci/containers/debian-10-cross-aarch64.Dockerfile | 1 -
ci/containers/debian-10-cross-armv6l.Dockerfile | 1 -
ci/containers/debian-10-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-10-cross-i686.Dockerfile | 1 -
ci/containers/debian-10-cross-mips.Dockerfile | 1 -
ci/containers/debian-10-cross-mips64el.Dockerfile | 1 -
ci/containers/debian-10-cross-mipsel.Dockerfile | 1 -
ci/containers/debian-10-cross-ppc64le.Dockerfile | 1 -
ci/containers/debian-10-cross-s390x.Dockerfile | 1 -
ci/containers/debian-10.Dockerfile | 1 -
ci/containers/debian-11-cross-aarch64.Dockerfile | 1 -
ci/containers/debian-11-cross-armv6l.Dockerfile | 1 -
ci/containers/debian-11-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-11-cross-i686.Dockerfile | 1 -
ci/containers/debian-11-cross-mips64el.Dockerfile | 1 -
ci/containers/debian-11-cross-mipsel.Dockerfile | 1 -
ci/containers/debian-11-cross-ppc64le.Dockerfile | 1 -
ci/containers/debian-11-cross-s390x.Dockerfile | 1 -
ci/containers/debian-11.Dockerfile | 1 -
ci/containers/debian-sid-cross-aarch64.Dockerfile | 1 -
ci/containers/debian-sid-cross-armv6l.Dockerfile | 1 -
ci/containers/debian-sid-cross-armv7l.Dockerfile | 1 -
ci/containers/debian-sid-cross-i686.Dockerfile | 1 -
ci/containers/debian-sid-cross-mips64el.Dockerfile | 1 -
ci/containers/debian-sid-cross-mipsel.Dockerfile | 1 -
ci/containers/debian-sid-cross-ppc64le.Dockerfile | 1 -
ci/containers/debian-sid-cross-s390x.Dockerfile | 1 -
ci/containers/debian-sid.Dockerfile | 1 -
ci/containers/fedora-34.Dockerfile | 1 -
ci/containers/fedora-35-cross-mingw32.Dockerfile | 1 -
ci/containers/fedora-35-cross-mingw64.Dockerfile | 1 -
ci/containers/fedora-35.Dockerfile | 1 -
ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 1 -
ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 1 -
ci/containers/fedora-rawhide.Dockerfile | 1 -
ci/containers/opensuse-leap-152.Dockerfile | 1 -
ci/containers/opensuse-tumbleweed.Dockerfile | 1 -
ci/containers/ubuntu-2004.Dockerfile | 1 -
47 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 480a403361..e8b06b32e1 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index 480a403361..e8b06b32e1 100644
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index 480a403361..e8b06b32e1 100644
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
index eb6d6db18f..a5afb4eb4d 100644
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='brew'
PIP3='/usr/local/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
PYPI_PKGS=''
PYTHON='/usr/local/bin/python3'
diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile
index 55ce0908a3..1b55e9f66f 100644
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@@ -22,7 +22,6 @@ RUN dnf update -y && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile
index 4ca35a949b..1cd3fc6b0c 100644
--- a/ci/containers/alpine-314.Dockerfile
+++ b/ci/containers/alpine-314.Dockerfile
@@ -21,7 +21,6 @@ RUN apk update && \
curl-dev \
cyrus-sasl-dev \
diffutils \
- dnsmasq \
eudev-dev \
fuse-dev \
gcc \
diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile
index d171ed1be7..76e85b4386 100644
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@@ -21,7 +21,6 @@ RUN apk update && \
curl-dev \
cyrus-sasl-dev \
diffutils \
- dnsmasq \
eudev-dev \
fuse-dev \
gcc \
@@ -62,6 +61,7 @@ RUN apk update && \
python3 \
qemu-img \
readline-dev \
+ rpcgen \
samurai \
sed \
util-linux-dev \
diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index 2496c5b0bb..82cbd7cde7 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -6,7 +6,7 @@
FROM quay.io/centos/centos:stream8
-RUN dnf update -y && \
+RUN dnf distro-sync -y && \
dnf install 'dnf-command(config-manager)' -y && \
dnf config-manager --set-enabled -y powertools && \
dnf install -y centos-release-advanced-virtualization && \
@@ -22,7 +22,6 @@ RUN dnf update -y && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile
index d20602b847..34ff3a06eb 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -6,7 +6,7 @@
FROM quay.io/centos/centos:stream9
-RUN dnf update -y && \
+RUN dnf distro-sync -y && \
dnf install 'dnf-command(config-manager)' -y && \
dnf config-manager --set-enabled -y crb && \
dnf install -y \
@@ -22,7 +22,6 @@ RUN dnf update -y && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
index ca6b36b439..f4054490df 100644
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
index 6818d6c409..96a6fa94aa 100644
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
index 726d5d5846..d3c221e87a 100644
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
index 16e29e00c9..37f4962286 100644
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
index d5cabb47c4..7c8847260f 100644
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
index ff63c2b5da..0cc7bc7034 100644
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
index 93b68bd10e..ae3fd260ea 100644
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index 5577056754..7cd3a3a419 100644
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
index 886d532927..589a5b1d9c 100644
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index 63d070cb37..41691c708f 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile
index d57a7c0e6e..778eed4be1 100644
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile
index cead78f3ca..6c13a93b95 100644
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile
index bb3ce1c70c..66f95d5cd8 100644
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile
index a3408eb6fe..a12e703f42 100644
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile
index cf28516bb9..9c880ba1f1 100644
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile
index 535e8a53f1..b4d2b53f27 100644
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile
index 147a45c837..bd2d62b0bb 100644
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile
index d3e879b084..aa73a79210 100644
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile
index 102973de0b..2609c83928 100644
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index 96f3651e54..7e4e5d0b7c 100644
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index 332e0d6570..c64bf14f67 100644
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 1372fe954d..81604816f7 100644
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index 9557986f1b..4f0f1a992a 100644
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 0738f5bdad..c6186a2454 100644
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile
index 8fabe91bfd..eece32d2da 100644
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index 4b71bba63c..1605ca2771 100644
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 68f35fc72d..7b5a6b4b79 100644
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 0cabbcea66..52f1724415 100644
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
index 9153ec2ca1..6949231a62 100644
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-35-cross-mingw32.Dockerfile
index 0181237702..3cc5e7b59b 100644
--- a/ci/containers/fedora-35-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile
@@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \
cpp \
cppi \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-35-cross-mingw64.Dockerfile
index 889f32bbfc..b6662f6da7 100644
--- a/ci/containers/fedora-35-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile
@@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \
cpp \
cppi \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile
index 48d22cb056..117b2736c3 100644
--- a/ci/containers/fedora-35.Dockerfile
+++ b/ci/containers/fedora-35.Dockerfile
@@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 3e474578f0..5c4a124e33 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \
cpp \
cppi \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index a27fb5af4e..7e626a8230 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \
cpp \
cppi \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 9615f22230..beca9062f5 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -31,7 +31,6 @@ exec "$@"' > /usr/bin/nosync && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
firewalld-filesystem \
diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
index 864dfa4fa7..19161f60cf 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -21,7 +21,6 @@ RUN zypper update -y && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
fuse-devel \
diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index 8f249ccb61..72824c5505 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -21,7 +21,6 @@ RUN zypper dist-upgrade -y && \
cyrus-sasl-devel \
device-mapper-devel \
diffutils \
- dnsmasq \
dwarves \
ebtables \
fuse-devel \
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index b6b10f2cbe..81115ab338 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
codespell \
cpp \
diffutils \
- dnsmasq-base \
dwarves \
ebtables \
flake8 \
--
2.34.1
2 years, 7 months
- 2
- 1