April 2022 - Devel - libvirt List Archives

[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 08 Apr '22

08 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