- Devel - libvirt List Archives

[PATCH] qemu_namespace: Deal with nested mounts when umount()-ing /dev
by Michal Privoznik 07 Feb '23

07 Feb '23

In one of recent commits (v9.0.0-rc1~106) I've made our QEMU namespace code umount the original /dev. One of the reasons was enhanced security, because previously we just mounted a tmpfs over the original /dev. Thus a malicious QEMU could just umount("/dev") and it would get to the original /dev with all nodes. Now, on some systems this introduced a regression: failed to umount devfs on /dev: Device or resource busy But how this could be? We've moved all file systems mounted under /dev to a temporary location. Or have we? As it turns out, not quite. If there are two file systems mounted on the same target, e.g. like this: mount -t tmpfs tmpfs /dev/shm/ && mount -t tmpfs tmpfs /dev/shm/ then only the top most (i.e. the last one) is moved. See qemuDomainUnshareNamespace() for more info. Now, we could enhance our code to deal with these "doubled" mount points. Or, since it is the top most file system that is accessible anyways (and this one is preserved), we can umount("/dev") in a recursive fashion. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2167302 Fixes: 379c0ce4bfed8733dfbde557c359eecc5474ce38 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 5769a4dfe0..5fc043bd62 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -777,7 +777,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, } #if defined(__linux__) - if (umount("/dev") < 0) { + if (umount2("/dev", MNT_DETACH) < 0) { virReportSystemError(errno, "%s", _("failed to umount devfs on /dev")); return -1; } -- 2.39.1

2 1

[PATCH 00/10] remote: Pass 'mode' and 'socket' URI parameters to virt-ssh-helper
by Michal Privoznik 07 Feb '23

07 Feb '23

The first couple of patches are cleanups, mostly. The last 5 patches are the important ones. Now, the fix I went with in the 10/10 is to format URI anew, just for the virt-ssh-helper's sake. I did not want to touch @name as it's passed to sub-daemon's .open() method. If desired, I can change the @name variable instead as it seems that no driver relies on ?mode or ?socket (they couldn't anyway). Thoughts? Michal Prívozník (10): viruri: Search params case insensitively Drop checks for virURIFormat() retval doRemoteOpen(): Rename 'failed' label to 'error' remote_driver: Expose EXTRACT_URI_ARG_* macros src: Unify URI params parsing virt-ssh-helper: Accept ?mode= in connection URI virt-ssh-helper: Accept ?socket= in connection URI remote_driver: Move URI re-generation into a function viruri: Introduce virURIParamsSetIgnore() remote: Pass 'mode' and 'socket' URI parameters to virt-ssh-helper po/POTFILES | 1 + src/admin/libvirt-admin.c | 21 ++-- src/esx/esx_util.c | 96 ++++++++-------- src/hyperv/hyperv_util.c | 30 +++-- src/libvirt-host.c | 10 +- src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 3 +- src/qemu/qemu_migration.c | 24 ++-- src/remote/remote_driver.c | 158 +++++++++++++------------- src/remote/remote_ssh_helper.c | 27 ++++- src/storage/storage_backend_gluster.c | 6 +- src/util/virauth.c | 12 +- src/util/viruri.c | 24 +++- src/util/viruri.h | 37 ++++++ tests/viruritest.c | 3 +- 15 files changed, 245 insertions(+), 208 deletions(-) -- 2.39.1

4 22

[PATCH] qemu: Jump to cleanup label on umount failure
by Jim Fehlig 07 Feb '23

07 Feb '23

Similar to other error paths in qemuDomainUnshareNamespace(), jump to the cleanup label on umount error instead of directly returning -1. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I noticed this while looking at a bug report containing the error. ATM I'm not sure why the umount failed, but have asked for more info in the bug https://bugzilla.opensuse.org/show_bug.cgi?id=1207889 src/qemu/qemu_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 5769a4dfe0..833313d5a6 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -779,7 +779,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, #if defined(__linux__) if (umount("/dev") < 0) { virReportSystemError(errno, "%s", _("failed to umount devfs on /dev")); - return -1; + goto cleanup; } #endif /* !defined(__linux__) */ -- 2.39.1

2 1

[PATCH 0/2] virhostdevtest: Initialize hostdev @subsys
by Michal Privoznik 06 Feb '23

06 Feb '23

While the first one qualifies to be pushed as trivial, the second less so. I'll wait a while and if there's no reply I'll just push these, as the build is currently broken. Michal Prívozník (2): virhostdevtest: Initialize hostdev @subsys virhostdevtest: Decrease possibility of uninitialized @subsys tests/virhostdevtest.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.39.1

3 4

[PATCH] Revert ".gitignore: Ignore cscope and other *tags files"
by Martin Kletzander 06 Feb '23

06 Feb '23

This reverts commit f2d379e7cb802f922409c35e4831ee52a2162486. On top of that it also removes the `/tags` file because we don't even have the `make tags` target any more. Any tool-related ignores should go to user's global ignore file or the user's local exclude file which is per-project. See git-config(1) and gitignore(5) for more details. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.gitignore b/.gitignore index 61ea7779b02b..0898c0d29f3c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,17 +20,6 @@ __pycache__/ /build/ /ci/scratch/ -# *tags and cscope files -/GPATH -/GRTAGS -/GTAGS -/TAGS -/cscope.files -/cscope.in.out -/cscope.out -/cscope.po.out -/tags - # clangd related ignores .clangd compile_commands.json -- 2.39.1

2 4

[PATCH v3 0/5] logging: add log cleanup for obsolete domains
by Oleg Vasilev 06 Feb '23

06 Feb '23

