- Devel - libvirt List Archives

[libvirt PATCH] qemu: Shorten domain name in virtiofsd log path
by Martin Kletzander 19 Apr '22

19 Apr '22

This helps when starting domains with long names which could possibly end up creating too long of a name for the filesystem. The path is not being saved in the domain config, so there is no need for backwards compatibility. User aliases will always start with "ua-" and the only way paths could collide is to: 1) create a domain named e.g. "asdf-ua" 2) start the domain with virtiofsd debug logs 3) destroy the domain 4) restart libvirt daemon for domain IDs to start from 1 again 5) create a domain named "asdf" 6) add user alias for the virtiofs that is the same as was generated for the first domain, with the required "ua-" prefix 7) start the "asdf" domain at which point the logs for the two domains would end up in the same logfile. Since this is still better than what we had before I think it is not worth fixing this peculiar scenario in this patch. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1817401 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_virtiofs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 7e3324b017ce..67df8b3890b6 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -81,8 +81,9 @@ qemuVirtioFSCreateLogFilename(virQEMUDriverConfig *cfg, const char *alias) { g_autofree char *name = NULL; + g_autofree char *shortname = virDomainDefGetShortName(def); - name = g_strdup_printf("%s-%s", def->name, alias); + name = g_strdup_printf("%s-%s", shortname, alias); return virFileBuildPath(cfg->logDir, name, "-virtiofsd.log"); } -- 2.35.1

3 3

what is virtunixd ? Is there such a daemon?
by Claudio Fontana 19 Apr '22

19 Apr '22

Hello, as I experiment with virsh migration commands (and probably I do things that don't make sense), I got an error I could not understand: # virsh migrate centos7 unix:///tmp/netcat.sock error: Failed to connect socket to '/var/run/libvirt/virtunixd-sock': No such file or directory What is "/var/run/libvirt/virtunixd-sock" ? Should I have a "virtunixd" process running? I am building with non-modularized libvirtd currently, but I could not find a virtunixd module either... Thanks, Claudio

3 3

[PATCH] qemu: Fetch info on NVDIMM-s too when updating memory devices
by Michal Privoznik 19 Apr '22

19 Apr '22

Sometimes it may come handy to learn what address is a NVDIMM mapped to inside a guest. While users can provide an address they want to have NVDIMM mapped to, it's optional. Fortunately, when a domain is being started we issue the 'query-memory-devices' monitor command and the reply is the same for 'dimm' and 'nvdimm' types. Therefore, updating NVDIMM address is trivial. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d5622bd6d9..68ee322ad9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7484,7 +7484,7 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon, meminfo = g_new0(qemuMonitorMemoryDeviceInfo, 1); /* dimm memory devices */ - if (STREQ(type, "dimm")) { + if (STREQ(type, "dimm") || STREQ(type, "nvdimm") ) { if (virJSONValueObjectGetNumberUlong(dimminfo, "addr", &meminfo->address) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 2.35.1

2 1

[libvirt PATCH] util: Fix stubs for virProcessGet{Stat,Sched}Info()
by Andrea Bolognani 19 Apr '22

19 Apr '22

Commit d73852c49962 moved the original QEMU-specific helpers to the utils module, which resulted in build failures on non-Unix platforms due to the unconditional use of Unix-only symbols such as _SC_CLK_TCK. To deal with that situation, commit d7c64453aa0e made the helpers Linux-only and added stubs for other platforms that, when called, would always fail with ENOSYS. However the original helpers had been carefully written so that, while they would only be able to produce useful output on Linux, they would still succeed on the other Unix platforms where we build the QEMU driver. Restore the original behavior so that calling APIs such as virDomainGetInfo() can once again work on FreeBSD and macOS. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/298 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/517776953 src/util/virprocess.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b559a4257e..36d7df050a 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1875,23 +1875,34 @@ virProcessGetSchedInfo(unsigned long long *cpuWait, #else int -virProcessGetStatInfo(unsigned long long *cpuTime G_GNUC_UNUSED, - int *lastCpu G_GNUC_UNUSED, - long *vm_rss G_GNUC_UNUSED, +virProcessGetStatInfo(unsigned long long *cpuTime, + int *lastCpu, + long *vm_rss, pid_t pid G_GNUC_UNUSED, pid_t tid G_GNUC_UNUSED) { - errno = ENOSYS; - return -1; + /* We don't have a way to collect this information on non-Linux + * platforms, so just report neutral values */ + if (cpuTime) + *cpuTime = 0; + if (lastCpu) + *lastCpu = 0; + if (vm_rss) + *vm_rss = 0; + + return 0; } int -virProcessGetSchedInfo(unsigned long long *cpuWait G_GNUC_UNUSED, +virProcessGetSchedInfo(unsigned long long *cpuWait, pid_t pid G_GNUC_UNUSED, pid_t tid G_GNUC_UNUSED) { - virReportSystemError(ENOSYS, "%s", - _("scheduler information is not supported on this platform")); - return -1; + /* We don't have a way to collect this information on non-Linux + * platforms, so just report neutral values */ + if (cpuWait) + *cpuWait = 0; + + return 0; } #endif /* __linux__ */ -- 2.35.1

2 1

[PATCH 00/14] docs: Convert some pages to rST and clean up (part 5)
by Peter Krempa 14 Apr '22

14 Apr '22

This series corrects some mistakes from previous conversions (local anchor links, ordering of input files) and finishes the conversion of format* documents. Pavel Hrdina (1): docs: Convert 'formatnwfilter' page to rst Peter Krempa (13): docs: meson: Sort list of RST files to build docs: api: Fix local anchor links docs: drivers: Fix local anchor links docs: drvbhve: Fix local anchor links docs: drvesx: Fix local anchor links docs: drvnodedev: Fix local anchor links docs: drvsecret: Fix local anchor links docs: kbase/launch_security_sev: Fix local anchor links docs: kbase/tlscerts: Fix local anchor links docs: pci-hotplug: Fix local anchor links docs: Convert 'formatcaps' page to rst docs: Convert 'formatnetwork' page to rst docs: Convert 'formatnode' page to rst docs/api.rst | 5 +- docs/drivers.rst | 2 +- docs/drvbhyve.rst | 6 +- docs/drvesx.rst | 19 +- docs/drvnodedev.rst | 20 +- docs/firewall.rst | 2 +- docs/formatcaps.html.in | 222 --- docs/formatcaps.rst | 197 +++ docs/formatdomain.rst | 7 +- docs/formatnetwork.html.in | 1479 ----------------- docs/formatnetwork.rst | 1144 +++++++++++++ docs/formatnetworkport.rst | 2 +- docs/formatnode.html.in | 657 -------- docs/formatnode.rst | 556 +++++++ docs/formatnwfilter.html.in | 2471 ---------------------------- docs/formatnwfilter.rst | 1789 ++++++++++++++++++++ docs/formatsecret.rst | 16 +- docs/kbase/launch_security_sev.rst | 2 +- docs/kbase/tlscerts.rst | 7 +- docs/manpages/virsh.rst | 5 +- docs/meson.build | 12 +- docs/pci-hotplug.rst | 5 +- 22 files changed, 3742 insertions(+), 4883 deletions(-) delete mode 100644 docs/formatcaps.html.in create mode 100644 docs/formatcaps.rst delete mode 100644 docs/formatnetwork.html.in create mode 100644 docs/formatnetwork.rst delete mode 100644 docs/formatnode.html.in create mode 100644 docs/formatnode.rst delete mode 100644 docs/formatnwfilter.html.in create mode 100644 docs/formatnwfilter.rst -- 2.35.1

2 16

[libvirt PATCH 00/10] Automatic mutex management - part 6
by Tim Wiederhake 14 Apr '22

14 Apr '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. Tim Wiederhake (10): virstorageobj: Replace deprecated virHash functions virStoragePoolObjAddVol: Simplify error path virStorageVolObjEndAPI: Remove virStorageVolObjNew: Move locking to usage site virstorageobject: Use automatic mutex management virNetServerProcessClients: Remove goto virnetserver: Use automatic mutex management virnetserverclient: Use automatic mutex management security_manager: Use automatic mutex management vz_driver: Use automatic mutex management src/conf/virstorageobj.c | 185 +++++------ src/rpc/virnetserver.c | 295 +++++++----------- src/rpc/virnetserverclient.c | 432 ++++++++++++-------------- src/security/security_manager.c | 524 +++++++++++++------------------- src/vz/vz_driver.c | 50 ++- 5 files changed, 604 insertions(+), 882 deletions(-) -- 2.31.1

2 11

[libvirt PATCH 0/6] ci: Update targets
by Andrea Bolognani 14 Apr '22

14 Apr '22

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/516876671 Andrea Bolognani (6): ci: Drop FreeBSD -CURRENT ci: Simplify Alpine Linux 3.14 definition ci: Add Alpine Linux 3.15 ci: Add openSUSE Leap 15.3 ci: Move codestyle job to openSUSE Leap 15.3 ci: Drop openSUSE Leap 15.2 .gitlab-ci.yml | 4 +- ci/cirrus/freebsd-current.vars | 16 ---- ci/containers/alpine-315.Dockerfile | 80 +++++++++++++++++++ ...ockerfile => opensuse-leap-153.Dockerfile} | 2 +- ci/gitlab.yml | 26 ++++-- ci/manifest.yml | 14 +--- 6 files changed, 108 insertions(+), 34 deletions(-) delete mode 100644 ci/cirrus/freebsd-current.vars create mode 100644 ci/containers/alpine-315.Dockerfile rename ci/containers/{opensuse-leap-152.Dockerfile => opensuse-leap-153.Dockerfile} (98%) -- 2.35.1

2 8

[libvirt PATCH 0/1] ci: integration: Expose list of installed packages on failure
by Erik Skultety 14 Apr '22

14 Apr '22

Erik Skultety (1): ci: integration: Expose installed packages on failure ci/integration.yml | 1 + 1 file changed, 1 insertion(+) -- 2.34.1

2 2

[PATCH] docs: Fix spelling for Homebrew
by Andrea Bolognani 14 Apr '22

14 Apr '22

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/platforms.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/platforms.rst b/docs/platforms.rst index 90f14b02e8..2e7e35e1c4 100644 --- a/docs/platforms.rst +++ b/docs/platforms.rst @@ -52,7 +52,7 @@ the project will look at CentOS, Debian, Fedora, openSUSE, RHEL, SLES and Ubuntu LTS. Other distros will be assumed to ship similar software versions. For FreeBSD, decisions will be made based on the contents of the ports tree; -for macOS, `HomeBrew`_ will be used, although `MacPorts`_ is expected to carry +for macOS, `Homebrew`_ will be used, although `MacPorts`_ is expected to carry similar versions. Windows @@ -78,7 +78,7 @@ If a hypervisor is not commonly shipped directly by any distro listed above, or until the vendor discontinues support, whichever comes first. -.. _HomeBrew: https://brew.sh/ +.. _Homebrew: https://brew.sh/ .. _MacPorts: https://www.macports.org/ .. _Repology: https://repology.org/ .. _hypervisor drivers: drivers.html -- 2.35.1

1 0

[PATCH 0/2] qemu: fix and cleanup for a race on undefine and create
by Nikolay Shirokovskiy 13 Apr '22

13 Apr '22

Nikolay Shirokovskiy (2): qemu: drop needless acquiring job on removing domain qemu: fix one more race on undefining and create src/qemu/qemu_domain.c | 45 +-------------------------------------- src/qemu/qemu_domain.h | 10 ++++----- src/qemu/qemu_domainjob.c | 10 +++++++++ src/qemu/qemu_driver.c | 12 +++++------ src/qemu/qemu_migration.c | 10 ++++----- src/qemu/qemu_process.c | 12 ++++------- 6 files changed, 30 insertions(+), 69 deletions(-) -- 2.35.1

2 5

[PATCH] virDomainGraphicsListenDefParseXML: validate attribute 'network' for listen type 'network'
by Amneesh Singh 13 Apr '22

13 Apr '22

Related: https://gitlab.com/libvirt/libvirt/-/issues/93 Signed-off-by: Amneesh Singh <natto(a)weirdnatto.in> --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bd28840..f1651e3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12268,6 +12268,13 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, goto error; } def->network = g_steal_pointer(&network); + } else { + if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'network' attribute is required for listen " + "type 'network'")); + goto error; + } } if (socketPath && socketPath[0]) { -- 2.35.1

2 1

[PATCH 0/4] qemu: a bugfix and a few cleanups of graphics port releasing
by Nikolay Shirokovskiy 13 Apr '22

13 Apr '22

Nikolay Shirokovskiy (4): qemu: cleanup code to release VNC port qemu: fix releasing VNC websocket port domain does not own qemu: cleanup code to release VNC websocket port qemu: cleanup code to relece SPICE ports src/conf/domain_conf.h | 1 + src/qemu/qemu_process.c | 46 ++++++++++++++++++----------------------- 2 files changed, 21 insertions(+), 26 deletions(-) -- 2.35.1

2 5

Help - Troubleshoot libvirt
by Eduardo Kiassucumuca 13 Apr '22

13 Apr '22

Good morning I'm Eduardo, a computer science student and I'm doing a final course work focused on virtualization. The work consists of creating virtual machines on a server and allowing ssh access to the virtual machines that are on the server containing qemu/kvm/libvirt. The problem is that I can't access the virtual machines from an external network but I can access them inside the server. I would like to know what would be the best way since we want to have a single public ip and be able to have a reverse proxy to access the virtual machines, I would like to know from your experience what you recommend?

2 1

[PATCH 0/2] docs: Adapt XSL/CSS to docutils-0.17 and later
by Peter Krempa 13 Apr '22

13 Apr '22

The breakage will be visible only when you build with newer docutils such as is in fedora rawhide. Alternatively you can install one locally for your user via 'pip install docutils --force' and then build the tree via: export PYTHONPATH=~/.local/lib/python3.10/site-packages/ ninja Peter Krempa (2): docs/css: Simplify selector for heading of 'knowledge-base' and 'documentation' pages docs: Adapt to semantic tag usage of docutils-0.17 and later docs/css/libvirt.css | 13 +++++++++++-- docs/page.xsl | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-) -- 2.35.1

5 6

[PATCH] docs: man: Add description of 'calc_mode' and 'vcpu.<num>.megabytes_per_second' dirtyrate mode
by Peter Krempa 12 Apr '22

12 Apr '22

Commit 42d36b65a31 added new fields to the API docs but didn't add the virsh man page equivalent. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2073867 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/manpages/virsh.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 588445028b..d7753c4970 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -2505,6 +2505,10 @@ not available for statistical purposes. calculation. * ``dirtyrate.megabytes_per_second`` - the calculated memory dirty rate in MiB/s. +* ``dirtyrate.calc_mode`` - the calculation mode used last measurement + (``page-sampling``/``dirty-bitmap``/``dirty-ring``) +* ``dirtyrate.vcpu.<num>.megabytes_per_second`` - the calculated memory dirty + rate for a virtual cpu in MiB/s Selecting a specific statistics groups doesn't guarantee that the -- 2.35.1

2 1

[PATCH v3] conf: Move validation checks from virDomainDiskDefIotuneParse into domain_validate.c
by Moteen Shah 12 Apr '22

12 Apr '22

Move validation from virDomainDiskDefIotuneParse into the validation callback Signed-off-by: Moteen Shah <codeguy.moteen(a)gmail.com> --- src/conf/domain_conf.c | 40 -------------------------------------- src/conf/domain_validate.c | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 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..68190fc3e2 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -651,6 +651,43 @@ 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 2

[libvirt RFC] virFile: new VIR_FILE_WRAPPER_BIG_PIPE to improve performance
by Claudio Fontana 12 Apr '22

12 Apr '22

the first user is the qemu driver, virsh save/resume would slow to a crawl with a default pipe size (64k). This improves the situation by 400%. Going through io_helper still seems to incur in some penalty (~15%-ish) compared with direct qemu migration to a nc socket to a file. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_saveimage.c | 11 ++++++----- src/util/virfile.c | 12 ++++++++++++ src/util/virfile.h | 1 + 4 files changed, 22 insertions(+), 8 deletions(-) Hello, I initially thought this to be a qemu performance issue, so you can find the discussion about this in qemu-devel: "Re: bad virsh save /dev/null performance (600 MiB/s max)" https://lists.gnu.org/archive/html/qemu-devel/2022-03/msg03142.html RFC since need to validate idea, and it is only lightly tested: save - about 400% benefit in throughput, getting around 20 Gbps to /dev/null, and around 13 Gbps to a ramdisk. By comparison, direct qemu migration to a nc socket is around 24Gbps. restore - not tested, _should_ also benefit in the "bypass_cache" case coredump - not tested, _should_ also benefit like for save Thanks for your comments and review, Claudio diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c1b3bd8536..be248c1e92 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3044,7 +3044,7 @@ doCoreDump(virQEMUDriver *driver, virFileWrapperFd *wrapperFd = NULL; int directFlag = 0; bool needUnlink = false; - unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING; + unsigned int wrapperFlags = VIR_FILE_WRAPPER_NON_BLOCKING | VIR_FILE_WRAPPER_BIG_PIPE; const char *memory_dump_format = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virCommand) compressor = NULL; @@ -3059,7 +3059,7 @@ doCoreDump(virQEMUDriver *driver, /* Create an empty file with appropriate ownership. */ if (dump_flags & VIR_DUMP_BYPASS_CACHE) { - flags |= VIR_FILE_WRAPPER_BYPASS_CACHE; + wrapperFlags |= VIR_FILE_WRAPPER_BYPASS_CACHE; directFlag = virFileDirectFdFlag(); if (directFlag < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -3072,7 +3072,7 @@ doCoreDump(virQEMUDriver *driver, &needUnlink)) < 0) goto cleanup; - if (!(wrapperFd = virFileWrapperFdNew(&fd, path, flags))) + if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) goto cleanup; if (dump_flags & VIR_DUMP_MEMORY_ONLY) { diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index c0139041eb..1b522a1542 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -267,7 +267,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, int fd = -1; int directFlag = 0; virFileWrapperFd *wrapperFd = NULL; - unsigned int wrapperFlags = VIR_FILE_WRAPPER_NON_BLOCKING; + unsigned int wrapperFlags = VIR_FILE_WRAPPER_NON_BLOCKING | VIR_FILE_WRAPPER_BIG_PIPE; /* Obtain the file handle. */ if ((flags & VIR_DOMAIN_SAVE_BYPASS_CACHE)) { @@ -463,10 +463,11 @@ qemuSaveImageOpen(virQEMUDriver *driver, if ((fd = qemuDomainOpenFile(cfg, NULL, path, oflags, NULL)) < 0) return -1; - if (bypass_cache && - !(*wrapperFd = virFileWrapperFdNew(&fd, path, - VIR_FILE_WRAPPER_BYPASS_CACHE))) - return -1; + if (bypass_cache) { + unsigned int wrapperFlags = VIR_FILE_WRAPPER_BYPASS_CACHE | VIR_FILE_WRAPPER_BIG_PIPE; + if (!(*wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) + return -1; + } data = g_new0(virQEMUSaveData, 1); diff --git a/src/util/virfile.c b/src/util/virfile.c index a04f888e06..fdacd17890 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -282,6 +282,18 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) ret->cmd = virCommandNewArgList(iohelper_path, name, NULL); + if (flags & VIR_FILE_WRAPPER_BIG_PIPE) { + /* + * virsh save/resume would slow to a crawl with a default pipe size (usually 64k). + * This improves the situation by 400%, although going through io_helper still incurs + * in a performance penalty compared with a direct qemu migration to a socket. + */ + int pipe_sz, rv = virFileReadValueInt(&pipe_sz, "/proc/sys/fs/pipe-max-size"); + if (rv != 0) { + pipe_sz = 1024 * 1024; /* common default for pipe-max-size */ + } + fcntl(pipefd[output ? 0 : 1], F_SETPIPE_SZ, pipe_sz); + } if (output) { virCommandSetInputFD(ret->cmd, pipefd[0]); virCommandSetOutputFD(ret->cmd, fd); diff --git a/src/util/virfile.h b/src/util/virfile.h index b04386f6e6..8383c4b069 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -107,6 +107,7 @@ int virFileDirectFdFlag(void); typedef enum { VIR_FILE_WRAPPER_BYPASS_CACHE = (1 << 0), VIR_FILE_WRAPPER_NON_BLOCKING = (1 << 1), + VIR_FILE_WRAPPER_BIG_PIPE = (1 << 2), } virFileWrapperFdFlags; virFileWrapperFd *virFileWrapperFdNew(int *fd, -- 2.26.2

6 38

[PATCH] processMonitorEOFEvent:fix delet Domain object about the new VM in processMonitorEOFEvent()
by Yi Wang 11 Apr '22

11 Apr '22