Presently, logs from deleted domains remain forever. Particular motivation comes from the case when libguestfs has repeatedly created transient VMs, which in turn created plenty of logs. This takes up space and lots of files troubles filesystem navigation. More motivation in [1]. Patch solving same problem in [2]. Changes in v3: codestyle cleanup, minor fixes Changes in v2: substantial rework according to Martin Kletzander's comments v1: https://www.mail-archive.com/libvir-list@redhat.com/msg233754.html v2: https://www.spinics.net/linux/fedora/libvir/msg236081.html [1]: https://listman.redhat.com/archives/libvir-list/2022-February/228149.html [2]: https://listman.redhat.com/archives/libvir-list/2022-February/msg00865.html CC: Martin Kletzander <mkletzan(a)redhat.com> Oleg Vasilev (5): logging: refactor to store config inside log handler logging: move virLogHandler to header logging: add configuration for future log cleaner logging: add log cleanup for obsolete domains logging: use the log cleaner po/POTFILES | 1 + src/logging/log_cleaner.c | 268 +++++++++++++++++++++++++++++++ src/logging/log_cleaner.h | 29 ++++ src/logging/log_daemon.c | 6 +- src/logging/log_daemon_config.c | 9 ++ src/logging/log_daemon_config.h | 3 + src/logging/log_handler.c | 64 +++----- src/logging/log_handler.h | 50 ++++-- src/logging/meson.build | 1 + src/logging/test_virtlogd.aug.in | 2 + src/logging/virtlogd.aug | 2 + src/logging/virtlogd.conf | 14 ++ 12 files changed, 391 insertions(+), 58 deletions(-) create mode 100644 src/logging/log_cleaner.c create mode 100644 src/logging/log_cleaner.h -- 2.39.1

3 10

[PATCH] .gitignore: Ignore cscope and other *tags files
by Martin Kletzander 06 Feb '23

06 Feb '23

Commit f7114e61dbc2 cleaned up way too much and now that I have cscope working again I noticed there are some files that ought to stay ignored. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 469539134280..61ea7779b02b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,17 @@ __pycache__/ # libvirt related ignores /build/ /ci/scratch/ -tags + +# *tags and cscope files +/GPATH +/GRTAGS +/GTAGS +/TAGS +/cscope.files +/cscope.in.out +/cscope.out +/cscope.po.out +/tags # clangd related ignores .clangd -- 2.39.1

5 6

[PATCH 0/3] qemu: Fix setting TPM state seclabels wrt save/restore
by Michal Privoznik 06 Feb '23

06 Feb '23

*** BLURB HERE *** Michal Prívozník (3): qemuProcessStop: Fix detection of outgoing migration for external devices qemuExtTPMStop: Restore TPM state label more often qemuProcessLaunch: Tighten rules for external devices wrt incoming migration src/qemu/qemu_process.c | 11 +++++++++-- src/qemu/qemu_tpm.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) -- 2.39.1

3 5

[libvirt PATCH v2 0/8] Extract the integration job commands to a shell script
by Erik Skultety 06 Feb '23

06 Feb '23

Using shell scripts rather than inlining shell commands to YAML feels more natural, more readable, and will keep all different variations of execution consistent. Essentially the only disadvantage is that we won't see each command listed one-by-one in gitlab's log output (unless we set -x that is), but given that shell would complain if something was wrong with the script, it's fairly easy to identify the problem. Here's a test pipeline after the change: https://gitlab.com/eskultety/libvirt/-/pipelines/759277200 Since v1: - 3/7 - reworded commit message as requested - 4/7 was dropped - point the SCRATCH_DIR to /var/tmp instead of /tmp to not be limited by the size of ramdisk mounted in there Erik Skultety (8): syntax-check: Drop the shell's 'check for minus' rule ci: Move the SCRATCH_DIR from /tmp ci: integration: Extract several hidden job definitions to a script ci: integration: Drop the 'install-deps' hidden job and reference ci: integration-template: Drop the '-lt Fedora 35' check ci: integration.sh: Add/Rewrite/Reformat commentaries ci: integration.sh: Replace 'test' with '[' operator ci: integration.sh: Define the SCRATCH_DIR variable for local execution build-aux/syntax-check.mk | 9 -------- ci/integration-template.yml | 44 +++-------------------------------- ci/integration.sh | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 ci/integration.sh -- 2.39.1

1 9

[PATCH 0/5] Various (json related) cleanups
by Peter Krempa 06 Feb '23

06 Feb '23

Some more patches from old branches that I didn't get around finishing before. Peter Krempa (5): virbitmap: Allow NULL bitmap in functions returning index of a set/clear bit qemuMonitorJSONQueryStats: Simplify logic to construct 'provider_list' qemu_monitor_json: Replace simplify fetching Array from JSON object qemu: agent: Use virJSONValueObjectGetArray qemuDomainGetStatsVcpu: Refactor cleanup src/qemu/qemu_agent.c | 29 ++++--------------- src/qemu/qemu_driver.c | 22 ++++++--------- src/qemu/qemu_monitor_json.c | 54 ++++++++++++++---------------------- src/util/virbitmap.c | 9 ++++++ src/util/virbitmap.h | 9 ++---- 5 files changed, 46 insertions(+), 77 deletions(-) -- 2.39.1

2 6

Unable to use Routed (brouter) method with netmask 255.255.255.255 in both host and vm
by jose.r.r＠metztli.com 04 Feb '23

04 Feb '23

Hello- Assuming I have the host /etc/network/interfaces in Debian Bullseye as follows: ----------------------------------------------------- auto enpXYs0 iface eth0 inet static address mn.opq.rst.xy # Main IP netmask 255.255.255.255 pointopoint (Gateway IP) gateway (Gateway IP) auto virbr0 iface virbr0 inet static address mn.opq.rst.xy #Main IP netmask 255.255.255.255 bridge_ports none bridge_stp off bridge_fd 0 pre-up brctl addbr virbr0 # Additional IP for VM below: only mn.opq octets match main IP up ip route add mn.opq.uw.z/32 dev virbr0 down ip route del mn.opq.uw.z/32 dev virbr0 ---------------------------------------------------- Using the above configuration, ip addr shows the main host IP address as 'peer' with its gateway IP. Please, see: < https://docs.hetzner.com/robot/dedicated-server/network/net-config-debian-u… > What kind of /etc/libvirt/qemu/network/mytestnetwork.xml file should I create for a virtual machine installation connected via libvirtd? Please note that nftables are in use and possibly I should edit its configuration file to add the IP mn.opq.uw.z of the virtual machine and thus enable the VM to utilize the main host IP as a gateway. Currently I have mytestnetwork.xml which contains: <network> <name>mytestnetwork</name> <uuid>char-string</uuid> <forward mode='bridge'/> <bridge name='virbr0'/> </network> The VirtManager GUI advances the installation of the Debian OS in the VM but even if I have provided the main host IP as its gateway IP it cannot fetch the debian packages from its repository, i.e., there is no connection to the outside world. Any insight is appreciated. -- Best Professional Regards. -- Jose R R http://metztli.it --------------------------------------------------------------------------------------------- Download Metztli Reiser4: Debian Buster w/ Linux 5.16.20 AMD64 --------------------------------------------------------------------------------------------- feats ZSTD compression https://sf.net/projects/metztli-reiser4/ ------------------------------------------------------------------------------------------- Official current Reiser4 resources: https://reiser4.wiki.kernel.org/

1 0

[PATCH 0/2] conf: Turn virDomainDeviceDef->type into proper type
by Peter Krempa 03 Feb '23

03 Feb '23

Some more patch necromancy. Pipeline: https://gitlab.com/pipo.sk/libvirt/-/pipelines/765613613 Peter Krempa (2): virDomainDeviceDefParse: Separate code for parsing type conf: Use proper type for 'type' field of struct _virDomainDeviceDef src/conf/domain_conf.c | 43 ++++++---- src/conf/domain_conf.h | 2 +- src/hyperv/hyperv_driver.c | 28 ++++++- src/libxl/libxl_driver.c | 158 ++++++++++++++++++++++++++++++++++-- src/lxc/lxc_driver.c | 159 +++++++++++++++++++++++++++++++++++-- src/vz/vz_sdk.c | 81 ++++++++++++++++++- tests/qemuhotplugtest.c | 76 +++++++++++++++++- 7 files changed, 512 insertions(+), 35 deletions(-) -- 2.39.1

2 3

[PATCH 0/2] tools: A few small fixes for virt-qemu-sev-validate
by Jim Fehlig 03 Feb '23

03 Feb '23

See patches for details. Jim Fehlig (2): docs: Fix examples in virt-qemu-sev-validate man page tools: Fix detection of remote libvirt access in virt-qemu-sev-validate docs/manpages/virt-qemu-sev-validate.rst | 24 ++++++++++++------------ tools/virt-qemu-sev-validate | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) -- 2.38.1

2 3

[PATCH 0/7] Remove last instances of looped XML element lookup from domain_conf.c
by Peter Krempa 02 Feb '23

02 Feb '23

Had this around for a while but it needed some finishing touches. This ousts the last loop-based XML parser iterating over XML nodes and replaces it by something more modern, fixing a few bugs i the process and cleaning stuff up. There are a few of such parsers still around e.g in the network XML parsing part. Peter Krempa (7): virPCIDeviceAddressParseXML: Use virXMLNodeGetSubelement to find 'zpci' virNetDevVPortProfileParse: Use virXMLNodeGetSubelement to find '<parameters>' virNetworkDHCPRangeDefParseXML: Use virXMLNodeGetSubelement to find 'lease' virNetworkDHCPHostDefParseXML: Use virXMLNodeGetSubelement to find 'lease' virBitmapIsBitSet: Allow NULL bitmap qemustatusxml2xmltest: Add test data for testing '<origstates>' of PCI hostdev conf: Store 'origstates' of PCI hostdevs in a bitmap src/conf/device_conf.c | 16 +--- src/conf/domain_conf.c | 97 +++++++++++------------ src/conf/domain_conf.h | 31 +++----- src/conf/netdev_vport_profile_conf.c | 20 ++--- src/conf/network_conf.c | 28 ++----- src/conf/virconftypes.h | 2 - src/hypervisor/virhostdev.c | 25 +++--- src/util/virbitmap.c | 4 +- src/util/virbitmap.h | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 12 +++ 10 files changed, 107 insertions(+), 130 deletions(-) -- 2.39.1

3 11

[libvirt PATCH] tools: use g_autofree more
by Ján Tomko 01 Feb '23

01 Feb '23