From: 王鹏钧10288409 <10288409@zte.intra@LIN-184C297BAE7.zte.com.cn> Virsh shutdown is executed firstly, virsh destroy is executed later, and VM is recreated again. In this process, due to will delet Domain object about the new VM in processMonitorEOFEvent(), which virDomainObjListRemove is called to remove objlist, the new VM cannot be found through virsh list command and qemu process is still running. Therefore, add virDomainObjListFindByName function checks to avoid delet Domain object about the new VM in objlist. This process chart of problem is as follows shutdown | destroy | create ============================+==================+=================== qemuMonitorIO | | qemuProcessHandleMonitorEOF | | | virDomainDestroy | | qemuProcessStop | | | qemuDomainCreateXML | | qemuProcessInit processMonitorEOFEvent | | qemuDomainRemoveInactive | | | | qemuProcessLaunch Signed-off-by: Wang PengJun <wang.pengjun1(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_driver.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c0e36e9b2..c16e9a9795 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4024,6 +4024,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, const char *auditReason = "shutdown"; unsigned int stopFlags = 0; virObjectEvent *event = NULL; + virDomainObj *obj; if (qemuProcessBeginStopJob(driver, vm, VIR_JOB_DESTROY, true) < 0) return; @@ -4055,8 +4056,17 @@ processMonitorEOFEvent(virQEMUDriver *driver, virObjectEventStateQueue(driver->domainEventState, event); endjob: - qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(vm); + virObjectUnlock(vm); + obj = virDomainObjListFindByName(driver->domains, vm->def->name); + if (vm == obj) { + qemuDomainRemoveInactive(driver, vm); + qemuDomainObjEndJob(vm); + } + virDomainObjEndAPI(&obj); + if (vm != NULL) { + virObjectLock(vm); + qemuDomainObjEndJob(vm); + } } -- 2.27.0

1 0

Issue in WinRM on Linux
by Nishit Sharma 11 Apr '22

11 Apr '22

Hi All, I am trying to create and launch a *windows10 guest VM* using libvirt-vagrant over Linux/KVM. The Windows box I am using is "*peru/windows-10-enterprise-x64-eval*". The Windows guest is created and allocated IP in 192.168.xxx.xxx range. Did WinRM configurations on Windows Guest OS. On Linux messages "*DEBUG winrmshell: [WinRM] opening remote shell on http://IP:5985/wsman <http://IP:5985/wsman>*" were seen around 20 times ( default winrm tries 20) and after that VM was disconnected with message Error: An error of type WinRM::WinRMHTTPTransportError happened, message is Unable to parse authorization header. Headers: {"Mime-Version"=>"1.0", "Date"=>"Wed, 06 Apr 2022 13:40:44 GMT", "Content-Type"=>"text/html;charset=utf-8", "Content-Length"=>"277", "X-iboss-Error"=>"ERR_CONNECT_FAIL 110", "X-Cache"=>"MISS from bgproxy06-int.prxy.ice.xxx.com", "Connection"=>"keep-alive"} Body: <!doctype html> <html> <head> <meta http-equiv="refresh" content="0;url= http://7rx80271.ibosscloud.com/ibreports/ibp/bp.html?bu=http://10.xxx.xxx.x… "/> </head> <body> </body> </html> (503). Error: Exiting with code 1 I tried accessing WinRM service on Windows guest using http://localhost:5985/wsman but got an error *HTTP 405 page is not working currently* but when I tried http://localhost:5985/WS-Man result was *HTTP Error 404. The requested resource is not found.* *Question is:* *1. Do libvirt support winrm to connect with Windows guest?* *2. The request to open a remote shell should be http://IP:5985/WS-Man <http://IP:5985/WS-Man> rather than http://IP:5985/wsman <http://IP:5985/wsman>?* *Waiting for a swift reply.* *Regards* *Nishit*

3 7

[PATCH v3] conf: Move validation checks from virDomainDiskDefIotuneParse into domain_validate.c
by Moteen Shah 11 Apr '22

11 Apr '22

Move validation from virDomainDiskDefIotuneParse into the validation callback Signed-off-by: Moteen Shah <codeguy.moteen(a)gmail.com> --- src/conf/domain_conf.c | 40 -------------------------------------- src/conf/domain_validate.c | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 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..68190fc3e2 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -651,6 +651,43 @@ 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

1 0

[CI] libvirt-gitlab-executor project is now part of the libvirt namespace
by Erik Skultety 11 Apr '22

11 Apr '22

This is just a small announcement that the $subj project which was created in order to provision customized VMs as throwaway worker nodes for our functional test suite utilizing GitLab's custom executor feature was transferred to the libvirt's GitLab namespace. Anything that relates to both infrastructure and executing the functional test suite in a customized environment should go to this project. Regards, Erik

1 0

[PATCH v2] conf: Move validation checks from virDomainDiskDefIotuneParse into domain_validate.c
by Moteen Shah 11 Apr '22

11 Apr '22

From: Moteen Shah <moteenshah.02(a)gmail.com> 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 1

[libvirt PATCH] virsh: fix event registration for single event
by Ján Tomko 11 Apr '22

11 Apr '22

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 1

[PATCH for 8.3.0 00/17] qemu: Stop supporting Ubuntu 1804-ancient qemus
by Peter Krempa 11 Apr '22

11 Apr '22

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

4 22

(no subject)
by Moteen Shah 09 Apr '22

09 Apr '22

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

1 0

[PATCH 00/11] docs: Convert some pages to rST and clean up (part 4)
by Peter Krempa 08 Apr '22

08 Apr '22

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 13

[libvirt PATCH 0/5] Fix error handling in nwfilterStateInitialize
by Tim Wiederhake 08 Apr '22

08 Apr '22

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 6

[libvirt PATCH 0/2] qemu: Drop QEMU_CAPS_INCOMING_DEFER
by Jiri Denemark 08 Apr '22

08 Apr '22

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 3

[PATCH 00/17] Use virXMLPropEnum() more (part I)
by Michal Privoznik 08 Apr '22

08 Apr '22

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

1 17

[PATCH v2] conf: Move validation from virDomainDiskDefIotuneParse into the validation callback
by Moteen Shah 08 Apr '22

08 Apr '22

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 1

[libvirt PATCH] drivers: Group global feature together
by Andrea Bolognani 07 Apr '22

07 Apr '22

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 4

[libvirt PATCH] ci: Refresh Dockerfiles and vars files
by Erik Skultety 07 Apr '22

07 Apr '22

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 1

[PATCH 0/4] Restrictive numatune mode related fixes
by Michal Privoznik 07 Apr '22

07 Apr '22

*** BLURB HERE *** Michal Prívozník (4): lib: Don't short circuit around virDomainCgroupSetupVcpuBW() hypervisor: Drop dead code in virDomainCgroupSetupGlobalCpuCgroup() ch: Explicitly forbid live changing nodeset for strict numatune lib: Set up cpuset controller for restrictive numatune src/ch/ch_driver.c | 2 +- src/ch/ch_process.c | 6 +++--- src/hypervisor/domain_cgroup.c | 25 ++----------------------- src/hypervisor/domain_cgroup.h | 3 +-- src/lxc/lxc_controller.c | 3 ++- src/qemu/qemu_driver.c | 12 ------------ src/qemu/qemu_process.c | 11 ++++++----- 7 files changed, 15 insertions(+), 47 deletions(-) -- 2.35.1

2 5

[PATCH] lib: Use virReportSystemError() more
by Michal Privoznik 07 Apr '22

07 Apr '22

Instead of reporting virReportError(..., g_strerror(), ...) let's use proper virReportSystemError(). Generated with help of cocci: @@ expression c; @@ <... - virReportError(c, + virReportSystemError(errno, ..., - g_strerror(errno), ...); ...> But then I had to hand fix format strings, because I'm not sure if cocci even knows how to do that. And even if it did, I surely don't. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_conf.c | 7 +++---- src/libxl/libxl_driver.c | 35 +++++++++++++++-------------------- src/qemu/qemu_interface.c | 8 ++++---- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a0fc51c74a..6398129195 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1775,10 +1775,9 @@ libxlDriverConfigInit(libxlDriverConfig *cfg) uint64_t free_mem; if (g_mkdir_with_parents(cfg->logDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create log dir '%s': %s"), - cfg->logDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create log dir '%s'"), + cfg->logDir); return -1; } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 01f281d0a5..5d76eb9752 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -721,38 +721,33 @@ libxlStateInitialize(bool privileged, libxl_driver->config = cfg; if (g_mkdir_with_parents(cfg->stateDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create state dir '%s': %s"), - cfg->stateDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create state dir '%s'"), + cfg->stateDir); goto error; } if (g_mkdir_with_parents(cfg->libDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create lib dir '%s': %s"), - cfg->libDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create lib dir '%s'"), + cfg->libDir); goto error; } if (g_mkdir_with_parents(cfg->saveDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create save dir '%s': %s"), - cfg->saveDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create save dir '%s'"), + cfg->saveDir); goto error; } if (g_mkdir_with_parents(cfg->autoDumpDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create dump dir '%s': %s"), - cfg->autoDumpDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create dump dir '%s'"), + cfg->autoDumpDir); goto error; } if (g_mkdir_with_parents(cfg->channelDir, 0777) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create channel dir '%s': %s"), - cfg->channelDir, - g_strerror(errno)); + virReportSystemError(errno, + _("failed to create channel dir '%s'"), + cfg->channelDir); goto error; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 676bc896d6..d0dcce5690 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -370,10 +370,10 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfig *cfg, if (errbuf && *errbuf) errstr = g_strdup_printf("\nstderr=%s", errbuf); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: failed to communicate with bridge helper: %s%s"), - cmdstr, g_strerror(errno), - NULLSTR_EMPTY(errstr)); + virReportSystemError(errno, + _("%s: failed to communicate with bridge helper: %s"), + cmdstr, + NULLSTR_EMPTY(errstr)); VIR_FREE(errstr); goto cleanup; } -- 2.35.1

2 1

[RFC PING PATCH 0/2] logging: add service to cleanup internal log files
by Nikolay Shirokovskiy 07 Apr '22

07 Apr '22

Hi all! Please take a look a RFC linked below. Sorry I switched to a new email and can't reply to it directly to draw attention. [RFC PATCH 0/2] logging: add service to cleanup internal log files https://listman.redhat.com/archives/libvir-list/2022-February/228817.html Nikolay

1 0

[PATCH 0/7] docs: Convert some pages to rST and clean up (part 3)
by Peter Krempa 06 Apr '22

06 Apr '22

This iteration has some patches from Pavel who also converted the pages to RST but didn't send it out yet. Included are those that didn't diverge yet. Additionally since I've moved the descriptions of types used in the C# bindings to the libvirt-csharp repo this series also cleans out the redundancy and converts the 'csharp' page. Pavel Hrdina (4): docs: convert 'dbus' page to rst docs: convert 'python' page to rst docs: convert 'tlscerts' page to rst docs: convert 'windows' page to rst Peter Krempa (3): docs: Move 'tlscerts' page to 'kbase/' docs: csharp: Remove project-specific information docs: convert 'csharp' page to rst docs/csharp.html.in | 470 ---------------------------------------- docs/csharp.rst | 38 ++++ docs/daemons.rst | 2 +- docs/dbus.html.in | 94 -------- docs/dbus.rst | 75 +++++++ docs/docs.html.in | 3 - docs/kbase/index.rst | 3 + docs/kbase/meson.build | 1 + docs/kbase/tlscerts.rst | 331 ++++++++++++++++++++++++++++ docs/meson.build | 9 +- docs/python.html.in | 72 ------ docs/python.rst | 79 +++++++ docs/remote.html.in | 2 +- docs/tlscerts.html.in | 413 ----------------------------------- docs/windows.html.in | 194 ----------------- docs/windows.rst | 139 ++++++++++++ 16 files changed, 672 insertions(+), 1253 deletions(-) delete mode 100644 docs/csharp.html.in create mode 100644 docs/csharp.rst delete mode 100644 docs/dbus.html.in create mode 100644 docs/dbus.rst create mode 100644 docs/kbase/tlscerts.rst delete mode 100644 docs/python.html.in create mode 100644 docs/python.rst delete mode 100644 docs/tlscerts.html.in delete mode 100644 docs/windows.html.in create mode 100644 docs/windows.rst -- 2.35.1

2 8

[PATCH v1 0/4] Add 'version' to other exported types
by Victor Toso 06 Apr '22

06 Apr '22

Hi, This series is an extension of what Daniel did in e0e0bf6628 "scripts: include function versions in API definition". The main motivation behind this is to help code generators to consider if a given symbol is present in a given version of libvirt that they are either running/building against, more specifically: https://gitlab.com/libvirt/libvirt-go-module/-/merge_requests/7 As headers are already a great source of documentation for developers, I'm suggesting to add a specific comment to each of this exported types: /* ... Since <version> */ For the use case I mentioned above, I'm adding small parsing function in apibuild.py to fetch the above metadata and included it on the generated XML API. To avoid adding too much noise in the githistory, I'm proposing the addition of symbols.versions.allowlist file, that apibuild.py can use to fetch the first git tag that a given symbol appeared in. I did a small script to generate it, but it sums up to calling the bellow command for any tag that starts with 'v' and has not '-rc'. git grep $symbol $tag ./include I'm trying the simples approach I could find but I'm happy to improve this further based on your suggestions. Ah, the diff in the generated XMLs, per patch (sadly, pasteben drops it after a single day). The initial reference is current master 67c77744d7 'tests: Fixing compiler warning in cputest' 0001 (enums) ... https://paste.centos.org/view/e9137ef0 0002 (typedefs) https://paste.centos.org/view/76f0b397 0003 (macros) .. https://paste.centos.org/view/b68fb03a 0004 (variables) https://paste.centos.org/view/4a20d9bb Cheers, Victor Victor Toso (4): scripts: apibuild: parse 'Since' version for enums scripts: apibuild: parse 'Since' for typedefs scripts: apibuild: parse 'Since' for macros scripts: apibuild: add 'version' to variables scripts/apibuild.py | 68 +- symbols.versions.allowlist | 2144 ++++++++++++++++++++++++++++++++++++ 2 files changed, 2199 insertions(+), 13 deletions(-) create mode 100644 symbols.versions.allowlist -- 2.35.1

3 17

[PATCH] qemu: Rename @main variable in qemuDomainRemoveLogs()
by Michal Privoznik 06 Apr '22

06 Apr '22

Older GCC fails to understand that 'char *main' is a variable and not main() function. Rename the variable to appease old GCC. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c35e5c09a3..a4334de158 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11828,7 +11828,7 @@ qemuDomainRemoveLogs(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autofree char *format = NULL; - g_autofree char *main = NULL; + g_autofree char *main_log = NULL; g_autoptr(DIR) dir = NULL; struct dirent *entry; int rc; @@ -11840,13 +11840,13 @@ qemuDomainRemoveLogs(virQEMUDriver *driver, if (virDirOpen(&dir, cfg->logDir) < 0) return -1; - main = g_strdup_printf("%s.log", name); + main_log = g_strdup_printf("%s.log", name); format = g_strdup_printf("%s.log.%%u", name); while ((rc = virDirRead(dir, &entry, cfg->logDir)) > 0) { unsigned int u; - if (STREQ(entry->d_name, main) || + if (STREQ(entry->d_name, main_log) || sscanf(entry->d_name, format, &u) == 1) { g_autofree char *path = NULL; -- 2.35.1

2 1

[PATCH] virsh: Remove any reference of KVM device assignment
by Michal Privoznik 05 Apr '22

05 Apr '22

The KVM device assignment was removed in v5.7.0-rc1~103 but virsh and its manpage still mention it. Don't do that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/manpages/virsh.rst | 7 +++---- tools/virsh-nodedev.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index d2e6528533..215beabd96 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5198,10 +5198,9 @@ guests via <hostdev> passthrough. This is reversed with ``nodedev-reattach``, and is done automatically for managed devices. Different backend drivers expect the device to be bound to different -dummy devices. For example, QEMU's "kvm" backend driver (the default) -expects the device to be bound to pci-stub, but its "vfio" backend -driver expects the device to be bound to vfio-pci. The *--driver* -parameter can be used to specify the desired backend driver. +dummy devices. For example, QEMU's "vfio" backend driver expects the +device to be bound to vfio-pci. The *--driver* parameter can be used +to specify the desired backend driver. nodedev-dumpxml diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index d21b2baab6..90066249af 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -615,7 +615,7 @@ static const vshCmdOptDef opts_node_device_detach[] = { {.name = "driver", .type = VSH_OT_STRING, .completer = virshNodeDevicePCIBackendCompleter, - .help = N_("pci device assignment backend driver (e.g. 'vfio' or 'kvm')") + .help = N_("pci device assignment backend driver (e.g. 'vfio' or 'xen')") }, {.name = NULL} }; -- 2.35.1

2 1

[PATCH v2 0/4] VirtioNet RSS support.
by Andrew Melnychenko 05 Apr '22

05 Apr '22

This series of patches add RSS property support for virtio-net-pci. Virtio RSS effectively works with TAP devices, it requires additional vectors for VirtioNet, queues for TAP device, and vCPU cores. Example of device configuration: ``` <interface type="network"> <mac address="52:54:00:c4:90:25"/> <source network="default"/> <model type="virtio"/> <driver name="qemu" queues="9" rss="on" rss_hash_report="off"/> <address type="pci" domain="0x0000" bus="0x01" slot="0x00" function="0x0"/> </interface> ``` Capability "rss" enables RSS, "rss_hash_report" - enables hashes in vheader. For now, "rss" property will trigger "in-qemu" RSS in most cases. Current Qemu(6.2) supports eBPF RSS that may require additional capabilities. In future, the helper will be provided. And this code is the base for VirtIO RSS. Changes since v1: * refactored patches * changed docs and tests Changes since RFC: * rebased and refactored * added tests * postponed the helper Andrew Melnychenko (4): domain_conf: Added configs for RSS and Hash report. qemu_capabilities: Added capabilites for qemu's "rss" and "hash". qemu_command: Added "rss" and "hash" properties. test: Added xml2argv and xml2xml tests. docs/formatdomain.rst | 18 ++++++++ docs/schemas/domaincommon.rng | 10 +++++ src/conf/domain_conf.c | 31 ++++++++++++- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_validate.c | 14 ++++++ .../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 + .../net-virtio-rss.x86_64-latest.args | 43 +++++++++++++++++++ tests/qemuxml2argvdata/net-virtio-rss.xml | 39 +++++++++++++++++ .../virtio-options.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/virtio-options.xml | 2 +- tests/qemuxml2argvtest.c | 2 + 26 files changed, 178 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-virtio-rss.xml -- 2.34.1

4 9

[PATCH] qemu: disarm fake reboot flag on reset
by Nikolay Shirokovskiy 05 Apr '22

05 Apr '22

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> This is a quite an old (created at 2016) patch fixing an issue for at that time contemporary Fedora 23. virsh reboot returns success (yet after hanging for a while), VM is rebooted sucessfully too but then shutdown from inside guest causes reboot and not shutdown. VM has agent installed. So virsh reboot first tries to reboot VM thru the agent. The agent calls 'shutdown -r' command. Typically it returns instantly but on this distro for some reason it takes time. I did not investigate the cause but the command waits in dbus client code, probably waits for reply. The libvirt waits 60s for agent command to execute and then errors out. Next reboot API falls back to ACPI shutdown which returns successfully thus the reboot command return success too. Yet shutdown command in guest eventually successfull and guest is truly rebooted. So libvirt does not receive SHUTDOWN event and fake reboot flag which is armed on fallback path stays armed. Thus next shutdown from guest leads to reboot. The issue has 100% repro on Fedora 23. On modern distros I can't reproduce it at all. Shutdown command is asynchronous and returns immediately even if I start some service that ignores TERM signal and thus shutdown procedure waits for 90s (if I not mistaken) before sending KILL. Yet I guess it is nice to have this patch to be more robust. Signed-off-by: Nikolay Shirokovskiy <nikolay.shirokovskiy(a)openvz.org> --- src/qemu/qemu_process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f63fc3389d..d81ed9391a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -435,6 +435,7 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); + qemuDomainSetFakeReboot(vm, false); qemuDomainSaveStatus(vm); unlock: -- 2.35.1

1 0

libvirt: introduce VIR_DOMAIN_DESTROY_REMOVE_LOGS flag
by Nikolay Shirokovskiy 05 Apr '22

05 Apr '22

The patch series based on discussion in RFC [1]. I wonder if we'd better add some property like "transient logs" instead of adding a flag to destoy API. Yes libguestfs uses virDomainDestroyFlags to terminate a VM and it is intended client of this new flag but it or other clients may want to use shutdown API or use autodestroy domains with same log behaviour. Then for the current task we only need to support this property in domain xml I guess. [1] removing VMs logs https://listman.redhat.com/archives/libvir-list/2022-February/msg00273.html Nikolay Shirokovskiy (3): libvirt: introduce VIR_DOMAIN_DESTROY_REMOVE_LOGS flag qemu: support VIR_DOMAIN_DESTROY_REMOVE_LOGS flag tools: support --remove-logs flag on destroing domain docs/manpages/virsh.rst | 7 +++++- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 6 +++++ src/qemu/qemu_domain.c | 41 ++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 8 ++++++- tools/virsh-domain.c | 8 ++++++- 7 files changed, 72 insertions(+), 3 deletions(-) -- 2.31.1

3 6

[PATCH 0/9] Fixes and improvements around virXMLPropTristate*()
by Andrea Bolognani 05 Apr '22

05 Apr '22

I have manually audited all commits that have converted existing code to use the new helpers (full list below) and have convinced myself that allowReboot is indeed the only one that requires special handling. Changes from [RFC]: * introduce a separate helper for the one scenario where we need to accept 'default' as input instead of going for an approach that would require updating most callers; * throw in a bunch of extra fixes and improvements. [RFC] https://listman.redhat.com/archives/libvir-list/2022-March/229506.html Commits that performed the conversion in a way that accurately preserved the existing behavior: 14c803cb8276c564d242d4aec8f7d1f64da30321 deac783c86009e0e828746c8c49de70f656aeb85 e1e2e7ec46191a83eadf32be8a87901b01488a6d cea39e95291517ff2a8ae515573bad587a7dad2d 388cdd11f3c746690edc8e0f71289872c6180c60 dfff3db7763f55b0157f22d816d84c71bbc2dcad 793e71ee76acb49b215e31ee89e0c9cb52322811 92204134806ba4c41ba6cbc20ad2408015e7f3d5 c348da7c4c138c108695c5f309f62e87d0101eda 45abc1a5db60213bf94b5fb780dc6549ddd9103c 45a61cbf68a2459202b7eda4a01a56bfcb6be048 be63e8703c7354bdf0c767a771223b33ab2ad4f2 b13f801d6ff6f9fe5e58aa48fc31bd25ad0b072b b45ba35e350f2a62c6b06a637d707029bc99e559 fa48004af5ba58cfab38cd8ab5092719a5978509 fcc563a29bd91bd2a45b8f242eccaf37ab75b5b3 97cdb5be1ea84b5224f6353b425ea2503763df07 754a7f6c942268b2b604de072a3391ea4df91e57 b975a8a755b192f5980a14c46e745a92d3cdd3be e2a38216d2ff6dac8bc927603fdec1ba887b2da7 cd4c756fd5eece6b1d7723a407ead0ed1bf8a298 e663717cb13e49f4da21280bc2f455ddfeee782c cacde05ad3e8428ad0e16afcfdb715cb4b3d3165 567efa85c2194e45ae943c01c9dffe5b44e81c96 54fb0b9e95c398e8ba09bc7cdceca3f588f910b8 3b7bc307d5fd8e7b9c618a6454d32d59b83277d2 2beae8273b932505888dec35ae97bd8d74893272 0eb42087c7907f43c114cb57b5ff2cf2a52dfea4 b683978f1f4609e7a099ff8b36d7cac25e84cf7c a85d553d7608bf4c9ffe74546d32afe0275d7c69 86cfd4d4e8de1834607e977318eee4e0c6a9a565 593140dabd66f01aa0d606984ff684f7cb9c1eb1 956373230631929dfa9a36814a283666cb290ee0 0f8fd4548295e3a1516939d7f3bb912a8d7e4713 7ae08ef3a230978510e2722fc56b61ebbae9c6b7 Commits that altered the existing behavior but did so safely, in that they stopped accepting 'default' as a valid value for a property that was defined in the schema as only taking either 'yes' or 'no' and for which libvirt itself never produced the 'default' value: 9086ae4facfb91436c1d9e7daec9285156cb4eb8 931afa7d99b8ff6eb18a6aa402ed64b789197d30 38dc25989c50dad1f6f64aa038de8c2d1c008734 38d76cde5e90cbb59cd8c726f35646be1740c685 ee387289dd6c993bd2bcfdebcbad86a51fe36da8 550981ce9713ef82df49116c336a9f4bd0eedef4 b127e50290383dc26e8714ba866acc9f501d7af6 54635ea592859d110e87d19565ffabe24d2f0e2e 232c01ec4f650523ab5ff84cf38c4d8b55763052 bb94b3d28db909d43d83b3f2ab73aa3f881b5c95 3681a5393313eba7bfa8e8f763116efb9961c686 Commits that altered the existing behavior in a way that required some fixing afterwards: 0fe2d8dd335054fae38b46bbbac58a4662e1a1d0 Andrea Bolognani (9): conf: Don't pass PROP_NONZERO to virXMLPropTristateBool() conf: Use virTristateBoolToBool() more qemu: Format <allowReboot> conditionally util: Introduce virXMLPropTristateBoolAllowDefault() qemu: Accept <allowReboot value='default'/> qemu: Don't ignore XMLParseAllowReboot() errors conf: Restore error checking in VideoAccelDefParseXML() conf: Format managed property of hostdev-pci ports correctly network: Convert managed property of hostdev-pci ports correctly src/conf/domain_conf.c | 42 +++++++++++-------- src/conf/interface_conf.c | 2 +- src/conf/virnetworkportdef.c | 7 +++- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_domain.c | 19 +++++---- src/util/virxml.c | 18 ++++++++ src/util/virxml.h | 7 ++++ .../plug-hostdev-pci-unmanaged.xml | 12 ++++++ tests/virnetworkportxml2xmltest.c | 1 + 10 files changed, 83 insertions(+), 28 deletions(-) create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci-unmanaged.xml -- 2.35.1

2 10

[libvirt PATCH 00/10] Automatic mutex management - part 5
by Tim Wiederhake 05 Apr '22

05 Apr '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. Tim Wiederhake (10): virnetdaemon: Use automatic mutex management bridge_driver: Use automatic mutex management node_device_driver: Use automatic mutex management interface_backend_netcf: Use automatic mutex management node_device_udev: Use automatic mutex management qemu_agent: Use automatic mutex management vbox_common: Use automatic mutex management datatypes: Use automatic mutex management ch_monitor: Use automatic mutex management virportallocator: Use automatic mutex management src/ch/ch_monitor.c | 55 +++---- src/datatypes.c | 63 +++----- src/interface/interface_backend_netcf.c | 192 +++++++++++------------- src/network/bridge_driver.c | 59 +++----- src/network/bridge_driver_linux.c | 4 +- src/node_device/node_device_driver.c | 12 +- src/node_device/node_device_udev.c | 76 +++++----- src/qemu/qemu_agent.c | 25 ++- src/rpc/virnetdaemon.c | 144 ++++++------------ src/util/virportallocator.c | 93 +++++------- src/vbox/vbox_common.c | 31 ++-- 11 files changed, 302 insertions(+), 452 deletions(-) -- 2.31.1

2 13

[PATCH] tests: Fixing compiler warning in cputest
by Boris Fiuczynski 05 Apr '22

05 Apr '22

Found when building on Fedora 36 on s390x. C compiler for the host machine: gcc (gcc 12.0.1 "gcc (GCC) 12.0.1 20220308 (Red Hat 12.0.1-0)") C linker for the host machine: gcc ld.bfd 2.37-24 In function ‘cpuTestUpdateLiveCompare’, inlined from ‘cpuTestUpdateLive’ at ../dist-unpack/libvirt-8.2.5/tests/cputest.c:784:12: ../dist-unpack/libvirt-8.2.5/tests/cputest.c:696:21: warning: potential null pointer dereference [-Wnull-dereference] 696 | featAct->policy == VIR_CPU_FEATURE_REQUIRE) || | ~~~~~~~^~~~~~~~ Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- tests/cputest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cputest.c b/tests/cputest.c index 609b5df7c6..95fb37d15c 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -692,7 +692,7 @@ cpuTestUpdateLiveCompare(virArch arch, if ((cmp == 0 && featAct->policy == VIR_CPU_FEATURE_REQUIRE && featExp->policy == VIR_CPU_FEATURE_DISABLE) || - (cmp < 0 && + (cmp < 0 && featAct && featAct->policy == VIR_CPU_FEATURE_REQUIRE) || (cmp > 0 && featExp->policy == VIR_CPU_FEATURE_DISABLE)) { -- 2.33.1

2 1

[PATCH 00/17] qemu: Stop supporting Ubuntu 1804-ancient qemus
by Peter Krempa 05 Apr '22

05 Apr '22

(this is a rebase of the previous posting since there were conflicts in some of new capability tests as this series is removing some capability flags) As of April 23 2022, (thus during this release cycle) 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 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 Pipeline: https://gitlab.com/pipo.sk/libvirt/-/pipelines/508215334 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 - .../caps_7.0.0.aarch64.xml | 4 - .../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 +- 550 files changed, 956 insertions(+), 237444 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.35.1

3 20

[PATCH 0/3] virsh: Add some completers
by Amneesh Singh 04 Apr '22

04 Apr '22

Add some basic completers Amneesh Singh (3): virsh: Provide completer for virtualization types virsh: Provide completer for CPU architectures virsh: Provide completer for PCI backend drivers src/util/virarch.c | 2 +- src/util/virarch.h | 2 +- tools/virsh-completer-host.c | 24 ++++++++++++++++++++++++ tools/virsh-completer-host.h | 10 ++++++++++ tools/virsh-completer-nodedev.c | 11 +++++++++++ tools/virsh-completer-nodedev.h | 4 ++++ tools/virsh-host.c | 8 ++++++++ tools/virsh-nodedev.c | 2 ++ 8 files changed, 61 insertions(+), 2 deletions(-) -- 2.35.1

2 7

[libvirt PATCH 0/4] Introduce VIR_UNLESS and VIR_ELSIF
by Ján Tomko 04 Apr '22

04 Apr '22

3 6

[libvirt PATCH v4 00/16] qemu: Implement virtio-iommu support
by Andrea Bolognani 04 Apr '22

04 Apr '22

Only patch 14/16 is still missing a Reviewed-by. Changes from [v3]: * drop updates to .replies files, which have already been pushed; * update version numbers in documentation. Changes from [v2]: * rebase on top of master; * generate -device argument as JSON. Changes from [v1]: * rebased after Peter's recent changes enabling JSON for -device. [v3] https://listman.redhat.com/archives/libvir-list/2022-March/229397.html [v2] https://listman.redhat.com/archives/libvir-list/2021-October/224302.html [v1] https://listman.redhat.com/archives/libvir-list/2021-October/223977.html Andrea Bolognani (16): conf: Introduce VIR_PCI_CONNECT_INTEGRATED qemu: Tweak some code qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI qemu: Introduce QEMU_CAPS_VIRTIO_IOMMU_BOOT_BYPASS conf: Introduce virtio model for <iommu> tests: Add test cases for virtio-iommu qemu: Validate machine type used with virtio-iommu qemu: Validate capabilities for virtio-iommu qemu: Validate use of ACPI with virtio-iommu conf: Add virDomainDeviceInfo to virDomainIOMMUDef qemu: Assign PCI address to virtio-iommu qemu: Validate address type for virtio-iommu tests: Add test for virtio-iommu address qemu: Generate command line for virtio-iommu docs: Document virtio-iommu news: Document virtio-iommu NEWS.rst | 4 + docs/formatdomain.rst | 5 +- src/conf/domain_addr.c | 17 ++ src/conf/domain_addr.h | 26 +- src/conf/domain_conf.c | 38 ++- src/conf/domain_conf.h | 2 + src/conf/schemas/domaincommon.rng | 64 ++-- src/qemu/qemu_capabilities.c | 10 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 30 +- src/qemu/qemu_domain_address.c | 33 ++- src/qemu/qemu_validate.c | 32 ++ .../caps_5.0.0.aarch64.replies | 71 +++-- .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.ppc64.replies | 59 ++-- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.replies | 55 ++-- .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.replies | 71 +++-- .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.replies | 71 +++-- .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.replies | 71 +++-- .../caps_5.2.0.aarch64.xml | 1 + .../caps_5.2.0.ppc64.replies | 59 ++-- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.replies | 55 ++-- .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.s390x.replies | 59 ++-- .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.replies | 71 +++-- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.replies | 71 +++-- .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.s390x.replies | 59 ++-- .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.replies | 71 +++-- .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.replies | 71 +++-- .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.replies | 71 +++-- .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.ppc64.replies | 59 ++-- .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.replies | 71 +++-- .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.aarch64.replies | 275 ++++++++++++++++-- .../caps_7.0.0.aarch64.xml | 2 + .../caps_7.0.0.ppc64.replies | 263 +++++++++++++++-- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + .../caps_7.0.0.x86_64.replies | 275 ++++++++++++++++-- .../caps_7.0.0.x86_64.xml | 2 + .../virtio-iommu-aarch64.aarch64-latest.args | 36 +++ .../qemuxml2argvdata/virtio-iommu-aarch64.xml | 20 ++ ...mmu-invalid-address-type.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address-type.xml | 20 ++ ...io-iommu-invalid-address.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address.xml | 20 ++ .../virtio-iommu-no-acpi.x86_64-latest.err | 1 + .../qemuxml2argvdata/virtio-iommu-no-acpi.xml | 15 + ...rtio-iommu-wrong-machine.x86_64-latest.err | 1 + .../virtio-iommu-wrong-machine.xml | 18 ++ .../virtio-iommu-x86_64.x86_64-6.1.0.err | 1 + .../virtio-iommu-x86_64.x86_64-latest.args | 32 ++ .../qemuxml2argvdata/virtio-iommu-x86_64.xml | 18 ++ tests/qemuxml2argvtest.c | 7 + .../virtio-iommu-aarch64.aarch64-latest.xml | 34 +++ .../virtio-iommu-x86_64.x86_64-latest.xml | 36 +++ tests/qemuxml2xmltest.c | 2 + 69 files changed, 1946 insertions(+), 531 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-iommu-aarch64.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-6.1.0.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml -- 2.35.1

2 17

[PATCH] qemu: capabilities: Remove check for /usr/libexec/qemu-kvm
by Jim Fehlig 04 Apr '22

04 Apr '22

A downstream packaging bug resulted in a scenario where no aarch64 emulator binary was installed on a kvm host. Querying capabilities on the host succeeds and the capabilities correctly report that no <guest>'s are supported, but the following error is logged libvirtd: Cannot check QEMU binary /usr/libexec/qemu-kvm: No such file or directory This error is confusing and not very helpful. Additionally, comments in the associated code note that /usr/libexec/qemu-kvm is disto-specific, which suggests the logic is better suited for a downstream patch. Removing the check for /usr/libexec/qemu-kvm leaves virQEMUCapsGetDefaultEmulator() as nothing more than a needless wrapper around virQEMUCapsFindBinaryForArch. Drop virQEMUCapsGetDefaultEmulator() and call virQEMUCapsFindBinaryForArch() directly in its place, which squelches the unhelpful error. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/qemu/qemu_capabilities.c | 25 +++---------------------- src/qemu/qemu_capabilities.h | 5 +++-- src/qemu/qemu_domain.c | 2 +- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6b4ed08499..c866c5acf6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -915,7 +915,7 @@ virQEMUCapsFindBinary(const char *format, return ret; } -static char * +char * virQEMUCapsFindBinaryForArch(virArch hostarch, virArch guestarch) { @@ -949,25 +949,6 @@ virQEMUCapsFindBinaryForArch(virArch hostarch, } -char * -virQEMUCapsGetDefaultEmulator(virArch hostarch, - virArch guestarch) -{ - char *binary = NULL; - /* Check for existence of base emulator, or alternate base - * which can be used with magic cpu choice - */ - binary = virQEMUCapsFindBinaryForArch(hostarch, guestarch); - - /* RHEL doesn't follow the usual naming for QEMU binaries and ships - * a single binary named qemu-kvm outside of $PATH instead */ - if (virQEMUCapsGuestIsNative(hostarch, guestarch) && !binary) - binary = g_strdup("/usr/libexec/qemu-kvm"); - - return binary; -} - - static int virQEMUCapsInitGuest(virCaps *caps, virFileCache *cache, @@ -978,7 +959,7 @@ virQEMUCapsInitGuest(virCaps *caps, virQEMUCaps *qemuCaps = NULL; int ret = -1; - binary = virQEMUCapsGetDefaultEmulator(hostarch, guestarch); + binary = virQEMUCapsFindBinaryForArch(hostarch, guestarch); /* Ignore binary if extracting version info fails */ if (binary) { @@ -5878,7 +5859,7 @@ virQEMUCapsCacheLookupDefault(virFileCache *cache, } if (!binary) { - probedbinary = virQEMUCapsGetDefaultEmulator(hostarch, arch); + probedbinary = virQEMUCapsFindBinaryForArch(hostarch, arch); binary = probedbinary; } if (!binary) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 948029d60d..d0e776a5c4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -752,8 +752,6 @@ const char *virQEMUCapsGetMachineDefaultRAMid(virQEMUCaps *qemuCaps, void virQEMUCapsFilterByMachineType(virQEMUCaps *qemuCaps, virDomainVirtType virtType, const char *machineType); -char * virQEMUCapsGetDefaultEmulator(virArch hostarch, - virArch guestarch); virFileCache *virQEMUCapsCacheNew(const char *libDir, const char *cacheDir, @@ -789,6 +787,9 @@ bool virQEMUCapsSupportsGICVersion(virQEMUCaps *qemuCaps, const char *virQEMUCapsGetPreferredMachine(virQEMUCaps *qemuCaps, virDomainVirtType virtType); +char *virQEMUCapsFindBinaryForArch(virArch hostarch, + virArch guestarch); + int virQEMUCapsInitGuestFromBinary(virCaps *caps, const char *binary, virQEMUCaps *qemuCaps, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 18d403e099..81b56b4233 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4607,7 +4607,7 @@ qemuDomainDefPostParseBasic(virDomainDef *def, /* check for emulator and create a default one if needed */ if (!def->emulator) { - if (!(def->emulator = virQEMUCapsGetDefaultEmulator( + if (!(def->emulator = virQEMUCapsFindBinaryForArch( driver->hostarch, def->os.arch))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("No emulator found for arch '%s'"), -- 2.35.1

3 7

[PATCH 00/29] docs: Convert some pages to rST and clean up (part 2)
by Peter Krempa 01 Apr '22

01 Apr '22

Peter Krempa (29): docs: Remove empty unreferenced 'drvremote' page docs: Convert 'cgroups' page to rST docs: Convert 'drvbhyve' page to rST docs: Convert 'drvesx' page to rST docs: Convert 'drvhyperv' page to rST docs: Convert 'drvlxc' page to rST docs: Convert 'drvnodedev' page to rST docs: Convert 'drvopenvz' page to rST docs: Convert 'drvsecret' page to rST docs: Convert 'drvtest' page to rST docs: Convert 'drvvbox' page to rST docs: Convert 'drvvirtuozzo' page to rST docs: Convert 'drvvmware' page to rST docs: Convert 'drvxen' page to rST docs: Convert 'firewall' page to rST docs: Convert 'format' page to rST docs: Convert 'formatcaps' page to rST docs: Convert 'formatdomaincaps' to rST docs: Convert 'formatnetworkport' to rST docs: Fix heading of 'formatnetworkport' page docs: Convert 'formatstoragecaps' page to rST docs: Convert 'formatstorageencryption' page to rST docs: formatstorageencryption: Drop empty 'default' paragraph docs: formatstorageencryption: Re-style encryption type headers docs: Convert 'hooks' page to rST docs: Convert 'java' page to rST docs: Convert 'logging' page to rST docs: logging: Replace example by link to kbase/debuglogs.html docs: Convert 'php' page to rST docs/cgroups.html.in | 424 -------------- docs/cgroups.rst | 364 ++++++++++++ docs/drvbhyve.html.in | 583 ------------------- docs/drvbhyve.rst | 582 +++++++++++++++++++ docs/drvesx.html.in | 838 --------------------------- docs/drvesx.rst | 681 ++++++++++++++++++++++ docs/drvhyperv.html.in | 150 ----- docs/drvhyperv.rst | 121 ++++ docs/drvlxc.html.in | 822 -------------------------- docs/drvlxc.rst | 670 +++++++++++++++++++++ docs/drvnodedev.html.in | 383 ------------ docs/drvnodedev.rst | 348 +++++++++++ docs/drvopenvz.html.in | 123 ---- docs/drvopenvz.rst | 97 ++++ docs/drvremote.html.in | 7 - docs/drvsecret.html.in | 82 --- docs/drvsecret.rst | 65 +++ docs/drvtest.html.in | 27 - docs/drvtest.rst | 21 + docs/drvvbox.html.in | 172 ------ docs/drvvbox.rst | 161 +++++ docs/drvvirtuozzo.html.in | 70 --- docs/drvvirtuozzo.rst | 60 ++ docs/drvvmware.html.in | 89 --- docs/drvvmware.rst | 72 +++ docs/drvxen.html.in | 358 ------------ docs/drvxen.rst | 338 +++++++++++ docs/firewall.html.in | 523 ----------------- docs/firewall.rst | 506 ++++++++++++++++ docs/format.html.in | 48 -- docs/format.rst | 35 ++ docs/formatcaps.html.in | 219 ------- docs/formatcaps.rst | 196 +++++++ docs/formatdomain.rst | 25 +- docs/formatdomaincaps.html.in | 693 ---------------------- docs/formatdomaincaps.rst | 602 +++++++++++++++++++ docs/formatnetworkport.html.in | 223 ------- docs/formatnetworkport.rst | 175 ++++++ docs/formatstoragecaps.html.in | 95 --- docs/formatstoragecaps.rst | 81 +++ docs/formatstorageencryption.html.in | 181 ------ docs/formatstorageencryption.rst | 139 +++++ docs/hooks.html.in | 406 ------------- docs/hooks.rst | 518 +++++++++++++++++ docs/java.html.in | 121 ---- docs/java.rst | 128 ++++ docs/kbase/backing_chains.rst | 2 +- docs/logging.html.in | 243 -------- docs/logging.rst | 215 +++++++ docs/meson.build | 49 +- docs/php.html.in | 28 - docs/php.rst | 23 + 52 files changed, 6236 insertions(+), 6946 deletions(-) delete mode 100644 docs/cgroups.html.in create mode 100644 docs/cgroups.rst delete mode 100644 docs/drvbhyve.html.in create mode 100644 docs/drvbhyve.rst delete mode 100644 docs/drvesx.html.in create mode 100644 docs/drvesx.rst delete mode 100644 docs/drvhyperv.html.in create mode 100644 docs/drvhyperv.rst delete mode 100644 docs/drvlxc.html.in create mode 100644 docs/drvlxc.rst delete mode 100644 docs/drvnodedev.html.in create mode 100644 docs/drvnodedev.rst delete mode 100644 docs/drvopenvz.html.in create mode 100644 docs/drvopenvz.rst delete mode 100644 docs/drvremote.html.in delete mode 100644 docs/drvsecret.html.in create mode 100644 docs/drvsecret.rst delete mode 100644 docs/drvtest.html.in create mode 100644 docs/drvtest.rst delete mode 100644 docs/drvvbox.html.in create mode 100644 docs/drvvbox.rst delete mode 100644 docs/drvvirtuozzo.html.in create mode 100644 docs/drvvirtuozzo.rst delete mode 100644 docs/drvvmware.html.in create mode 100644 docs/drvvmware.rst delete mode 100644 docs/drvxen.html.in create mode 100644 docs/drvxen.rst delete mode 100644 docs/firewall.html.in create mode 100644 docs/firewall.rst delete mode 100644 docs/format.html.in create mode 100644 docs/format.rst delete mode 100644 docs/formatcaps.html.in create mode 100644 docs/formatcaps.rst delete mode 100644 docs/formatdomaincaps.html.in create mode 100644 docs/formatdomaincaps.rst delete mode 100644 docs/formatnetworkport.html.in create mode 100644 docs/formatnetworkport.rst delete mode 100644 docs/formatstoragecaps.html.in create mode 100644 docs/formatstoragecaps.rst delete mode 100644 docs/formatstorageencryption.html.in create mode 100644 docs/formatstorageencryption.rst delete mode 100644 docs/hooks.html.in create mode 100644 docs/hooks.rst delete mode 100644 docs/java.html.in create mode 100644 docs/java.rst delete mode 100644 docs/logging.html.in create mode 100644 docs/logging.rst delete mode 100644 docs/php.html.in create mode 100644 docs/php.rst -- 2.35.1

2 63

[libvirt PATCH 0/3] qemu: Don't assume that /usr/libexec/qemu-kvm exists
by Andrea Bolognani 01 Apr '22

01 Apr '22

My own take on [1], with some additional cleanups on top. [1] https://listman.redhat.com/archives/libvir-list/2022-March/229697.html Andrea Bolognani (3): qemu: Clean up virQEMUCapsFindBinaryForArch() qemu: Don't assume that /usr/libexec/qemu-kvm exists qemu: Dissolve virQEMUCapsFindBinaryForArch() src/qemu/qemu_capabilities.c | 42 +++++++++++++----------------------- 1 file changed, 15 insertions(+), 27 deletions(-) -- 2.35.1

3 8

[libvirt PATCH] nwfilter: spawn thread for reloading on firewalld trigger
by Daniel P. Berrangé 01 Apr '22

01 Apr '22

When firewalld is restarted or has its rules reloaded, we trigger a reload of the nwfilter driver. This is done directly in the main event loop thread which is a bad idea. In a previous commit we fixed a actual deadlock problem with the virStateReload API, when triggered from SIGHUP: commit 33c6eb9689eb51dfe31dd05b24b3b6b1c948c267 Author: Jim Fehlig <jfehlig(a)suse.com> Date: Thu Mar 8 15:04:48 2018 -0700 libvirtd: fix potential deadlock when reloading The same deadlock problem previously existed with the firewalld reload trigger, however, today it is not quite so series. The QEMU driver uses a private event thread for each VM, so the particular deadlock would not occur. None the less during the time the filters are reloading all use of the event loop is blocked, which prevents APIs being serviced. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1f7d40e1b0..f620461f6a 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -59,6 +59,13 @@ static virMutex driverMutex = VIR_MUTEX_INITIALIZER; #ifdef WITH_FIREWALLD +static void nwfilterStateReloadThread(void *opaque G_GNUC_UNUSED) +{ + VIR_INFO("Reloading configuration on firewalld reload/restart"); + + nwfilterStateReload(); +} + static void nwfilterFirewalldDBusSignalCallback(GDBusConnection *connection G_GNUC_UNUSED, const char *senderName G_GNUC_UNUSED, @@ -68,7 +75,15 @@ nwfilterFirewalldDBusSignalCallback(GDBusConnection *connection G_GNUC_UNUSED, GVariant *parameters G_GNUC_UNUSED, gpointer user_data G_GNUC_UNUSED) { - nwfilterStateReload(); + virThread thr; + + if (virThreadCreateFull(&thr, false, nwfilterStateReloadThread, + "firewall-reload", false, NULL) < 0) { + /* + * Not much we can do on error here except log it. + */ + VIR_ERROR(_("Failed to create thread to handle firewall reload/restart")); + } } static unsigned int restartID; -- 2.34.1

2 1

Release of libvirt-8.2.0
by Jiri Denemark 01 Apr '22

01 Apr '22

The 8.2.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * qemu: Introduce ``manual`` disk snapshot mode This new mode allows users to synchronize libvirt snapshots with snapshots which need to be done outside of libvirt e.g. when 'vhost-user-blk' is used to back the disk. * Introduce memory allocation threads When starting a QEMU guest, libvirt can now instruct QEMU to allocate guest's memory in parallel. This may be handy when guest has large amounts of memory. * Improvements * qemu: ``VIR_MIGRATE_PARAM_TLS_DESTINATION`` now works with non-shared storage migration The setting now also applies to the NBD connections for non-shared storage migration allowing migration to proceed even when the user expects certificate name not to match. * qemu: Allow overrides of device properties via the qemu namespace Users wishing to override or modify properties of devices configured by libvirt can use the ``<qemu:deviceOverride>`` QEMU namespace element to specify the overrides instead of relying on the argv passthrough of the ``-set`` qemu commandline option which no longer works with new qemu. * qemu: Allow passing file descriptors to ``virsh qemu-monitor-command`` Passing FDs allows users wanting to experiment with qemu driven by libvirt use commands like ``add-fd`` properly. * libxl: Turn on user aliases Users can now use so called user aliases for XEN domains. * Implement support for FUSE3 The LXC driver uses fuse to overwrite some lines in ``/proc/meminfo`` inside containers so that they see correct amount of memory given to them. The code was changed so that both ``fuse`` and ``fuse3`` are supported. * Improve domain save/restore throughput Code that's handling save or restore of QEMU domains was changed resulting in better performance of I/O and thus shortening time needed for the operation. * Bug fixes * Both build and tests should now pass on Alpine Linux or any other distribution with musl libc. * virsh: Fix integer overflow in allocpages On hosts which support hugepages larger than 1GiB ``virsh allocpages`` failed to accept them because of an integer overflow. This is now fixed. * qemu: Fix segmentation fault in virDomainUndefineFlags When a domain without any ``<loader/>`` was being undefined, libvirt has crashed. This is now fixed. * lxc: Fix unaligned reads of /proc/meminfo within a container When /proc/meminfo was read in chunks smaller than the entire file, libvirt would produce mangled output. While porting the code to FUSE3 this area was reworked and the file can now be read with any granularity. * qemu: Be less aggressive around cgroup_device_acl A basic set of devices common to every domain can be set in ``qemu.conf`` via cgroup_device_acl knob. Devices from this set are allowed in CGroup and created in domain private namespace for every domain. However, upon device hotunplug it may have had happened that libvirt mistakenly denied a device from this set and/or removed it from the namespace. For instance, /dev/urandom was removed and denied in CGroup on RNG hotunplug. * nodedev: trigger mdev device definition update on udev add and remove When nodedev objects are added and removed mdev device definitions are updated to report correct associated parent. Enjoy. Jirka

1 0

[PATCH] NEWS: Document some contributions
by Michal Privoznik 01 Apr '22

01 Apr '22

Document either my contributions or commits I helped review for the upcoming release. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 754687ac4d..47859f2193 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,12 @@ v8.2.0 (unreleased) * **New features** + * Introduce memory allocation threads + + When starting a QEMU guest, libvirt can now instruct QEMU to allocate + guest's memory in parallel. This may be handy when guest has large amounts + of memory. + * **Improvements** * qemu: ``VIR_MIGRATE_PARAM_TLS_DESTINATION`` now works with non-shared storage migration @@ -32,11 +38,56 @@ v8.2.0 (unreleased) specify the overrides instead of relying on the argv passthrough of the ``-set`` qemu commandline option which no longer works with new qemu. + * libxl: Turn on user aliases + + Users can now use so called user aliases for XEN domains. + + * Implement support for FUSE3 + + The LXC driver uses fuse to overwrite some lines in ``/proc/meminfo`` + inside containers so that they see correct amount of memory given to them. + The code was changed so that both ``fuse`` and ``fuse3`` are supported. + + * Improve domain save/restore throughput + + Code that's handling save or restore of QEMU domains was changed resulting + in better performance of I/O and thus shortening time needed for the operation. + * **Bug fixes** * Both build and tests should now pass on Alpine Linux or any other distribution with musl libc. + * virsh: Fix integer overflow in allocpages + + On hosts which support hugepages larger than 1GiB ``virsh allocpages`` + failed to accept them because of an integer overflow. This is now fixed. + + * qemu: Fix segmentation fault in virDomainUndefineFlags + + When a domain without any ``<loader/>`` was being undefined, libvirt has + crashed. This is now fixed. + + * lxc: Fix unaligned reads of /proc/meminfo within a container + + When /proc/meminfo was read in chunks smaller than the entire file, libvirt + would produce mangled output. While porting the code to FUSE3 this area was + reworked and the file can now be read with any granularity. + + * qemu: Be less aggressive around cgroup_device_acl + + A basic set of devices common to every domain can be set in ``qemu.conf`` + via cgroup_device_acl knob. Devices from this set are allowed in CGroup and + created in domain private namespace for every domain. However, upon device + hotunplug it may have had happened that libvirt mistakenly denied a device + from this set and/or removed it from the namespace. For instance, + /dev/urandom was removed and denied in CGroup on RNG hotunplug. + + * nodedev: trigger mdev device definition update on udev add and remove + + When nodedev objects are added and removed mdev device definitions are + updated to report correct associated parent. + v8.1.0 (2022-03-01) =================== -- 2.35.1

2 1

[PATCH] NEWS: Mention 'manual' snapshots and FD passing for 'virsh qemu-monitor-command'
by Peter Krempa 01 Apr '22

01 Apr '22

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 754687ac4d..900e2702dd 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,12 @@ v8.2.0 (unreleased) * **New features** + * qemu: Introduce ``manual`` disk snapshot mode + + This new mode allows users to synchronize libvirt snapshots with snapshots + which need to be done outside of libvirt e.g. when 'vhost-user-blk' is used + to back the disk. + * **Improvements** * qemu: ``VIR_MIGRATE_PARAM_TLS_DESTINATION`` now works with non-shared storage migration @@ -32,6 +38,11 @@ v8.2.0 (unreleased) specify the overrides instead of relying on the argv passthrough of the ``-set`` qemu commandline option which no longer works with new qemu. + * qemu: Allow passing file descriptors to ``virsh qemu-monitor-command`` + + Passing FDs allows users wanting to experiment with qemu driven by libvirt + use commands like ``add-fd`` properly. + * **Bug fixes** * Both build and tests should now pass on Alpine Linux or any other -- 2.35.1

2 1

[libvirt PATCH 0/3] tests: Update capabilities for QEMU 7.0.0
by Andrea Bolognani 01 Apr '22

01 Apr '22

Heavily snipped to accomodate mailing list size limits, get the full version with $ git fetch https://gitlab.com/abologna/libvirt.git caps-7.0.0 I'm going to push these as a straightforward capabilities update later today, once the 8.3.0 development cycle opens, unless somebody shouts about it. They are a prerequisite for my virtio-iommu patches[1], for which I'll send out a respin after merging these. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/506156899 [1] https://listman.redhat.com/archives/libvir-list/2022-March/229397.html Andrea Bolognani (3): tests: Update capabilities for QEMU 7.0.0 on x86_64 tests: Update capabilities for QEMU 7.0.0 on ppc64 tests: Add capabilities for QEMU 7.0.0 on aarch64 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + ....ppc64.xml => qemu_7.0.0-virt.aarch64.xml} | 75 +- ...7.0.0.ppc64.xml => qemu_7.0.0.aarch64.xml} | 65 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 2 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + ...c64.replies => caps_7.0.0.aarch64.replies} | 15654 +++++++--------- .../caps_7.0.0.aarch64.xml | 552 + .../caps_7.0.0.ppc64.replies | 2400 ++- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 27 +- .../caps_7.0.0.x86_64.replies | 2211 ++- .../caps_7.0.0.x86_64.xml | 90 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 6 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 6 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 36 +- .../aarch64-virt-headless.aarch64-latest.args | 28 +- .../cpu-host-model.x86_64-latest.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 6 +- ...default-video-type-ppc64.ppc64-latest.args | 1 + .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 1 + ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 1 + ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 1 + ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 1 + ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 1 + ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 1 + .../ppc64-pseries-graphics.ppc64-latest.args | 1 + .../ppc64-pseries-headless.ppc64-latest.args | 1 + .../ppc64-tpmproxy-single.ppc64-latest.args | 1 + .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 1 + .../tpm-emulator-spapr.ppc64-latest.args | 1 + 32 files changed, 10525 insertions(+), 10655 deletions(-) copy tests/domaincapsdata/{qemu_7.0.0.ppc64.xml => qemu_7.0.0-virt.aarch64.xml} (58%) copy tests/domaincapsdata/{qemu_7.0.0.ppc64.xml => qemu_7.0.0.aarch64.xml} (60%) copy tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.replies => caps_7.0.0.aarch64.replies} (77%) create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml -- 2.35.1

1 3

[PATCH] virsh: Provide completer for virtualization types
by natto1784 01 Apr '22

01 Apr '22

Related: https://gitlab.com/libvirt/libvirt/-/issues/9 Signed-off-by: natto1784 <natto(a)weirdnatto.in> --- .gitignore | 4 ++++ tools/virsh-completer-host.c | 12 ++++++++++++ tools/virsh-completer-host.h | 5 +++++ tools/virsh-host.c | 3 +++ 4 files changed, 24 insertions(+) diff --git a/.gitignore b/.gitignore index 4695391..62012f4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,8 @@ tags # clangd related ignores .clangd +.cache/clangd compile_commands.json + +# ccls cache +.ccls-cache diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 40cb687..e481a73 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -27,6 +27,7 @@ #include "virxml.h" #include "virutil.h" #include "virsh-host.h" +#include "conf/domain_conf.h" static char * virshPagesizeNodeToString(xmlNodePtr node) @@ -180,3 +181,14 @@ virshNodeSuspendTargetCompleter(vshControl *ctl G_GNUC_UNUSED, return virshEnumComplete(VIR_NODE_SUSPEND_TARGET_LAST, virshNodeSuspendTargetTypeToString); } + +char ** +virshVirtTypeCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, NULL); + + return virshEnumComplete(VIR_DOMAIN_VIRT_LAST, + virDomainVirtTypeToString); +} diff --git a/tools/virsh-completer-host.h b/tools/virsh-completer-host.h index e71ccff..372ac14 100644 --- a/tools/virsh-completer-host.h +++ b/tools/virsh-completer-host.h @@ -41,3 +41,8 @@ char ** virshNodeSuspendTargetCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshVirtTypeCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 2e3cbc3..b28f29f 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -77,6 +77,7 @@ static const vshCmdInfo info_domcapabilities[] = { static const vshCmdOptDef opts_domcapabilities[] = { {.name = "virttype", .type = VSH_OT_STRING, + .completer = virshVirtTypeCompleter, .help = N_("virtualization type (/domain/@type)"), }, {.name = "emulatorbin", @@ -1577,6 +1578,7 @@ static const vshCmdOptDef opts_hypervisor_cpu_compare[] = { VIRSH_COMMON_OPT_FILE(N_("file containing an XML CPU description")), {.name = "virttype", .type = VSH_OT_STRING, + .completer = virshVirtTypeCompleter, .help = N_("virtualization type (/domain/@type)"), }, {.name = "emulator", @@ -1686,6 +1688,7 @@ static const vshCmdOptDef opts_hypervisor_cpu_baseline[] = { VIRSH_COMMON_OPT_FILE(N_("file containing XML CPU descriptions")), {.name = "virttype", .type = VSH_OT_STRING, + .completer = virshVirtTypeCompleter, .help = N_("virtualization type (/domain/@type)"), }, {.name = "emulator", -- 2.35.1

3 5

[PATCH] checkpoint: Fix a typo of comments
by Han Han 01 Apr '22

01 Apr '22

Signed-off-by: Han Han <hhan(a)redhat.com> --- src/libvirt-domain-checkpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoint.c index e6ad4f4f5d..58ee26857d 100644 --- a/src/libvirt-domain-checkpoint.c +++ b/src/libvirt-domain-checkpoint.c @@ -248,7 +248,7 @@ virDomainCheckpointGetXMLDesc(virDomainCheckpointPtr checkpoint, * @checkpoints: pointer to variable to store the array containing checkpoint * object, or NULL if the list is not required (just returns * number of checkpoints) - * @flags: bitwise-OR of supported virDomainCheckpoinListFlags + * @flags: bitwise-OR of supported virDomainCheckpointListFlags * * Collect the list of domain checkpoints for the given domain and allocate * an array to store those objects. -- 2.35.1

2 1

[libvirt PATCH] meson: Use dicts to initialize cfg_data objects
by Andrea Bolognani 31 Mar '22

31 Mar '22

Instead of creating an empty object and then setting keys one at a time, it is possible to pass a dict object to configuration_data(). This is nicer because it doesn't require repeating the name of the cfg_data object over and over. There is one exception: the 'conf' object, where we store values that are used directly by C code. In that case, using a dict object is not feasible for two reasons: first of all, replacing the set_quoted() calls would result in awkward code with a lot of calls to format(); moreover, since code that modifies it is sprinkled all over the place, refactoring it would probably make things more complicated rather than simpler. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- build-aux/meson.build | 18 ++++----- docs/manpages/meson.build | 9 +++-- meson.build | 35 ++++++++++------- po/meson.build | 7 ++-- src/meson.build | 65 ++++++++++++++++++------------- src/remote/meson.build | 5 ++- src/security/apparmor/meson.build | 11 +++--- tools/bash-completion/meson.build | 5 ++- tools/meson.build | 21 +++++----- 9 files changed, 98 insertions(+), 78 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index f4d0130e3b..bbfa27c4c6 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -1,14 +1,7 @@ -syntax_check_conf = configuration_data() -syntax_check_conf.set('top_srcdir', meson.source_root()) -syntax_check_conf.set('top_builddir', meson.build_root()) - flake8_path = '' if flake8_prog.found() flake8_path = flake8_prog.path() endif -syntax_check_conf.set('flake8_path', flake8_path) -syntax_check_conf.set('runutf8', ' '.join(runutf8)) -syntax_check_conf.set('PYTHON3', python3_prog.path()) if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin' make_prog = find_program('gmake') @@ -33,8 +26,15 @@ else grep_prog = find_program('grep') endif -syntax_check_conf.set('GREP', grep_prog.path()) -syntax_check_conf.set('SED', sed_prog.path()) +syntax_check_conf = configuration_data({ + 'top_srcdir': meson.source_root(), + 'top_builddir': meson.build_root(), + 'flake8_path': flake8_path, + 'runutf8': ' '.join(runutf8), + 'PYTHON3': python3_prog.path(), + 'GREP': grep_prog.path(), + 'SED': sed_prog.path(), +}) configure_file( input: 'Makefile.in', diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index bad9b62a2e..d9fcb6b057 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -84,10 +84,11 @@ foreach name : keyname_list } endforeach -docs_man_conf = configuration_data() -docs_man_conf.set('SYSCONFDIR', sysconfdir) -docs_man_conf.set('RUNSTATEDIR', runstatedir) -docs_man_conf.set('VERSION', meson.project_version()) +docs_man_conf = configuration_data({ + 'SYSCONFDIR': sysconfdir, + 'RUNSTATEDIR': runstatedir, + 'VERSION': meson.project_version(), +}) foreach data : docs_man_files rst_in_file = '@0@.rst'.format(data['name']) diff --git a/meson.build b/meson.build index 27c21d1d67..50b996cbd4 100644 --- a/meson.build +++ b/meson.build @@ -2135,14 +2135,15 @@ pkgconfig_files = [ 'libvirt-admin.pc.in', ] -pkgconfig_conf = configuration_data() -pkgconfig_conf.set('VERSION', meson.project_version()) -pkgconfig_conf.set('datadir', datadir) -pkgconfig_conf.set('datarootdir', datadir) -pkgconfig_conf.set('exec_prefix', prefix) -pkgconfig_conf.set('includedir', includedir) -pkgconfig_conf.set('libdir', libdir) -pkgconfig_conf.set('prefix', prefix) +pkgconfig_conf = configuration_data({ + 'VERSION': meson.project_version(), + 'datadir': datadir, + 'datarootdir': datadir, + 'exec_prefix': prefix, + 'includedir': includedir, + 'libdir': libdir, + 'prefix': prefix, +}) pkgconfig_dir = libdir / 'pkgconfig' @@ -2165,8 +2166,9 @@ if git 'mingw-libvirt.spec.in', ] - spec_conf = configuration_data() - spec_conf.set('VERSION', meson.project_version()) + spec_conf = configuration_data({ + 'VERSION': meson.project_version(), + }) foreach file : spec_files configure_file( @@ -2180,8 +2182,9 @@ if git env: runutf8, check: true) authors_file = 'AUTHORS.rst.in' - authors_conf = configuration_data() - authors_conf.set('contributorslist', authors.stdout()) + authors_conf = configuration_data({ + 'contributorslist': authors.stdout(), + }) configure_file( input: authors_file, @@ -2209,9 +2212,11 @@ configure_file(output: 'meson-config.h', configuration: conf) # generate run helper -run_conf = configuration_data() -run_conf.set('abs_builddir', meson.build_root()) -run_conf.set('abs_top_builddir', meson.build_root()) +run_conf = configuration_data({ + 'abs_builddir': meson.build_root(), + 'abs_top_builddir': meson.build_root(), +}) + configure_file( input: 'run.in', output: '@BASENAME@', diff --git a/po/meson.build b/po/meson.build index 69d8be726a..f4d95f97fe 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,8 +1,9 @@ i18n = import('i18n') -potfiles_conf = configuration_data() -potfiles_conf.set('SRCDIR', '') -potfiles_conf.set('BUILDDIR', '') +potfiles_conf = configuration_data({ + 'SRCDIR': '', + 'BUILDDIR': '', +}) potfiles = configure_file( input: 'POTFILES.in', diff --git a/src/meson.build b/src/meson.build index b2d951d36c..10165ba5ac 100644 --- a/src/meson.build +++ b/src/meson.build @@ -698,20 +698,23 @@ endforeach foreach data : virt_daemon_confs capitalize_args = [ '-c', 'print("@0@".capitalize())'.format(data['name']) ] name_uc = run_command(python3_prog, capitalize_args, check: true, env: runutf8).stdout().strip() - daemon_conf = configuration_data() - daemon_conf.set('runstatedir', runstatedir) - daemon_conf.set('sbindir', sbindir) - daemon_conf.set('sysconfdir', sysconfdir) - daemon_conf.set('DAEMON_NAME', data['name']) - daemon_conf.set('DAEMON_NAME_UC', name_uc) - # to silence meson warning about missing 'CONFIG' in the configuration_data - daemon_conf.set('CONFIG', '@CONFIG@') + if conf.has('WITH_POLKIT') - daemon_conf.set('default_auth', 'polkit') + default_auth = 'polkit' else - daemon_conf.set('default_auth', 'none') + default_auth = 'none' endif + daemon_conf = configuration_data({ + 'runstatedir': runstatedir, + 'sbindir': sbindir, + 'sysconfdir': sysconfdir, + 'DAEMON_NAME': data['name'], + 'DAEMON_NAME_UC': name_uc, + 'default_auth': default_auth, + # to silence meson warning about missing 'CONFIG' in the configuration_data + 'CONFIG': '@CONFIG@', + }) if data.get('with_ip', false) conf_in = libvirtd_conf_tmp @@ -783,20 +786,23 @@ if conf.has('WITH_LIBVIRTD') ) foreach unit : virt_daemon_units - unit_conf = configuration_data() - unit_conf.set('runstatedir', runstatedir) - unit_conf.set('sbindir', sbindir) - unit_conf.set('sysconfdir', sysconfdir) - unit_conf.set('name', unit['name']) - unit_conf.set('service', unit['service']) - unit_conf.set('sockprefix', unit['sockprefix']) - unit_conf.set('deps', unit.get('deps', '')) if conf.has('WITH_POLKIT') - unit_conf.set('mode', '0666') + mode = '0666' else - unit_conf.set('mode', '0600') + mode = '0600' endif + unit_conf = configuration_data({ + 'runstatedir': runstatedir, + 'sbindir': sbindir, + 'sysconfdir': sysconfdir, + 'name': unit['name'], + 'service': unit['service'], + 'sockprefix': unit['sockprefix'], + 'deps': unit.get('deps', ''), + 'mode': mode, + }) + configure_file( input: unit['service_in'], output: '@0@.service'.format(unit['service']), @@ -829,15 +835,17 @@ if conf.has('WITH_LIBVIRTD') # Generate openrc init files if init_script == 'openrc' foreach init : openrc_init_files - init_conf = configuration_data() - init_conf.set('sbindir', sbindir) - init_conf.set('runstatedir', runstatedir) if conf.has('WITH_FIREWALLD') need_firewalld = 'need firewalld' else need_firewalld = '' endif - init_conf.set('NEED_FIREWALLD', need_firewalld) + + init_conf = configuration_data({ + 'sbindir': sbindir, + 'runstatedir': runstatedir, + 'NEED_FIREWALLD': need_firewalld, + }) init_file = configure_file( input: init['in_file'], @@ -1010,10 +1018,11 @@ run_pkg_config_files = [ 'libvirt.pc.in', ] -run_pkg_config_conf = configuration_data() -run_pkg_config_conf.set('VERSION', meson.project_version()) -run_pkg_config_conf.set('abs_top_builddir', meson.build_root()) -run_pkg_config_conf.set('abs_top_srcdir', meson.source_root()) +run_pkg_config_conf = configuration_data({ + 'VERSION': meson.project_version(), + 'abs_top_builddir': meson.build_root(), + 'abs_top_srcdir': meson.source_root(), +}) foreach file : run_pkg_config_files configure_file( diff --git a/src/remote/meson.build b/src/remote/meson.build index b2aafe6320..eb4f7a0068 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -240,8 +240,9 @@ if conf.has('WITH_REMOTE') runstatedir / 'libvirt' / 'common', ] - logrotate_conf = configuration_data() - logrotate_conf.set('localstatedir', localstatedir) + logrotate_conf = configuration_data({ + 'localstatedir': localstatedir, + }) foreach name : logrotate_files log_file = configure_file( diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build index 990f00b4f3..58b4024b85 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -5,11 +5,12 @@ apparmor_gen_profiles = [ 'usr.sbin.virtxend', ] -apparmor_gen_profiles_conf = configuration_data() -apparmor_gen_profiles_conf.set('sysconfdir', sysconfdir) -apparmor_gen_profiles_conf.set('sbindir', sbindir) -apparmor_gen_profiles_conf.set('runstatedir', runstatedir) -apparmor_gen_profiles_conf.set('libexecdir', libexecdir) +apparmor_gen_profiles_conf = configuration_data({ + 'sysconfdir': sysconfdir, + 'sbindir': sbindir, + 'runstatedir': runstatedir, + 'libexecdir': libexecdir, +}) apparmor_dir = sysconfdir / 'apparmor.d' diff --git a/tools/bash-completion/meson.build b/tools/bash-completion/meson.build index deda7c4f46..2ce1c47602 100644 --- a/tools/bash-completion/meson.build +++ b/tools/bash-completion/meson.build @@ -4,8 +4,9 @@ completion_commands = [ ] foreach command : completion_commands - completion_conf = configuration_data() - completion_conf.set('command', command) + completion_conf = configuration_data({ + 'command': command, + }) completion = configure_file( input: 'vsh.in', output: command, diff --git a/tools/meson.build b/tools/meson.build index ac714e6425..bb28a904dc 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -231,16 +231,17 @@ if conf.has('WITH_REMOTE') ) endif -tools_conf = configuration_data() -tools_conf.set('PACKAGE', meson.project_name()) -tools_conf.set('VERSION', meson.project_version()) -tools_conf.set('bindir', bindir) -tools_conf.set('libexecdir', libexecdir) -tools_conf.set('localedir', localedir) -tools_conf.set('localstatedir', localstatedir) -tools_conf.set('sbindir', sbindir) -tools_conf.set('schemadir', pkgdatadir / 'schemas') -tools_conf.set('sysconfdir', sysconfdir) +tools_conf = configuration_data({ + 'PACKAGE': meson.project_name(), + 'VERSION': meson.project_version(), + 'bindir': bindir, + 'libexecdir': libexecdir, + 'localedir': localedir, + 'localstatedir': localstatedir, + 'sbindir': sbindir, + 'schemadir': pkgdatadir / 'schemas', + 'sysconfdir': sysconfdir, +}) configure_file( input: 'virt-xml-validate.in', -- 2.35.1

2 1

[PATCH 00/11] qemu: switch to modern QEMU's snapshot-* API for
by Nikolay Shirokovskiy 31 Mar '22

31 Mar '22

This series applied on top of [1]. In this series I still use old API to load snapshot if snapshot was done using old API. The thing is snapshot-load require "vmstate" parameter to be set. And with old snapshot the disk which holds vmstate is not known to libvirt. This is unfortunate as we will need to use old API for a long time even after we drop support for QEMU older then 6.0 (where snapshot-* API is introduced). I guess the best will be to allow omiting "vmstate" for snapshot-load and thus falling back to default disk for vmstate. The code for recovering on libvirtd crash/restart is missing. I'll work on it too if the overall approach is accepted. [PATCH v2 REBASE 0/3] qemu: don't pause VM when creating internal snapshot https://listman.redhat.com/archives/libvir-list/2022-March/229719.html Nikolay Shirokovskiy (11): qemu: add QEMU_CAPS_SNAPSHOT_SAVE capability qemu: add monitor commands to snapshot-{save, load, delete} qemu: move snapshot related funcs from domain.c to snapshot.c qemu: introduce QEMU_ASYNC_JOB_SNAPSHOT_DELETE qemu: snapshot: prepare for async snapshot deletion conf: add memory state disk for internal snapshots qemu: check internal snaphshot memory disk qemu: add snapshot job types to qemuMonitorJobType qemu: use snapshot-save for modern qemu to create snapshot qemu: use snapshot-load for modern QEMU to revert to snapshot qemu: use snapshot-delete for modern QEMU to delete snapshot src/conf/snapshot_conf.c | 13 + src/conf/snapshot_conf.h | 1 + src/hypervisor/domain_job.c | 1 + src/hypervisor/domain_job.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 241 +------- src/qemu/qemu_domain.h | 19 - src/qemu/qemu_domainjob.c | 2 + src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_migration.c | 2 + src/qemu/qemu_monitor.c | 56 ++ src/qemu/qemu_monitor.h | 26 + src/qemu/qemu_monitor_json.c | 106 ++++ src/qemu/qemu_monitor_json.h | 23 + src/qemu/qemu_process.c | 22 +- src/qemu/qemu_snapshot.c | 583 +++++++++++++++++- src/qemu/qemu_snapshot.h | 10 + .../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 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + 27 files changed, 844 insertions(+), 288 deletions(-) -- 2.35.1

1 11

[PATCH] virsh: Fix integer overflow in allocpages
by Michal Privoznik 31 Mar '22

31 Mar '22

I've came across an aarch64 system which supports hugepages up to 16GiB of size. However, I was unable to allocate them using virsh allocpages. This is because cmdAllocpages() uses vshCommandOptScaledInt(), which scales passed value into bytes, but since the virNodeAllocPages() expects size in KiB the variable holding bytes is then divided by 1024. However, the limit for the biggest value passed to vshCommandOptScaledInt() is UINT_MAX which is now obviously wrong, as it needs to be UINT_MAX * 1024. The same bug is in completer. But here, let's use ULLONG_MAX so that we don't have to care about it anymore. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-completer-host.c | 2 +- tools/virsh-host.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 40cb687582..cbdc3f0d49 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -42,7 +42,7 @@ virshPagesizeNodeToString(xmlNodePtr node) unit = virXMLPropString(node, "unit"); if (virStrToLong_ull(pagesize, NULL, 10, &byteval) < 0) return NULL; - if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0) + if (virScaleInteger(&byteval, unit, 1024, ULLONG_MAX) < 0) return NULL; size = vshPrettyCapacity(byteval, &suffix); ret = g_strdup_printf("%.0f%s", size, suffix); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 2e3cbc39b6..1e83d19fa1 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -488,7 +488,7 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd) if (cellno && vshCommandOptInt(ctl, cmd, "cellno", &startCell) < 0) return false; - if (vshCommandOptScaledInt(ctl, cmd, "pagesize", &tmp, 1024, UINT_MAX) < 0) + if (vshCommandOptScaledInt(ctl, cmd, "pagesize", &tmp, 1024, UINT_MAX * 1024ULL) < 0) return false; pageSizes[0] = VIR_DIV_UP(tmp, 1024); -- 2.35.1

2 1

Entering freeze for libvirt-8.2.0
by Jiri Denemark 31 Mar '22

31 Mar '22

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

3 3

[PATCH v2 REBASE 0/3] qemu: don't pause VM when creating internal snapshot
by Nikolay Shirokovskiy 31 Mar '22

31 Mar '22

Diff to v1 [1]: - fix mistake of dropping hunk that starts CPUs if snapshot was not successful. We still need it if halt upon snapshot is requested. The is series is mostly about the first patch. The others patch are minor cleanups. [1] v1 version https://listman.redhat.com/archives/libvir-list/2022-March/229437.html Maxim Nestratov (1): qemu: don't pause vm when creating internal snapshot Nikolay Shirokovskiy (2): qemu: remove excessive check in qemuSnapshotCreateActiveInternal qemu: remove unnecessary gotos in qemuSnapshotCreateActiveInternal src/qemu/qemu_snapshot.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) -- 2.35.1

1 3

[libvirt PATCH] Fix spelling
by Tim Wiederhake 30 Mar '22

30 Mar '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- ci/integration.yml | 8 ++++---- docs/drvqemu.rst | 6 +++--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/integration.yml b/ci/integration.yml index 2808e829ef..17f20b3945 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -62,7 +62,7 @@ centos-stream-8-tests: variables: # needed by libvirt-gitlab-executor DISTRO: centos-stream-8 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG @@ -78,7 +78,7 @@ centos-stream-9-tests: variables: # needed by libvirt-gitlab-executor DISTRO: centos-stream-9 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG @@ -94,7 +94,7 @@ fedora-34-tests: variables: # needed by libvirt-gitlab-executor DISTRO: fedora-34 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG @@ -110,7 +110,7 @@ fedora-35-tests: variables: # needed by libvirt-gitlab-executor DISTRO: fedora-35 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index afc499ad50..cfe4473951 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -589,13 +589,13 @@ specific properties of devices instantiated by libvirt. The ``<qemu:device>`` sub-element groups overrides for a device identified via the ``alias`` attribute. The alias corresponds to the ``<alias name=''>`` property of a device. It's strongly recommended to use user-specified aliases -for devices with overriden properties. +for devices with overridden properties. Sub element ``<qemu:frontend>`` encapsulates all overrides of properties for the device frontend and overrides what libvirt formats via ``-device``. :since:`Since 8.2.0`. -The individual properties are overriden by a ``<qemu:property>`` element. The +The individual properties are overridden by a ``<qemu:property>`` element. The ``name`` specifies the name of the property to override. In case when libvirt doesn't configure the property a property with the name is added to the commandline. The ``type`` attribute specifies a type of the argument used. The @@ -612,7 +612,7 @@ remove a device property which is not formatted by libvirt will cause failure to startup the VM. *Note:* The libvirt project doesn't guarantee any form of compatibility and -stability of devices with overriden properties. The domain is tainted when +stability of devices with overridden properties. The domain is tainted when such configuration is used. Example: diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 948029d60d..b2426a6d25 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -642,7 +642,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */ /* 425 */ - QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME, /* tls hostname can be overriden for NBD clients */ + QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME, /* tls hostname can be overridden for NBD clients */ QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS, /* -object memory-backend-*.prealloc-threads */ QEMU_CAPS_LAST /* this must always be the last item */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 18d403e099..1bfea0d470 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3368,7 +3368,7 @@ qemuDomainDefNamespaceParseOverrideProperties(qemuDomainXmlNsOverrideProperty *p if (STREQ(prop->name, "id")) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("property with name 'id' can't be overriden")); + _("property with name 'id' can't be overridden")); return -1; } -- 2.31.1

2 1

[libvirt PATCH] fix documentation for sockets topology
by John Levon 30 Mar '22

30 Mar '22

From: John Levon <john.levon(a)nutanix.com> In 0895a0e, it was noted that the "sockets" value in the topology section of capabilities reflects not the number of sockets per NUMA node, not the total number. Unfortunately, the fix was applied to the wrong place: the domain XML format documentation, not that for the capabilities output. And, in fact, the domain XML interprets "sockets" as the total number, not a per-node value. Back out this change in favour of a note in the capabilities documentation instead. Fixes: 0895a0e75d13874254218e16dc66dcad673671d3 Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: John Levon <john.levon(a)nutanix.com> --- docs/formatcaps.html.in | 5 ++++- docs/formatdomain.rst | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 09662f78c8..a4abad5d20 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -51,7 +51,10 @@ <dt><code>topology</code></dt> <dd>This element embodies the host internal topology. Management applications may want to learn this information when orchestrating new - guests - e.g. due to reduce inter-NUMA node transfers.</dd> + guests - e.g. due to reduce inter-NUMA node transfers. Note that the + <code>sockets</code> value reported here is per-NUMA-node; this is in + contrast to the value given in domain definitions, which is interpreted + as a total number of sockets for the domain.</dd> <dt><code>secmodel</code></dt> <dd>To find out default security labels for different security models you diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e492532004..9652e97eec 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1489,12 +1489,12 @@ In case no restrictions need to be put on CPU model and its features, a simpler The ``topology`` element specifies requested topology of virtual CPU provided to the guest. Four attributes, ``sockets``, ``dies``, ``cores``, and ``threads``, accept non-zero positive integer values. They refer to the - number of CPU sockets per NUMA node, number of dies per socket, number of - cores per die, and number of threads per core, respectively. The ``dies`` - attribute is optional and will default to 1 if omitted, while the other - attributes are all mandatory. Hypervisors may require that the maximum number - of vCPUs specified by the ``cpus`` element equals to the number of vcpus - resulting from the topology. + total number of CPU sockets, number of dies per socket, number of cores per + die, and number of threads per core, respectively. The ``dies`` attribute is + optional and will default to 1 if omitted, while the other attributes are all + mandatory. Hypervisors may require that the maximum number of vCPUs specified + by the ``cpus`` element equals to the number of vcpus resulting from the + topology. ``feature`` The ``cpu`` element can contain zero or more ``feature`` elements used to fine-tune features provided by the selected CPU model. The list of known -- 2.32.0

2 1

[PATCH 0/3] Cleanups based on 'nvram' refactor patch
by Peter Krempa 30 Mar '22

30 Mar '22

Few cleanups that I've suggested in the review for adding remote store of nvram. Peter Krempa (3): virXMLFormatElement: Introduce virXMLFormatElementInternal virDomainLoaderDefFormat: Use modern XML formatting approach vboxSetBootDeviceOrder: Remove whitespace alignment in VIR_DEBUG statements src/conf/domain_conf.c | 40 +++++++++++++-------------- src/libvirt_private.syms | 1 + src/util/virxml.c | 58 +++++++++++++++++++++++++++++++--------- src/util/virxml.h | 7 +++++ src/vbox/vbox_common.c | 36 ++++++++++++------------- 5 files changed, 90 insertions(+), 52 deletions(-) -- 2.35.1

2 4

[libvirt PATCH] qemu: Rename virDomainAsyncJobPhase{From,To}String
by Jiri Denemark 30 Mar '22

30 Mar '22

Recent refactor (v8.1.0-217-ga193f4bef6) generalized job related enums and functions by changing "qemu" prefix to "vir" and moving them to src/hypervisor/domain_job.[ch]. This was in most cases a good thing, but async job phases are driver specific and the corresponding functions remained in src/qemu/qemu_domainjob.[ch], but still their prefix was changed to "vir". Let's change it back to "qemu". Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domainjob.c | 10 +++++----- src/qemu/qemu_domainjob.h | 4 ++-- src/qemu/qemu_migration.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 56a3f6cb19..1cddc7f2f0 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -74,7 +74,7 @@ qemuDomainJobSetStatsType(virDomainJobData *jobData, const char * -virDomainAsyncJobPhaseToString(virDomainAsyncJob job, +qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job, int phase G_GNUC_UNUSED) { switch (job) { @@ -97,7 +97,7 @@ virDomainAsyncJobPhaseToString(virDomainAsyncJob job, } int -virDomainAsyncJobPhaseFromString(virDomainAsyncJob job, +qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, const char *phase) { if (!phase) @@ -682,7 +682,7 @@ qemuDomainObjSetJobPhase(virDomainObj *obj, VIR_DEBUG("Setting '%s' phase to '%s'", virDomainAsyncJobTypeToString(priv->job.asyncJob), - virDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); if (priv->job.asyncOwner == 0) { priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); @@ -1191,7 +1191,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, if (priv->job.phase) { virBufferAsprintf(&attrBuf, " phase='%s'", - virDomainAsyncJobPhaseToString(priv->job.asyncJob, + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, priv->job.phase)); } @@ -1244,7 +1244,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, priv->job.asyncJob = async; if ((tmp = virXPathString("string(@phase)", ctxt))) { - priv->job.phase = virDomainAsyncJobPhaseFromString(async, tmp); + priv->job.phase = qemuDomainAsyncJobPhaseFromString(async, tmp); if (priv->job.phase < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job phase %s"), tmp); diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index faf47105a3..f67eace36c 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -119,9 +119,9 @@ struct _qemuDomainJobObj { void qemuDomainJobSetStatsType(virDomainJobData *jobData, qemuDomainJobStatsType type); -const char *virDomainAsyncJobPhaseToString(virDomainAsyncJob job, +const char *qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job, int phase); -int virDomainAsyncJobPhaseFromString(virDomainAsyncJob job, +int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, const char *phase); void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3e653543c6..98f82abe7c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2190,7 +2190,7 @@ qemuMigrationSrcCleanup(virDomainObj *vm, VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s", vm->def->name, conn, virDomainAsyncJobTypeToString(priv->job.asyncJob), - virDomainAsyncJobPhaseToString(priv->job.asyncJob, + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, priv->job.phase)); if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT)) -- 2.35.1

2 1

[libvirt PATCH] qemu: fix hotplug for multiqueue vdpa net device
by Jonathon Jongsma 30 Mar '22

30 Mar '22

While commit a5e659f0 removed the restriction against multiple queues for the vdpa net device, there were some missing pieces. Configuring a device statically and then starting the domain worked as expected, but hotplugging a device didn't have the expected multiqueue support enabled. Add the missing bits. Consider the following device xml: <interface type="vdpa"> <mac address="00:11:22:33:44:03" /> <source dev="/dev/vhost-vdpa-0" /> <model type="virtio" /> <driver queues='2' /> </interface> Without this patch, hotplugging the above XML description resulted in the following: {"execute":"netdev_add","arguments":{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","id":"hostnet1"},"id":"libvirt-392"} {"execute":"device_add","arguments":{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:03","bus":"pci.5","addr":"0x0"},"id":"libvirt-393"} With the patch, hotplugging results in the following: {"execute":"netdev_add","arguments":{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","queues":2,"id":"hostnet1"},"id":"libvirt-392"} {"execute":"device_add","arguments":{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:03","bus":"pci.5","addr":"0x0"},"id":"libvirt-393"} Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024406 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++++ src/qemu/qemu_hotplug.c | 3 +++ tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 453891a725..f7f55b20ef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4346,6 +4346,10 @@ qemuBuildHostNetProps(virDomainNetDef *net, if (virJSONValueObjectAdd(&netprops, "s:type", "vhost-vdpa", NULL) < 0 || virJSONValueObjectAppendString(netprops, "vhostdev", vdpadev) < 0) return NULL; + + if (net->driver.virtio.queues > 1 && + virJSONValueObjectAppendNumberUlong(netprops, "queues", net->driver.virtio.queues) < 0) + return NULL; break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3d1bb1be2a..d9ba0b7abe 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1386,6 +1386,9 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, break; case VIR_DOMAIN_NET_TYPE_VDPA: + queueSize = net->driver.virtio.queues; + if (!queueSize) + queueSize = 1; if (qemuDomainAdjustMaxMemLock(vm, false) < 0) goto cleanup; adjustmemlock = true; diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args index 26ef666036..4cb805451a 100644 --- a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -add-fd set=0,fd=1732,opaque=net0-vdpa \ --netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \ +-netdev vhost-vdpa,vhostdev=/dev/fdset/0,queues=2,id=hostnet0 \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -- 2.35.1

2 1

[libvirt PATCH] util: Improve macOS workaround
by Andrea Bolognani 29 Mar '22

29 Mar '22

Since the workaround is specific to macOS, only disable compiler warnings when building on that platform. While at it, update the comment to reflect the fact that the workaround is needed for all versions of the OS, including the modern ones that we currently target. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/502990271 src/util/virutil.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index fe5500726e..176e2f8f59 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -869,9 +869,11 @@ virDoesGroupExist(const char *name) -/* Work around an incompatibility of OS X 10.11: getgrouplist +/* Work around an incompatibility of macOS: getgrouplist accepts int *, not gid_t *, and int and gid_t differ in sign. */ +# ifdef __APPLE__ VIR_WARNINGS_NO_POINTER_SIGN +# endif /* Compute the list of primary and supplementary groups associated * with @uid, and including @gid in the list (unless it is -1), @@ -934,7 +936,9 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list) return ret; } +# ifdef __APPLE__ VIR_WARNINGS_RESET +# endif /* Set the real and effective uid and gid to the given values, as well -- 2.35.1

2 1

[libvirt PATCH] qemu: Use real defaults for user and group in qemu.conf
by Andrea Bolognani 29 Mar '22

29 Mar '22

The default values used by the library are determined at configure time based on a number of factors, and we should reflect them in the installed configuration file to make the comments it contains more useful. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/263 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/meson.build | 30 +++++++++++++++++++++++++--- src/qemu/{qemu.conf => qemu.conf.in} | 4 ++-- src/qemu/test_libvirtd_qemu.aug.in | 4 ++-- 3 files changed, 31 insertions(+), 7 deletions(-) rename src/qemu/{qemu.conf => qemu.conf.in} (99%) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 39f0f615cc..96952cc52d 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -130,12 +130,36 @@ if conf.has('WITH_QEMU') ], } - virt_conf_files += files('qemu.conf') + qemu_user_group_conf = configuration_data({ + 'QEMU_USER': qemu_user, + 'QEMU_GROUP': qemu_group, + }) + qemu_conf = configure_file( + input: 'qemu.conf.in', + output: 'qemu.conf', + configuration: qemu_user_group_conf, + ) + + qemu_user_group_hack_conf = configuration_data({ + 'QEMU_USER': qemu_user, + 'QEMU_GROUP': qemu_group, + # This hack is necessary because the output file is going to be + # used as input for another configure_file() call later, which + # will take care of substituting @CONFIG@ with useful data + 'CONFIG': '@CONFIG@', + }) + test_libvirtd_qemu_aug_tmp = configure_file( + input: 'test_libvirtd_qemu.aug.in', + output: 'test_libvirtd_qemu.aug.tmp', + configuration: qemu_user_group_hack_conf, + ) + + virt_conf_files += qemu_conf virt_aug_files += files('libvirtd_qemu.aug') virt_test_aug_files += { 'name': 'test_libvirtd_qemu.aug', - 'aug': files('test_libvirtd_qemu.aug.in'), - 'conf': files('qemu.conf'), + 'aug': test_libvirtd_qemu_aug_tmp, + 'conf': qemu_conf, 'test_name': 'libvirtd_qemu', 'test_srcdir': meson.current_source_dir(), 'test_builddir': meson.current_build_dir(), diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf.in similarity index 99% rename from src/qemu/qemu.conf rename to src/qemu/qemu.conf.in index 71fd125699..04b7740136 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf.in @@ -516,11 +516,11 @@ # user = "+0" # Super user (uid=0) # user = "100" # A user named "100" or a user with uid=100 # -#user = "root" +#user = "@QEMU_USER@" # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. -#group = "root" +#group = "@QEMU_GROUP@" # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 20a89ade32..757d21c33f 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -47,8 +47,8 @@ module Test_libvirtd_qemu = { "security_driver" = "selinux" } { "security_default_confined" = "1" } { "security_require_confined" = "1" } -{ "user" = "root" } -{ "group" = "root" } +{ "user" = "@QEMU_USER@" } +{ "group" = "@QEMU_GROUP@" } { "dynamic_ownership" = "1" } { "remember_owner" = "1" } { "cgroup_controllers" -- 2.35.1

2 1

[PATCH] Introduce network-backed NVRAM
by Rohit Kumar 28 Mar '22

28 Mar '22

Libvirt domain XML allows only local filepaths to specify a NVRAM element. Since VMs can move across different hosts, it should be possibe to allocate NVRAM disks on network storage for uninturrupted access. This Patch extends the NVRAM disk elements to be described as virStorageSource* elements. Sample XML with new annotation: <nvram> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> </source> </nvram> or <nvram> <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/> </nvram> Signed-off-by: Prerna Saxena <prerna.saxena(a)nutanix.com> Signed-off-by: Florian Schmidt <flosch(a)nutanix.com> Signed-off-by: Rohit Kumar <rohit.kumar3(a)nutanix.com> --- docs/schemas/domaincommon.rng | 72 +++++++++------ src/conf/domain_conf.c | 90 +++++++++++++++---- src/conf/domain_conf.h | 2 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_command.c | 5 +- src/qemu/qemu_domain.c | 23 +++-- src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_firmware.c | 17 ++-- src/qemu/qemu_namespace.c | 5 +- src/qemu/qemu_process.c | 5 +- src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- src/security/virt-aa-helper.c | 5 +- src/vbox/vbox_common.c | 8 +- .../qemuxml2argvdata/bios-nvram-network.args | 35 ++++++++ tests/qemuxml2argvdata/bios-nvram-network.xml | 40 +++++++++ tests/qemuxml2argvtest.c | 1 + 17 files changed, 256 insertions(+), 72 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9c1b64a644..a25c84a0b7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -330,7 +330,17 @@ </attribute> </optional> <optional> - <ref name="absFilePath"/> + <choice> + <group> + <ref name="absFilePath"/> + </group> + <group> + <ref name="diskSourceFileElement"/> + </group> + <group> + <ref name="diskSourceNetworkElement"/> + </group> + </choice> </optional> </element> </optional> @@ -1714,6 +1724,31 @@ </choice> </define> + <define name="diskSourceFileElement"> + <element name="source"> + <interleave> + <optional> + <attribute name="file"> + <choice> + <ref name="absFilePath"/> + <ref name="vmwarePath"/> + </choice> + </attribute> + </optional> + <ref name="diskSourceCommon"/> + <optional> + <ref name="storageStartupPolicy"/> + </optional> + <optional> + <ref name="encryption"/> + </optional> + <zeroOrMore> + <ref name="devSeclabel"/> + </zeroOrMore> + </interleave> + </element> + </define> + <define name="diskSourceFile"> <optional> <attribute name="type"> @@ -1721,28 +1756,7 @@ </attribute> </optional> <optional> - <element name="source"> - <interleave> - <optional> - <attribute name="file"> - <choice> - <ref name="absFilePath"/> - <ref name="vmwarePath"/> - </choice> - </attribute> - </optional> - <ref name="diskSourceCommon"/> - <optional> - <ref name="storageStartupPolicy"/> - </optional> - <optional> - <ref name="encryption"/> - </optional> - <zeroOrMore> - <ref name="devSeclabel"/> - </zeroOrMore> - </interleave> - </element> + <ref name="diskSourceFileElement"/> </optional> </define> @@ -2137,10 +2151,7 @@ </element> </define> - <define name="diskSourceNetwork"> - <attribute name="type"> - <value>network</value> - </attribute> + <define name="diskSourceNetworkElement"> <choice> <ref name="diskSourceNetworkProtocolNBD"/> <ref name="diskSourceNetworkProtocolGluster"/> @@ -2155,6 +2166,13 @@ </choice> </define> + <define name="diskSourceNetwork"> + <attribute name="type"> + <value>network</value> + </attribute> + <ref name="diskSourceNetworkElement"/> + </define> + <define name="diskSourceVolume"> <attribute name="type"> <value>volume</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e0dfc9e45f..5fcc09db05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3535,7 +3535,7 @@ virDomainLoaderDefFree(virDomainLoaderDef *loader) return; g_free(loader->path); - g_free(loader->nvram); + virObjectUnref(loader->nvram); g_free(loader->nvramTemplate); g_free(loader); } @@ -17834,6 +17834,37 @@ virDomainLoaderDefParseXML(xmlNodePtr node, } +static int +virDomainNvramDefParseXML(virStorageSource *nvram, + xmlXPathContextPtr ctxt, + virDomainXMLOption *opt, + unsigned int flags) +{ + g_autofree char *srcTypeFile = NULL; + g_autofree char *srcTypeNetwork = NULL; + xmlNodePtr source; + + srcTypeFile = virXPathString("string(./os/nvram/source/@file)", ctxt); + srcTypeNetwork = virXPathString("string(./os/nvram/source/@protocol)", ctxt); + + if (!srcTypeFile && !srcTypeNetwork) { + nvram->type = VIR_STORAGE_TYPE_FILE; + nvram->path = virXPathString("string(./os/nvram[1])", ctxt); + return 0; + } else { + if (srcTypeFile) { + nvram->type = VIR_STORAGE_TYPE_FILE; + } else { + nvram->type = VIR_STORAGE_TYPE_NETWORK; + } + source = virXPathNode("./os/nvram/source[1]", ctxt); + if (!source) + return -1; + return virDomainStorageSourceParse(source, ctxt, nvram, flags, opt); + } + +} + static int virDomainSchedulerParseCommonAttrs(xmlNodePtr node, virProcessSchedPolicy *policy, @@ -18219,7 +18250,9 @@ virDomainDefParseBootFirmwareOptions(virDomainDef *def, static int virDomainDefParseBootLoaderOptions(virDomainDef *def, - xmlXPathContextPtr ctxt) + xmlXPathContextPtr ctxt, + virDomainXMLOption *xmlopt, + unsigned int flags) { xmlNodePtr loader_node = virXPathNode("./os/loader[1]", ctxt); const bool fwAutoSelect = def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_NONE; @@ -18234,7 +18267,14 @@ virDomainDefParseBootLoaderOptions(virDomainDef *def, fwAutoSelect) < 0) return -1; - def->os.loader->nvram = virXPathString("string(./os/nvram[1])", ctxt); + if (virXPathNode("./os/nvram[1]", ctxt)) { + def->os.loader->nvram = g_new0(virStorageSource, 1); + + if (virDomainNvramDefParseXML(def->os.loader->nvram, + ctxt, xmlopt, flags) < 0) + return -1; + } + if (!fwAutoSelect) def->os.loader->nvramTemplate = virXPathString("string(./os/nvram[1]/@template)", ctxt); @@ -18288,7 +18328,9 @@ virDomainDefParseBootAcpiOptions(virDomainDef *def, static int virDomainDefParseBootOptions(virDomainDef *def, - xmlXPathContextPtr ctxt) + xmlXPathContextPtr ctxt, + virDomainXMLOption *xmlopt, + unsigned int flags) { /* * Booting options for different OS types.... @@ -18306,7 +18348,7 @@ virDomainDefParseBootOptions(virDomainDef *def, if (virDomainDefParseBootFirmwareOptions(def, ctxt) < 0) return -1; - if (virDomainDefParseBootLoaderOptions(def, ctxt) < 0) + if (virDomainDefParseBootLoaderOptions(def, ctxt, xmlopt, flags) < 0) return -1; if (virDomainDefParseBootAcpiOptions(def, ctxt) < 0) @@ -18322,7 +18364,7 @@ virDomainDefParseBootOptions(virDomainDef *def, case VIR_DOMAIN_OSTYPE_UML: virDomainDefParseBootKernelOptions(def, ctxt); - if (virDomainDefParseBootLoaderOptions(def, ctxt) < 0) + if (virDomainDefParseBootLoaderOptions(def, ctxt, xmlopt, flags) < 0) return -1; break; @@ -19606,7 +19648,7 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, if (virDomainDefClockParse(def, ctxt) < 0) return NULL; - if (virDomainDefParseBootOptions(def, ctxt) < 0) + if (virDomainDefParseBootOptions(def, ctxt, xmlopt, flags) < 0) return NULL; /* analysis of the disk devices */ @@ -26899,7 +26941,9 @@ virDomainHugepagesFormat(virBuffer *buf, static void virDomainLoaderDefFormat(virBuffer *buf, - virDomainLoaderDef *loader) + virDomainLoaderDef *loader, + virDomainXMLOption *xmlopt, + unsigned int flags) { const char *readonly = virTristateBoolTypeToString(loader->readonly); const char *secure = virTristateBoolTypeToString(loader->secure); @@ -26921,13 +26965,27 @@ virDomainLoaderDefFormat(virBuffer *buf, else virBufferAddLit(buf, "/>\n"); - if (loader->nvram || loader->nvramTemplate) { - virBufferAddLit(buf, "<nvram"); - virBufferEscapeString(buf, " template='%s'", loader->nvramTemplate); - if (loader->nvram) - virBufferEscapeString(buf, ">%s</nvram>\n", loader->nvram); - else - virBufferAddLit(buf, "/>\n"); + if (loader->nvram) { + if (loader->nvram->type == VIR_STORAGE_TYPE_FILE) { + virBufferAddLit(buf, "<nvram"); + virBufferEscapeString(buf, " template='%s'", loader->nvramTemplate); + if (loader->nvram->path) + virBufferEscapeString(buf, ">%s</nvram>\n", loader->nvram->path); + else + virBufferAddLit(buf, "/>\n"); + } else { + virBufferAddLit(buf, "<nvram"); + virBufferEscapeString(buf, " template='%s'", loader->nvramTemplate); + virBufferAdjustIndent(buf, 2); + if (virDomainDiskSourceFormat(buf, loader->nvram, "source", 0, + 0, false, flags, true, xmlopt) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot format NVRAM source")); + return; + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</nvram>\n"); + } } } @@ -28122,7 +28180,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def, virBufferAsprintf(buf, "<initgroup>%s</initgroup>\n", def->os.initgroup); if (def->os.loader) - virDomainLoaderDefFormat(buf, def->os.loader); + virDomainLoaderDefFormat(buf, def->os.loader, xmlopt, flags); virBufferEscapeString(buf, "<kernel>%s</kernel>\n", def->os.kernel); virBufferEscapeString(buf, "<initrd>%s</initrd>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a4de46773c..f65558e82d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2231,7 +2231,7 @@ struct _virDomainLoaderDef { virTristateBool readonly; virDomainLoader type; virTristateBool secure; - char *nvram; /* path to non-volatile RAM */ + virStorageSource *nvram; char *nvramTemplate; /* user override of path to master nvram */ }; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index aa0c927578..d46c9ff36a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -581,7 +581,8 @@ qemuSetupFirmwareCgroup(virDomainObj *vm) return -1; if (vm->def->os.loader->nvram && - qemuSetupImagePathCgroup(vm, vm->def->os.loader->nvram, false) < 0) + vm->def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE && + qemuSetupImagePathCgroup(vm, vm->def->os.loader->nvram->path, false) < 0) return -1; return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c836799888..649a6f5b55 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9583,6 +9583,7 @@ qemuBuildDomainLoaderPflashCommandLine(virCommand *cmd, virQEMUCaps *qemuCaps) { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_autofree char *nvramPath = NULL; int unit = 0; if (loader->secure == VIR_TRISTATE_BOOL_YES) { @@ -9610,8 +9611,10 @@ qemuBuildDomainLoaderPflashCommandLine(virCommand *cmd, virCommandAddArgBuffer(cmd, &buf); if (loader->nvram) { + if (qemuGetDriveSourceString(loader->nvram, NULL, &nvramPath) < 0) + return; virBufferAddLit(&buf, "file="); - virQEMUBuildBufferEscapeComma(&buf, loader->nvram); + virQEMUBuildBufferEscapeComma(&buf, nvramPath); virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit); virCommandAddArg(cmd, "-drive"); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7180ae616b..303d9661a4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4452,8 +4452,13 @@ qemuDomainDefPostParse(virDomainDef *def, } if (virDomainDefHasOldStyleROUEFI(def) && - !def->os.loader->nvram) - qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); + (!def->os.loader->nvram || !def->os.loader->nvram->path)) { + + if (!def->os.loader->nvram) + def->os.loader->nvram = g_new0(virStorageSource, 1); + def->os.loader->nvram->type = VIR_STORAGE_TYPE_FILE; + qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram->path); + } if (qemuDomainDefAddDefaultDevices(driver, def, qemuCaps) < 0) return -1; @@ -11133,15 +11138,23 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm) pflash0->nodeformat = g_strdup("libvirt-pflash0-format"); pflash0->nodestorage = g_strdup("libvirt-pflash0-storage"); - if (def->os.loader->nvram) { pflash1 = virStorageSourceNew(); - pflash1->type = VIR_STORAGE_TYPE_FILE; pflash1->format = VIR_STORAGE_FILE_RAW; - pflash1->path = g_strdup(def->os.loader->nvram); + pflash1->path = g_strdup(def->os.loader->nvram->path); pflash1->readonly = false; pflash1->nodeformat = g_strdup("libvirt-pflash1-format"); pflash1->nodestorage = g_strdup("libvirt-pflash1-storage"); + + if (def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE) { + pflash1->type = VIR_STORAGE_TYPE_FILE; + } else if (def->os.loader->nvram->type == VIR_STORAGE_TYPE_NETWORK) { + pflash1->protocol = def->os.loader->nvram->protocol; + pflash1->hosts = g_new0(virStorageNetHostDef, 1); + pflash1->nhosts = 1; + pflash1->hosts[0].name = def->os.loader->nvram->hosts[0].name; + pflash1->hosts[0].port = def->os.loader->nvram->hosts[0].port; + } } priv->pflash0 = g_steal_pointer(&pflash0); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b7e83c769a..4f4098975c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6605,8 +6605,9 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } - if (vm->def->os.loader && vm->def->os.loader->nvram) { - nvram_path = g_strdup(vm->def->os.loader->nvram); + if (vm->def->os.loader && vm->def->os.loader->nvram && + vm->def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE) { + nvram_path = g_strdup(vm->def->os.loader->nvram->path); } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); } diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 51223faadf..fa99c7d217 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1192,13 +1192,16 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, VIR_FREE(def->os.loader->nvramTemplate); def->os.loader->nvramTemplate = g_strdup(flash->nvram_template.filename); - if (!def->os.loader->nvram) - qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); + if (!def->os.loader->nvram) { + def->os.loader->nvram = g_new0(virStorageSource, 1); + def->os.loader->nvram->type = VIR_STORAGE_TYPE_FILE; + qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram->path); + } VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'", def->os.loader->path, def->os.loader->nvramTemplate, - def->os.loader->nvram); + def->os.loader->nvram->path); break; case QEMU_FIRMWARE_DEVICE_KERNEL: @@ -1364,8 +1367,12 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, * its path in domain XML) but no template for NVRAM was * specified and the varstore doesn't exist ... */ if (!virDomainDefHasOldStyleROUEFI(def) || - def->os.loader->nvramTemplate || - (!reset_nvram && virFileExists(def->os.loader->nvram))) + def->os.loader->nvramTemplate || + (def->os.loader->nvram && + !reset_nvram && ((def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE + && virFileExists(def->os.loader->nvram->path)) || + (def->os.loader->nvram->type == VIR_STORAGE_TYPE_NETWORK && + def->os.loader->nvram->path)))) return 0; /* ... then we want to consult JSON FW descriptors first, diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 23681b14a4..18a24635ad 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -572,8 +572,9 @@ qemuDomainSetupLoader(virDomainObj *vm, case VIR_DOMAIN_LOADER_TYPE_PFLASH: *paths = g_slist_prepend(*paths, g_strdup(loader->path)); - if (loader->nvram) - *paths = g_slist_prepend(*paths, g_strdup(loader->nvram)); + if (loader->nvram && + loader->nvram->type == VIR_STORAGE_TYPE_FILE) + *paths = g_slist_prepend(*paths, g_strdup(loader->nvram->path)); break; case VIR_DOMAIN_LOADER_TYPE_NONE: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1ed60917ea..c8a25dbe91 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4475,7 +4475,8 @@ qemuPrepareNVRAM(virQEMUDriver *driver, struct qemuPrepareNVRAMHelperData data; if (!loader || !loader->nvram || - (virFileExists(loader->nvram) && !reset_nvram)) + loader->nvram->type != VIR_STORAGE_TYPE_FILE || + (virFileExists(loader->nvram->path) && !reset_nvram)) return 0; master_nvram_path = loader->nvramTemplate; @@ -4507,7 +4508,7 @@ qemuPrepareNVRAM(virQEMUDriver *driver, data.srcFD = srcFD; data.srcPath = master_nvram_path; - if (virFileRewrite(loader->nvram, + if (virFileRewrite(loader->nvram->path, S_IRUSR | S_IWUSR, cfg->user, cfg->group, qemuPrepareNVRAMHelper, diff --git a/src/security/security_dac.c b/src/security/security_dac.c index e9e316551e..66c36c57a3 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1971,7 +1971,8 @@ virSecurityDACRestoreAllLabel(virSecurityManager *mgr, } if (def->os.loader && def->os.loader->nvram && - virSecurityDACRestoreFileLabel(mgr, def->os.loader->nvram) < 0) + def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE && + virSecurityDACRestoreFileLabel(mgr, def->os.loader->nvram->path) < 0) rc = -1; if (def->os.kernel && @@ -2182,8 +2183,9 @@ virSecurityDACSetAllLabel(virSecurityManager *mgr, } if (def->os.loader && def->os.loader->nvram && + def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE && virSecurityDACSetOwnership(mgr, NULL, - def->os.loader->nvram, + def->os.loader->nvram->path, user, group, true) < 0) return -1; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 6f02baf2ce..1b6b67e8c7 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2806,7 +2806,8 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManager *mgr, } if (def->os.loader && def->os.loader->nvram && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram, true) < 0) + def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE && + virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram->path, true) < 0) rc = -1; if (def->os.kernel && @@ -3212,8 +3213,9 @@ virSecuritySELinuxSetAllLabel(virSecurityManager *mgr, /* This is different than kernel or initrd. The nvram store * is really a disk, qemu can read and write to it. */ if (def->os.loader && def->os.loader->nvram && + def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE && secdef && secdef->imagelabel && - virSecuritySELinuxSetFilecon(mgr, def->os.loader->nvram, + virSecuritySELinuxSetFilecon(mgr, def->os.loader->nvram->path, secdef->imagelabel, true) < 0) return -1; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 1f1cce8b3d..5803f9ff8d 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1006,8 +1006,9 @@ get_files(vahControl * ctl) if (vah_add_file(&buf, ctl->def->os.loader->path, "rk") != 0) goto cleanup; - if (ctl->def->os.loader && ctl->def->os.loader->nvram) - if (vah_add_file(&buf, ctl->def->os.loader->nvram, "rwk") != 0) + if (ctl->def->os.loader && ctl->def->os.loader->nvram && + ctl->def->os.loader->nvram->type == VIR_STORAGE_TYPE_FILE) + if (vah_add_file(&buf, ctl->def->os.loader->nvram->path, "rwk") != 0) goto cleanup; for (i = 0; i < ctl->def->ngraphics; i++) { diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index acd18494d3..d6a482d28b 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -994,10 +994,10 @@ vboxSetBootDeviceOrder(virDomainDef *def, struct _vboxDriver *data, VIR_DEBUG("def->os.cmdline %s", def->os.cmdline); VIR_DEBUG("def->os.root %s", def->os.root); if (def->os.loader) { - VIR_DEBUG("def->os.loader->path %s", def->os.loader->path); - VIR_DEBUG("def->os.loader->readonly %d", def->os.loader->readonly); - VIR_DEBUG("def->os.loader->type %d", def->os.loader->type); - VIR_DEBUG("def->os.loader->nvram %s", def->os.loader->nvram); + VIR_DEBUG("def->os.loader->path %s", def->os.loader->path); + VIR_DEBUG("def->os.loader->readonly %d", def->os.loader->readonly); + VIR_DEBUG("def->os.loader->type %d", def->os.loader->type); + VIR_DEBUG("def->os.loader->nvram->path %s", def->os.loader->nvram->path); } VIR_DEBUG("def->os.bootloader %s", def->os.bootloader); VIR_DEBUG("def->os.bootloaderArgs %s", def->os.bootloaderArgs); diff --git a/tests/qemuxml2argvdata/bios-nvram-network.args b/tests/qemuxml2argvdata/bios-nvram-network.args new file mode 100644 index 0000000000..05075b45de --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-network.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test-bios \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test-bios,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ +-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ +-drive file=iscsi://example.org:6000/iqn.1992-01.com.example,if=pflash,format=raw,unit=1 \ +-m 1024 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot menu=on,strict=on \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-device usb-tablet,id=input0,bus=usb.0,port=1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/bios-nvram-network.xml b/tests/qemuxml2argvdata/bios-nvram-network.xml new file mode 100644 index 0000000000..0e1e23fd31 --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-network.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>test-bios</name> + <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> + <nvram> + <source protocol='iscsi' name='iqn.1992-01.com.example'> + <host name='example.org' port='6000'/> + </source> + </nvram> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e7fecb24d3..7ec45ec74b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1189,6 +1189,7 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_NOCAPS("bios-nvram"); DO_TEST_PARSE_ERROR_NOCAPS("bios-nvram-no-path"); + DO_TEST_NOCAPS("bios-nvram-network"); DO_TEST_CAPS_LATEST("bios-nvram-rw"); DO_TEST_CAPS_LATEST("bios-nvram-rw-implicit"); DO_TEST("bios-nvram-secure", -- 2.25.1

2 3

[PATCH] virConnectDomainEventRegisterAny: correct docs
by John Levon 28 Mar '22

28 Mar '22

The callback ID can be zero, not necessarily positive; correct the comment to reflect this. Signed-off-by: John Levon <levon(a)movementarian.org> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a197618673..53efb60406 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -9486,7 +9486,7 @@ virDomainMigrateStartPostCopy(virDomainPtr domain, * The reference can be released once the object is no longer required * by calling virDomainFree(). * - * The return value from this method is a positive integer identifier + * The return value from this method is a non-negative integer identifier * for the callback. To unregister a callback, this callback ID should * be passed to the virConnectDomainEventDeregisterAny() method. * -- 2.32.0

3 2

[PATCH] virfile: Report error when changing pipe size fails
by Michal Privoznik 28 Mar '22

28 Mar '22

When changing the size of pipe that virFileWrapperFdNew() creates we start at 1MiB and if that fails because it's above the system wide limit we get EPERM and continue with half of the size. However, we might get another error in which case we should report proper system error and return failure from virFileWrapperFdNew(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfile.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 12b359d550..130b0fbace 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -217,7 +217,7 @@ struct _virFileWrapperFd { * * OS note: only for linux, on other OS this is a no-op. */ -static void +static int virFileWrapperSetPipeSize(int fd) { int sz; @@ -230,21 +230,24 @@ virFileWrapperSetPipeSize(int fd) continue; /* retry with half the size */ } if (rv < 0) { - break; + virReportSystemError(errno, "%s", + _("unable to set pipe size")); + return -1; } VIR_DEBUG("fd %d pipe size adjusted to %d", fd, sz); - return; + return 0; } VIR_WARN("unable to set pipe size, data transfer might be slow: %s", g_strerror(errno)); + return 0; } # else /* !__linux__ */ -static void +static int virFileWrapperSetPipeSize(int fd G_GNUC_UNUSED) { - return; + return 0; } # endif /* !__linux__ */ @@ -323,6 +326,9 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) if (virPipe(pipefd) < 0) goto error; + if (virFileWrapperSetPipeSize(pipefd[output]) < 0) + goto error; + if (!(iohelper_path = virFileFindResource("libvirt_iohelper", abs_top_builddir "/src", LIBEXECDIR))) @@ -330,8 +336,6 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) ret->cmd = virCommandNewArgList(iohelper_path, name, NULL); - virFileWrapperSetPipeSize(pipefd[output]); - if (output) { virCommandSetInputFD(ret->cmd, pipefd[0]); virCommandSetOutputFD(ret->cmd, fd); -- 2.34.1

3 3

Request to move my GitLab custom executor repo under the libvirt umbrella
by Erik Skultety 28 Mar '22

28 Mar '22

So, we successfully enabled functional testing utilizing GitLab's custom executor feature. The code responsible for creating template images and provisioning and tearing down the VM workers currently lives under my GitLab account [1] and I think it would be better if we hosted it under the libvirt umbrella, especially since the project should serve as a uniform way of setting up custom runners for anyone in the libvirt community. If you think this is not a good idea, then please speak up and raise your concerns. Note there's still quite some work to be done with the project in general, but I'd be happy for any feedback in terms of what needs to be done prior moving the project to the libvirt namespace. Regards, Erik [1] https://gitlab.com/eskultety/libvirt-gitlab-executor

2 3

[libvirt RFCv4] virfile: set pipe size in virFileWrapperFdNew to improve throughput
by Claudio Fontana 28 Mar '22

28 Mar '22

currently the only user of virFileWrapperFdNew is the qemu driver; virsh save is very slow with a default pipe size. This change improves throughput by ~400% on fast nvme or ramdisk. Best value currently measured is 1MB, which happens to be also the kernel default for the pipe-max-size. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/util/virfile.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) see v2 at https://listman.redhat.com/archives/libvir-list/2022-March/229423.html Changes v3 -> v4: * changed INFO and WARN messages to DEBUG (Daniel) Changes v2 -> v3: * removed reading of max-pipe-size from procfs, instead make multiple attempts on EPERM with smaller sizes. In the regular case, this should succeed on the first try. (Daniel) Changes v1 -> v2: * removed VIR_FILE_WRAPPER_BIG_PIPE, made the new pipe resizing unconditional (Michal) * moved code to separate functions (Michal) * removed ternary op, disliked in libvirt (Michal) * added #ifdef __linux__ (Ani Sinha) * try smallest value between currently best measured value (1MB) and the pipe-max-size setting. If pipe-max-size cannot be read, try kernel default max (1MB). (Daniel) diff --git a/src/util/virfile.c b/src/util/virfile.c index a04f888e06..87539be0b9 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -201,6 +201,50 @@ struct _virFileWrapperFd { }; #ifndef WIN32 + +#ifdef __linux__ + +/** + * virFileWrapperSetPipeSize: + * @fd: the fd of the pipe + * + * Set best pipe size on the passed file descriptor for bulk transfers of data. + * + * default pipe size (usually 64K) is generally not suited for large transfers + * to fast devices. A value of 1MB has been measured to improve virsh save + * by 400% in ideal conditions. We retry multiple times with smaller sizes + * on EPERM to account for possible small values of /proc/sys/fs/pipe-max-size. + * + * OS note: only for linux, on other OS this is a no-op. + */ +static void +virFileWrapperSetPipeSize(int fd) +{ + int sz; + + for (sz = 1024 * 1024; sz >= 64 * 1024; sz /= 2) { + int rv = fcntl(fd, F_SETPIPE_SZ, sz); + if (rv < 0 && errno == EPERM) { + VIR_DEBUG("EPERM trying to set fd %d pipe size to %d", fd, sz); + continue; /* retry with half the size */ + } + if (rv < 0) { + break; + } + VIR_DEBUG("fd %d pipe size adjusted to %d", fd, sz); + return; + } + virReportSystemError(errno, "%s", _("unable to set pipe size, data transfer might be slow")); +} + +#else /* !__linux__ */ +static void virFileWrapperSetPipeSize(int fd) +{ + return; +} +#endif /* !__linux__ */ + + /** * virFileWrapperFdNew: * @fd: pointer to fd to wrap @@ -282,6 +326,8 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) ret->cmd = virCommandNewArgList(iohelper_path, name, NULL); + virFileWrapperSetPipeSize(pipefd[!output]); + if (output) { virCommandSetInputFD(ret->cmd, pipefd[0]); virCommandSetOutputFD(ret->cmd, fd); -- 2.35.1

3 4

[build-fix PATCH] util: virfile: Fix indentation of preprocessor directives
by Peter Krempa 28 Mar '22

28 Mar '22

stderr: cppi: /home/pipo/libvirt/src/util/virfile.c: line 205: not properly indented cppi: /home/pipo/libvirt/src/util/virfile.c: line 243: not properly indented cppi: /home/pipo/libvirt/src/util/virfile.c: line 249: not properly indented build-aux/syntax-check.mk: incorrect preprocessor indentation make: *** [/home/pipo/libvirt/build-aux/syntax-check.mk:565: sc_preprocessor_indentation] Error 1 Fixes: c61d1e9ba0a0bec18fdb0bdd485060dc27a4e5cc Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed. src/util/virfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 6f2af35201..12b359d550 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -202,7 +202,7 @@ struct _virFileWrapperFd { #ifndef WIN32 -#ifdef __linux__ +# ifdef __linux__ /** * virFileWrapperSetPipeSize: @@ -240,13 +240,13 @@ virFileWrapperSetPipeSize(int fd) g_strerror(errno)); } -#else /* !__linux__ */ +# else /* !__linux__ */ static void virFileWrapperSetPipeSize(int fd G_GNUC_UNUSED) { return; } -#endif /* !__linux__ */ +# endif /* !__linux__ */ /** -- 2.35.1

1 0

[PATCH v2 0/6] qemu: Add qemu-namespace XML to override device properties (-set replacement)
by Peter Krempa 28 Mar '22

28 Mar '22

v2: - patch 1/7 from last time was pushed - XML changes: - top level element renamed to "qemu:override" to accomodate possible extension in the future - wrapped 'qemu:props' meant to override the frontend under a 'qemu:frontend' element - code changes: - renamed few bits (dropped 'Device') from code that can theoretically be reused - split out some functions for enhanced extensibility in the future Peter Krempa (6): docs: drvqemu: Document overriding of device properties qemu: domain: Add XML namespace code for overriding device config conf: Introduce VIR_DOMAIN_TAINT_CUSTOM_DEVICE and use it in qemu qemuBuildDeviceCommandlineFromJSON: Pass 'virDomainDef' into the function qemu: command: Override device definition according to the namespace config NEWS: Mention the qemu device property override feature NEWS.rst | 7 + docs/drvqemu.rst | 57 +++++ src/conf/domain_conf.c | 2 + src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 42 ++++ src/qemu/qemu_command.c | 133 +++++++---- src/qemu/qemu_domain.c | 221 ++++++++++++++++++ src/qemu/qemu_domain.h | 33 +++ .../qemu-ns.x86_64-4.0.0.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/qemu-ns.xml | 14 ++ .../qemu-ns.x86_64-latest.xml | 14 ++ 12 files changed, 478 insertions(+), 50 deletions(-) -- 2.35.1

2 8

[PATCH 0/2] Revert two patches I've pushed mistakenly
by Michal Privoznik 28 Mar '22

28 Mar '22

Firstly, QEMU part is not merged which alone should have prevented me from pushing these patches. Secondly, in the end QEMU is fixing the bug in a different manner that does not require any libvirt work. https://lists.gnu.org/archive/html/qemu-devel/2022-03/msg06077.html https://lists.gnu.org/archive/html/qemu-devel/2022-03/msg06188.html Michal Prívozník (2): Revert "domain: add tsc.on_reboot element" Revert "qemu: add support for tsc.on_reboot element" docs/formatdomain.rst | 4 -- src/conf/domain_conf.c | 17 ------- src/conf/domain_conf.h | 10 ----- src/conf/schemas/domaincommon.rng | 8 ---- src/qemu/qemu_capabilities.c | 2 - src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_command.c | 11 ----- src/qemu/qemu_validate.c | 45 ++++++++----------- .../caps_7.0.0.x86_64.replies | 4 -- .../caps_7.0.0.x86_64.xml | 1 - .../cpu-tsc-clear-on-reset.args | 32 ------------- .../cpu-tsc-clear-on-reset.x86_64-7.0.0.args | 34 -------------- .../cpu-tsc-clear-on-reset.xml | 35 --------------- tests/qemuxml2argvtest.c | 2 - 14 files changed, 19 insertions(+), 187 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-clear-on-reset.args delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-clear-on-reset.x86_64-7.0.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-clear-on-reset.xml -- 2.34.1

2 3

[PATCH v2 0/7] Do async IO when starting swtpm emulator
by Michal Privoznik 28 Mar '22

28 Mar '22

v2 of: https://listman.redhat.com/archives/libvir-list/2022-March/229433.html diff to v1: - More fixes - New test case, yay! Michal Prívozník (7): qemu_tpm: Do async IO when starting swtpm emulator vircommand: Document virCommandSetSendBuffer() behaviour wrt daemonize vircommand: Don't set nonblocking FDs in virCommandDoAsyncIO() commandtest: Use unsigned char in test27() virCommandSetSendBuffer: Take double pointer of @buffer commandtest: Test virCommandSetSendBuffer() with virCommandDoAsyncIO() commandtest: Use virTestCompareToFile() in checkoutput() src/qemu/qemu_tpm.c | 3 +- src/util/vircommand.c | 12 ++-- src/util/vircommand.h | 2 +- tests/commanddata/test29.log | 19 ++++++ tests/commandtest.c | 110 +++++++++++++++++++++++++++++------ 5 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 tests/commanddata/test29.log -- 2.34.1

4 10

[PATCH 0/2] domain, qemu: add support for clearing TSC on reset
by Paolo Bonzini 28 Mar '22

28 Mar '22

Some versions of Windows hang on reboot if their TSC value is greater than 2^54. The workaround is to reset the TSC to a small value, and is implemented by QEMU and ESXi. This series adds a domain attribute for this, and implements it in QEMU. Paolo Paolo Bonzini (2): domain: add tsc.on_reboot element qemu: add support for tsc.on_reboot element docs/formatdomain.rst | 4 +++ src/conf/domain_conf.c | 22 ++++++++++++ src/conf/domain_conf.h | 10 ++++++ src/conf/schemas/domaincommon.rng | 9 +++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 +++ src/qemu/qemu_validate.c | 36 +++++++++++++------ .../caps_7.0.0.x86_64.replies | 4 +++ .../caps_7.0.0.x86_64.xml | 1 + ...uency.args => cpu-tsc-clear-on-reset.args} | 2 +- ... cpu-tsc-clear-on-reset.x86_64-7.0.0.args} | 6 ++-- ...equency.xml => cpu-tsc-clear-on-reset.xml} | 2 +- tests/qemuxml2argvtest.c | 2 ++ 14 files changed, 89 insertions(+), 16 deletions(-) copy tests/qemuxml2argvdata/{cpu-tsc-frequency.args => cpu-tsc-clear-on-reset.args} (97%) copy tests/qemuxml2argvdata/{virtio-rng-builtin.x86_64-latest.args => cpu-tsc-clear-on-reset.x86_64-7.0.0.args} (77%) copy tests/qemuxml2argvdata/{cpu-tsc-frequency.xml => cpu-tsc-clear-on-reset.xml} (95%) -- 2.35.1

2 8

[libvirt PATCH] iohelper: some refactoring
by Claudio Fontana 26 Mar '22

26 Mar '22

while doing research with alternative implementations of runIO, it seemed necessary to do some refactoring, in order to separate parameter setting from the actual copy, so that alternative copy methods can be researched and hopefully eventually implemented. No functional changes are expected. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/util/iohelper.c | 193 +++++++++++++++++++++++++++----------------- 1 file changed, 118 insertions(+), 75 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 2c91bf4f93..c04c97af27 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -45,21 +45,38 @@ # define O_DIRECT 0 #endif -static int -runIO(const char *path, int fd, int oflags) +struct runIOParams { + bool isBlockDev; + bool isDirect; + bool isWrite; + int fdin; + const char *fdinname; + int fdout; + const char *fdoutname; +}; + +/* runIOCopy: execute the IO copy based on the passed parameters */ +/** + * runIOCopy: + * @p: the IO parameters + * + * Execute the copy based on the passed parameters. + * + * Returns: size transfered, or < 0 on error. + * Errors: -1 = read/write error + * -2 = read error + * -3 = write error + * -4 = truncate error + */ + +static ssize_t +runIOCopy(const struct runIOParams p) { g_autofree void *base = NULL; /* Location to be freed */ char *buf = NULL; /* Aligned location within base */ size_t buflen = 1024*1024; intptr_t alignMask = 64*1024 - 1; - int ret = -1; - int fdin, fdout; - const char *fdinname, *fdoutname; - unsigned long long total = 0; - bool direct = O_DIRECT && ((oflags & O_DIRECT) != 0); - off_t end = 0; - struct stat sb; - bool isBlockDev = false; + ssize_t total = 0; #if WITH_POSIX_MEMALIGN if (posix_memalign(&base, alignMask + 1, buflen)) @@ -71,50 +88,6 @@ runIO(const char *path, int fd, int oflags) buf = (char *) (((intptr_t) base + alignMask) & ~alignMask); #endif - if (fstat(fd, &sb) < 0) { - virReportSystemError(errno, - _("Unable to access file descriptor %d path %s"), - fd, path); - goto cleanup; - } - isBlockDev = S_ISBLK(sb.st_mode); - - switch (oflags & O_ACCMODE) { - case O_RDONLY: - fdin = fd; - fdinname = path; - fdout = STDOUT_FILENO; - fdoutname = "stdout"; - /* To make the implementation simpler, we give up on any - * attempt to use O_DIRECT in a non-trivial manner. */ - if (!isBlockDev && direct && ((end = lseek(fd, 0, SEEK_CUR)) != 0)) { - virReportSystemError(end < 0 ? errno : EINVAL, "%s", - _("O_DIRECT read needs entire seekable file")); - goto cleanup; - } - break; - case O_WRONLY: - fdin = STDIN_FILENO; - fdinname = "stdin"; - fdout = fd; - fdoutname = path; - /* To make the implementation simpler, we give up on any - * attempt to use O_DIRECT in a non-trivial manner. */ - if (!isBlockDev && direct && (end = lseek(fd, 0, SEEK_END)) != 0) { - virReportSystemError(end < 0 ? errno : EINVAL, "%s", - _("O_DIRECT write needs empty seekable file")); - goto cleanup; - } - break; - - case O_RDWR: - default: - virReportSystemError(EINVAL, - _("Unable to process file with flags %d"), - (oflags & O_ACCMODE)); - goto cleanup; - } - while (1) { ssize_t got; @@ -124,53 +97,123 @@ runIO(const char *path, int fd, int oflags) * writes will be aligned. * In other cases using saferead reduces number of syscalls. */ - if (fdin == fd && direct) { - if ((got = read(fdin, buf, buflen)) < 0 && + if (!p.isWrite && p.isDirect) { + if ((got = read(p.fdin, buf, buflen)) < 0 && errno == EINTR) continue; } else { - got = saferead(fdin, buf, buflen); - } - - if (got < 0) { - virReportSystemError(errno, _("Unable to read %s"), fdinname); - goto cleanup; + got = saferead(p.fdin, buf, buflen); } + if (got < 0) + return -2; if (got == 0) break; total += got; /* handle last write size align in direct case */ - if (got < buflen && direct && fdout == fd) { + if (got < buflen && p.isDirect && p.isWrite) { ssize_t aligned_got = (got + alignMask) & ~alignMask; memset(buf + got, 0, aligned_got - got); - if (safewrite(fdout, buf, aligned_got) < 0) { - virReportSystemError(errno, _("Unable to write %s"), fdoutname); - goto cleanup; + if (safewrite(p.fdout, buf, aligned_got) < 0) { + return -3; } - - if (!isBlockDev && ftruncate(fd, total) < 0) { - virReportSystemError(errno, _("Unable to truncate %s"), fdoutname); - goto cleanup; + if (!p.isBlockDev && ftruncate(p.fdout, total) < 0) { + return -4; } - break; } + } + return total; +} - if (safewrite(fdout, buf, got) < 0) { - virReportSystemError(errno, _("Unable to write %s"), fdoutname); +static int +runIO(const char *path, int fd, int oflags) +{ + int ret = -1; + off_t total = 0; + struct stat sb; + struct runIOParams p; + + if (fstat(fd, &sb) < 0) { + virReportSystemError(errno, + _("Unable to access file descriptor %d path %s"), + fd, path); + goto cleanup; + } + p.isBlockDev = S_ISBLK(sb.st_mode); + p.isDirect = O_DIRECT && (oflags & O_DIRECT); + + switch (oflags & O_ACCMODE) { + case O_RDONLY: + p.isWrite = false; + p.fdin = fd; + p.fdinname = path; + p.fdout = STDOUT_FILENO; + p.fdoutname = "stdout"; + break; + case O_WRONLY: + p.isWrite = true; + p.fdin = STDIN_FILENO; + p.fdinname = "stdin"; + p.fdout = fd; + p.fdoutname = path; + break; + case O_RDWR: + default: + virReportSystemError(EINVAL, + _("Unable to process file with flags %d"), + (oflags & O_ACCMODE)); + goto cleanup; + } + /* To make the implementation simpler, we give up on any + * attempt to use O_DIRECT in a non-trivial manner. */ + if (!p.isBlockDev && p.isDirect) { + off_t end; + if (p.isWrite) { + if ((end = lseek(fd, 0, SEEK_END)) != 0) { + virReportSystemError(end < 0 ? errno : EINVAL, "%s", + _("O_DIRECT write needs empty seekable file")); + goto cleanup; + } + } else if ((end = lseek(fd, 0, SEEK_CUR)) != 0) { + virReportSystemError(end < 0 ? errno : EINVAL, "%s", + _("O_DIRECT read needs entire seekable file")); goto cleanup; } } + total = runIOCopy(p); + + if (total < 0) { + switch (total) { + case -1: + virReportSystemError(errno, _("Unable to move data from %s to %s"), + p.fdinname, p.fdoutname); + break; + case -2: + virReportSystemError(errno, _("Unable to read %s"), p.fdinname); + break; + case -3: + virReportSystemError(errno, _("Unable to write %s"), p.fdoutname); + break; + case -4: + virReportSystemError(errno, _("Unable to truncate %s"), p.fdoutname); + break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown runIOCopy error %ld"), total); + break; + } + goto cleanup; + } + /* Ensure all data is written */ - if (virFileDataSync(fdout) < 0) { + if (virFileDataSync(p.fdout) < 0) { if (errno != EINVAL && errno != EROFS) { /* fdatasync() may fail on some special FDs, e.g. pipes */ - virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + virReportSystemError(errno, _("unable to fsync %s"), p.fdoutname); goto cleanup; } } -- 2.35.1

1 1

[PATCH v2 00/19] Refactoring conf to use XPath
by Kristina Hanicova 25 Mar '22

25 Mar '22

This is v2 from https://listman.redhat.com/archives/libvir-list/2021-April/msg00617.html Changes since v1: - rebase to the lastest git master This series reworks the outdated way of parsing XML to parsing by XPath, which is more obvious and saves a few lines of code. Kristina Hanicova (19): conf: Propagate xmlXPathContextPtr into virDomainHostdevSubsysUSBDefParseXML() Refactoring virDomainHostdevSubsysUSBDefParseXML() to use XPath conf: Propagate xmlXPathContextPtr into virDomainBlkioDeviceParseXML() Refactoring virDomainBlkioDeviceParseXML() to use XPath conf: Propagate xmlXPathContextPtr into virDomainHostdevSubsysPCIDefParseXML() Refactoring virDomainHostdevSubsysPCIDefParseXML() to use XPath conf: Propagate xmlXPathContextPtr into virDomainLeaseDefParseXML() Refactoring virDomainLeaseDefParseXML() to use XPath Refactoring virDomainFSDefParseXML() to use XPath Refactoring virDomainNetDefParseXML() to use XPath conf: Propagate xmlXPathContextPtr into virDomainChrDefParseTargetXML() Refactoring virDomainChrDefParseTargetXML() to use XPath Refactoring virDomainChrSourceDefParseXML() to use XPath Refactoring virDomainChrDefParseXML() to use XPath Refactoring virDomainSmartcardDefParseXML() to use XPath Refactoring virDomainGraphicsDefParseXMLSpice() to use XPath conf: Propagate xmlXPathContextPtr into virDomainVideoDriverDefParseXML() Refactoring virDomainVideoDriverDefParseXML() to use XPath Refactoring virDomainVideoDefParseXML() to use XPath src/conf/domain_conf.c | 1641 +++++++++++++++++----------------------- 1 file changed, 707 insertions(+), 934 deletions(-) -- 2.30.2

3 26

[PATCH v2] meson: do not look for libparted if not necessary
by Paolo Bonzini 25 Mar '22

25 Mar '22

libparted_dep is not used if -Dstorage_disk=disabled. Do not bother looking for it if the disk storage backend was not requested. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index eb13c7efa4..27c21d1d67 100644 --- a/meson.build +++ b/meson.build @@ -1013,7 +1013,7 @@ else endif libparted_version = '1.8.0' -libparted_dep = dependency('libparted', version: '>=' + libparted_version, required: false) +libparted_dep = dependency('libparted', version: '>=' + libparted_version, required: get_option('storage_disk')) libpcap_version = '1.5.0' if not get_option('libpcap').disabled() -- 2.35.1

2 1

[PATCH] meson: do not look for librbd/librados if not requested
by Paolo Bonzini 25 Mar '22

25 Mar '22

rbd_dep is not used if -Dstorage_rbd=disabled. Do not bother looking for the libraries that compose it if the rbd storage backend was not requested. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 2c1d3bc64d..eb13c7efa4 100644 --- a/meson.build +++ b/meson.build @@ -1127,8 +1127,8 @@ parallels_sdk_dep = dependency('parallels-sdk', version: '>=' + parallels_sdk_ve pciaccess_version = '0.10.0' pciaccess_dep = dependency('pciaccess', version: '>=' + pciaccess_version, required: get_option('pciaccess')) -rbd_dep = cc.find_library('rbd', required: false) -rados_dep = cc.find_library('rados', required: false) +rbd_dep = cc.find_library('rbd', required: get_option('storage_rbd')) +rados_dep = cc.find_library('rados', required: get_option('storage_rbd')) if rbd_dep.found() and not cc.has_function('rbd_get_features', dependencies: rbd_dep) rbd_dep = dependency('', required: false) endif -- 2.35.1

2 1

[PATCH] meson: do not look for libdevmapper/libparted if not requested
by Paolo Bonzini 25 Mar '22

25 Mar '22

devmapper_dep and libparted_dep are not used if -Dstorage_disk=disabled. Do not bother looking for these libraries if the disk storage backend was not requested. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index eb13c7efa4..9d1f90fc80 100644 --- a/meson.build +++ b/meson.build @@ -933,7 +933,7 @@ if curl_dep.found() endif devmapper_version = '1.0.0' -devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false) +devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: get_option('storage_disk')) if devmapper_dep.found() conf.set('WITH_DEVMAPPER', 1) endif @@ -1013,7 +1013,7 @@ else endif libparted_version = '1.8.0' -libparted_dep = dependency('libparted', version: '>=' + libparted_version, required: false) +libparted_dep = dependency('libparted', version: '>=' + libparted_version, required: get_option('storage_disk')) libpcap_version = '1.5.0' if not get_option('libpcap').disabled() -- 2.35.1

2 1

[PATCH] tests: add dependencies to meson declaration
by Paolo Bonzini 25 Mar '22

25 Mar '22

Make sure that all tests are run after the helpers and mocks are (re)built. This enables for example using "meson test" as the command line passed to "git bisect run". Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- tests/meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index 8f92f2033f..fd78d8a2fd 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -191,8 +191,9 @@ test_file_wrapper_lib = static_library( dependencies: [ tests_dep ], ) +tests_deps = [] foreach mock : mock_libs - shared_library( + tests_deps += shared_library( mock['name'], mock.get('sources', [ '@0@.c'.format(mock['name']) ]), override_options: [ @@ -215,7 +216,7 @@ endforeach # Must not link to any libvirt modules - libc only otherwise external # libraries might unexpectedly leak file descriptors into commandhelper # invalidating the test logic assumptions. -executable( +tests_deps += executable( 'commandhelper', [ 'commandhelper.c' ], dependencies: [ @@ -227,7 +228,7 @@ executable( ) # This is a fake SSH we use from virnetsockettest -executable( +tests_deps += executable( 'ssh', [ 'ssh.c' ], dependencies: [ @@ -592,7 +593,7 @@ foreach data : tests # default meson timeout timeout = 30 endif - test(data['name'], test_bin, env: tests_env, timeout: timeout) + test(data['name'], test_bin, env: tests_env, timeout: timeout, depends: tests_deps) endforeach -- 2.35.1

2 1

[libvirt RFCv3] virfile: set pipe size in virFileWrapperFdNew to improve throughput
by Claudio Fontana 25 Mar '22

25 Mar '22

currently the only user of virFileWrapperFdNew is the qemu driver; virsh save is very slow with a default pipe size. This change improves throughput by ~400% on fast nvme or ramdisk. Best value currently measured is 1MB, which happens to be also the kernel default for the pipe-max-size. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- see v2 at https://listman.redhat.com/archives/libvir-list/2022-March/229423.html Changes v2 -> v3: * removed reading of max-pipe-size from procfs, instead make multiple attempts on EPERM with smaller sizes. In the regular case, this should succeed on the first try. (Daniel) Changes v1 -> v2: * removed VIR_FILE_WRAPPER_BIG_PIPE, made the new pipe resizing unconditional (Michal) * moved code to separate functions (Michal) * removed ternary op, disliked in libvirt (Michal) * added #ifdef __linux__ (Ani Sinha) * try smallest value between currently best measured value (1MB) and the pipe-max-size setting. If pipe-max-size cannot be read, try kernel default max (1MB). (Daniel) src/util/virfile.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index a04f888e06..876b865974 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -201,6 +201,51 @@ struct _virFileWrapperFd { }; #ifndef WIN32 + +#ifdef __linux__ + +/** + * virFileWrapperSetPipeSize: + * @fd: the fd of the pipe + * + * Set best pipe size on the passed file descriptor for bulk transfers of data. + * + * default pipe size (usually 64K) is generally not suited for large transfers + * to fast devices. A value of 1MB has been measured to improve virsh save + * by 400% in ideal conditions. We retry multiple times with smaller sizes + * on EPERM to account for possible small values of /proc/sys/fs/pipe-max-size. + * + * Return value is 0 on success, -1 and errno set on error. + * OS note: only for linux, on other OS this is a no-op. + */ +static int +virFileWrapperSetPipeSize(int fd) +{ + int sz; + + for (sz = 1024 * 1024; sz >= 64 * 1024; sz /= 2) { + int rv = fcntl(fd, F_SETPIPE_SZ, sz); + if (rv < 0 && errno == EPERM) { + continue; /* retry with half the size */ + } + if (rv < 0) { + break; + } + VIR_INFO("fd %d pipe size adjusted to %d", fd, sz); + return 0; + } + VIR_WARN("failed to set pipe size to %d (errno=%d)", sz, errno); + return -1; +} + +#else /* !__linux__ */ +static int virFileWrapperSetPipeSize(int fd) +{ + return 0; +} +#endif /* !__linux__ */ + + /** * virFileWrapperFdNew: * @fd: pointer to fd to wrap @@ -282,6 +327,10 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) ret->cmd = virCommandNewArgList(iohelper_path, name, NULL); + if (virFileWrapperSetPipeSize(pipefd[!output]) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("unable to set pipe size, data transfer might be slow")); + } + if (output) { virCommandSetInputFD(ret->cmd, pipefd[0]); virCommandSetOutputFD(ret->cmd, fd); -- 2.35.1

2 5

[PATCH 0/5] Generalize job enums across all hypervisors
by Kristina Hanicova 25 Mar '22

25 Mar '22

2 7

[libvirt RFC v2] virfile: set pipe size in virFileWrapperFdNew to improve throughput
by Claudio Fontana 25 Mar '22

25 Mar '22

virsh save is very slow with a default pipe size, so set a larger one. This change improves throughput by ~400% on fast nvme or ramdisk, for the current only user of virFileWrapperFdNew: the qemu driver. Best value currently measured is 1MB, which happens to be also the kernel default for the pipe-max-size. We do not try to use a pipe buffer larger than what the setting of /proc/sys/fs/pipe-max-size currently allows. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/util/virfile.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) see v1 at https://listman.redhat.com/archives/libvir-list/2022-March/229252.html Changes v1 -> v2: * removed VIR_FILE_WRAPPER_BIG_PIPE, made the new pipe resizing unconditional (Michal) * moved code to separate functions (Michal) * removed ternary op, disliked in libvirt (Michal) * added #ifdef __linux__ (Ani Sinha) * try smallest value between currently best measured value (1MB) and the pipe-max-size setting. If pipe-max-size cannot be read, try kernel default max (1MB). (Daniel) diff --git a/src/util/virfile.c b/src/util/virfile.c index a04f888e06..13bdd42c68 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -201,6 +201,71 @@ struct _virFileWrapperFd { }; #ifndef WIN32 + +#ifdef __linux__ +/** + * virFileWrapperGetBestPipeSize: + * + * get the best pipe size to use with virFileWrapper. + * + * We first check the maximum we are allowed by the system pipe-max-size, + * and then use the minimum between that and our tested best value. + * This is because a request beyond pipe-max-size may fail with EPERM. + * If we are unable to read pipe-max-size, use the kernel default (1MB). + * + * Return value is the pipe size to use. + */ + +static int virFileWrapperGetBestPipeSize(void) +{ + const char path[] = "/proc/sys/fs/pipe-max-size"; + int best_sz = 1024 * 1024; /* good virsh save results with this size */ + int max_sz; + + if (virFileReadValueInt(&max_sz, path) < 0) { + max_sz = 1024 * 1024; /* this is the kernel default pipe-max-size */ + VIR_WARN("failed to read %s, trying default %d", path, max_sz); + } else if (max_sz > best_sz) { + max_sz = best_sz; + } + return max_sz; +} + +/** + * virFileWrapperSetPipeSize: + * @fd: the fd of the pipe + * + * Set best pipe size on the passed file descriptor for bulk transfers of data. + * + * default pipe size (usually 64K) is generally not suited for large transfers + * to fast devices. This has been measured to improve virsh save by 400% + * in ideal conditions. + * + * Return value is 0 on success, -1 and errno set on error. + * OS note: only for linux, on other OS this is a no-op. + */ +static int +virFileWrapperSetPipeSize(int fd) +{ + int pipe_sz = virFileWrapperGetBestPipeSize(); + int rv = fcntl(fd, F_SETPIPE_SZ, pipe_sz); + + if (rv < 0) { + VIR_ERROR(_("failed to set pipe size to %d (errno=%d)"), pipe_sz, errno); + return -1; + } + VIR_INFO("fd %d pipe size adjusted to %d", fd, rv); + return 0; +} + +#else /* !__linux__ */ +static int virFileWrapperSetPipeSize(int fd) +{ + return 0; +} +#endif /* !__linux__ */ + + /** * virFileWrapperFdNew: * @fd: pointer to fd to wrap @@ -282,6 +347,10 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) ret->cmd = virCommandNewArgList(iohelper_path, name, NULL); + if (virFileWrapperSetPipeSize(pipefd[!output]) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("unable to set pipe size, data transfer might be slow")); + } + if (output) { virCommandSetInputFD(ret->cmd, pipefd[0]); virCommandSetOutputFD(ret->cmd, fd); -- 2.35.1

2 3

[PATCH] error message in virDomainDiskDefIotuneParse shifted to virDomainDefPostParseCheck
by Jamm02 25 Mar '22

25 Mar '22

From: Moteen Shah <moteenshah.02(a)gmail.com> domain_conf.c: all the option collision total and... error messages in virDomainDiskDefIotuneParse shifted to new function virDomainDefPostParseCheck --- src/conf/domain_conf.c | 86 ++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 153954a0b0..f2480f37f6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6229,6 +6229,50 @@ 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, @@ -8784,47 +8828,7 @@ 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; + return virDomainDefPostParseCheck(def); } #undef PARSE_IOTUNE -- 2.35.1

2 1

[PATCH 0/2] qemu: remove else after return / goto
by Kristina Hanicova 25 Mar '22

25 Mar '22

Kristina Hanicova (2): qemu: remove unnecessary else branches after return / goto qemu: remove else branches after return in qemuMigrationSrcPerform() src/qemu/qemu_domainjob.c | 3 +- src/qemu/qemu_migration.c | 59 +++++++++++++++++++-------------------- src/qemu/qemu_process.c | 4 +-- src/qemu/qemu_snapshot.c | 13 ++++----- 4 files changed, 38 insertions(+), 41 deletions(-) -- 2.35.1

2 4

[PATCH] kbase: Fix the syntax of the snapshot link in index.rst
by Han Han 25 Mar '22

25 Mar '22

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/kbase/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/index.rst b/docs/kbase/index.rst index 77b23e96a8..860bfde71f 100644 --- a/docs/kbase/index.rst +++ b/docs/kbase/index.rst @@ -55,7 +55,7 @@ Usage `Memory devices <memorydevices.html>`__ Memory devices and their use -`Snapshots <snapshots.html>` +`Snapshots <snapshots.html>`__ Details about snapshotting a VM -- 2.35.1

2 1

[PATCH 0/4] Introduce memory allocation threads
by Michal Privoznik 24 Mar '22

24 Mar '22

*** BLURB HERE *** Michal Prívozník (4): conf: Introduce memory allocation threads qemu_capabilities: Detect memory-backend-*.prealloc-threads property qemu_validate: Validate prealloc threads against qemuCpas qemu_command: Generate prealloc-threads property docs/formatdomain.rst | 6 ++++-- docs/schemas/domaincommon.rng | 19 +++++++++++++------ src/conf/domain_conf.c | 15 ++++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- src/qemu/qemu_validate.c | 7 +++++++ .../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 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../memfd-memory-numa.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- 30 files changed, 69 insertions(+), 13 deletions(-) -- 2.34.1

4 15

[PATCH v2 0/3] qemu: don't pause VM when creating internal snapshot
by Nikolay Shirokovskiy 24 Mar '22

24 Mar '22

Diff to v1 [1]: - fix mistake of dropping hunk that starts CPUs if snapshot was not successful. We still need it if halt upon snapshot is requested. The is series is mostly about the first patch. The others patch are minor cleanups. [1] v1 version https://listman.redhat.com/archives/libvir-list/2022-March/229437.html Maxim Nestratov (1): qemu: don't pause vm when creating internal snapshot Nikolay Shirokovskiy (2): qemu: remove excessive check in qemuSnapshotCreateActiveInternal qemu: remove unnecessary gotos in qemuSnapshotCreateActiveInternal src/qemu/qemu_snapshot.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) -- 2.35.1

1 3

[PATCH 0/3] qemu: don't pause vm when creating internal snapshot
by Nikolay Shirokovskiy 24 Mar '22

24 Mar '22

The is series is mostly about the first patch. The others patch are minor cleanups. Maxim Nestratov (1): qemu: don't pause vm when creating internal snapshot Nikolay Shirokovskiy (2): qemu: remove excessive check in qemuSnapshotCreateActiveInternal qemu: remove unnecessary goto in qemuSnapshotCreateActiveInternal src/qemu/qemu_snapshot.c | 65 +++++++++++----------------------------- 1 file changed, 18 insertions(+), 47 deletions(-) -- 2.35.1

1 4

[RFC 0/1] virxml: Accept 'default' for virTristate* properties
by Andrea Bolognani 24 Mar '22

24 Mar '22

Sending this as an RFC because it's incomplete. After virXMLPropTristate*() had been introduced, existing code was gradually converted to use the new helpers; however, if you look for example at 593140dabd66 you'll see that the original implementation considered encountering 'default' to be an error, and the change I'm proposing would relax such a check. So we need to go through the callers one by one, adapting them as necessary (in this case, we would pass VIR_XML_PROP_NONZERO in addition to existing flags) to ensure that the original semantic is preserved. Any better ideas? Andrea Bolognani (1): virxml: Accept 'default' for virTristate* properties src/util/virxml.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.35.1

4 10

[libvirt PATCH 0/3] Enable copy/paste for vnc displays
by Jonathon Jongsma 23 Mar '22

23 Mar '22

This patch series enables support for the qemu-vdagent character device which enables copy/paste support between guest and client when using vnc graphics. The guest must be configured with something like the following: <channel type='qemu-vdagent'> <source clipboard='on' mouse='on'/> <target type='virtio' name='com.redhat.spice.0'/> </channel> Copy/paste sync requires a vnc client that has support for copy/paste commands. Currently virt-viewer does not work, but the version of tigervnc provided by fedora (executable name 'vncviewer') does work. More details about this device on Gerd's blog: https://www.kraxel.org/blog/2021/05/qemu-cut-paste/ OPEN QUESTIONS: - I'm not fully convinced that the `<source>` element is the right place for the new `clipboard` / `mouse` configuration options, but I'm not sure that adding a new xml element to the `<channel>` is the right approach either. Suggestions welcome. - There may be an expectation that vnc clipboard is enabled using the <graphics type='vnc'><clipboard copypaste='yes'/></graphics> similar to what spice offers. In fact, it seems that this is the approach Marc-Andre took when adding copy/paste support in his dbus display patch series. But even for spice, this <clipboard> configuration element is not enough to enable the copy/paste feature. It also requires a 'spicevmc' character device to be added to the domain. Jonathon Jongsma (3): qemu: add capability for qemu-vdagent chardev conf: add qemu-vdagent channel qemu: add support for qemu-vdagent channel docs/formatdomain.rst | 17 ++++++ src/conf/domain_conf.c | 49 ++++++++++++++++- src/conf/domain_conf.h | 7 +++ src/conf/domain_validate.c | 1 + src/conf/schemas/domaincommon.rng | 11 ++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +++++ src/qemu/qemu_monitor_json.c | 10 ++++ src/qemu/qemu_process.c | 1 + src/qemu/qemu_validate.c | 1 + src/security/security_dac.c | 2 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.aarch64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../channel-qemu-vdagent.x86_64-latest.args | 41 ++++++++++++++ .../qemuxml2argvdata/channel-qemu-vdagent.xml | 34 ++++++++++++ tests/qemuxml2argvtest.c | 1 + .../channel-qemu-vdagent.x86_64-latest.xml | 55 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + tests/testutilsqemu.c | 1 + 22 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-qemu-vdagent.xml create mode 100644 tests/qemuxml2xmloutdata/channel-qemu-vdagent.x86_64-latest.xml -- 2.35.1

3 10

[libvirt PATCH] ci: integration: Rename all Avocado standard stream log files to *.log
by Erik Skultety 22 Mar '22

22 Mar '22

By default, stdout/stderr Avocado test log files do not have any file extension which confuses GitLab's web UI to mangle the MIME type for these and so the browser will never offer the option to open such file from in a text editor rather than dowloading it. Since GitLab sets a proper MIME for .txt and .log file extensions, rename all Avocado log files without an extension to *.log . This pairs nicely with the coredumpctl info file which we already name as 'coredumpctl.txt' because of this. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Here are 2 artifact web UI views on a failed job which you can try yourself in your browser: Before this patch: https://gitlab.com/eskultety/libvirt/-/jobs/2232852413/artifacts/browse/log… After this patch: https://gitlab.com/eskultety/libvirt/-/jobs/2234111527/artifacts/browse/log… ci/integration.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/integration.yml b/ci/integration.yml index 519494cfd5..2808e829ef 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -36,6 +36,9 @@ - sudo coredumpctl info --no-pager > logs/coredumpctl.txt - sudo mv /var/log/libvirt logs/libvirt - sudo chown -R $(whoami):$(whoami) logs + # rename all Avocado stderr/stdout logs to *.log so that GitLab's web UI doesn't mangle the MIME type + - find logs/avocado/ -type f ! -name "*.log" -exec + sh -c 'DIR=$(dirname {}); NAME=$(basename {}); mv $DIR/$NAME{,.log}' \; variables: SCRATCH_DIR: "/tmp/scratch" artifacts: -- 2.34.1

3 5

[libvirt PATCH] keycodemapdb: Update git submodule
by Andrea Bolognani 22 Mar '22

22 Mar '22

This brings in all the fixes made since April 2020. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/keycodemapdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keycodemapdb b/src/keycodemapdb index 27acf0ef82..57ba70da53 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 27acf0ef828bf719b2053ba398b195829413dbdd +Subproject commit 57ba70da5312170883a3d622cd2aa3fd0e2ec7ae -- 2.35.1

2 1