Remove some obvious uses of VIR_FREE in favor of automatic cleanup. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tools/virsh-domain-monitor.c | 5 +---- tools/virsh-domain.c | 37 +++++++++---------------------- tools/virsh-network.c | 6 ++--- tools/virsh-nwfilter.c | 3 +-- tools/virt-admin.c | 13 ++++------- tools/virt-host-validate-common.c | 6 ++--- 6 files changed, 20 insertions(+), 50 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index f89118f64f..c2134faba1 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1213,7 +1213,6 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) virDomainInfo info; g_autoptr(virshDomain) dom = NULL; virSecurityModel secmodel; - virSecurityLabelPtr seclabel; int persistent = 0; bool ret = true; int autostart; @@ -1301,6 +1300,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) } else { /* Only print something if a security model is active */ if (secmodel.model[0] != '\0') { + g_autofree virSecurityLabelPtr seclabel = NULL; vshPrint(ctl, "%-15s %s\n", _("Security model:"), secmodel.model); vshPrint(ctl, "%-15s %s\n", _("Security DOI:"), secmodel.doi); @@ -1308,15 +1308,12 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) seclabel = g_new0(virSecurityLabel, 1); if (virDomainGetSecurityLabel(dom, seclabel) == -1) { - VIR_FREE(seclabel); return false; } else { if (seclabel->label[0] != '\0') vshPrint(ctl, "%-15s %s (%s)\n", _("Security label:"), seclabel->label, seclabel->enforcing ? "enforcing" : "permissive"); } - - VIR_FREE(seclabel); } } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 59b2b3ce60..a4abcb1b03 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -366,7 +366,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshDomain) dom = NULL; const char *from = NULL; - char *buffer; + g_autofree char *buffer = NULL; int rv; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); @@ -404,8 +404,6 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) else rv = virDomainAttachDevice(dom, buffer); - VIR_FREE(buffer); - if (rv < 0) { vshError(ctl, _("Failed to attach device from %s"), from); return false; @@ -2364,7 +2362,7 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; int abort_flags = 0; const char *xml = NULL; - char *xmlstr = NULL; + g_autofree char *xmlstr = NULL; bool print_xml = vshCommandOptBool(cmd, "print-xml"); virTypedParameterPtr params = NULL; virshBlockJobWaitData *bjWait = NULL; @@ -2567,7 +2565,6 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - VIR_FREE(xmlstr); virTypedParamsFree(params, nparams); virshBlockJobWaitFree(bjWait); return ret; @@ -5624,7 +5621,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) bool ret = false; bool created = false; bool generated = false; - char *mime = NULL; + g_autofree char *mime = NULL; virshControl *priv = ctl->privData; virshStreamCallbackData cbdata; @@ -5688,7 +5685,6 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) unlink(file); if (generated) VIR_FREE(file); - VIR_FREE(mime); return ret; } @@ -7432,9 +7428,8 @@ cmdGuestvcpus(vshControl *ctl, const vshCmd *cmd) goto cleanup; for (i = 0; i < nparams; i++) { - char *str = vshGetTypedParamValue(ctl, &params[i]); + g_autofree char *str = vshGetTypedParamValue(ctl, &params[i]); vshPrint(ctl, "%-15s: %s\n", params[i].field, str); - VIR_FREE(str); } } @@ -8305,7 +8300,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshDomain) dom = NULL; const char *from = NULL; - char *buffer; + g_autofree char *buffer = NULL; unsigned int flags = 0; virshControl *priv = ctl->privData; @@ -8322,7 +8317,6 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) dom = virDomainDefineXMLFlags(priv->conn, buffer, flags); else dom = virDomainDefineXML(priv->conn, buffer); - VIR_FREE(buffer); if (!dom) { vshError(ctl, _("Failed to define domain from %s"), from); @@ -10340,7 +10334,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshDomain) dom = NULL; bool ret = false; - char *guest_agent_cmd = NULL; + g_autofree char *guest_agent_cmd = NULL; char *result = NULL; int timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; int judge = 0; @@ -10405,7 +10399,6 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(result); - VIR_FREE(guest_agent_cmd); return ret; } @@ -11185,7 +11178,7 @@ doMigrate(void *opaque) if (vshCommandOptStringReq(ctl, cmd, "migrate-disks", &opt) < 0) goto out; if (opt) { - char **val = NULL; + g_autofree char **val = NULL; val = g_strsplit(opt, ",", 0); @@ -11194,28 +11187,22 @@ doMigrate(void *opaque) &maxparams, VIR_MIGRATE_PARAM_MIGRATE_DISKS, (const char **)val) < 0) { - VIR_FREE(val); goto save_error; } - - VIR_FREE(val); } if (vshCommandOptStringReq(ctl, cmd, "comp-methods", &opt) < 0) goto out; if (opt) { - char **val = g_strsplit(opt, ",", 0); + g_autofree char **val = g_strsplit(opt, ",", 0); if (virTypedParamsAddStringList(&params, &nparams, &maxparams, VIR_MIGRATE_PARAM_COMPRESSION, (const char **)val) < 0) { - VIR_FREE(val); goto save_error; } - - VIR_FREE(val); } if ((rv = vshCommandOptInt(ctl, cmd, "comp-mt-level", &intOpt)) < 0) { @@ -11257,7 +11244,7 @@ doMigrate(void *opaque) if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { - char *xml; + g_autofree char *xml = NULL; if (virFileReadAll(opt, VSH_MAX_XML_FILE, &xml) < 0) { vshError(ctl, _("cannot read file '%s'"), opt); @@ -11266,16 +11253,14 @@ doMigrate(void *opaque) if (virTypedParamsAddString(&params, &nparams, &maxparams, VIR_MIGRATE_PARAM_DEST_XML, xml) < 0) { - VIR_FREE(xml); goto save_error; } - VIR_FREE(xml); } if (vshCommandOptStringReq(ctl, cmd, "persistent-xml", &opt) < 0) goto out; if (opt) { - char *xml; + g_autofree char *xml = NULL; if (virFileReadAll(opt, VSH_MAX_XML_FILE, &xml) < 0) { vshError(ctl, _("cannot read file '%s'"), opt); @@ -11284,10 +11269,8 @@ doMigrate(void *opaque) if (virTypedParamsAddString(&params, &nparams, &maxparams, VIR_MIGRATE_PARAM_PERSIST_XML, xml) < 0) { - VIR_FREE(xml); goto save_error; } - VIR_FREE(xml); } if ((rv = vshCommandOptInt(ctl, cmd, "auto-converge-initial", &intOpt)) < 0) { diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 004719dad6..13f2e729eb 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -412,7 +412,7 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) int autostart; int persistent = -1; int active = -1; - char *bridge = NULL; + g_autofree char *bridge = NULL; if (!(network = virshCommandOptNetwork(ctl, cmd, NULL))) return false; @@ -441,7 +441,6 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) if (bridge) vshPrint(ctl, "%-15s %s\n", _("Bridge:"), bridge); - VIR_FREE(bridge); return true; } @@ -1500,7 +1499,7 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *cmd) virNetworkPortPtr port = NULL; const char *from = NULL; bool ret = false; - char *buffer = NULL; + g_autofree char *buffer = NULL; g_autoptr(virshNetwork) network = NULL; unsigned int flags = 0; @@ -1533,7 +1532,6 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - VIR_FREE(buffer); if (port) virNetworkPortFree(port); return ret; diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index d4112c8620..98380b452d 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -516,7 +516,7 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCmd *cmd) { virNWFilterBindingPtr binding; const char *from = NULL; - char *buffer; + g_autofree char *buffer = NULL; unsigned int flags = 0; virshControl *priv = ctl->privData; @@ -530,7 +530,6 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCmd *cmd) return false; binding = virNWFilterBindingCreateXML(priv->conn, buffer, flags); - VIR_FREE(buffer); if (!binding) { vshError(ctl, _("Failed to create network filter from %s"), from); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 85b010b95f..8baf9636d3 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -73,7 +73,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED, vshControl *ctl = opaque; const char *str = "unknown reason"; virErrorPtr error; - char *uri = NULL; + g_autofree char *uri = NULL; if (reason == VIR_CONNECT_CLOSE_REASON_CLIENT) return; @@ -97,8 +97,6 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED, } vshError(ctl, _(str), NULLSTR(uri)); - VIR_FREE(uri); - virErrorRestore(&error); } @@ -183,7 +181,7 @@ static const vshCmdInfo info_uri[] = { static bool cmdURI(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { - char *uri; + g_autofree char *uri = NULL; vshAdmControl *priv = ctl->privData; uri = virAdmConnectGetURI(priv->conn); @@ -193,7 +191,6 @@ cmdURI(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) } vshPrint(ctl, "%s\n", uri); - VIR_FREE(uri); return true; } @@ -328,7 +325,7 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) int nsrvs = 0; size_t i; bool ret = false; - char *uri = NULL; + g_autofree char *uri = NULL; virAdmServerPtr *srvs = NULL; vshAdmControl *priv = ctl->privData; g_autoptr(vshTable) table = NULL; @@ -365,7 +362,6 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) virAdmServerFree(srvs[i]); VIR_FREE(srvs); } - VIR_FREE(uri); return ret; } @@ -702,9 +698,8 @@ cmdClientInfo(vshControl *ctl, const vshCmd *cmd) vshAdmClientTransportToString(virAdmClientGetTransport(clnt))); for (i = 0; i < nparams; i++) { - char *str = vshGetTypedParamValue(ctl, &params[i]); + g_autofree char *str = vshGetTypedParamValue(ctl, &params[i]); vshPrint(ctl, "%-15s: %s\n", params[i].field, str); - VIR_FREE(str); } ret = true; diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 2ac96d1e19..a41bb346d2 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -56,7 +56,7 @@ void virHostMsgCheck(const char *prefix, ...) { va_list args; - char *msg; + g_autofree char *msg = NULL; if (quiet) return; @@ -66,7 +66,6 @@ void virHostMsgCheck(const char *prefix, va_end(args); fprintf(stdout, _("%6s: Checking %-60s: "), prefix, msg); - VIR_FREE(msg); } static bool virHostMsgWantEscape(void) @@ -114,7 +113,7 @@ void virHostMsgFail(virHostValidateLevel level, ...) { va_list args; - char *msg; + g_autofree char *msg = NULL; if (quiet) return; @@ -129,7 +128,6 @@ void virHostMsgFail(virHostValidateLevel level, else fprintf(stdout, "%s (%s)\n", _(failMessages[level]), msg); - VIR_FREE(msg); } -- 2.39.0

2 1

[PATCH 0/6] Few outstanding XML schema interleaving fixes
by Peter Krempa 01 Feb '23

01 Feb '23

Few patches I had in a different branch from my posting in october of 2022. Peter Krempa (6): schema: domain: Allow interleave of 'smartcard' subelements schema: domain: Allow interleaving of elements in 'osxen' definition schema: domain: Allow interleaving of 'inituser/initgroup' in 'osexe' definition schema: nodedev: Allow interleaving of sub-elements of 'device' schema: nodedev: Allow interneaving sub-elements of 'css' address type schema: storage: Allow interleaving of 'cipher' and 'ivgen' elements src/conf/schemas/domaincommon.rng | 140 ++++++++++++++++------------- src/conf/schemas/nodedev.rng | 103 ++++++++++----------- src/conf/schemas/storagecommon.rng | 14 +-- 3 files changed, 140 insertions(+), 117 deletions(-) -- 2.39.1

2 8

[PATCH 0/5] qemu: Don't remove macvtaps on failed start
by Michal Privoznik 01 Feb '23

01 Feb '23

See 5/5 for explanation. Michal Prívozník (5): domain_conf: Move virDomainNetVhostuserMode enum declaration domain_conf: Rewrite virDomainChrSourceModeTypeFromString() using VIR_ENUM_IMPL() virnetdevmacvlan: Drop G_GNUC_WARN_UNUSED_RESULT annotation for virNetDevMacVLanDeleteWithVPortProfile() conf: Format and parse private data for virDomainNetDef qemu: Don't remove macvtaps on failed start src/conf/domain_conf.c | 122 +++++++++++++++++++++++++----------- src/conf/domain_conf.h | 7 +++ src/qemu/qemu_domain.c | 27 ++++++++ src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_hotplug.c | 22 +++---- src/qemu/qemu_interface.c | 3 + src/qemu/qemu_process.c | 13 ++-- src/util/virnetdevmacvlan.h | 2 +- 8 files changed, 144 insertions(+), 57 deletions(-) -- 2.39.1

2 6

[libvirt PATCH] qemu: fix a typo
by Ján Tomko 01 Feb '23

01 Feb '23

s/usw/use/ Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial src/qemu/qemu_fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c index f5eedb88ec..d613f22032 100644 --- a/src/qemu/qemu_fd.c +++ b/src/qemu/qemu_fd.c @@ -100,7 +100,7 @@ qemuFDPassNew(const char *prefix, * qemuFDPassNewPassed: * @fdSetID: ID of an FDset which was allready passed to qemu * - * Create qemuFDPass pointing to an already passed FD. Useful to usw with + * Create qemuFDPass pointing to an already passed FD. Useful to use with * qemuFDPassTransferMonitorRollback, when restoring after restart. */ qemuFDPass * -- 2.39.0

1 0

[PATCH 0/7] various cleanups
by Peter Krempa 01 Feb '23

01 Feb '23

Collection of cleanup patches from my previous series attempting to remove secrets clearing refactored so that it doesn't depend on the patches which were not accepted. Peter Krempa (7): virCryptoEncryptDataAESgnutls: Restructure control flow virStorageBackendISCSISetAuth: Refactor cleanup virStorageBackendISCSISetAuth: Use g_strndup to '\0' terminate data virStorageBackendISCSIDirectSetAuth: Refactor cleanup virStorageBackendISCSIDirectSetAuth: Use 'g_strndup' to '\0' terminate data libxlMakeNetworkDiskSrc: Refactor cleanup storageBackendCreateQemuImgSecretPath: Refactor cleanup src/libxl/libxl_conf.c | 17 ++++------ src/storage/storage_backend_iscsi.c | 17 ++++------ src/storage/storage_backend_iscsi_direct.c | 23 ++++++-------- src/storage/storage_util.c | 36 ++++++++++------------ src/util/vircrypto.c | 28 ++++++++--------- 5 files changed, 49 insertions(+), 72 deletions(-) -- 2.39.1

2 12

[PATCH 0/7] virDomainNetDefFormat: Modernize XML formatting
by Michal Privoznik 31 Jan '23

31 Jan '23

A bit. After these, the function is still long and could be broken into smaller ones, but let's leave that as an exercise for future us. Michal Prívozník (7): qemuxml2xmloutdata: Turn net-mtu.xml into a symlink virDomainNetDefFormat: Rename @attrBuf to @targetAttrBuf virDomainNetDefFormat: Modernize <tune/> formatting virDomainNetDefFormat: Modernize <guest/> formatting virDomainNetDefFormat: Modernize <source/> formatting virDomainNetDefFormat: Simplify @sourceAttrBuf handling for some types of VIR_DOMAIN_NET virDomainNetDefFormat: Modernize <mac/> formatting src/conf/domain_conf.c | 151 ++++++++++----------------- tests/qemuxml2argvdata/net-mtu.xml | 26 +++-- tests/qemuxml2xmloutdata/net-mtu.xml | 72 +------------ 3 files changed, 74 insertions(+), 175 deletions(-) mode change 100644 => 120000 tests/qemuxml2xmloutdata/net-mtu.xml -- 2.39.1

2 8

[PATCH 0/7] qemu: Fix hot-(un-)plug of disks with FD-passed storage
by Peter Krempa 31 Jan '23

31 Jan '23

Peter Krempa (7): qemu_fd: Remove declaration for 'qemuFDPassNewDirect' qemuStorageSourcePrivateDataFormat: Rename 'tmp' to 'objectsChildBuf' qemu: command: Handle FD passing commandline via qemuBuildBlockStorageSourceAttachDataCommandline qemuFDPassTransferCommand: Mark that FD was passed qemu: fd: Add helpers allowing storing FD set data in status XML qemu: domain: Store fdset ID for disks passed to qemu via FD qemu: block: Properly handle FD-passed disk hot-(un-)plug src/qemu/qemu_block.c | 7 +++ src/qemu/qemu_block.h | 2 + src/qemu/qemu_command.c | 26 ++--------- src/qemu/qemu_domain.c | 31 +++++++++---- src/qemu/qemu_fd.c | 43 +++++++++++++++++++ src/qemu/qemu_fd.h | 8 +++- tests/qemustatusxml2xmldata/modern-in.xml | 3 ++ .../disk-source-fd.x86_64-latest.args | 6 +-- 8 files changed, 91 insertions(+), 35 deletions(-) -- 2.39.1

2 9

[RFC PATCH] build: deprecate --enable-gprof builds and remove from CI
by Alex Bennée 31 Jan '23

31 Jan '23

As gprof relies on instrumentation you rarely get useful data compared to a real optimised build. Lets deprecate the build option and simplify the CI configuration as a result. Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> Cc: Thomas Huth <thuth(a)redhat.com> --- docs/about/deprecated.rst | 14 ++++++++++++++ meson.build | 7 ++++++- .gitlab-ci.d/buildtest.yml | 19 ++++--------------- meson_options.txt | 3 ++- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 9f1bbc495d..87b4511535 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -20,6 +20,20 @@ they were first deprecated in the 2.10.0 release. What follows is a list of all features currently marked as deprecated. +Build options +------------- + +``gprof`` builds (since 8.0) +'''''''''''''''''''''''''''' + +The ``--enable-gprof`` configure setting relies on compiler +instrumentation to gather its data which can distort the generated +profile. As other non-instrumenting tools are available that give a +more holistic view of the system with non-instrumented binaries we are +deprecating the build option and no longer defend it in CI. The +``--enable-gcov`` build option remains for analysis test case +coverage. + System emulator command line arguments -------------------------------------- diff --git a/meson.build b/meson.build index 56320ae717..ecf44ea534 100644 --- a/meson.build +++ b/meson.build @@ -3791,7 +3791,12 @@ summary_info += {'mutex debugging': get_option('debug_mutex')} summary_info += {'memory allocator': get_option('malloc')} summary_info += {'avx2 optimization': config_host_data.get('CONFIG_AVX2_OPT')} summary_info += {'avx512f optimization': config_host_data.get('CONFIG_AVX512F_OPT')} -summary_info += {'gprof enabled': get_option('gprof')} +if get_option('gprof') + gprof_info = 'YES (deprecated)' +else + gprof_info = get_option('gprof') +endif +summary_info += {'gprof': gprof_info} summary_info += {'gcov': get_option('b_coverage')} summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')} summary_info += {'CFI support': get_option('cfi')} diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 9a6ba1fe3b..dc8fa0a498 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -468,27 +468,16 @@ tsan-build: TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=1 -# gprof/gcov are GCC features -build-gprof-gcov: +# gcov is a GCC features +gcov: extends: .native_build_job_template needs: job: amd64-ubuntu2004-container + timeout: 80m variables: IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-gprof --enable-gcov + CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - artifacts: - expire_in: 1 days - paths: - - build - -check-gprof-gcov: - extends: .native_test_job_template - needs: - - job: build-gprof-gcov - artifacts: true - variables: - IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check after_script: - cd build diff --git a/meson_options.txt b/meson_options.txt index 559a571b6b..53459c15fc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -316,7 +316,8 @@ option('debug_stack_usage', type: 'boolean', value: false, option('qom_cast_debug', type: 'boolean', value: false, description: 'cast debugging support') option('gprof', type: 'boolean', value: false, - description: 'QEMU profiling with gprof') + description: 'QEMU profiling with gprof', + deprecated: true) option('profiler', type: 'boolean', value: false, description: 'profiler support') option('slirp_smbd', type : 'feature', value : 'auto', -- 2.34.1

3 3

Zoned storage support in libvirt
by Stefan Hajnoczi 30 Jan '23

30 Jan '23

Hi Peter, Zoned storage support (https://zonedstorage.io/docs/introduction/zoned-storage) is being added to QEMU. Given a zoned host block device, the QEMU syntax will look like this: --blockdev zoned_host_device,node-name=drive0,filename=/dev/$BDEV,... --device virtio-blk-pci,drive=drive0 Note that regular --blockdev host_device will not work. For now the virtio-blk device is the only one that supports zoned blockdevs. This brings to mind a few questions: 1. Does libvirt need domain XML syntax for zoned storage? Alternatively, it could probe /sys/block/$BDEV/queue/zoned and generate the correct QEMU command-line arguments for zoned devices when the contents of the file are not "none". 2. Should QEMU --blockdev host_device detected zoned devices so that --blockdev zoned_host_device is not necessary? That way libvirt would automatically support zoned storage without any domain XML syntax or libvirt code changes. The drawbacks I see when QEMU detects zoned storage automatically: - You can't easiy tell if a blockdev is zoned from the command-line. - It's possible to mismatch zoned and non-zoned devices across live migration. We still have time to decide on the QEMU command-line syntax for QEMU 8.0, so I wanted to raise this now. Thanks, Stefan

3 6

[PATCH v2 0/5] logging: add log cleanup for obsolete domains
by Oleg Vasilev 30 Jan '23

30 Jan '23

Presently, logs from deleted domains remain forever. Particular motivation comes from the case when libguestfs has repeatedly created transient VMs, which in turn created plenty of logs. This takes up space and lots of files troubles filesystem navigation. More motivation in [1]. Patch solving same problem in [2]. Changes in v2: substantial rework according to Martin Kletzander's comments v1: https://www.mail-archive.com/libvir-list@redhat.com/msg233754.html [1]: https://listman.redhat.com/archives/libvir-list/2022-February/228149.html [2]: https://listman.redhat.com/archives/libvir-list/2022-February/msg00865.html CC: Martin Kletzander <mkletzan(a)redhat.com> Oleg Vasilev (5): logging: refactor to store config inside log handler logging: move virLogHandler to header logging: add configuration for future log cleaner logging: add log cleanup for obsolete domains logging: use the log cleaner po/POTFILES | 1 + src/logging/log_cleaner.c | 276 +++++++++++++++++++++++++++++++ src/logging/log_cleaner.h | 29 ++++ src/logging/log_daemon.c | 6 +- src/logging/log_daemon_config.c | 9 + src/logging/log_daemon_config.h | 3 + src/logging/log_handler.c | 64 +++---- src/logging/log_handler.h | 50 ++++-- src/logging/meson.build | 1 + src/logging/test_virtlogd.aug.in | 2 + src/logging/virtlogd.aug | 2 + src/logging/virtlogd.conf | 14 ++ 12 files changed, 399 insertions(+), 58 deletions(-) create mode 100644 src/logging/log_cleaner.c create mode 100644 src/logging/log_cleaner.h -- 2.38.1

2 11

Re: [PATCH] qemu: implement QEMU NBD source reconnect delay attribute
by Christian Nautze 30 Jan '23

30 Jan '23

Hi! Is it possible to get a review on this patch I send before Christmas? :) Thank you! Christian _____________________________________________________ Currently it's only possible to set this parameter during domain creation via QEMU commandline passthrough feature. With the new delay attribute it's also possible to set this parameter if you want to attach a new NBD disk using "virsh attach-device domain device.xml" e.g.: <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='nbd' name='foo'> <host name='example.org' port='6000'/> <reconnect enabled='yes' delay='10'/> </source> <target dev='vdb' bus='virtio'/> </disk> Signed-off-by: Christian Nautze <christian.nautze at exoscale.ch <https://listman.redhat.com/mailman/listinfo/libvir-list>> --- docs/formatdomain.rst | 10 ++++++-- src/conf/domain_conf.c | 19 +++++++++++++++ src/conf/schemas/domaincommon.rng | 3 +++ src/conf/schemas/storagecommon.rng | 5 ++++ src/conf/storage_source_conf.c | 1 + src/conf/storage_source_conf.h | 4 ++++ src/qemu/qemu_block.c | 4 +++- src/qemu/qemu_domain.c | 9 ++++++++ .../disk-network-nbd.x86_64-latest.args | 23 +++++++++++-------- tests/qemuxml2argvdata/disk-network-nbd.xml | 8 +++++++ tests/qemuxml2xmloutdata/disk-network-nbd.xml | 9 ++++++++ 11 files changed, 82 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index d7fffc6e0b..3fbeba644a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2938,13 +2938,19 @@ paravirtualized driver is specified via the ``disk`` element. are intended to be default, then the entire element may be omitted. ``reconnect`` For disk type ``vhostuser`` configures reconnect timeout if the connection - is lost. It has two mandatory attributes: + is lost. This is set with the two mandatory attributes ``enabled`` and + ``timeout``. For disk type ``network`` and protocol ``nbd`` the QEMU NBD + reconnect delay can be set via the mandatory attributes ``enabled`` + and ``delay``: ``enabled`` If the reconnect feature is enabled, accepts ``yes`` and ``no`` ``timeout`` The amount of seconds after which hypervisor tries to reconnect. - + ``delay`` + The amount of seconds during which all requests are paused and will be rerun + after a successful reconnect. After that time, any delayed requests and all + future requests before a successful reconnect will immediately fail. For a "file" or "volume" disk type which represents a cdrom or floppy (the ``device`` attribute), it is possible to define policy what to do with the diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c088ff295..909c78ef28 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7024,6 +7024,22 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, src->tlsFromConfig = !!value; } + if (src->protocol == VIR_STORAGE_NET_PROTOCOL_NBD) { + xmlNodePtr cur; + if ((cur = virXPathNode("./reconnect", ctxt))) { + virTristateBool enabled; + if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, + &enabled) < 0) + return -1; + + if (enabled == VIR_TRISTATE_BOOL_YES) { + if (virXMLPropUInt(cur, "delay", 10, VIR_XML_PROP_REQUIRED, + &src->reconnectDelay) < 0) + return -1; + } + } + } + /* for historical reasons we store the volume and image name in one XML * element although it complicates thing when attempting to access them. */ if (src->path && @@ -21729,6 +21745,9 @@ virDomainDiskSourceFormatNetwork(virBuffer *attrBuf, virBufferAddLit(childBuf, "/>\n"); } + if (src->reconnectDelay) { + virBufferAsprintf(childBuf, "<reconnect enabled='yes' delay='%u'/>\n", src->reconnectDelay); + } virBufferEscapeString(childBuf, "<snapshot name='%s'/>\n", src->snapshot); virBufferEscapeString(childBuf, "<config file='%s'/>\n", src->configFile); diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index c588a48fd2..72587416fe 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -2184,6 +2184,9 @@ </optional> <ref name="diskSourceCommon"/> <ref name="diskSourceNetworkHost"/> + <optional> + <ref name="reconnect"/> + </optional> <optional> <ref name="encryption"/> </optional> diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng index 76714c9aad..2842376e78 100644 --- a/src/conf/schemas/storagecommon.rng +++ b/src/conf/schemas/storagecommon.rng @@ -61,6 +61,11 @@ <ref name="unsignedInt"/> </attribute> </optional> + <optional> + <attribute name="delay"> + <ref name="unsignedInt"/> + </attribute> + </optional> </element> </define> diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 2b4cf5e241..edfd17c77c 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -810,6 +810,7 @@ virStorageSourceCopy(const virStorageSource *src, def->sslverify = src->sslverify; def->readahead = src->readahead; def->timeout = src->timeout; + def->reconnectDelay = src->reconnectDelay; def->metadataCacheMaxSize = src->metadataCacheMaxSize; /* storage driver metadata are not copied */ diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index f2440cec6a..b60a4b3346 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -290,6 +290,10 @@ struct _virStorageSource { unsigned long long readahead; /* size of the readahead buffer in bytes */ unsigned long long timeout; /* connection timeout in seconds */ + /* NBD QEMU reconnect-delay option, + * 0 as default value */ + unsigned int reconnectDelay; + virStorageSourceNVMeDef *nvme; /* type == VIR_STORAGE_TYPE_NVME */ virDomainChrSourceDef *vhostuser; /* type == VIR_STORAGE_TYPE_VHOST_USER */ diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 8a6f601b29..6913c380a0 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -530,6 +530,7 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src, "S:export", src->path, "S:tls-creds", tlsAlias, "S:tls-hostname", tlsHostname, + "p:reconnect-delay", src->reconnectDelay, NULL) < 0) return NULL; @@ -1817,7 +1818,8 @@ qemuBlockGetBackingStoreString(virStorageSource *src, src->ncookies == 0 && src->sslverify == VIR_TRISTATE_BOOL_ABSENT && src->timeout == 0 && - src->readahead == 0) { + src->readahead == 0 && + src->reconnectDelay == 0) { switch ((virStorageNetProtocol) src->protocol) { case VIR_STORAGE_NET_PROTOCOL_NBD: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5c05032ce3..840d857f78 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4927,6 +4927,15 @@ qemuDomainValidateStorageSource(virStorageSource *src, } } + if (src->reconnectDelay > 0) { + if (actualType != VIR_STORAGE_TYPE_NETWORK || + src->protocol != VIR_STORAGE_NET_PROTOCOL_NBD) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("reconnect delay is supported only with NBD protocol")); + return -1; + } + } + if (src->query && (actualType != VIR_STORAGE_TYPE_NETWORK || (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS && diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 21e619af3e..e8d13b0bd4 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -28,21 +28,24 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-6-format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-5-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-5-format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-4-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-4-format","id":"virtio-disk2"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"export":"bar","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-3-format","id":"virtio-disk2"}' \ --blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"6000"},"export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-3-format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},"export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-2-format","id":"virtio-disk3"}' \ --blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},"export":"bar","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"libvirt-2-format","id":"virtio-disk4"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"foo","reconnect-delay":10,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"libvirt-1-format","id":"virtio-disk4"}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-1-format","id":"virtio-disk5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2argvdata/disk-network-nbd.xml index 8ac6cc3b7b..243ffeb1ed 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.xml +++ b/tests/qemuxml2argvdata/disk-network-nbd.xml @@ -49,6 +49,14 @@ </source> <target dev='vde' bus='virtio'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='foo'> + <host name='example.org' port='6000'/> + <reconnect enabled='yes' delay='10'/> + </source> + <target dev='vdf' bus='virtio'/> + </disk> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-nbd.xml index f8dcca4bab..ed0c760d5b 100644 --- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml @@ -54,6 +54,15 @@ <target dev='vde' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='nbd' name='foo'> + <host name='example.org' port='6000'/> + <reconnect enabled='yes' delay='10'/> + </source> + <target dev='vdf' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> -- 2.34.1

2 2