- Devel - libvirt List Archives

[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

Re: [RFC PATCH 14/19] mm: Introduce a cgroup for pinned memory
by Jason Gunthorpe 30 Jan '23

30 Jan '23

On Fri, Jan 27, 2023 at 11:44:19AM -1000, Tejun Heo wrote: > On Tue, Jan 24, 2023 at 04:42:43PM +1100, Alistair Popple wrote: > > If too much memory in a system is pinned or locked it can lead to > > problems such as performance degredation or in the worst case > > out-of-memory errors as such memory cannot be moved or paged out. > > > > In order to prevent users without CAP_IPC_LOCK from causing these > > issues the amount of memory that can be pinned is typically limited by > > RLIMIT_MEMLOCK. However this is inflexible as limits can't be shared > > between tasks and the enforcement of these limits is inconsistent > > between in-kernel users of pinned memory such as mlock() and device > > drivers which may also pin pages with pin_user_pages(). > > > > To allow for a single limit to be set introduce a cgroup controller > > which can be used to limit the number of pages being pinned by all > > tasks in the cgroup. > > The use case makes some sense to me but I wonder whether this'd fit a lot > better in memcg rather than being its own controller. As long as the pinned limitation has its own bucket it is probably fine? The underlying memory allocations should have already been charged to the memcg - so we don't want to double account. Alex and Daniel were looking at this from the qemu/libvirt perspective, perhaps they have some insight what they would like to see? Thanks, Jason

1 0

[PATCH] virsh: Make domif-setlink work more than once
by Michal Privoznik 30 Jan '23

30 Jan '23

In virsh, we have this convenient domif-setlink command, which is just a wrapper over virDomainUpdateDeviceFlags() and which allows setting link state of given guest NIC. It does so by fetching corresponding <interface/> XML snippet and either putting <link state=''/> into it, OR if the element already exists setting the attribute to desired value. The XML is then fed into the update API. There's, however, a small bug in detecting the pre-existence of the element and its attribute. The code looks at "link" attribute, while in fact, the attribute is called "state". Resolves: https://gitlab.com/libvirt/libvirt/-/issues/426 Fixes: e575bf082ed4889280be07c986375f1ca15bb7ee Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6b431bd1e5..59b2b3ce60 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3209,7 +3209,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) } } - if (xmlHasProp(linkNode, BAD_CAST "link")) + if (xmlHasProp(linkNode, BAD_CAST "state")) stateAttr = xmlSetProp(linkNode, BAD_CAST "state", BAD_CAST state); else stateAttr = xmlNewProp(linkNode, BAD_CAST "state", BAD_CAST state); -- 2.39.1

2 1

[libvirt PATCH] remote: Fix memory leak in remoteDomainMigrateFinish3*
by Jiri Denemark 30 Jan '23

30 Jan '23

Theoretically, when remoteDomainMigrateFinish3* is called without a pointer for storing migration cookie and its length (i.e., either cookieout == NULL or cookieoutlen == NULL), we would leak the freshly created virDomain object referenced by rv. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/remote/remote_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2f421fb5e0..9fc73f6d88 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5917,8 +5917,6 @@ remoteDomainMigrateFinish3(virConnectPtr dconn, (xdrproc_t) xdr_remote_domain_migrate_finish3_ret, (char *) &ret) == -1) return NULL; - rv = get_nonnull_domain(dconn, ret.dom); - if (ret.cookie_out.cookie_out_len > 0) { if (!cookieout || !cookieoutlen) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -5930,6 +5928,8 @@ remoteDomainMigrateFinish3(virConnectPtr dconn, ret.cookie_out.cookie_out_len = 0; } + rv = get_nonnull_domain(dconn, ret.dom); + xdr_free((xdrproc_t) &xdr_remote_domain_migrate_finish3_ret, (char *) &ret); return rv; @@ -6770,8 +6770,6 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, (char *) &ret) == -1) goto cleanup; - rv = get_nonnull_domain(dconn, ret.dom); - if (ret.cookie_out.cookie_out_len > 0) { if (!cookieout || !cookieoutlen) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6783,6 +6781,8 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, ret.cookie_out.cookie_out_len = 0; } + rv = get_nonnull_domain(dconn, ret.dom); + xdr_free((xdrproc_t) &xdr_remote_domain_migrate_finish3_params_ret, (char *) &ret); -- 2.39.1

2 1

[PATCH v2 6/6] qemu: Allow mixing active internal and external active disk snapshots
by ORO＠il.ibm.com 29 Jan '23

29 Jan '23

From: Or Ozeri <oro(a)il.ibm.com> Previous commit added support for active RBD disk snapshots, using the same qmp_transaction used also for external snapshots. The same transaction can be used to mix internal and external snapshots. To allow this, this commit simply removes the check that disallows mixing for active snapshots. Note that previous commits added validation disallowing deletion and reverting of RBD disks. The same validation applies to the mixed type of snapshots introduced by this commit. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_snapshot.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c72bdb4723..81b3e94988 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -746,10 +746,9 @@ qemuSnapshotPrepare(virDomainObj *vm, return -1; } - /* For now, we don't allow mixing internal and external disks. - * XXX technically, we could mix internal and external disks for + /* For now, we don't allow mixing internal and external disks for * offline snapshots */ - if ((found_internal && external) || + if ((found_internal && external && !active) || (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL && external) || (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL && found_internal)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 2.25.1

1 0

[PATCH v2 5/6] qemu: Allow setting per-disk snapshot name for RBD disks
by ORO＠il.ibm.com 29 Jan '23

29 Jan '23

From: Or Ozeri <oro(a)il.ibm.com> This commit adds the option for setting per-disk snapshot name for RBD disks. All other disk types are still disallowed to use the snapshotName attribute. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index a10bdf7bf2..c72bdb4723 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -664,7 +664,7 @@ qemuSnapshotPrepare(virDomainObj *vm, return -1; } - if (disk->snapshot_name) { + if (disk->snapshot_name && !is_raw_rbd) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("snapshot name setting for disk %s unsupported " "for storage type %s"), -- 2.25.1

1 0

[PATCH v2 4/6] qemu: Allow active disk snapshots for RBD disks
by ORO＠il.ibm.com 29 Jan '23

29 Jan '23

From: Or Ozeri <oro(a)il.ibm.com> This commit removes the check disallowing users to take active disk-only snapshots of RBD disks. The actual support for this functionality was added in a previous commit. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_snapshot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index e82352ba7d..a10bdf7bf2 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -630,6 +630,8 @@ qemuSnapshotPrepare(virDomainObj *vm, for (i = 0; i < def->ndisks; i++) { virDomainSnapshotDiskDef *disk = &def->disks[i]; virDomainDiskDef *dom_disk = vm->def->disks[i]; + bool is_raw_rbd = (dom_disk->src->format == VIR_STORAGE_FILE_RAW && + dom_disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD); if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NO && qemuDomainDiskBlockJobIsActive(dom_disk)) @@ -639,7 +641,7 @@ qemuSnapshotPrepare(virDomainObj *vm, case VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL: found_internal = true; - if (def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT && active) { + if (def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT && active && !is_raw_rbd) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("active qemu domains require external disk " "snapshots; disk %s requested internal"), @@ -652,7 +654,8 @@ qemuSnapshotPrepare(virDomainObj *vm, return -1; if (dom_disk->src->format > 0 && - dom_disk->src->format != VIR_STORAGE_FILE_QCOW2) { + dom_disk->src->format != VIR_STORAGE_FILE_QCOW2 && + !is_raw_rbd) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("internal snapshot for disk %s unsupported " "for storage type %s"), -- 2.25.1

1 0

[PATCH v2 3/6] qemu: Add internal support for active disk internal snapshots
by ORO＠il.ibm.com 29 Jan '23

29 Jan '23

From: Or Ozeri <oro(a)il.ibm.com> libvirt supports taking external disk snapshots on a running VM, using qemu's "blockdev-snapshot" command. qemu also supports "blockdev-snapshot-internal-sync" to do the same for internal snapshots. This commit wraps this (old) qemu capability to allow future libvirt users to take internal disk snapshots on a running VM. This will only work for disk types which support internal snapshots, and thus we require the disk type to be part of a white list of known types. For this commit, the list of supported formats is empty. An upcoming commit will allow RBD disks to use this new capability. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_monitor.c | 9 +++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 14 ++++ src/qemu/qemu_monitor_json.h | 5 ++ src/qemu/qemu_snapshot.c | 72 ++++++++++++------- .../disk_snapshot.xml | 2 +- .../disk_snapshot.xml | 2 +- .../disk_snapshot_redefine.xml | 2 +- tests/qemumonitorjsontest.c | 1 + 9 files changed, 82 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 38f89167e0..f6dab34243 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4225,6 +4225,15 @@ qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions, } +int +qemuMonitorTransactionInternalSnapshotBlockdev(virJSONValue *actions, + const char *device, + const char *name) +{ + return qemuMonitorJSONTransactionInternalSnapshotBlockdev(actions, device, name); +} + + int qemuMonitorTransactionBackup(virJSONValue *actions, const char *device, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 2d16214ba2..1bfd1ccbc2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1411,6 +1411,11 @@ qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions, const char *node, const char *overlay); +int +qemuMonitorTransactionInternalSnapshotBlockdev(virJSONValue *actions, + const char *device, + const char *name); + typedef enum { QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_NONE = 0, QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_INCREMENTAL, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index db99017555..002a6caa52 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8307,6 +8307,20 @@ qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions, NULL); } + +int +qemuMonitorJSONTransactionInternalSnapshotBlockdev(virJSONValue *actions, + const char *device, + const char *name) +{ + return qemuMonitorJSONTransactionAdd(actions, + "blockdev-snapshot-internal-sync", + "s:device", device, + "s:name", name, + NULL); +} + + VIR_ENUM_DECL(qemuMonitorTransactionBackupSyncMode); VIR_ENUM_IMPL(qemuMonitorTransactionBackupSyncMode, QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_LAST, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 6f376cf9b7..313004f327 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -779,6 +779,11 @@ qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions, const char *node, const char *overlay); +int +qemuMonitorJSONTransactionInternalSnapshotBlockdev(virJSONValue *actions, + const char *device, + const char *name); + int qemuMonitorJSONTransactionBackup(virJSONValue *actions, const char *device, diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c1855b3028..e82352ba7d 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -736,7 +736,7 @@ qemuSnapshotPrepare(virDomainObj *vm, } /* disk snapshot requires at least one disk */ - if (def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT && !external) { + if (def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT && !external && !found_internal) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk-only snapshots require at least " "one disk to be selected for snapshot")); @@ -852,6 +852,7 @@ qemuSnapshotDiskCleanup(qemuSnapshotDiskData *data, struct _qemuSnapshotDiskContext { qemuSnapshotDiskData *dd; size_t ndd; + bool has_internal; virJSONValue *actions; @@ -1070,17 +1071,17 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *snapctxt, /** - * qemuSnapshotDiskPrepareActiveExternal: + * qemuSnapshotDiskPrepareActive: * * Collects and prepares a list of structures that hold information about disks * that are selected for the snapshot. */ static qemuSnapshotDiskContext * -qemuSnapshotDiskPrepareActiveExternal(virDomainObj *vm, - virDomainMomentObj *snap, - bool reuse, - GHashTable *blockNamedNodeData, - virDomainAsyncJob asyncJob) +qemuSnapshotDiskPrepareActive(virDomainObj *vm, + virDomainMomentObj *snap, + bool reuse, + GHashTable *blockNamedNodeData, + virDomainAsyncJob asyncJob) { g_autoptr(qemuSnapshotDiskContext) snapctxt = NULL; size_t i; @@ -1089,16 +1090,33 @@ qemuSnapshotDiskPrepareActiveExternal(virDomainObj *vm, snapctxt = qemuSnapshotDiskContextNew(snapdef->ndisks, vm, asyncJob); for (i = 0; i < snapdef->ndisks; i++) { - if (snapdef->disks[i].snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) - continue; + switch (snapdef->disks[i].snapshot) { + case VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL: { + if (qemuSnapshotDiskPrepareOne(snapctxt, + vm->def->disks[i], + snapdef->disks + i, + blockNamedNodeData, + reuse, + true) < 0) + return NULL; + break; + } - if (qemuSnapshotDiskPrepareOne(snapctxt, - vm->def->disks[i], - snapdef->disks + i, - blockNamedNodeData, - reuse, - true) < 0) - return NULL; + case VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL: { + snapctxt->has_internal = true; + if (qemuMonitorTransactionInternalSnapshotBlockdev(snapctxt->actions, + vm->def->disks[i]->src->nodeformat, + snapdef->disks[i].snapshot_name) < 0) + return NULL; + break; + } + + case VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT: + case VIR_DOMAIN_SNAPSHOT_LOCATION_NO: + case VIR_DOMAIN_SNAPSHOT_LOCATION_MANUAL: + case VIR_DOMAIN_SNAPSHOT_LOCATION_LAST: + continue; + } } return g_steal_pointer(&snapctxt); @@ -1182,7 +1200,7 @@ qemuSnapshotDiskCreate(qemuSnapshotDiskContext *snapctxt) int rc; /* check whether there's anything to do */ - if (snapctxt->ndd == 0) + if (snapctxt->ndd == 0 && !snapctxt->has_internal) return 0; if (qemuDomainObjEnterMonitorAsync(snapctxt->vm, snapctxt->asyncJob) < 0) @@ -1215,11 +1233,11 @@ qemuSnapshotDiskCreate(qemuSnapshotDiskContext *snapctxt) /* The domain is expected to be locked and active. */ static int -qemuSnapshotCreateActiveExternalDisks(virDomainObj *vm, - virDomainMomentObj *snap, - GHashTable *blockNamedNodeData, - unsigned int flags, - virDomainAsyncJob asyncJob) +qemuSnapshotCreateActiveDisks(virDomainObj *vm, + virDomainMomentObj *snap, + GHashTable *blockNamedNodeData, + unsigned int flags, + virDomainAsyncJob asyncJob) { bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; g_autoptr(qemuSnapshotDiskContext) snapctxt = NULL; @@ -1229,8 +1247,8 @@ qemuSnapshotCreateActiveExternalDisks(virDomainObj *vm, /* prepare a list of objects to use in the vm definition so that we don't * have to roll back later */ - if (!(snapctxt = qemuSnapshotDiskPrepareActiveExternal(vm, snap, reuse, - blockNamedNodeData, asyncJob))) + if (!(snapctxt = qemuSnapshotDiskPrepareActive(vm, snap, reuse, + blockNamedNodeData, asyncJob))) return -1; if (qemuSnapshotDiskCreate(snapctxt) < 0) @@ -1370,9 +1388,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver, /* the domain is now paused if a memory snapshot was requested */ - if ((ret = qemuSnapshotCreateActiveExternalDisks(vm, snap, - blockNamedNodeData, flags, - VIR_ASYNC_JOB_SNAPSHOT)) < 0) + if ((ret = qemuSnapshotCreateActiveDisks(vm, snap, + blockNamedNodeData, flags, + VIR_ASYNC_JOB_SNAPSHOT)) < 0) goto cleanup; /* the snapshot is complete now */ diff --git a/tests/qemudomainsnapshotxml2xmlin/disk_snapshot.xml b/tests/qemudomainsnapshotxml2xmlin/disk_snapshot.xml index cf5ea0814e..87b6251a7f 100644 --- a/tests/qemudomainsnapshotxml2xmlin/disk_snapshot.xml +++ b/tests/qemudomainsnapshotxml2xmlin/disk_snapshot.xml @@ -4,7 +4,7 @@ <disks> <disk name='/dev/HostVG/QEMUGuest1'/> <disk name='hdb' snapshot='no'/> - <disk name='hdc' snapshot='internal'/> + <disk name='hdc' snapshot='internal' snapshotName='snap1'/> <disk name='hdd' snapshot='external'> <source/> <driver type='qed'/> diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot.xml index 76c543d25c..6cf93183d5 100644 --- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot.xml +++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot.xml @@ -5,7 +5,7 @@ <disks> <disk name='/dev/HostVG/QEMUGuest1'/> <disk name='hdb' snapshot='no'/> - <disk name='hdc' snapshot='internal'/> + <disk name='hdc' snapshot='internal' snapshotName='snap1'/> <disk name='hdd' snapshot='external' type='file'> <driver type='qed'/> </disk> diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml index 24b41ba7c5..f574793edf 100644 --- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml @@ -10,7 +10,7 @@ <disks> <disk name='hda' snapshot='no'/> <disk name='hdb' snapshot='no'/> - <disk name='hdc' snapshot='internal'/> + <disk name='hdc' snapshot='internal' snapshotName='snap1'/> <disk name='hdd' snapshot='external' type='file'> <driver type='qed'/> <source file='/path/to/generated4'/> diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 1db1f2b949..1269c74e43 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2587,6 +2587,7 @@ testQemuMonitorJSONTransaction(const void *opaque) qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") < 0 || qemuMonitorTransactionBitmapMerge(actions, "node5", "bitmap5", &mergebitmaps) < 0 || qemuMonitorTransactionSnapshotBlockdev(actions, "node7", "overlay7") < 0 || + qemuMonitorTransactionInternalSnapshotBlockdev(actions, "device1", "snapshot1") < 0 || qemuMonitorTransactionBackup(actions, "dev8", "job8", "target8", "bitmap8", QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_NONE) < 0 || qemuMonitorTransactionBackup(actions, "dev9", "job9", "target9", "bitmap9", -- 2.25.1

1 0

[PATCH] rpc: Use struct zero initializer for args
by Michal Privoznik 26 Jan '23

26 Jan '23

In a recent commit of v9.0.0-104-g0211e430a8 I've turned all args vars in src/remote/remote_driver.c to be initialized wit {0}. What I've missed was the generated code. Do what we've done in v9.0.0-13-g1c656836e3 and init also args, not just ret. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/gendispatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index e9dc8e27d7..085e2a29d8 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1330,7 +1330,7 @@ elsif ($mode eq "client") { if ($argtype eq "void") { $call_args = "NULL"; } else { - push(@vars_list, "$argtype args"); + push(@vars_list, "$argtype args = {0}"); my $is_first_arg = 1; my $has_node_device = 0; -- 2.39.1

2 1

[PATCH 0/2] Two forgotten build fixes (pushed under build-breaker rule)
by Martin Kletzander 26 Jan '23

26 Jan '23

These should've been amended into the last series, sorry. Martin Kletzander (2): qemuxml2argvdata: Fix watchdog parameters in crypto-builtin qemuxml2argvdata: Fix missing device in crypto-builtin XML tests/qemuxml2argvdata/crypto-builtin.x86_64-latest.args | 2 ++ tests/qemuxml2argvdata/crypto-builtin.xml | 1 + 2 files changed, 3 insertions(+) -- 2.39.1

1 2

[PATCH] remote: Initialize args variable
by Michal Privoznik 26 Jan '23

26 Jan '23

Recently, in v9.0.0-7-gb2034bb04c we've dropped initialization of @args variable. The reasoning was that eventually, all members of the variable will be set. Well, this is not correct. For instance, in remoteConnectGetAllDomainStats() the args.doms.doms_val pointer is set iff @ndoms != 0. However, regardless of that, the pointer is then passed to VIR_FREE(). Worse, the whole args is passed to xdr_remote_connect_get_all_domain_stats_args() which then calls xdr_array, which tests the (uninitialized) pointer against NULL. This effectively reverts b2034bb04c61c75ddbfbed46879d641b6f8ca8dc. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_driver.c | 178 ++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7f84050f70..9f3a9520e4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1434,7 +1434,7 @@ remoteNodeGetCPUStats(virConnectPtr conn, unsigned int flags) { int rv = -1; - remote_node_get_cpu_stats_args args; + remote_node_get_cpu_stats_args args = {0}; remote_node_get_cpu_stats_ret ret = {0}; size_t i; struct private_data *priv = conn->privateData; @@ -1496,7 +1496,7 @@ remoteNodeGetMemoryStats(virConnectPtr conn, unsigned int flags) { int rv = -1; - remote_node_get_memory_stats_args args; + remote_node_get_memory_stats_args args = {0}; remote_node_get_memory_stats_ret ret = {0}; size_t i; struct private_data *priv = conn->privateData; @@ -1554,7 +1554,7 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn, int startCell, int maxCells) { - remote_node_get_cells_free_memory_args args; + remote_node_get_cells_free_memory_args args = {0}; remote_node_get_cells_free_memory_ret ret = {0}; size_t i; struct private_data *priv = conn->privateData; @@ -1588,7 +1588,7 @@ remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids) { int rv = -1; size_t i; - remote_connect_list_domains_args args; + remote_connect_list_domains_args args = {0}; remote_connect_list_domains_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1661,7 +1661,7 @@ remoteDomainBlockStatsFlags(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_block_stats_flags_args args; + remote_domain_block_stats_flags_args args = {0}; remote_domain_block_stats_flags_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1718,7 +1718,7 @@ remoteDomainGetMemoryParameters(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_memory_parameters_args args; + remote_domain_get_memory_parameters_args args = {0}; remote_domain_get_memory_parameters_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1762,7 +1762,7 @@ remoteDomainGetNumaParameters(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_numa_parameters_args args; + remote_domain_get_numa_parameters_args args = {0}; remote_domain_get_numa_parameters_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1807,7 +1807,7 @@ remoteDomainGetLaunchSecurityInfo(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_launch_security_info_args args; + remote_domain_get_launch_security_info_args args = {0}; remote_domain_get_launch_security_info_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1842,7 +1842,7 @@ remoteDomainGetPerfEvents(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_perf_events_args args; + remote_domain_get_perf_events_args args = {0}; remote_domain_get_perf_events_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1876,7 +1876,7 @@ remoteDomainGetBlkioParameters(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_blkio_parameters_args args; + remote_domain_get_blkio_parameters_args args = {0}; remote_domain_get_blkio_parameters_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1923,7 +1923,7 @@ remoteDomainGetVcpuPinInfo(virDomainPtr domain, { int rv = -1; size_t i; - remote_domain_get_vcpu_pin_info_args args; + remote_domain_get_vcpu_pin_info_args args = {0}; remote_domain_get_vcpu_pin_info_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -1988,7 +1988,7 @@ remoteDomainPinEmulator(virDomainPtr dom, unsigned int flags) { struct private_data *priv = dom->conn->privateData; - remote_domain_pin_emulator_args args; + remote_domain_pin_emulator_args args = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); if (cpumaplen > REMOTE_CPUMAP_MAX) { @@ -2021,7 +2021,7 @@ remoteDomainGetEmulatorPinInfo(virDomainPtr domain, { int rv = -1; size_t i; - remote_domain_get_emulator_pin_info_args args; + remote_domain_get_emulator_pin_info_args args = {0}; remote_domain_get_emulator_pin_info_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2074,7 +2074,7 @@ remoteDomainGetVcpus(virDomainPtr domain, { int rv = -1; size_t i; - remote_domain_get_vcpus_args args; + remote_domain_get_vcpus_args args = {0}; remote_domain_get_vcpus_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2143,7 +2143,7 @@ remoteDomainGetIOThreadInfo(virDomainPtr dom, int rv = -1; size_t i; struct private_data *priv = dom->conn->privateData; - remote_domain_get_iothread_info_args args; + remote_domain_get_iothread_info_args args = {0}; remote_domain_get_iothread_info_ret ret = {0}; remote_domain_iothread_info *src; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2202,7 +2202,7 @@ remoteDomainGetIOThreadInfo(virDomainPtr dom, static int remoteDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) { - remote_domain_get_security_label_args args; + remote_domain_get_security_label_args args = {0}; remote_domain_get_security_label_ret ret = {0}; struct private_data *priv = domain->conn->privateData; int rv = -1; @@ -2235,7 +2235,7 @@ remoteDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) static int remoteDomainGetSecurityLabelList(virDomainPtr domain, virSecurityLabelPtr* seclabels) { - remote_domain_get_security_label_list_args args; + remote_domain_get_security_label_list_args args = {0}; remote_domain_get_security_label_list_ret ret = {0}; struct private_data *priv = domain->conn->privateData; size_t i; @@ -2276,7 +2276,7 @@ remoteDomainGetState(virDomainPtr domain, int *reason, unsigned int flags) { - remote_domain_get_state_args args; + remote_domain_get_state_args args = {0}; remote_domain_get_state_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2341,7 +2341,7 @@ remoteDomainMigratePrepare(virConnectPtr dconn, unsigned long flags, const char *dname, unsigned long resource) { - remote_domain_migrate_prepare_args args; + remote_domain_migrate_prepare_args args = {0}; remote_domain_migrate_prepare_ret ret = {0}; struct private_data *priv = dconn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2376,7 +2376,7 @@ remoteDomainMigratePrepare2(virConnectPtr dconn, const char *dom_xml) { int rv = -1; - remote_domain_migrate_prepare2_args args; + remote_domain_migrate_prepare2_args args = {0}; remote_domain_migrate_prepare2_ret ret = {0}; struct private_data *priv = dconn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2426,8 +2426,8 @@ remoteDomainMigratePrepare2(virConnectPtr dconn, static int remoteDomainCreate(virDomainPtr domain) { - remote_domain_create_args args; - remote_domain_lookup_by_uuid_args args2; + remote_domain_create_args args = {0}; + remote_domain_lookup_by_uuid_args args2 = {0}; remote_domain_lookup_by_uuid_ret ret2 = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2458,7 +2458,7 @@ remoteDomainCreate(virDomainPtr domain) static char * remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams) { - remote_domain_get_scheduler_type_args args; + remote_domain_get_scheduler_type_args args = {0}; remote_domain_get_scheduler_type_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2483,7 +2483,7 @@ remoteDomainMemoryStats(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_memory_stats_args args; + remote_domain_memory_stats_args args = {0}; remote_domain_memory_stats_ret ret = {0}; struct private_data *priv = domain->conn->privateData; size_t i; @@ -2525,7 +2525,7 @@ remoteDomainBlockPeek(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_block_peek_args args; + remote_domain_block_peek_args args = {0}; remote_domain_block_peek_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2572,7 +2572,7 @@ remoteDomainMemoryPeek(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_memory_peek_args args; + remote_domain_memory_peek_args args = {0}; remote_domain_memory_peek_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2616,7 +2616,7 @@ static int remoteDomainGetBlockJobInfo(virDomainPtr domain, virDomainBlockJobInfoPtr info, unsigned int flags) { - remote_domain_get_block_job_info_args args; + remote_domain_get_block_job_info_args args = {0}; remote_domain_get_block_job_info_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2650,7 +2650,7 @@ static int remoteDomainGetBlockIoTune(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_block_io_tune_args args; + remote_domain_get_block_io_tune_args args = {0}; remote_domain_get_block_io_tune_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -2700,7 +2700,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, unsigned int flags) { struct private_data *priv = domain->conn->privateData; - remote_domain_get_cpu_stats_args args; + remote_domain_get_cpu_stats_args args = {0}; remote_domain_get_cpu_stats_ret ret = {0}; int rv = -1; int cpu; @@ -2789,7 +2789,7 @@ remoteConnectNetworkEventRegisterAny(virConnectPtr conn, virFreeCallback freecb) { struct private_data *priv = conn->privateData; - remote_connect_network_event_register_any_args args; + remote_connect_network_event_register_any_args args = {0}; remote_connect_network_event_register_any_ret ret = {0}; int callbackID; int count; @@ -2833,7 +2833,7 @@ remoteConnectNetworkEventDeregisterAny(virConnectPtr conn, int callbackID) { struct private_data *priv = conn->privateData; - remote_connect_network_event_deregister_any_args args; + remote_connect_network_event_deregister_any_args args = {0}; int eventID; int remoteID; int count; @@ -2870,7 +2870,7 @@ remoteConnectStoragePoolEventRegisterAny(virConnectPtr conn, virFreeCallback freecb) { struct private_data *priv = conn->privateData; - remote_connect_storage_pool_event_register_any_args args; + remote_connect_storage_pool_event_register_any_args args = {0}; remote_connect_storage_pool_event_register_any_ret ret = {0}; int callbackID; int count; @@ -2914,7 +2914,7 @@ remoteConnectStoragePoolEventDeregisterAny(virConnectPtr conn, int callbackID) { struct private_data *priv = conn->privateData; - remote_connect_storage_pool_event_deregister_any_args args; + remote_connect_storage_pool_event_deregister_any_args args = {0}; int eventID; int remoteID; int count; @@ -2953,7 +2953,7 @@ remoteConnectNodeDeviceEventRegisterAny(virConnectPtr conn, virFreeCallback freecb) { struct private_data *priv = conn->privateData; - remote_connect_node_device_event_register_any_args args; + remote_connect_node_device_event_register_any_args args = {0}; remote_connect_node_device_event_register_any_ret ret = {0}; int callbackID; int count; @@ -2998,7 +2998,7 @@ remoteConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID) { struct private_data *priv = conn->privateData; - remote_connect_node_device_event_deregister_any_args args; + remote_connect_node_device_event_deregister_any_args args = {0}; int eventID; int remoteID; int count; @@ -3037,7 +3037,7 @@ remoteConnectSecretEventRegisterAny(virConnectPtr conn, virFreeCallback freecb) { struct private_data *priv = conn->privateData; - remote_connect_secret_event_register_any_args args; + remote_connect_secret_event_register_any_args args = {0}; remote_connect_secret_event_register_any_ret ret = {0}; int callbackID; int count; @@ -3082,7 +3082,7 @@ remoteConnectSecretEventDeregisterAny(virConnectPtr conn, int callbackID) { struct private_data *priv = conn->privateData; - remote_connect_secret_event_deregister_any_args args; + remote_connect_secret_event_deregister_any_args args = {0}; int eventID; int remoteID; int count; @@ -3204,7 +3204,7 @@ remoteConnectFindStoragePoolSources(virConnectPtr conn, unsigned int flags) { char *rv = NULL; - remote_connect_find_storage_pool_sources_args args; + remote_connect_find_storage_pool_sources_args args = {0}; remote_connect_find_storage_pool_sources_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -3229,7 +3229,7 @@ remoteConnectFindStoragePoolSources(virConnectPtr conn, static int remoteNodeDeviceDettach(virNodeDevicePtr dev) { - remote_node_device_dettach_args args; + remote_node_device_dettach_args args = {0}; struct private_data *priv = dev->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -3248,7 +3248,7 @@ remoteNodeDeviceDetachFlags(virNodeDevicePtr dev, const char *driverName, unsigned int flags) { - remote_node_device_detach_flags_args args; + remote_node_device_detach_flags_args args = {0}; struct private_data *priv = dev->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -3267,7 +3267,7 @@ remoteNodeDeviceDetachFlags(virNodeDevicePtr dev, static int remoteNodeDeviceReAttach(virNodeDevicePtr dev) { - remote_node_device_re_attach_args args; + remote_node_device_re_attach_args args = {0}; struct private_data *priv = dev->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -3284,7 +3284,7 @@ remoteNodeDeviceReAttach(virNodeDevicePtr dev) static int remoteNodeDeviceReset(virNodeDevicePtr dev) { - remote_node_device_reset_args args; + remote_node_device_reset_args args = {0}; /* This method is unusual in that it uses the HV driver, not the devMon driver * hence its use of privateData, instead of nodeDevicePrivateData */ struct private_data *priv = dev->conn->privateData; @@ -3702,9 +3702,9 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, virConnectAuthPtr auth, const char *wantmech) { remote_auth_sasl_init_ret iret; - remote_auth_sasl_start_args sargs; + remote_auth_sasl_start_args sargs = {0}; remote_auth_sasl_start_ret sret; - remote_auth_sasl_step_args pargs; + remote_auth_sasl_step_args pargs = {0}; remote_auth_sasl_step_ret pret; const char *clientout; char *serverin = NULL; @@ -3976,7 +3976,7 @@ remoteConnectDomainEventRegister(virConnectPtr conn, if (count == 1) { /* Tell the server when we are the first callback registering */ if (priv->serverEventFilter) { - remote_connect_domain_event_callback_register_any_args args; + remote_connect_domain_event_callback_register_any_args args = {0}; remote_connect_domain_event_callback_register_any_ret ret = {0}; args.eventID = VIR_DOMAIN_EVENT_ID_LIFECYCLE; @@ -4012,7 +4012,7 @@ remoteConnectDomainEventDeregister(virConnectPtr conn, virConnectDomainEventCallback callback) { struct private_data *priv = conn->privateData; - remote_connect_domain_event_callback_deregister_any_args args; + remote_connect_domain_event_callback_deregister_any_args args = {0}; int callbackID; int remoteID; int count; @@ -5085,7 +5085,7 @@ static unsigned char * remoteSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) { - remote_secret_get_value_args args; + remote_secret_get_value_args args = {0}; remote_secret_get_value_ret ret = {0}; struct private_data *priv = secret->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -5492,7 +5492,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, * events on the server */ if (count == 1) { if (priv->serverEventFilter) { - remote_connect_domain_event_callback_register_any_args args; + remote_connect_domain_event_callback_register_any_args args = {0}; remote_connect_domain_event_callback_register_any_ret ret = {0}; args.eventID = eventID; @@ -5513,7 +5513,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, virObjectEventStateSetRemote(conn, priv->eventState, callbackID, ret.callbackID); } else { - remote_connect_domain_event_register_any_args args; + remote_connect_domain_event_register_any_args args = {0}; args.eventID = eventID; @@ -5553,7 +5553,7 @@ remoteConnectDomainEventDeregisterAny(virConnectPtr conn, * events on the server */ if (count == 0) { if (priv->serverEventFilter) { - remote_connect_domain_event_callback_deregister_any_args args; + remote_connect_domain_event_callback_deregister_any_args args = {0}; args.callbackID = remoteID; @@ -5563,7 +5563,7 @@ remoteConnectDomainEventDeregisterAny(virConnectPtr conn, (xdrproc_t) xdr_void, (char *) NULL) == -1) return -1; } else { - remote_connect_domain_event_deregister_any_args args; + remote_connect_domain_event_deregister_any_args args = {0}; args.eventID = eventID; @@ -5668,7 +5668,7 @@ remoteDomainMigrateBegin3(virDomainPtr domain, unsigned long resource) { char *rv = NULL; - remote_domain_migrate_begin3_args args; + remote_domain_migrate_begin3_args args = {0}; remote_domain_migrate_begin3_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -5719,7 +5719,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, const char *dom_xml) { int rv = -1; - remote_domain_migrate_prepare3_args args; + remote_domain_migrate_prepare3_args args = {0}; remote_domain_migrate_prepare3_ret ret = {0}; struct private_data *priv = dconn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -5781,7 +5781,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, const char *dom_xml) { struct private_data *priv = dconn->privateData; - remote_domain_migrate_prepare_tunnel3_args args; + remote_domain_migrate_prepare_tunnel3_args args = {0}; remote_domain_migrate_prepare_tunnel3_ret ret = {0}; virNetClientStream *netst; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -5847,7 +5847,7 @@ remoteDomainMigratePerform3(virDomainPtr dom, const char *dname, unsigned long resource) { - remote_domain_migrate_perform3_args args; + remote_domain_migrate_perform3_args args = {0}; remote_domain_migrate_perform3_ret ret = {0}; struct private_data *priv = dom->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -5898,7 +5898,7 @@ remoteDomainMigrateFinish3(virConnectPtr dconn, unsigned long flags, int cancelled) { - remote_domain_migrate_finish3_args args; + remote_domain_migrate_finish3_args args = {0}; remote_domain_migrate_finish3_ret ret = {0}; struct private_data *priv = dconn->privateData; virDomainPtr rv = NULL; @@ -5947,7 +5947,7 @@ remoteDomainMigrateConfirm3(virDomainPtr domain, unsigned long flags, int cancelled) { - remote_domain_migrate_confirm3_args args; + remote_domain_migrate_confirm3_args args = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -5975,7 +5975,7 @@ remoteConnectGetCPUModelNames(virConnectPtr conn, int rv = -1; size_t i; g_auto(GStrv) retmodels = NULL; - remote_connect_get_cpu_model_names_args args; + remote_connect_get_cpu_model_names_args args = {0}; remote_connect_get_cpu_model_names_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6024,7 +6024,7 @@ remoteDomainOpenGraphics(virDomainPtr dom, int fd, unsigned int flags) { - remote_domain_open_graphics_args args; + remote_domain_open_graphics_args args = {0}; struct private_data *priv = dom->conn->privateData; int fdin[] = { fd }; size_t fdinlen = G_N_ELEMENTS(fdin); @@ -6052,7 +6052,7 @@ remoteDomainOpenGraphicsFD(virDomainPtr dom, unsigned int flags) { int rv = -1; - remote_domain_open_graphics_fd_args args; + remote_domain_open_graphics_fd_args args = {0}; struct private_data *priv = dom->conn->privateData; int *fdout = NULL; size_t fdoutlen = 0; @@ -6139,7 +6139,7 @@ remoteDomainGetDiskErrors(virDomainPtr dom, { int rv = -1; struct private_data *priv = dom->conn->privateData; - remote_domain_get_disk_errors_args args; + remote_domain_get_disk_errors_args args = {0}; remote_domain_get_disk_errors_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6244,7 +6244,7 @@ remoteDomainGetInterfaceParameters(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_interface_parameters_args args; + remote_domain_get_interface_parameters_args args = {0}; remote_domain_get_interface_parameters_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6291,7 +6291,7 @@ remoteNodeGetMemoryParameters(virConnectPtr conn, unsigned int flags) { int rv = -1; - remote_node_get_memory_parameters_args args; + remote_node_get_memory_parameters_args args = {0}; remote_node_get_memory_parameters_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6336,7 +6336,7 @@ remoteNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { int rv = -1; - remote_node_get_sev_info_args args; + remote_node_get_sev_info_args args = {0}; remote_node_get_sev_info_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6370,7 +6370,7 @@ remoteNodeGetCPUMap(virConnectPtr conn, unsigned int flags) { int rv = -1; - remote_node_get_cpu_map_args args; + remote_node_get_cpu_map_args args = {0}; remote_node_get_cpu_map_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6439,7 +6439,7 @@ remoteDomainGetJobStats(virDomainPtr domain, unsigned int flags) { int rv = -1; - remote_domain_get_job_stats_args args; + remote_domain_get_job_stats_args args = {0}; remote_domain_get_job_stats_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6478,7 +6478,7 @@ remoteDomainMigrateBegin3Params(virDomainPtr domain, unsigned int flags) { char *rv = NULL; - remote_domain_migrate_begin3_params_args args; + remote_domain_migrate_begin3_params_args args = {0}; remote_domain_migrate_begin3_params_ret ret = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6536,7 +6536,7 @@ remoteDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { int rv = -1; - remote_domain_migrate_prepare3_params_args args; + remote_domain_migrate_prepare3_params_args args = {0}; remote_domain_migrate_prepare3_params_ret ret = {0}; struct private_data *priv = dconn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6607,7 +6607,7 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, { struct private_data *priv = dconn->privateData; int rv = -1; - remote_domain_migrate_prepare_tunnel3_params_args args; + remote_domain_migrate_prepare_tunnel3_params_args args = {0}; remote_domain_migrate_prepare_tunnel3_params_ret ret = {0}; virNetClientStream *netst; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6684,7 +6684,7 @@ remoteDomainMigratePerform3Params(virDomainPtr dom, unsigned int flags) { int rv = -1; - remote_domain_migrate_perform3_params_args args; + remote_domain_migrate_perform3_params_args args = {0}; remote_domain_migrate_perform3_params_ret ret = {0}; struct private_data *priv = dom->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6744,7 +6744,7 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, unsigned int flags, int cancelled) { - remote_domain_migrate_finish3_params_args args; + remote_domain_migrate_finish3_params_args args = {0}; remote_domain_migrate_finish3_params_ret ret = {0}; struct private_data *priv = dconn->privateData; virDomainPtr rv = NULL; @@ -6807,7 +6807,7 @@ remoteDomainMigrateConfirm3Params(virDomainPtr domain, int cancelled) { int rv = -1; - remote_domain_migrate_confirm3_params_args args; + remote_domain_migrate_confirm3_params_args args = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6845,7 +6845,7 @@ remoteDomainCreateXMLWithFiles(virConnectPtr conn, const char *xml_desc, { virDomainPtr rv = NULL; struct private_data *priv = conn->privateData; - remote_domain_create_xml_with_files_args args; + remote_domain_create_xml_with_files_args args = {0}; remote_domain_create_xml_with_files_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6873,7 +6873,7 @@ remoteDomainCreateWithFiles(virDomainPtr dom, unsigned int flags) { struct private_data *priv = dom->conn->privateData; - remote_domain_create_with_files_args args; + remote_domain_create_with_files_args args = {0}; remote_domain_create_with_files_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6900,7 +6900,7 @@ remoteDomainGetTime(virDomainPtr dom, unsigned int flags) { struct private_data *priv = dom->conn->privateData; - remote_domain_get_time_args args; + remote_domain_get_time_args args = {0}; remote_domain_get_time_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -6930,7 +6930,7 @@ remoteNodeGetFreePages(virConnectPtr conn, unsigned long long *counts, unsigned int flags) { - remote_node_get_free_pages_args args; + remote_node_get_free_pages_args args = {0}; remote_node_get_free_pages_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7010,7 +7010,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, int rv = -1; size_t i; struct private_data *priv = net->conn->privateData; - remote_network_get_dhcp_leases_args args; + remote_network_get_dhcp_leases_args args = {0}; remote_network_get_dhcp_leases_ret ret = {0}; virNetworkDHCPLeasePtr *leases_ret = NULL; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7072,7 +7072,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, struct private_data *priv = conn->privateData; int rv = -1; size_t i; - remote_connect_get_all_domain_stats_args args; + remote_connect_get_all_domain_stats_args args = {0}; remote_connect_get_all_domain_stats_ret ret = {0}; virDomainStatsRecordPtr elem = NULL; virDomainStatsRecordPtr *tmpret = NULL; @@ -7150,7 +7150,7 @@ remoteNodeAllocPages(virConnectPtr conn, unsigned int cellCount, unsigned int flags) { - remote_node_alloc_pages_args args; + remote_node_alloc_pages_args args = {0}; remote_node_alloc_pages_ret ret = {0}; struct private_data *priv = conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7187,7 +7187,7 @@ remoteDomainGetFSInfo(virDomainPtr dom, int rv = -1; size_t i, j, len; struct private_data *priv = dom->conn->privateData; - remote_domain_get_fsinfo_args args; + remote_domain_get_fsinfo_args args = {0}; remote_domain_get_fsinfo_ret ret = {0}; remote_domain_fsinfo *src; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7261,7 +7261,7 @@ remoteDomainInterfaceAddresses(virDomainPtr dom, size_t i, j; virDomainInterfacePtr *ifaces_ret = NULL; - remote_domain_interface_addresses_args args; + remote_domain_interface_addresses_args args = {0}; remote_domain_interface_addresses_ret ret = {0}; struct private_data *priv = dom->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7393,7 +7393,7 @@ remoteDomainRename(virDomainPtr dom, const char *new_name, unsigned int flags) { int rv = -1; struct private_data *priv = dom->conn->privateData; - remote_domain_rename_args args; + remote_domain_rename_args args = {0}; remote_domain_rename_ret ret = {0}; char *tmp = NULL; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7427,7 +7427,7 @@ remoteStorageVolGetInfoFlags(virStorageVolPtr vol, unsigned int flags) { struct private_data *priv = vol->conn->privateData; - remote_storage_vol_get_info_flags_args args; + remote_storage_vol_get_info_flags_args args = {0}; remote_storage_vol_get_info_flags_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7457,7 +7457,7 @@ remoteNetworkPortGetParameters(virNetworkPortPtr port, { int rv = -1; struct private_data *priv = port->net->conn->privateData; - remote_network_port_get_parameters_args args; + remote_network_port_get_parameters_args args = {0}; remote_network_port_get_parameters_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7492,7 +7492,7 @@ remoteDomainGetGuestInfo(virDomainPtr dom, { int rv = -1; struct private_data *priv = dom->conn->privateData; - remote_domain_get_guest_info_args args; + remote_domain_get_guest_info_args args = {0}; remote_domain_get_guest_info_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7530,7 +7530,7 @@ remoteDomainAuthorizedSSHKeysGet(virDomainPtr domain, int rv = -1; size_t i; struct private_data *priv = domain->conn->privateData; - remote_domain_authorized_ssh_keys_get_args args; + remote_domain_authorized_ssh_keys_get_args args = {0}; remote_domain_authorized_ssh_keys_get_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7570,7 +7570,7 @@ remoteDomainAuthorizedSSHKeysSet(virDomainPtr domain, unsigned int flags) { struct private_data *priv = domain->conn->privateData; - remote_domain_authorized_ssh_keys_set_args args; + remote_domain_authorized_ssh_keys_set_args args = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); if (nkeys > REMOTE_DOMAIN_AUTHORIZED_SSH_KEYS_MAX) { @@ -7603,7 +7603,7 @@ remoteDomainGetMessages(virDomainPtr domain, int rv = -1; size_t i; struct private_data *priv = domain->conn->privateData; - remote_domain_get_messages_args args; + remote_domain_get_messages_args args = {0}; remote_domain_get_messages_ret ret = {0}; VIR_LOCK_GUARD lock = remoteDriverLock(priv); @@ -7643,7 +7643,7 @@ remoteDomainFDAssociate(virDomainPtr domain, int *fds, unsigned int flags) { - remote_domain_fd_associate_args args; + remote_domain_fd_associate_args args = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); -- 2.39.1

4 4

[libvirt PATCH] remote: Fix version annotation for remoteDomainFDAssociate
by Jiri Denemark 26 Jan '23

26 Jan '23

The API was added in libvirt 9.0.0. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9f3a9520e4..2f421fb5e0 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8101,7 +8101,7 @@ static virHypervisorDriver hypervisor_driver = { .domainGetMessages = remoteDomainGetMessages, /* 7.1.0 */ .domainStartDirtyRateCalc = remoteDomainStartDirtyRateCalc, /* 7.2.0 */ .domainSetLaunchSecurityState = remoteDomainSetLaunchSecurityState, /* 8.0.0 */ - .domainFDAssociate = remoteDomainFDAssociate, /* 8.9.0 */ + .domainFDAssociate = remoteDomainFDAssociate, /* 9.0.0 */ }; static virNetworkDriver network_driver = { -- 2.39.1

2 1

[libvirt PATCH 0/4] remote: Random RPC fixes and cleanups
by Jiri Denemark 26 Jan '23

26 Jan '23

Jiri Denemark (4): remote: Propagate error from virDomainGetSecurityLabelList via RPC remote: Drop useless check in remoteDispatchDomainGetIOThreadInfo remote: Avoid leaking uri_out remote: Drop useless cleanup in remoteDispatchNodeGet{CPU,Memory}Stats src/remote/remote_daemon_dispatch.c | 48 +++++++++-------------------- 1 file changed, 15 insertions(+), 33 deletions(-) -- 2.39.1

3 7

[libvirt PATCH 0/7] Extract the integration job commands to a shell scripts
by Erik Skultety 26 Jan '23

26 Jan '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 successful pipeline after the change: https://gitlab.com/eskultety/libvirt/-/pipelines/753090691 Erik Skultety (7): ci: integration: Extract several hidden job definitions to a script ci: integration: Drop the 'install-deps' hidden job and reference ci: integration-template: Drop Fedora 35 check ci: integration.sh: Replace most 'sudo' usage with running as root 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 ci/integration-template.yml | 42 ++---------------------------- ci/integration.sh | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 40 deletions(-) create mode 100644 ci/integration.sh -- 2.39.0

3 23

[PATCH] qemu_domain: Don't unref NULL hash table in qemuDomainRefreshStatsSchema()
by Michal Privoznik 26 Jan '23

26 Jan '23

The g_hash_table_unref() function does not accept NULL. Passing NULL results in a glib warning being triggered. Check whether the hash table is not NULL and unref it only then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b6ad118f1f..881c88d54c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11923,7 +11923,8 @@ qemuDomainRefreshStatsSchema(virDomainObj *dom) if (!schema) return -1; - g_hash_table_unref(priv->statsSchema); + if (priv->statsSchema) + g_hash_table_unref(priv->statsSchema); priv->statsSchema = schema; return 0; -- 2.39.1

2 1

[PATCH 0/7] qemu: Fix implicit q35 watchdog
by Martin Kletzander 26 Jan '23

26 Jan '23

More info in commit messages (duh). Martin Kletzander (7): Avoid unnecessary nesting Support multiple watchdog devices Add iTCO watchdog support qemu: Enable iTCO watchdog by disabling its noreboot pin strap qemu: Add implicit watchdog for q35 machine types Document change to multiple watchdogs news: Add information about iTCO watchdog changes NEWS.rst | 6 ++ docs/formatdomain.rst | 10 ++- src/conf/domain_conf.c | 83 +++++++++++++------ src/conf/domain_conf.h | 9 +- src/conf/schemas/domaincommon.rng | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 26 ++++-- src/qemu/qemu_alias.h | 5 +- src/qemu/qemu_command.c | 34 ++++++-- src/qemu/qemu_domain.c | 44 ++++++++++ src/qemu/qemu_domain_address.c | 9 +- src/qemu/qemu_driver.c | 14 ++-- src/qemu/qemu_hotplug.c | 71 +++++++--------- src/qemu/qemu_process.c | 3 +- src/qemu/qemu_validate.c | 50 +++++++++++ .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + tests/qemuxml2argvdata/autoindex.args | 2 + .../boot-floppy-q35.x86_64-latest.args | 2 + tests/qemuxml2argvdata/boot-floppy-q35.xml | 1 + tests/qemuxml2argvdata/cpu-host-model.args | 2 + .../cpu-host-model.x86_64-4.2.0.args | 2 + .../cpu-host-model.x86_64-5.0.0.args | 2 + .../cpu-host-model.x86_64-5.1.0.args | 2 + .../cpu-host-model.x86_64-5.2.0.args | 2 + .../cpu-host-model.x86_64-6.0.0.args | 2 + .../cpu-host-model.x86_64-6.1.0.args | 2 + .../cpu-host-model.x86_64-latest.args | 2 + .../disk-floppy-q35.x86_64-latest.args | 2 + ...are-auto-bios-stateless.x86_64-latest.args | 2 + .../firmware-auto-bios.x86_64-latest.args | 2 + ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 + ...-auto-efi-loader-secure.x86_64-latest.args | 2 + ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 + ...are-auto-efi-no-secboot.x86_64-latest.args | 2 + ...firmware-auto-efi-nvram.x86_64-latest.args | 2 + ...rmware-auto-efi-secboot.x86_64-latest.args | 2 + ...ware-auto-efi-stateless.x86_64-latest.args | 2 + .../firmware-auto-efi.x86_64-latest.args | 2 + .../firmware-manual-efi-acpi-q35.args | 2 + .../firmware-manual-efi-secure.args | 2 + .../firmware-manual-noefi-acpi-q35.args | 2 + .../firmware-manual-noefi-noacpi-q35.args | 2 + ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args | 2 + ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 2 + .../hvf-x86_64-q35-headless.args | 2 + .../intel-iommu-aw-bits.x86_64-latest.args | 2 + .../qemuxml2argvdata/intel-iommu-aw-bits.xml | 1 + ...ntel-iommu-caching-mode.x86_64-latest.args | 2 + .../intel-iommu-caching-mode.xml | 1 + ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 + .../intel-iommu-device-iotlb.xml | 1 + .../intel-iommu-eim.x86_64-latest.args | 2 + tests/qemuxml2argvdata/intel-iommu-eim.xml | 1 + .../intel-iommu.x86_64-latest.args | 2 + tests/qemuxml2argvdata/intel-iommu.xml | 1 + ...othreads-ids-pool-sizes.x86_64-latest.args | 2 + .../iothreads-ids-pool-sizes.xml | 1 + .../machine-smm-off.x86_64-latest.args | 2 + .../machine-smm-on.x86_64-latest.args | 2 + tests/qemuxml2argvdata/pcie-expander-bus.args | 2 + .../pcie-root-port-model-generic.args | 2 + .../pcie-root-port-model-ioh3420.args | 2 + ...cie-root-port-nohotplug.x86_64-latest.args | 2 + tests/qemuxml2argvdata/pcie-root-port.args | 2 + tests/qemuxml2argvdata/pcie-root.args | 2 + .../pcie-switch-downstream-port.args | 2 + .../pcie-switch-upstream-port.args | 2 + tests/qemuxml2argvdata/pcihole64-q35.args | 2 + ...q35-default-devices-only.x86_64-4.2.0.args | 2 + ...35-default-devices-only.x86_64-latest.args | 2 + .../q35-multifunction.x86_64-4.2.0.args | 2 + .../q35-multifunction.x86_64-latest.args | 2 + .../q35-pci-force-address.args | 2 + .../q35-pcie-autoadd.x86_64-4.2.0.args | 2 + .../q35-pcie-autoadd.x86_64-latest.args | 2 + .../q35-pcie.x86_64-4.2.0.args | 2 + .../q35-pcie.x86_64-latest.args | 2 + .../q35-pm-disable-fallback.args | 2 + tests/qemuxml2argvdata/q35-pm-disable.args | 2 + tests/qemuxml2argvdata/q35-usb2-multi.args | 2 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 + tests/qemuxml2argvdata/q35-usb2.args | 2 + .../q35-virt-manager-basic.x86_64-4.2.0.args | 2 + .../q35-virt-manager-basic.x86_64-latest.args | 2 + tests/qemuxml2argvdata/q35.args | 2 + .../sgx-epc.x86_64-7.0.0.args | 2 + tests/qemuxml2argvdata/sgx-epc.xml | 1 + .../tseg-explicit-size.x86_64-latest.args | 2 + .../usb-controller-default-q35.args | 2 + .../usb-controller-explicit-q35.args | 2 + .../user-aliases2.x86_64-latest.args | 2 + .../vcpu-placement-static.args | 2 + .../vcpu-placement-static.xml | 1 + ...vhost-user-fs-hugepages.x86_64-latest.args | 2 + .../vhost-user-fs-hugepages.xml | 1 + .../virtio-iommu-x86_64.x86_64-latest.args | 2 + ...virtio-non-transitional.x86_64-latest.args | 2 + .../virtio-transitional.x86_64-latest.args | 2 + .../watchdog-q35-multiple.x86_64-latest.args | 40 +++++++++ .../watchdog-q35-multiple.xml | 25 ++++++ ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 + ...efault-cpu-tcg-features.x86_64-latest.args | 2 + .../x86_64-default-cpu-tcg-features.xml | 1 + ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 + .../x86_64-q35-graphics.x86_64-latest.args | 2 + .../x86_64-q35-headless.x86_64-latest.args | 2 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/autoindex.xml | 1 + ...ware-auto-bios-stateless.x86_64-latest.xml | 1 + .../firmware-auto-bios.x86_64-latest.xml | 1 + ...e-auto-efi-enrolled-keys.x86_64-latest.xml | 1 + ...e-auto-efi-loader-secure.x86_64-latest.xml | 1 + ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 1 + ...ware-auto-efi-no-secboot.x86_64-latest.xml | 1 + .../firmware-auto-efi-nvram.x86_64-latest.xml | 1 + ...irmware-auto-efi-secboot.x86_64-latest.xml | 1 + .../firmware-auto-efi.x86_64-latest.xml | 1 + ...dev-scsi-vhost-scsi-pcie.x86_64-latest.xml | 1 + .../hvf-x86_64-q35-headless.xml | 1 + .../machine-smm-off.x86_64-latest.xml | 1 + .../machine-smm-on.x86_64-latest.xml | 1 + .../net-isolated-port.x86_64-latest.xml | 1 + .../qemuxml2xmloutdata/pcie-expander-bus.xml | 1 + .../pcie-root-port-model-generic.xml | 1 + .../pcie-root-port-model-ioh3420.xml | 1 + ...pcie-root-port-nohotplug.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 + tests/qemuxml2xmloutdata/pcie-root.xml | 1 + .../pcie-switch-downstream-port.xml | 1 + .../pcie-switch-upstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 + ...q35-default-devices-only.x86_64-latest.xml | 1 + .../q35-multifunction.x86_64-latest.xml | 1 + .../q35-pci-force-address.xml | 1 + .../q35-pcie-autoadd.x86_64-latest.xml | 1 + .../q35-pcie.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2.xml | 1 + .../q35-virt-manager-basic.x86_64-latest.xml | 1 + tests/qemuxml2xmloutdata/q35.xml | 1 + .../tseg-explicit-size.x86_64-latest.xml | 1 + .../usb-controller-default-q35.xml | 1 + .../usb-controller-explicit-q35.xml | 1 + .../virtio-iommu-x86_64.x86_64-latest.xml | 1 + .../virtio-non-transitional.x86_64-latest.xml | 1 + .../virtio-transitional.x86_64-latest.xml | 1 + .../watchdog-q35-multiple.x86_64-latest.xml | 51 ++++++++++++ ...-default-cpu-kvm-q35-4.2.x86_64-latest.xml | 1 + ...-default-cpu-tcg-q35-4.2.x86_64-latest.xml | 1 + .../x86_64-q35-graphics.x86_64-latest.xml | 1 + .../x86_64-q35-headless.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 153 files changed, 601 insertions(+), 97 deletions(-) create mode 100644 tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/watchdog-q35-multiple.xml create mode 100644 tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml -- 2.39.1

3 13

[PATCH v2 0/5] Support crypto device
by zhenwei pi 25 Jan '23

25 Jan '23

v1 -> v2: - Rebase code against the latest commit: 46aee2a9255adf842ab44a9292acb46189a726f7 - Merge previous 1/7 and 2/7 into a single patch: conf: introduce crypto device - Add missing qemuxml2xmltest. - Merge previous 3/7 and 4/7 into a single patch: capabilities: introduce crypto - Add missing formatdomaincaps.rst. - Several fixes from Michal Prívozník' crypto_review branch. - Add caps and test for qemu-8.0. Thanks to Michal for lots of suggestions! v1: This series supports crypto device, also add support for QEMU. The basic xml schema looks like: <crypto model='virtio' type='qemu'> <backend model='builtin' queues='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </crypto> <crypto model='virtio' type='qemu'> <backend model='lkcf'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> </crypto> Each patch has been tested by 'ninja -C build test', and launch a QEMU with crypto devices, it works fine. zhenwei pi (5): conf: introduce crypto device capabilities: introduce crypto qemu: alias: support crypto device qemu: command: support crypto device NEWS: Document 'crypto' device NEWS.rst | 3 + docs/formatdomain.rst | 21 +++ docs/formatdomaincaps.rst | 33 ++++ src/ch/ch_domain.c | 1 + src/conf/domain_capabilities.c | 15 ++ src/conf/domain_capabilities.h | 12 ++ src/conf/domain_conf.c | 158 ++++++++++++++++++ src/conf/domain_conf.h | 39 +++++ src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 18 ++ src/conf/schemas/domaincaps.rng | 10 ++ src/conf/schemas/domaincommon.rng | 58 +++++++ src/conf/virconftypes.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 23 +++ src/qemu/qemu_capabilities.c | 30 ++++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_command.c | 109 ++++++++++++ src/qemu/qemu_domain.c | 3 + src/qemu/qemu_domain_address.c | 26 +++ src/qemu/qemu_driver.c | 5 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_validate.c | 22 +++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 11 ++ .../qemu_4.2.0-virt.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 11 ++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 11 ++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 11 ++ .../qemu_5.0.0-virt.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 11 ++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 9 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 11 ++ .../qemu_5.2.0-virt.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 11 ++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 11 ++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 11 ++ .../qemu_6.0.0-virt.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_6.0.0.s390x.xml | 11 ++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 11 ++ .../qemu_6.2.0-virt.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 11 ++ tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 11 ++ .../qemu_7.0.0-virt.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 11 ++ tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 11 ++ tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 11 ++ .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 11 ++ tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 11 ++ tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 11 ++ .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 12 ++ .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 12 ++ tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 12 ++ .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 12 ++ .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 12 ++ tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 12 ++ .../caps_4.2.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 + .../caps_4.2.0.x86_64.xml | 2 + .../caps_5.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 + .../caps_5.0.0.riscv64.xml | 2 + .../caps_5.0.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 + .../caps_5.1.0.x86_64.xml | 2 + .../caps_5.2.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 + .../caps_5.2.0.riscv64.xml | 2 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 + .../caps_5.2.0.x86_64.xml | 2 + .../caps_6.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 + .../caps_6.0.0.x86_64.xml | 2 + .../caps_6.1.0.x86_64.xml | 2 + .../caps_6.2.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + .../caps_6.2.0.x86_64.xml | 2 + .../caps_7.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + .../caps_7.0.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 2 + .../caps_7.1.0.x86_64.xml | 2 + .../caps_7.2.0.x86_64.xml | 3 + .../caps_8.0.0.x86_64.xml | 3 + tests/qemuxml2argvdata/crypto-builtin.xml | 51 ++++++ .../crypto-builtin.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 2 + 110 files changed, 1321 insertions(+) create mode 100644 tests/qemuxml2argvdata/crypto-builtin.xml create mode 120000 tests/qemuxml2xmloutdata/crypto-builtin.x86_64-latest.xml -- 2.34.1

2 15

[libvirt PATCH] rpc: don't try to spawn non-existant daemon
by Daniel P. Berrangé 25 Jan '23

25 Jan '23

If libvirt is built in client only mode, the libvirtd/virtqemud/etc daemons won't exist. If the client is told to connect to a local hypervisor, it'll see the socket doesn't exist, try to spawn the daemon and then re-try connecting to the socket for a few seconds. Ultimately this will fail because the daemon doesn't exist and the user gets an error message error: Failed to connect socket to '/run/user/1000/libvirt/virtqemud-sock': No such file or directory technically this is accurate, but it doesn't help identify the root cause. With this change it will now report error: binary 'virtqemud' does not exist in $PATH: No such file or directory and will skip all the socket connect retries Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/rpc/virnetsocket.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 8280bda007..bb2e0c5d3d 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -123,9 +123,19 @@ VIR_ONCE_GLOBAL_INIT(virNetSocket); #ifndef WIN32 static int virNetSocketForkDaemon(const char *binary) { - g_autoptr(virCommand) cmd = virCommandNewArgList(binary, - "--timeout=120", - NULL); + g_autofree char *binarypath = virFindFileInPath(binary); + g_autoptr(virCommand) cmd = NULL; + + if (!binarypath) { + virReportSystemError(ENOENT, + _("binary '%s' does not exist in $PATH"), + binary); + return -1; + } + + cmd = virCommandNewArgList(binarypath, + "--timeout=120", + NULL); virCommandAddEnvPassCommon(cmd); virCommandAddEnvPass(cmd, "XDG_CACHE_HOME"); -- 2.39.0

2 4

[PATCH 0/3] update RISC-V QEMU caps for QEMU 8.0.0
by Daniel Henrique Barboza 24 Jan '23

24 Jan '23

Hi, This series updates RISC-V QEMU caps that weren't being updated since QEMU 5.0.0. To do that I had to add a RISC-V stub driver in src/cpu to avoid test failures after the caps update. This is a very bare-bone driver that is basically a no-op. I also took the opportunity to enable the RISC-V 'virt' machine type in domaincapstest.c to increase the test coverage for the architecture. Daniel Henrique Barboza (3): src/cpu: add a basic RiscV64 cpu driver tests: update RISC-V QEMU caps for QEMU 8.0.0 tests: add QEMU RISC-V "virt" machine in domaincapstest src/cpu/cpu.c | 2 + src/cpu/cpu_riscv64.c | 59 + src/cpu/cpu_riscv64.h | 25 + src/cpu/meson.build | 1 + .../qemu_5.0.0-tcg-virt.riscv64.xml | 142 + .../qemu_5.0.0-virt.riscv64.xml | 145 + .../qemu_5.2.0-tcg-virt.riscv64.xml | 142 + .../qemu_5.2.0-virt.riscv64.xml | 145 + .../qemu_8.0.0-tcg-virt.riscv64.xml | 148 + .../qemu_8.0.0-virt.riscv64.xml | 151 + tests/domaincapstest.c | 14 +- .../caps_8.0.0.riscv64.replies | 28554 ++++++++++++++++ .../caps_8.0.0.riscv64.xml | 157 + ...ult-video-type-riscv64.riscv64-latest.args | 11 +- .../riscv64-virt-graphics.riscv64-latest.args | 45 +- .../riscv64-virt-headless.riscv64-latest.args | 37 +- tests/testutilshostcpus.h | 10 + 17 files changed, 29741 insertions(+), 47 deletions(-) create mode 100644 src/cpu/cpu_riscv64.c create mode 100644 src/cpu/cpu_riscv64.h create mode 100644 tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml create mode 100644 tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml create mode 100644 tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml create mode 100644 tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.0.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml -- 2.39.0

2 6

[PATCH] rpc: Fix error message in virNetServerSetClientLimits
by Martin Kletzander 24 Jan '23

24 Jan '23

Commit f007940cb25a tried to change the error message so that it is unified later in 35afa1d2d6c1, but various rewrites missed this particular error message which does not make sense. Fix it so that it is the same as the other two messages checking the same thing in this file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2033879 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/rpc/virnetserver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index bf0fda04ee89..e97dfe81369f 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1127,9 +1127,8 @@ virNetServerSetClientLimits(virNetServer *srv, if (max < max_unauth) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("The overall maximum number of clients waiting " - "for authentication must not be less than the overall " - "maximum number of clients")); + _("The overall maximum number of clients must not be less " + "than the number of clients waiting for authentication")); return -1; } -- 2.39.1

2 1

[PATCH 0/8] vbox: Report VirtualBox exceptions too
by Michal Privoznik 24 Jan '23

24 Jan '23

See 5/8 for motivation. Michal Prívozník (8): vbox: Introduce VBOX_QUERY_INTERFACE() vbox: Introduce IVirtualBoxErrorInfo interface vbox: Introduce vboxUniformedPFN::GetException() vbox: Introduce vboxUniformedPFN::ClearException() vbox: Introduce vboxReportError() vbox: Replace virReportError() with vboxReportError() vbox: Move error messages onto a single line vbox: Stop reporting RC in error messages src/vbox/vbox_common.c | 1223 +++++++++++++++++---------------- src/vbox/vbox_common.h | 6 + src/vbox/vbox_tmpl.c | 52 ++ src/vbox/vbox_uniformed_api.h | 11 + 4 files changed, 712 insertions(+), 580 deletions(-) -- 2.39.1

2 12

[PATCH 0/3] qemu: Fix alias generation for 'dimm' devices
by Peter Krempa 24 Jan '23

24 Jan '23

Peter Krempa (3): qemu: hotplug: Remove legacy quirk for 'dimm' address generation qemu: alias: Remove 'oldAlias' argument of qemuAssignDeviceMemoryAlias qemu: Remove 'memAliasOrderMismatch' field from VM private data src/qemu/qemu_alias.c | 13 ++++--------- src/qemu/qemu_alias.h | 3 +-- src/qemu/qemu_domain.h | 3 --- src/qemu/qemu_hotplug.c | 4 +--- src/qemu/qemu_process.c | 24 ------------------------ 5 files changed, 6 insertions(+), 41 deletions(-) -- 2.38.1

2 4

[PATCH 00/15] vbox: Add support for version 7.0 SDK and drop old
by Michal Privoznik 24 Jan '23

24 Jan '23

For full experience you'll need to apply these on top of: https://listman.redhat.com/archives/libvir-list/2023-January/237248.html Michal Prívozník (15): vbox: Drop misleading G_GNUC_UNUSED annotation vbox: Drop @mediaChangeOnly from vboxDomainAttachDeviceImpl() vbox: Drop @iid from UIMachine::LaunchVMProcess() vbox: Drop @iid from UISession::Open() vbox: Drop @iid from UISession::OpenExisting() vbox: Drop @data and @name from UIHost::CreateHostOnlyNetworkInterface() vbox: Drop UIUSBCommon::Enable() vbox: Drop UIUSBCommon::GetEnabled() vbox: Drop support for virtualbox-5.2.0 vbox: Drop support for virtualbox-6.0.0 vbox: Drop @networkName from UIDHCPServer::Start() vbox: Rename #include guard macro in header files vbox: add version 7.0 CAPI header vbox: Add support for version 7.0 SDK NEWS: Document recent vbox changes NEWS.rst | 11 + docs/drvvbox.rst | 2 +- src/vbox/meson.build | 3 +- src/vbox/vbox_CAPI_v5_2.h | 26870 ---------------- src/vbox/vbox_CAPI_v6_1.h | 6 +- .../{vbox_CAPI_v6_0.h => vbox_CAPI_v7_0.h} | 9280 +++++- src/vbox/vbox_V6_0.c | 13 - src/vbox/{vbox_V5_2.c => vbox_V7_0.c} | 6 +- src/vbox/vbox_XPCOMCGlue.h | 2 +- src/vbox/vbox_common.c | 65 +- src/vbox/vbox_common.h | 8 +- src/vbox/vbox_network.c | 5 +- src/vbox/vbox_storage.c | 10 +- src/vbox/vbox_tmpl.c | 204 +- src/vbox/vbox_uniformed_api.h | 15 +- 15 files changed, 8713 insertions(+), 27787 deletions(-) delete mode 100644 src/vbox/vbox_CAPI_v5_2.h rename src/vbox/{vbox_CAPI_v6_0.h => vbox_CAPI_v7_0.h} (75%) delete mode 100644 src/vbox/vbox_V6_0.c rename src/vbox/{vbox_V5_2.c => vbox_V7_0.c} (68%) -- 2.39.1

3 19

[PATCH] network: Increase max route size when checking IPv6 forwarding
by Brooks Swinnerton 24 Jan '23

24 Jan '23

In d9ee51e, virNetDevIPCheckIPv6Forwarding was updated to walk the contents of /proc/net/ipv6_route so that it could check to see if the RTF_ADDRCONF was set on any IPv6 routes to ultimately determine if enabling forwarding would result in an error due to accept_ra=1 being set on the interface. The implementation added in that commit limited the number of routes that could be read from /proc/net/ipv6_route to 100_000, each with 150 characters. This is problematic for machines that have a full IPv6 routing table, as the IPv6 routing table has now grown to over 160_000 (it was closer to 100_000 at the time of that commit). This patch increases the maximum route size from 100_000 to 1_000_000. While a million routes is somewhat arbitrary, it's meant to be a value that can be supported for the forseeable future. APNIC, one of the five regional internet registries, recently published a forecast of IPv6 table growth which anticipates a worst-case growth to 1_000_000 in January of 2029. Signed-off-by: Brooks Swinnerton <bswinnerton(a)gmail.com> --- src/util/virnetdevip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 2eacb64ebe..034b392ee7 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -529,7 +529,7 @@ virNetDevIPCheckIPv6Forwarding(void) char *cur; g_autofree char *buf = NULL; /* lines are 150 chars */ - enum {MAX_ROUTE_SIZE = 150*100000}; + enum {MAX_ROUTE_SIZE = 150*1000000}; /* This is /proc/sys/net/ipv6/conf/all/accept_ra */ int all_accept_ra = virNetDevIPGetAcceptRA(NULL); -- 2.39.1

2 1

[PATCH V2 1/1] qemuProcessEventSubmit : rename vm to event->vm
by Shaleen Bathla 24 Jan '23

24 Jan '23

In error case, free event->vm instead of vm. This makes it easier for the reader to understand what we should free. Signed-off-by: Shaleen Bathla <shaleen.bathla(a)oracle.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ee9f0784d3a3..83b553418068 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -287,7 +287,7 @@ qemuProcessEventSubmit(virDomainObj *vm, event->data = data; if (virThreadPoolSendJob(driver->workerPool, 0, event) < 0) { - virObjectUnref(vm); + virObjectUnref(event->vm); qemuProcessEventFree(event); } } -- 2.31.1

2 2

[PATCH V2 0/2] define g_autoptr for virNWFilterDef and virNWFilterRuleDef
by Jiang Jiacheng 24 Jan '23

24 Jan '23

Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label/variable. Those patches are followup with: https://gitlab.com/libvirt/libvirt/-/commit/a9027d447be789cd11c0aa18ceb83ed… diff to v1: * drop two changes that may cause memory leaks in 'nwfilterDefineXMLFlags' and 'virNWFilterObjListLoadConfig' Jiang Jiacheng (2): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef src/conf/nwfilter_conf.c | 44 +++++++++++++++---------------------- src/conf/nwfilter_conf.h | 2 ++ tests/nwfilterxml2xmltest.c | 22 +++++++------------ 3 files changed, 28 insertions(+), 40 deletions(-) -- 2.33.0

3 5

[PATCH 0/5] Credential asking cleanup follow-up
by Peter Krempa 23 Jan '23

23 Jan '23

Few things noticed during review and during fixing of the original patches after review. Peter Krempa (5): util: authconfig: Don't check return value of 'g_key_file_new()' virNetSSHSessionAuthAddPasswordAuth: Don't access unlocked 'sess' virnetsshsession: Don't check return value of 'virNetSSHSessionAuthMethodNew' virNetLibsshSessionAuthAddPasswordAuth: Don't access unlocked 'sess' virnetlibsshsession: Don't check return value of 'virNetLibsshSessionAuthMethodNew' src/rpc/virnetlibsshsession.c | 50 ++++++++--------------------------- src/rpc/virnetsshsession.c | 41 +++++++--------------------- src/util/virauthconfig.c | 8 ++---- 3 files changed, 23 insertions(+), 76 deletions(-) -- 2.38.1

2 6

[PATCH 0/2] vbox: Two simple fixes
by Michal Privoznik 23 Jan '23

23 Jan '23

I've notice these while working on adding support for 7.0 API. Michal Prívozník (2): vbox: Fix memleak in _virtualboxCreateMachine() vbox: Fix starting domains src/vbox/vbox_common.c | 13 ++++++------- src/vbox/vbox_tmpl.c | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.39.1

3 9

[PATCH v2 0/3] qemu: Provide virDomainGetCPUStats() implementation for session connection
by Michal Privoznik 23 Jan '23

23 Jan '23

v2 of: https://listman.redhat.com/archives/libvir-list/2023-January/237113.html diff to v1: - Make virProcessGetStatInfo() return an error, per Martin's review Michal Prívozník (3): src: Don't use virReportSystemError() on virProcessGetStatInfo() failure virprocess: Make virProcessGetStatInfo() fail if unable to parse data qemu: Provide virDomainGetCPUStats() implementation for session connection src/ch/ch_driver.c | 4 +-- src/qemu/qemu_driver.c | 67 +++++++++++++++++++++++++++++++++++------- src/util/virprocess.c | 28 +++++------------- 3 files changed, 65 insertions(+), 34 deletions(-) -- 2.38.2

3 9

[PATCH 0/2] qemu_interface: Fix managed='no' case when creating an ethernet interface
by Michal Privoznik 23 Jan '23

23 Jan '23

*** BLURB HERE *** Michal Prívozník (2): virnetdevtap: Clarify virNetDevTapCreate() behavior wrt VIR_NETDEV_TAP_CREATE_ALLOW_EXISTING qemu_interface: Fix managed='no' case when creating an ethernet interface src/qemu/qemu_interface.c | 5 +++-- src/util/virnetdevtap.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.39.1

2 3

KubeVirt with libvirt 9.0.0: Requested operation is not valid: The tap0 interface already exists
by Vasily Ulyanov 23 Jan '23

23 Jan '23

Hi All, I am now trying to run our downstream KubeVirt build with a recent libvirt 9.0.0 and I see a problem that libvirt refuses to start a VM if it is configured to use a pre-created tap device: virError(Code=55, Domain=0, Message='Requested operation is not valid: The tap0 interface already exists') After looking at the git history I found the bellow commit [1] which explicitly forbids such a usecase. This basically breaks KubeVirt since libvirt there runs unprivileged and can only use the existing tap's. I haven't yet look deeper into the original issue linked to the commit. Just wanted to raise this here first. Perhaps someone can provide feedback on that. What about some alternative approach instead? Or maybe it was discussed already... BTW, I tested with the reverted commit and it was successful. [1] https://gitlab.com/libvirt/libvirt/-/commit/a2ae3d299cf9c5ada8aa42ec4271748… -- Vasily Ulyanov <vulyanov(a)suse.de> Software Engineer, SUSE Labs Core

3 3

[libvirt PATCH] conf: clarify some external TPM error messages
by Ján Tomko 23 Jan '23

23 Jan '23

Two of the messages referred to 'backend type' when dealing with the source type and one mentioned the 'client' attribute from an earlier iteration of the patches, even though the attribute was later changed to 'connect'. https://bugzilla.redhat.com/show_bug.cgi?id=2063723 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- src/conf/domain_validate.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 45965fa0fa..733399e6da 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10545,7 +10545,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_TPM_TYPE_EXTERNAL: if (!(type = virXPathString("string(./backend/source/@type)", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing external TPM backend type")); + _("missing external TPM backend source type")); goto error; } @@ -10555,7 +10555,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, def->data.external.source->type = virDomainChrTypeFromString(type); if (def->data.external.source->type < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown backend type '%s' for external TPM"), + _("unknown backend source type '%s' for external TPM"), type); goto error; } diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 39d924d4ed..1c13929281 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2757,7 +2757,7 @@ virDomainTPMDevValidate(const virDomainTPMDef *tpm) } if (tpm->data.external.source->data.nix.listen) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("only 'client' mode is supported for external TPM device")); + _("only 'connect' mode is supported for external TPM device")); return -1; } if (tpm->data.external.source->data.nix.path == NULL) { -- 2.39.0

2 1

[PATCH] docs: fix passt example
by Laine Stump 20 Jan '23

20 Jan '23

Somehow I neglected to fully update the example for the interface passt backend when the design changed during development. This fixes the example to reflect what is in the code. Signed-off-by: Laine Stump <laine(a)redhat.com> --- docs/formatdomain.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f76c7c3d81..9c6843e082 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -4858,18 +4858,18 @@ ports **with the exception of some subset**. <backend type='passt' logFile='/var/log/passt.log'/> <mac address="00:11:22:33:44:55"/> <source dev='eth0'/> - <ip family='ipv4' address='172.17.2.0' prefix='24'/> - <ip family='ipv6' address='2001:db8:ac10:fd01::' prefix='64'/> - <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10' start='2022'> - <port start='22'/> + <ip family='ipv4' address='172.17.2.4' prefix='24'/> + <ip family='ipv6' address='2001:db8:ac10:fd01::20'/> + <portForward proto='tcp'> + <range start='2022' to='22'/> </portForward> - <portForward proto='udp' address='1.2.3.4' start='5000' end='5020'> - <port start='6000' end='6020'/> + <portForward proto='udp' address='1.2.3.4'> + <range start='5000' end='5020' to='6000'/> + <range start='5010' end='5015' exclude='yes'/> </portForward> - <portForward exclude='yes' proto='tcp' address='1.2.3.4' start='5010' end='5015'/> - <portForward proto='tcp' start='80'/> - <portForward proto='tcp' start='443'> - <port start='344'/> + <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10'>> + <range start='80'/> + <range start='443' to='344'/> </portForward> </interface> </devices> -- 2.38.1

2 1

[PATCH 0/3] migration: add qemu multifd migration options
by Jiang Jiacheng 19 Jan '23

19 Jan '23

Add qemu multifd migration options to set multifd-compression multifd-zlib-level and multifd-zstd-level. Jiang Jiacheng (3): Add public API for parallel compression method qemu: Add qemu parallel migration parameters virsh: Add options for multifd migration compression docs/manpages/virsh.rst | 11 +++++++-- include/libvirt/libvirt-domain.h | 30 ++++++++++++++++++++++++ src/qemu/qemu_migration.h | 3 +++ src/qemu/qemu_migration_params.c | 29 +++++++++++++++++++++++- src/qemu/qemu_migration_params.h | 3 +++ tools/virsh-domain.c | 39 ++++++++++++++++++++++++++++++++ 6 files changed, 112 insertions(+), 3 deletions(-) -- 2.33.0

3 10

[libvirt PATCH 0/2] ci: address more failing CI jobs
by Daniel P. Berrangé 19 Jan '23

19 Jan '23

Daniel P. Berrangé (2): ci: treat centos-stream9 as non-gating job ci: remove non-existant 'containers: false' key usage ci/gitlab/builds.yml | 64 ++++++++++++++++++++-------------------- ci/gitlab/containers.yml | 32 ++++++++++---------- ci/manifest.yml | 31 +++++++++---------- 3 files changed, 64 insertions(+), 63 deletions(-) -- 2.39.0

2 3

[libvirt PATCH 0/1] apparmor: Allow umount(/dev)
by Andrea Bolognani 18 Jan '23

18 Jan '23

CC'ing AppArmor experts to get their input :) This is a farily big hammer, but unfortunately I don't think it's possible to tell AppArmor "let the driver use umount, but only if it's running inside a namespace". Andrea Bolognani (1): apparmor: Allow umount(/dev) src/security/apparmor/usr.sbin.libvirtd.in | 1 + src/security/apparmor/usr.sbin.virtqemud.in | 1 + 2 files changed, 2 insertions(+) -- 2.39.0

3 7

[PATCH] remote: add missing lock guard for secret value API
by Daniel P. Berrangé 18 Jan '23

18 Jan '23

This fixes a bug in commit fda53ab3a536647192dd088672dcb6f4a6820e51 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Thu Dec 22 10:29:32 2022 -0500 remote: use VIR_LOCK_GUARD in client code Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 206a3829e2..a1e08bcfe2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5088,6 +5088,7 @@ remoteSecretGetValue(virSecretPtr secret, size_t *value_size, remote_secret_get_value_args args; remote_secret_get_value_ret ret = {0}; struct private_data *priv = secret->conn->privateData; + VIR_LOCK_GUARD lock = remoteDriverLock(priv); make_nonnull_secret(&args.secret, secret); args.flags = flags; -- 2.39.0

2 1

[libvirt PATCH] remote: remoteDomainCreate: Add missing struct initializer for 'ret2'
by Erik Skultety 18 Jan '23

18 Jan '23

Fixes: 62448c1a4927682f999fecf55e896de4625e46f6 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- The commit in question broke many integration tests: https://gitlab.com/libvirt/libvirt/-/jobs/3620679044 src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 206a3829e2..33eff0fe12 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2428,7 +2428,7 @@ remoteDomainCreate(virDomainPtr domain) { remote_domain_create_args args; remote_domain_lookup_by_uuid_args args2; - remote_domain_lookup_by_uuid_ret ret2; + remote_domain_lookup_by_uuid_ret ret2 = {0}; struct private_data *priv = domain->conn->privateData; VIR_LOCK_GUARD lock = remoteDriverLock(priv); -- 2.39.0

2 1

[libvirt PATCH] ch: use CURLOPT_UPLOAD instead of CURLOPT_PUT
by Daniel P. Berrangé 18 Jan '23

18 Jan '23

The CURLOPT_PUT constant causes a deprecation warning when compiling on Alpine Edge. The docs indicate it is deprecated since 7.2.1 https://curl.se/libcurl/c/CURLOPT_PUT.html We already use CURLOPT_UPLOAD in the ESX driver, so this brings the CH driver into line. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/ch/ch_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 8d8654332f..7b8f0a8077 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -660,7 +660,7 @@ virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint) curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpath); curl_easy_setopt(mon->handle, CURLOPT_URL, url); - curl_easy_setopt(mon->handle, CURLOPT_PUT, true); + curl_easy_setopt(mon->handle, CURLOPT_UPLOAD, 1L); curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, NULL); responseCode = virCHMonitorCurlPerform(mon->handle); -- 2.39.0

2 2

[PATCH V9 00/14] spec: Decompose the daemon subpackage
by Jim Fehlig 18 Jan '23

18 Jan '23

This is V9 of https://listman.redhat.com/archives/libvir-list/2023-January/237006.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V8: * Move adjustments to systemd service files to a new patch * Address more review comments Jim Fehlig (14): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from secondary drivers services: Weaken systemd dependency on virtlockd spec: Remove libvirt-daemon dependency from primary drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages NEWS: Mention split of libvirt-daemon subpackage NEWS.rst | 6 + docs/kbase/rpm-deployment.rst | 48 +++-- libvirt.spec.in | 332 +++++++++++++++++++++++---------- src/libxl/virtxend.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- src/remote/libvirtd.service.in | 2 +- 6 files changed, 281 insertions(+), 111 deletions(-) -- 2.38.1

3 24

[PATCH] qemu_namespace: Umount the original /dev before replacing it with tmpfs
by Michal Privoznik 18 Jan '23

18 Jan '23

Our code relies on mount events propagating into the namespace we create for a domain. However, there's one caveat. In v8.8.0-rc1~8 I've tried to make us detect differences in mount tables between the namespace in which libvirtd runs and the domain namespace. This is crucial for any mounts that happen after the domain was started (for instance new hugetlbfs can be mounted on say /dev/hugepages1G). Therefore, we take a look into /proc/$(pgrep qemu)/mounts to see what filesystems are mounted under /dev. Now, since we don't umount the original /dev, just mount a tmpfs over it, we get all the events (e.g. aforementioned hugetlbfs mount on /dev/hugepages1G), but we are not really able to access it because of the tmpfs that's placed on top. This then confuses our algorithm for detecting which filesystems are mounted (the algorithm is implemented in qemuDomainGetPreservedMounts()). To break the link between host's and guest's /dev we just need to umount() the original /dev in the namespace. Just before our artificially created tmpfs is moved into its place. Fixes: 46b03819ae8d833b11c2aaccb2c2a0361727f51b Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2151869#c6 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 90c0b90024..a6b9af1307 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -775,6 +775,11 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, goto cleanup; } + if (umount("/dev") < 0) { + virReportSystemError(errno, "%s", _("failed to umount devfs on /dev")); + return -1; + } + if (virFileMoveMount(devPath, "/dev") < 0) goto cleanup; -- 2.37.4

4 3

[PATCH 00/15] Clean up credential asking code in SSH transport
by Peter Krempa 17 Jan '23

17 Jan '23

Peter Krempa (15): virNetLibsshSessionAuthAddPrivKeyAuth: Drop 'password' argument virNetLibsshAuthMethod: Drop 'password' field util: authconfig: Use automatic pointer clearing for virAuthConfig util: authconfig: Use conteporary and consistent header style virNetSSHSessionAuthAddPrivKeyAuth: Remove unused 'password' argument virNetSSHSessionAuthAddPrivKeyAuth: Refactor cleanup virNetSSHAuthMethod: Remove unused 'password' field virnetsshsession: Pass in username via virNetSSHSessionNew rather than auth functions util: auth: Introduce virAuthAskCredential virNetLibsshAuthenticateKeyboardInteractive: Use virAuthAskCredential virNetLibsshAuthenticatePrivkeyCb: Use virAuthAskCredential util: virauth: Export virAuthGetCredential virNetLibsshCheckHostKey: Use virAuthAskCredential virNetLibsshAuthenticatePassword: Use virAuthAskPassword instead of virAuthGetPasswordPath virAuthGetPasswordPath: Use virAuthAskCredential for callback interaction src/libvirt_private.syms | 3 + src/rpc/virnetlibsshsession.c | 211 ++++++++++------------------------ src/rpc/virnetlibsshsession.h | 3 +- src/rpc/virnetsocket.c | 19 +-- src/rpc/virnetsshsession.c | 162 ++++++++------------------ src/rpc/virnetsshsession.h | 13 +-- src/util/virauth.c | 107 +++++++++++------ src/util/virauth.h | 12 ++ src/util/virauthconfig.c | 52 ++++----- 9 files changed, 223 insertions(+), 359 deletions(-) -- 2.38.1

2 21

[PATCH] qemu: Provide virDomainGetCPUStats() implementation for session connection
by Michal Privoznik 17 Jan '23

17 Jan '23

We have virDomainGetCPUStats() API which offers querying statistics on host CPU usage by given guest. And it works in two modes: getting overall stats (@start_cpu == -1, @ncpus == 1) or getting per host CPU usage. For the QEMU driver it is implemented by looking into values stored in corresponding cpuacct CGroup controller. Well, this works for system instances, where libvirt has permissions to create CGroups and place QEMU process into them. But it does not fly for session connection, where no CGroups are set up. Fortunately, we can do something similar to v8.8.0-rc1~95 and use virProcessGetStatInfo() to fill the overall stats. Unfortunately, I haven't found any source of per host CPU usage, so we just continue throwing an error in that case. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d6879175fe..a570057ecf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16009,6 +16009,50 @@ qemuDomainGetMetadata(virDomainPtr dom, return ret; } +#define QEMU_CPU_STATS_PROC_TOTAL 3 + +static int +qemuDomainGetCPUStatsProc(virDomainObj *vm, + virTypedParameterPtr params, + unsigned int nparams) +{ + unsigned long long cpuTime = 0; + unsigned long long userTime = 0; + unsigned long long sysTime = 0; + + if (nparams == 0) { + /* return supported number of params */ + return QEMU_CPU_STATS_PROC_TOTAL; + } + + if (virProcessGetStatInfo(&cpuTime, &userTime, &sysTime, + NULL, NULL, vm->pid, 0) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("cannot read cputime for domain")); + return -1; + } + + if (virTypedParameterAssign(&params[0], VIR_DOMAIN_CPU_STATS_CPUTIME, + VIR_TYPED_PARAM_ULLONG, cpuTime) < 0) + return -1; + + if (nparams > 1 && + virTypedParameterAssign(&params[1], VIR_DOMAIN_CPU_STATS_USERTIME, + VIR_TYPED_PARAM_ULLONG, userTime) < 0) + return -1; + + if (nparams > 2 && + virTypedParameterAssign(&params[2], VIR_DOMAIN_CPU_STATS_SYSTEMTIME, + VIR_TYPED_PARAM_ULLONG, sysTime) < 0) + return -1; + + if (nparams > 3) + nparams = 3; + + return nparams; +} + +#undef QEMU_CPU_STATS_PROC_TOTAL static int qemuDomainGetCPUStats(virDomainPtr domain, @@ -16037,8 +16081,12 @@ qemuDomainGetCPUStats(virDomainPtr domain, goto cleanup; if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUACCT)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cgroup CPUACCT controller is not mounted")); + if (start_cpu == -1) { + ret = qemuDomainGetCPUStatsProc(vm, params, nparams); + } else { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cgroup CPUACCT controller is not mounted")); + } goto cleanup; } -- 2.38.2

3 2

[PATCH] docs: Fix typo
by Andrea Bolognani 17 Jan '23

17 Jan '23

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 8fc8aeb928..f76c7c3d81 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2703,7 +2703,7 @@ paravirtualized driver is specified via the ``disk`` element. holding the disk. :since:`Since 0.0.3` :since:`Since 9.0.0` a new optional attribute ``fdgroup`` can be added - instructing to access the disk via file descriptiors associated to the + instructing to access the disk via file descriptors associated to the domain object via the ``virDomainFDAssociate()`` API rather than opening the files. The files do not necessarily have to be accessible by libvirt via the filesystem. The filename passed via ``file`` can still be used -- 2.39.0

1 0

[libvirt PATCH 0/3] cgroups cpu shares fixes
by Pavel Hrdina 17 Jan '23

17 Jan '23

Pavel Hrdina (3): vircgroupv2: fix cpu.weight limits check domain_validate: drop cpu.shares cgroup check docs: document correct cpu shares limits with both cgroups v1 and v2 docs/formatdomain.rst | 2 +- docs/manpages/virsh.rst | 3 ++- src/conf/domain_validate.c | 10 ---------- src/util/vircgroup.h | 2 ++ src/util/vircgroupv2.c | 8 ++++---- 5 files changed, 9 insertions(+), 16 deletions(-) -- 2.39.0

3 5

wiki.libvirt.org | Obsolete snapshots
by Ricky Tigg 17 Jan '23

17 Jan '23

Hello The new interfaces of the latest virt-manager made the snapshots presented here <https://wiki.libvirt.org/page/TaskRoutedNetworkSetupVirtManager> obsolete. Regards.

1 0

[PATCH 1/1] qemuProcessEventSubmit : rename vm to event->vm
by Shaleen Bathla 17 Jan '23

17 Jan '23

Coverity scan reports use after free issue which is a false positive. In error case, free event->vm instead of vm to avoid this warning in coverity. Coverty CID: 403592 Signed-off-by: Shaleen Bathla <shaleen.bathla(a)oracle.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ee9f0784d3a3..83b553418068 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -287,7 +287,7 @@ qemuProcessEventSubmit(virDomainObj *vm, event->data = data; if (virThreadPoolSendJob(driver->workerPool, 0, event) < 0) { - virObjectUnref(vm); + virObjectUnref(event->vm); qemuProcessEventFree(event); } } -- 2.31.1

2 2

[libvirt PATCH] rpm: convert license to SPDX format
by Daniel P. Berrangé 16 Jan '23

16 Jan '23

Note that with the introduction of SPDX, Fedora no longer wants maintainers to do effective license analysis, hence we no list all the licenses that are applicable to the binary package contents https://docs.fedoraproject.org/en-US/legal/license-field/#_no_effective_lic… Note, we can still omit licenses that are only applicable to the build system. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 77b274b6f9..afd0b04f99 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -230,7 +230,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: @VERSION@ Release: 1%{?dist} -License: LGPLv2+ +License: GPL-2.0-or-later and LGPL-2.1-only and LGPL-2.1-or-later and OFL-1.1 URL: https://libvirt.org/ %if %(echo %{version} | grep -q "\.0$"; echo $?) == 1 -- 2.39.0

2 2

[PATCH v1 0/4] Introduce active disk internal snapshot support
by Or Ozeri 16 Jan '23

16 Jan '23

Internal disk snapshots are currently only supported on non-active VMs. This patch series extends this support for active VMs running with qemu. This implementation for the qemu driver works even when there are other disks which ask for external snapshot. Thus we remove the restriction disallowing mixing of internal and external disk snapshots for active VMs. Note that mixing is still disallowed for non-active VMs, as it require a bit more work in a different area of the code. Additionally we add a new attribute to allow the user specifying a unique snapshot name for each internal disk snapshot. In case this optional attribute is not specified, snapshot name will be taken from the domain snapshot name, as it is currently done today. Or Ozeri (4): conf: add snapshotName attribute for internal disk snapshot qemu: Support active disk internal snapshots qemu: allow mixing active internal and external active disk snapshots qemu: switch offline internal disk snapshots to use snapshotName docs/formatsnapshot.rst | 5 ++ src/conf/schemas/domainsnapshot.rng | 4 + src/conf/snapshot_conf.c | 27 ++++++ src/conf/snapshot_conf.h | 2 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_monitor.c | 9 ++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 14 +++ src/qemu/qemu_monitor_json.h | 5 ++ src/qemu/qemu_snapshot.c | 88 +++++++++++-------- .../disk_snapshot.xml | 2 +- .../disk_snapshot.xml | 2 +- .../disk_snapshot_redefine.xml | 2 +- tests/qemumonitorjsontest.c | 1 + 14 files changed, 125 insertions(+), 43 deletions(-) -- 2.25.1

3 8

Release of libvirt-9.0.0
by Jiri Denemark 16 Jan '23

16 Jan '23

The 9.0.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * QEMU: implement external snapshot deletion External snapshot deletion is now possible using the existing API ``virDomainSnapshotDelete()``. Flags that allow deleting children or children only are not supported. * QEMU: support passt (https://passt.top) passt can be used to connect an emulated network device to the host's network without requiring libvirt to have any sort of elevated privileges. This is configured with:: <interface type='user'> <backend type='passt'> ... * QEMU: add external backend for swtpm Connecting the VM to a swtpm daemon started outside of libvirt is now possible. * QEMU: Support for passing FDs instead of opening files for `<disk>` A new API `virDomainFDAssociate` gives the users the option to pass FDs to libvirt and then use them when starting a VM. Currently the FDs can be used instead of directly opening files as `<disk>` backend. * Improvements * qemu: Prefer PNG for domain screenshots With sufficiently new QEMU (v7.1.0) screenshots change format from PPM to PNG. * tools: Fix install_mode for some scripts Scripts from the following list were installed with group write bit set: virt-xml-validate, virt-pki-validate, virt-sanlock-cleanup, libvirt-guests.sh. This was changed so that only the owner is able to write them. * qemu: Allow multiple nodes for preferred policy Due to restrictions of old kernels and libnuma APIs, the preferred NUMA policy accepted just a single host NUMA node. With recent enough kernel (v5.15.0) and libnuma (v2.0.15) it's possible to set multiple nodes. * secret: Inhibit shutdown of daemon for ephemeral secrets When an ephemeral secret is defined then automatic shutdown of virtsecretd is inhibited. This is to avoid ephemeral secrets disappearing shortly before their use. * qemu: Report Hyper-V Enlightenments in domcapabilities The supported Hyper-V Enlightenments are now reported in domain capabilities XML. * Bug fixes * Fix NULL-pointer dereference `virXMLPropStringRequired` Fix a bug where when parsing a XML property which is required to be present by using `virXMLPropStringRequired` the parser will crash instead of reporting an error. * qemu: Init ext devices paths on reconnect Paths for external devices are not stored in the status XML. Therefore, when the daemon restarted and was reconnecting to a running domain, these paths were left blank which led to the daemon crash. * qemu: Validate arguments passed to `virConnectGetDomainCapabilities` There was a code path in which insufficient validation of input arguments of `virConnectGetDomainCapabilities` API was possible which led to the daemon crash. This path is now fixed. Enjoy. Jirka

1 0

[PATCH 0/9] audio: remove deprecated QEMU_AUDIO env support
by Daniel P. Berrangé 16 Jan '23

16 Jan '23

This removes much of the deprecated audio code, most notably the QEMU_AUDIO env variables. The VNC server will also stop accepting client requests for audio streaming unless an audiodev is set. I tried to make the use of 'audiodev' mandatory for devices but that turned out to not be practical. Our test suite assumes it can create any device type without setting any properties. This is not possible if 'audiodev' setting is enforced at realize() time. Also there are several machihe boards with embedded soundcards that provide no way to set audiodev AFAICT Daniel P. Berrangé (9): audio: don't check qemu_add_vm_change_state_handler failure audio: remove special audio_calloc function audio: remove unused 'name' in QEMUSoundCard struct audio: remove QEMUSoundCard linked list audio: remove empty AUD_remove_card method docs: split the deprecation warning for soundcards vs VNC ui/vnc: don't accept VNC_ENCODING_AUDIO without audiodev audio: audio state is now mandatory for capture audio: remove support for QEMU_AUDIO_ env variables audio/alsaaudio.c | 6 +- audio/audio.c | 71 +--- audio/audio.h | 4 - audio/audio_int.h | 2 - audio/audio_legacy.c | 552 -------------------------------- audio/audio_template.h | 28 +- audio/meson.build | 1 - audio/mixeng.c | 7 +- docs/about/deprecated.rst | 16 +- docs/about/removed-features.rst | 14 + hw/audio/ac97.c | 1 - hw/audio/adlib.c | 1 - hw/audio/es1370.c | 1 - hw/audio/gus.c | 1 - hw/audio/hda-codec.c | 1 - hw/audio/wm8750.c | 1 - hw/usb/dev-audio.c | 1 - softmmu/vl.c | 4 - tests/qtest/fuzz-sb16-test.c | 6 +- tests/qtest/libqtest.c | 3 - ui/vnc.c | 10 +- 21 files changed, 53 insertions(+), 678 deletions(-) delete mode 100644 audio/audio_legacy.c -- 2.38.1

2 12

[PATCH] NEWS: Document my contributions for upcoming release
by Michal Privoznik 16 Jan '23

16 Jan '23

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 9baf10b8e9..a860c2b6f6 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -50,6 +50,30 @@ v9.0.0 (unreleased) With sufficiently new QEMU (v7.1.0) screenshots change format from PPM to PNG. + * tools: Fix install_mode for some scripts + + Scripts from the following list were installed with group write bit set: + virt-xml-validate, virt-pki-validate, virt-sanlock-cleanup, + libvirt-guests.sh. This was changed so that only the owner is able to write + them. + + * qemu: Allow multiple nodes for preferred policy + + Due to restrictions of old kernels and libnuma APIs, the preferred NUMA + policy accepted just a single host NUMA node. With recent enough kernel + (v5.15.0) and libnuma (v2.0.15) it's possible to set multiple nodes. + + * secret: Inhibit shutdown of daemon for ephemeral secrets + + When an ephemeral secret is defined then automatic shutdown of virtsecretd + is inhibited. This is to avoid ephemeral secrets disappearing shortly + before their use. + + * qemu: Report Hyper-V Enlightenments in domcapabilities + + The supported Hyper-V Enlightenments are now reported in domain + capabilities XML. + * **Bug fixes** * Fix NULL-pointer dereference `virXMLPropStringRequired` @@ -58,6 +82,19 @@ v9.0.0 (unreleased) by using `virXMLPropStringRequired` the parser will crash instead of reporting an error. + * qemu: Init ext devices paths on reconnect + + Paths for external devices are not stored in the status XML. Therefore, + when the daemon restarted and was reconnecting to a running domain, these + paths were left blank which led to the daemon crash. + + * qemu: Validate arguments passed to `virConnectGetDomainCapabilities` + + There was a code path in which insufficient validation of input arguments + of `virConnectGetDomainCapabilities` API was possible which led to the + daemon crash. This path is now fixed. + + v8.10.0 (2022-12-01) ==================== -- 2.38.2

2 1

[PATCH V8 00/13] spec: Decompose the daemon subpackage
by Jim Fehlig 13 Jan '23

13 Jan '23

This is V8 of https://listman.redhat.com/archives/libvir-list/2023-January/236919.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V7: * Since the primary and secondary drivers need to be handled a bit differently when dropping the libvirt-daemon dependency, split the work into two patches Jim Fehlig (13): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from secondary drivers spec: Remove libvirt-daemon dependency from primary drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages NEWS: Mention split of libvirt-daemon subpackage NEWS.rst | 6 + docs/kbase/rpm-deployment.rst | 48 +++-- libvirt.spec.in | 333 ++++++++++++++++++++++++---------- src/libxl/virtxend.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- 5 files changed, 281 insertions(+), 110 deletions(-) -- 2.38.1

2 19

Entering freeze for libvirt-9.0.0
by Jiri Denemark 13 Jan '23

13 Jan '23

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

3 5

[PATCH] NEWS: Document virDomainFDAssociate and NULL dereference in virXMLPropStringRequired
by Peter Krempa 13 Jan '23

13 Jan '23

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 8482c49b3c..9baf10b8e9 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -38,6 +38,12 @@ v9.0.0 (unreleased) Connecting the VM to a swtpm daemon started outside of libvirt is now possible. + * QEMU: Support for passing FDs instead of opening files for `<disk>` + + A new API `virDomainFDAssociate` gives the users the option to pass FDs + to libvirt and then use them when starting a VM. Currently the FDs can + be used instead of directly opening files as `<disk>` backend. + * **Improvements** * qemu: Prefer PNG for domain screenshots @@ -46,6 +52,11 @@ v9.0.0 (unreleased) * **Bug fixes** + * Fix NULL-pointer dereference `virXMLPropStringRequired` + + Fix a bug where when parsing a XML property which is required to be present + by using `virXMLPropStringRequired` the parser will crash instead of + reporting an error. v8.10.0 (2022-12-01) ==================== -- 2.38.1

2 1

[libvirt PATCH 0/3] Remove <backend upstream='blah'/> per danpb's request, and a couple small cleanups
by Laine Stump 13 Jan '23

13 Jan '23

The first patch implements what danpb suggested yesterday - using <source dev='blah'/> instead of <backend upstream='blah'/> to populate the passt --interface option. The other two are small cleanups I noticed while making the changes in patch 1. jdenemar: feel free to push once they've been reviewed, rather than waiting for me to get up, so that you can get RC2 tagged. Laine Stump (3): conf: remove <backend upstream='xxx'/> attribute qemu: remove commented-out option in passt qemu commandline setup tests: remove unused qemu .args file docs/formatdomain.rst | 9 +++--- src/conf/domain_conf.c | 15 ++++++++-- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 13 +++++---- src/qemu/qemu_passt.c | 5 ++-- tests/qemuxml2argvdata/net-user-passt.args | 34 ---------------------- tests/qemuxml2argvdata/net-user-passt.xml | 3 +- 7 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 tests/qemuxml2argvdata/net-user-passt.args -- 2.38.1

2 5

[libvirt PATCH 0/9] Support libvirt-managed QEMU domain <interface> backed by a passt process
by Laine Stump 12 Jan '23

12 Jan '23

passt (https://passt.top) provides a method for connecting a guest to the larger network without requiring any elevated privileges. This set of patches allows libvirt/QEMU users to easily configure a QEMU domain to use passt for the backend of any emulated network interface. More details are in the individual patches, but the short explanation is that you will use: <interface type='user'> <backend type='passt'> ... to select the passt backend. (We decided to do it this way since the concept is so similar to slirp, which was the original "type='user'") The following caveats currently apply: 1) passt support requires "-netdev stream" in QEMU, which is only available starting with qemu-7.2.0. So if you want to test these patches out, you need the latest upstream release of QEMU. 2) SELinux must be set to "permissive". This is of course temporary. As I understand it, the remedy to this is a new SELinux profile for the passt binary, which is outside the control of libvirt and so not something that can be addressed in this patchset (or any other patch to libvirt). 3) Although there is a a new option for QEMU's -netdev that will tell QEMU to attempt to reconnect to a new incarnation of the same socket if passt unexpectedly exits, and a new QEMU event that will be put into QEMU to inform libvirt that the passt process has exited (so that it can start a new, identical passt process), I think this hasn't been pushed upstream yet (??), and I haven't implemented any support for it here. So, if the passt process unexpectedly exits, the guest will be without networking. However, Stefano (passt author) is emphatic that passt will never unexpectedly exit :-) passt has *many* other options that libvirt could support, but the small subset here are the things that seem most useful (and/or were specifically requested by prospective users of passt). It is always easier to add more stuff in the future than to remove "mistakes", so I tried to no go overboard. Laine Stump (9): conf: rename virDomainNetBackend* to virDomainNetDriver* conf: move anonymous backend struct from virDomainNetDef into its own struct conf: put interface <backend> parsing/formatting separate functions conf: add passt XML additions to schema conf: parse/format passt-related XML additions qemu: new capability QEMU_CAPS_NETDEV_STREAM qemu: add passtStateDir to qemu driver config qemu: hook up passt config to qemu domains specfile: require passt for the build if fedora >= 36 or rhel >= 9 docs/formatdomain.rst | 95 +++++- libvirt.spec.in | 7 + meson.build | 1 + po/POTFILES | 1 + src/conf/domain_conf.c | 303 ++++++++++++++++-- src/conf/domain_conf.h | 64 +++- src/conf/domain_validate.c | 32 +- src/conf/schemas/domaincommon.rng | 65 ++++ src/conf/virconftypes.h | 6 + src/libvirt_private.syms | 1 + src/qemu/meson.build | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 11 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 12 + src/qemu/qemu_extdevice.c | 25 +- src/qemu/qemu_hotplug.c | 26 +- src/qemu/qemu_interface.c | 8 +- src/qemu/qemu_passt.c | 284 ++++++++++++++++ src/qemu/qemu_passt.h | 38 +++ src/qemu/qemu_process.c | 1 + src/qemu/qemu_validate.c | 9 +- src/security/virt-aa-helper.c | 2 +- .../caps_7.2.0.x86_64.xml | 1 + tests/qemuxml2argvdata/net-user-passt.args | 34 ++ .../net-user-passt.x86_64-latest.args | 37 +++ tests/qemuxml2argvdata/net-user-passt.xml | 57 ++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmloutdata/net-user-passt.xml | 1 + tests/qemuxml2xmltest.c | 1 + 35 files changed, 1087 insertions(+), 60 deletions(-) create mode 100644 src/qemu/qemu_passt.c create mode 100644 src/qemu/qemu_passt.h create mode 100644 tests/qemuxml2argvdata/net-user-passt.args create mode 100644 tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-user-passt.xml create mode 120000 tests/qemuxml2xmloutdata/net-user-passt.xml -- 2.38.1

5 27

[PATCH V7 00/12] spec: Decompose the daemon subpackage
by Jim Fehlig 12 Jan '23

12 Jan '23

This is V7 of https://listman.redhat.com/archives/libvir-list/2023-January/236586.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V6: * Revert to including virtlockd and lockd plugin in the hypervisor subpackages * Add NEWS entry Jim Fehlig (12): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages NEWS: Mention split of libvirt-daemon subpackage NEWS.rst | 6 + docs/kbase/rpm-deployment.rst | 48 +++-- libvirt.spec.in | 331 ++++++++++++++++++++++++---------- 3 files changed, 277 insertions(+), 108 deletions(-) -- 2.38.1

3 20

[PATCH] docs: drvqemu: Fix a typo
by Han Han 12 Jan '23

12 Jan '23

Fixes: a677ea92 Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/drvqemu.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index fa23912937..22d7e6502b 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -295,7 +295,7 @@ to ``system_u:object_r:virt_image_t``. In the case of NFS, there is an alternative option, of enabling the ``virt_use_nfs`` SELinux boolean. There are some network filesystems, however, that propagate SELinux labels -properly, just like a local filesystem (e.g. ceph of CIFS). In such case, +properly, just like a local filesystem (e.g. ceph or CIFS). In such case, dynamic labelling (described below) might prevent migration of a virtual machine as new unique SELinux label is assigned to the virtual machine on the migration destination side. Users are advised to use static labels (``<seclabel -- 2.39.0

2 1

[PATCH v1] qemu: block: fix error when blockcopy target is librbd encrypted
by Or Ozeri 12 Jan '23

12 Jan '23

Encryption secrets are considered a format dependency, even when being used by the storage node itself, as in the case of using encryption engine=librbd. Currently, the storage node is created (blockdev-add) before creating the format dependencies (including encryption secrets). As a result, when trying to perform a blockcopy when the target disk uses librbd encryption, an error of this form is returned: "error: internal error: unable to execute QEMU command 'blockdev-add': No secret with id 'libvirt-5-format-encryption-secret0'" To overcome this error, we change the order of commands so that format dependencies are created BEFORE creating the storage node. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- src/qemu/qemu_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e865aa17f9..2aafb2fac7 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1490,9 +1490,9 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon, qemuBlockStorageSourceAttachData *data) { if (qemuBlockStorageSourceAttachApplyStorageDeps(mon, data) < 0 || + qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 || qemuBlockStorageSourceAttachApplyStorage(mon, data) < 0 || qemuBlockStorageSourceAttachApplyStorageSlice(mon, data) < 0 || - qemuBlockStorageSourceAttachApplyFormatDeps(mon, data) < 0 || qemuBlockStorageSourceAttachApplyFormat(mon, data) < 0) return -1; -- 2.25.1

1 0

[libvirt PATCH] ci: integration: Set an expiration on logs artifacts
by Erik Skultety 12 Jan '23

12 Jan '23

The default expiry time is 30 days. Since the RPM artifacts coming from the previous pipeline stages are set to expire in 1 day we can set the failed integration job log artifacts to the same value. The sentiment here is that if an integration job legitimately failed (i.e. not with an infrastructure failure) unless it was fixed in the meantime it will fail the next day with the scheduled pipeline again, meaning, that even if the older log artifacts are removed, they'll be immediately replaced with fresh ones. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- If you look at: - https://gitlab.com/libvirt/libvirt/-/jobs/3563902921 - https://gitlab.com/libvirt/libvirt/-/jobs/3557946738 you can clearly see that the artifacts are still taking up (although small) some GitLab storage space which is unnecessary since anyone interested in debugging would opt into getting the latest ones anyway. ci/integration-template.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 61cd034009..9141d5cedf 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -94,6 +94,7 @@ SCRATCH_DIR: "/tmp/scratch" artifacts: name: logs + expire_in: 1 day paths: - logs when: on_failure -- 2.39.0

2 1

[libvirt PATCH] NEWS: document external swtpm backend addition
by Ján Tomko 11 Jan '23

11 Jan '23

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 768208ed03..8482c49b3c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -33,6 +33,11 @@ v9.0.0 (unreleased) <backend type='passt'> ... + * QEMU: add external backend for swtpm + + Connecting the VM to a swtpm daemon started outside of libvirt + is now possible. + * **Improvements** * qemu: Prefer PNG for domain screenshots -- 2.39.0

2 1

[libvirt PATCH 0/2] Coverity inspired fixes for qemuPasstStart
by Jiri Denemark 11 Jan '23

11 Jan '23

Jiri Denemark (2): qemu: Don't check pidfile in qemuPasstStart qemu: Change some gotos in qemuPasstStart to direct return src/qemu/qemu_passt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.39.0

2 3

[libvirt PATCH] conf: Avoid NULL dereference in virDomainNetPortForwardFree
by Jiri Denemark 11 Jan '23

11 Jan '23

In our current code the function is not called with NULL argument, but we should follow our common practice and make it safe anyway. Reported by coverity: /src/conf/domain_conf.c: 2635 in virDomainNetPortForwardFree() 2629 { 2630 size_t i; 2631 2632 if (pf) 2633 g_free(pf->dev); 2634 >>> CID 404359: Null pointer dereferences (FORWARD_NULL) >>> Dereferencing null pointer "pf". 2635 for (i = 0; i < pf->nRanges; i++) 2636 g_free(pf->ranges[i]); 2637 2638 g_free(pf->ranges); 2639 g_free(pf); 2640 } Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 598e23b005..e43dee1a60 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2629,8 +2629,10 @@ virDomainNetPortForwardFree(virDomainNetPortForward *pf) { size_t i; - if (pf) - g_free(pf->dev); + if (!pf) + return; + + g_free(pf->dev); for (i = 0; i < pf->nRanges; i++) g_free(pf->ranges[i]); -- 2.39.0

2 1

[PATCH v2] qemu: add append mode config for serial file
by Oleg Vasilev 11 Jan '23

11 Jan '23

Serial log file contains lots of useful information for debugging configuration problems. It makes sense to preserve the log in between restarts, so that one can later figure out what was going on. Before that, we could do that on a per-domain basis, now we can configure it once for all domains. Signed-off-by: Oleg Vasilev <oleg.vasilev(a)virtuozzo.com> --- src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf.in | 9 ++++ src/qemu/qemu_conf.c | 4 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 13 +++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemuxml2argvdata/serial-append.xml | 53 +++++++++++++++++++ .../qemuxml2xmloutdata/serial-append.off.xml | 53 +++++++++++++++++++ tests/qemuxml2xmloutdata/serial-append.on.xml | 53 +++++++++++++++++++ tests/qemuxml2xmloutdata/serial-append.xml | 53 +++++++++++++++++++ tests/qemuxml2xmltest.c | 10 ++++ 11 files changed, 254 insertions(+) create mode 100644 tests/qemuxml2argvdata/serial-append.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.off.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.on.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ed097ea3d9..7f3eec7cfd 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -147,6 +147,8 @@ module Libvirtd_qemu = let capability_filters_entry = str_array_entry "capability_filters" + let serial_file_append_entry = str_entry "serial_file_append" + (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -171,6 +173,7 @@ module Libvirtd_qemu = | swtpm_entry | capability_filters_entry | obsolete_entry + | serial_file_append_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in index 3895d42514..9c9a535e8d 100644 --- a/src/qemu/qemu.conf.in +++ b/src/qemu/qemu.conf.in @@ -968,3 +968,12 @@ # "full" - both QEMU and its helper processes are placed into separate # scheduling group #sched_core = "none" + +# Default append mode for writing to serial file. QEMU will set the chosen +# value everytime it processes the config, unless some value is already there. +# +# Possible options are: +# "default" - leave as-is for QEMU to decide. +# "on" - set append value to "on", meaning file won't be truncated on restart +# "off" - set append value to "off", file will be cleared on restart +#serial_file_append = "default" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ae5bbcd138..bfd93a168f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -288,6 +288,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, return NULL; cfg->deprecationBehavior = g_strdup("none"); + cfg->serialFileAppend = g_strdup("default"); return g_steal_pointer(&cfg); } @@ -376,6 +377,7 @@ static void virQEMUDriverConfigDispose(void *obj) g_strfreev(cfg->capabilityfilters); g_free(cfg->deprecationBehavior); + g_free(cfg->serialFileAppend); } @@ -903,6 +905,8 @@ virQEMUDriverConfigLoadDebugEntry(virQEMUDriverConfig *cfg, return -1; if (virConfGetValueString(conf, "deprecation_behavior", &cfg->deprecationBehavior) < 0) return -1; + if (virConfGetValueString(conf, "serial_file_append", &cfg->serialFileAppend) < 0) + return -1; return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 8cf2dd2ec5..316200f38d 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -229,6 +229,8 @@ struct _virQEMUDriverConfig { char *deprecationBehavior; virQEMUSchedCore schedCore; + + char *serialFileAppend; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ae458ae45..0d1fe1ffcc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -37,6 +37,7 @@ #include "qemu_validate.h" #include "qemu_namespace.h" #include "viralloc.h" +#include "virenum.h" #include "virlog.h" #include "virerror.h" #include "viridentity.h" @@ -5357,6 +5358,8 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr, virQEMUDriver *driver, unsigned int parseFlags) { + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + /* Historically, isa-serial and the default matched, so in order to * maintain backwards compatibility we map them here. The actual default * will be picked below based on the architecture and machine type. */ @@ -5428,6 +5431,16 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr, } } + + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->source && + chr->source->type == VIR_DOMAIN_CHR_TYPE_FILE && + chr->source->data.file.append == VIR_TRISTATE_SWITCH_ABSENT) { + + chr->source->data.file.append = + virTristateSwitchTypeFromString(cfg->serialFileAppend); + } + return 0; } diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 1dbd692921..d1ca9c8d3d 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -117,3 +117,4 @@ module Test_libvirtd_qemu = } { "deprecation_behavior" = "none" } { "sched_core" = "none" } +{ "serial_file_append" = "default" } diff --git a/tests/qemuxml2argvdata/serial-append.xml b/tests/qemuxml2argvdata/serial-append.xml new file mode 100644 index 0000000000..662a711dd0 --- /dev/null +++ b/tests/qemuxml2argvdata/serial-append.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.off.xml b/tests/qemuxml2xmloutdata/serial-append.off.xml new file mode 100644 index 0000000000..83fd37a0d1 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.off.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file' append='off'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file' append='off'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.on.xml b/tests/qemuxml2xmloutdata/serial-append.on.xml new file mode 100644 index 0000000000..e54959a725 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.on.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file' append='on'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/serial-append.xml b/tests/qemuxml2xmloutdata/serial-append.xml new file mode 100644 index 0000000000..662a711dd0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/serial-append.xml @@ -0,0 +1,53 @@ +<domain type='qemu'> + <name>machine</name> + <uuid>2187c512-ff97-47d7-b67c-c02d3bdc219d</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <serial type='unix'> + <source mode='connect' path='/tmp/serial.sock'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='file'> + <source path='/tmp/serial.file'> + <seclabel model='dac' relabel='no'/> + </source> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e13da8bd2c..e4ccee0cf7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -915,6 +915,16 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_NOCAPS("serial-append"); + + g_free(cfg->serialFileAppend); + cfg->serialFileAppend = g_strdup("on"); + DO_TEST_FULL("serial-append", ".on", WHEN_BOTH, ARG_END); + + g_free(cfg->serialFileAppend); + cfg->serialFileAppend = g_strdup("off"); + DO_TEST_FULL("serial-append", ".off", WHEN_BOTH, ARG_END); + DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); -- 2.39.0

3 5

[PATCH] NEWS: document addition of passt support
by Laine Stump 10 Jan '23

10 Jan '23

Signed-off-by: Laine Stump <laine(a)redhat.com> --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index fecca64344..768208ed03 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -23,6 +23,16 @@ v9.0.0 (unreleased) ``virDomainSnapshotDelete()``. Flags that allow deleting children or children only are not supported. + * QEMU: support passt (https://passt.top) + + passt can be used to connect an emulated network device to the + host's network without requiring libvirt to have any sort of + elevated privileges. This is configured with:: + + <interface type='user'> + <backend type='passt'> + ... + * **Improvements** * qemu: Prefer PNG for domain screenshots -- 2.38.1

2 3

[PATCH] spec: Restart libvirtd on upgrade without socket activation
by Martin Kletzander 10 Jan '23

10 Jan '23

The %posttrans phase needs has a special case for upgrading libvirt daemon with --listen, but it forgot to also restart the daemon in order to run the new installed version. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1820437 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index d9529fc76c4a..77b274b6f91d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1449,6 +1449,7 @@ then libvirtd-admin.socket \ libvirtd-tls.socket \ libvirtd-tcp.socket >/dev/null 2>&1 || : + /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : else # Old libvirtd owns the sockets and will delete them on # shutdown. Can't use a try-restart as libvirtd will simply -- 2.39.0

3 2

[libvirt PATCH 0/9] src: misc cleanups related to remote protocol/client
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

Just before xmas I did some work on an rpcgen replacement so we can use a non-sucky API instead of xdr_*. This short series has some general cleanups I found useful. The rpcgen code will come later. While this is all non-functional changes, I'm NOT proposing it for 9.0, it can safely wait as it isn't fixing any real bugs (that I've realized). Daniel P. Berrangé (9): remote: remove redundant initialization of args variable lxc: fix XDR protocol compliance logging: remove redundant XDR typedef rpc: use VIR_LOCK_GUARD in remote client code remote: use VIR_LOCK_GUARD in client code admin: use VIR_LOCK_GUARD in client code rpc: use struct zero initializer instead of memset remote: use struct zero initializer instead of memset admin: use struct zero initializer instead of memset src/admin/admin_remote.c | 92 +-- src/logging/log_protocol.x | 2 - src/lxc/lxc_monitor_protocol.x | 6 +- src/remote/remote_driver.c | 1280 +++++++++----------------------- src/rpc/gendispatch.pl | 18 +- 5 files changed, 397 insertions(+), 1001 deletions(-) -- 2.38.1

2 10

[PATCH] qemu: Fix handling of passed FDs in remoteDispatchDomainFdAssociate
by Peter Krempa 10 Jan '23

10 Jan '23

To ensure same behaviour when remote driver is or is not used we must not steal the FDs and array holding them passed to qemuDomainFDAssociate but rather duplicate them. At the same time the remote driver must close and free them to prevent leak. Pointed out by Coverity as FD leak on error path: *** CID 404348: Resource leaks (RESOURCE_LEAK) /src/remote/remote_daemon_dispatch.c: 7484 in remoteDispatchDomainFdAssociate() 7478 rv = 0; 7479 7480 cleanup: 7481 if (rv < 0) 7482 virNetMessageSaveError(rerr); 7483 virObjectUnref(dom); >>> CID 404348: Resource leaks (RESOURCE_LEAK) >>> Variable "fds" going out of scope leaks the storage it points to. 7484 return rv; Fixes: abd9025c2fd Fixes: f762f87534e Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 15 ++++++++++++--- src/remote/remote_daemon_dispatch.c | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a88c9ebe64..d6879175fe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20442,7 +20442,8 @@ qemuDomainFDAssociate(virDomainPtr domain, { virDomainObj *vm = NULL; qemuDomainObjPrivate *priv; - virStorageSourceFDTuple *new; + g_autoptr(virStorageSourceFDTuple) new = NULL; + size_t i; int ret = -1; virCheckFlags(VIR_DOMAIN_FD_ASSOCIATE_SECLABEL_RESTORE | @@ -20460,8 +20461,16 @@ qemuDomainFDAssociate(virDomainPtr domain, priv = vm->privateData; new = virStorageSourceFDTupleNew(); - new->fds = fds; new->nfds = nfds; + new->fds = g_new0(int, new->nfds); + for (i = 0; i < new->nfds; i++) { + if ((new->fds[i] = dup(fds[i])) < 0) { + virReportSystemError(errno, + _("failed to duplicate passed fd with index '%zu'"), + i); + goto cleanup; + } + } new->conn = domain->conn; new->writable = flags & VIR_DOMAIN_FD_ASSOCIATE_SECLABEL_WRITABLE; @@ -20469,7 +20478,7 @@ qemuDomainFDAssociate(virDomainPtr domain, virCloseCallbacksDomainAdd(vm, domain->conn, qemuDomainFDHashCloseConnect); - g_hash_table_insert(priv->fds, g_strdup(name), new); + g_hash_table_insert(priv->fds, g_strdup(name), g_steal_pointer(&new)); ret = 0; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 40c734ce6b..6c56e9ec3e 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7478,6 +7478,9 @@ remoteDispatchDomainFdAssociate(virNetServer *server G_GNUC_UNUSED, rv = 0; cleanup: + for (i = 0; i < nfds; i++) + VIR_FORCE_CLOSE(fds[i]); + g_free(fds); if (rv < 0) virNetMessageSaveError(rerr); virObjectUnref(dom); -- 2.38.1

2 1

[PATCH 00/12] migration/migrationpin:support migration pin
by Jiang Jiacheng 10 Jan '23

10 Jan '23

Support set the CPU affinity of the live migration thread to improve the migration performance in specific cases. By default, the migration thread shares CPU resources with the VM process. With those API, support pin migration thread to expected CPU list to avoid preempting CPU resources of VM process. New API 'pinMigrationThread' and virsh command 'virsh migrationpin' is used to pin migration thread to expected CPU list before or during migration. New migration param 'migration.pin' is used to support migration pin via interface 'virDomainMigrateToURI3'. Jiang Jiacheng (2): migration/migration-pin: support migration thread pin by virsh command migration/migration-pin/multifd-pin: add migration pin status handle zhengchuan (10): migration/migration-pin: get migration pid for migration pin migration/migration-pin: pin migration pid by given cpumap migration/migration-pin: add qemu monitor callback functions migration/migration-pin: add migrationpin for migration parameters migration/migration-pin: get cpumap from migration.pin migration/migration-pin: add domainMigrationPid for qemuMonitorCallbacks migration/multifd-pin: get multifd pid for migration pin migration/multifd-pin: pin multifd pid by given cpumap migration/multifd-pin: add qemu monitor callback functions migration/multifd-pin: support migration multifd thread pin include/libvirt/libvirt-domain.h | 19 ++ src/conf/domain_conf.c | 9 + src/conf/domain_conf.h | 11 ++ src/conf/virconftypes.h | 2 + src/driver-hypervisor.h | 16 ++ src/libvirt-domain.c | 144 +++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 7 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 175 ++++++++++++++++++ src/qemu/qemu_migration.c | 5 + src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 21 +++ src/qemu/qemu_migration_params.h | 4 + src/qemu/qemu_monitor.c | 20 ++ src/qemu/qemu_monitor.h | 13 ++ src/qemu/qemu_monitor_json.c | 32 ++++ src/qemu/qemu_process.c | 303 +++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 15 ++ src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 43 ++++- src/remote_protocol-structs | 28 +++ src/util/vircgroup.c | 3 + src/util/vircgroup.h | 1 + tools/virsh-domain.c | 69 +++++++ 26 files changed, 954 insertions(+), 1 deletion(-) -- 2.33.0

2 17

[PATCH] conf: check vhost-user queues with vcpus
by Jiang Jiacheng 10 Jan '23

10 Jan '23

With kernel without the ref patch, if queues > vcpus, interrupts will be centralized on one vcpu affecting guest performance. After the ref patch merged, the queues whose number is greater than the number of vcpus will not be used. Considering the above, it's better to check the counts of vhost-user queues and vcpus. ref: https://patchwork.kernel.org/project/linux-scsi/cover/1553682995-5682-1-git… Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> --- src/conf/domain_validate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 95b8d9b419..6106e79999 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -308,7 +308,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDef **seclabels, static int -virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) +virDomainDiskVhostUserValidate(const virDomainDef *def, const virDomainDiskDef *disk) { if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -465,6 +465,12 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) return -1; } + if (disk->queues > virDomainDefGetVcpus(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vhost-user disk queues must <= vcpus")); + return -1; + } + return 0; } @@ -807,7 +813,7 @@ virDomainDiskDefValidate(const virDomainDef *def, } if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER && - virDomainDiskVhostUserValidate(disk) < 0) { + virDomainDiskVhostUserValidate(def, disk) < 0) { return -1; } -- 2.33.0

2 2

[PATCH 0/3] define g_autoptr for virNWFilterDef and virNWFilterRuleDef
by Jiang Jiacheng 10 Jan '23

10 Jan '23

Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label/variable. Those patches are followup with: https://gitlab.com/libvirt/libvirt/-/commit/a9027d447be789cd11c0aa18ceb83ed… Jiang Jiacheng (3): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef virNWFilterSaveConfig: remove the unnecessary variable 'ret' src/conf/nwfilter_conf.c | 52 ++++++++++++++-------------------- src/conf/nwfilter_conf.h | 2 ++ src/conf/virnwfilterobj.c | 19 ++++++------- src/nwfilter/nwfilter_driver.c | 7 ++--- tests/nwfilterxml2xmltest.c | 22 ++++++-------- 5 files changed, 42 insertions(+), 60 deletions(-) -- 2.33.0

2 6

[PATCH] remote: fix double free of migration params on error
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

The remote_*_args methods will generally borrow pointers passed in the caller, so should not be freed. On failure of the virTypedParamsSerialize method, however, xdr_free was being called. This is presumably because it was thought that the params may have been partially serialized and need cleaning up. This is incorrect, as virTypedParamsSerialize takes care to cleanup partially serialized data. This xdr_free call would lead to free'ing the borrowed cookie pointers, which would be a double free. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b0dba9057b..bb44d0004f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6919,8 +6919,6 @@ remoteDomainMigrateBegin3Params(virDomainPtr domain, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_begin3_params_args, - (char *) &args); goto cleanup; } @@ -6981,8 +6979,6 @@ remoteDomainMigratePrepare3Params(virConnectPtr dconn, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_prepare3_params_args, - (char *) &args); goto cleanup; } @@ -7063,8 +7059,6 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_args, - (char *) &args); goto cleanup; } @@ -7149,8 +7143,6 @@ remoteDomainMigratePerform3Params(virDomainPtr dom, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_perform3_params_args, - (char *) &args); goto cleanup; } @@ -7216,8 +7208,6 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_finish3_params_args, - (char *) &args); goto cleanup; } @@ -7284,8 +7274,6 @@ remoteDomainMigrateConfirm3Params(virDomainPtr domain, (struct _virTypedParameterRemote **) &args.params.params_val, &args.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) { - xdr_free((xdrproc_t) xdr_remote_domain_migrate_confirm3_params_args, - (char *) &args); goto cleanup; } -- 2.38.1

2 1

[PATCH] admin: fix leak of typed parameters on error
by Daniel P. Berrangé 10 Jan '23

10 Jan '23

A few admin client methods had the xdr_free call the wrong side of the cleanup label, so typed parameters would not be freed on error. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/admin/admin_remote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 012488bff3..f99b93eef6 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -269,9 +269,9 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPtr srv, goto cleanup; rv = 0; - xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret); cleanup: + xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret); virObjectUnlock(priv); return rv; } @@ -342,9 +342,9 @@ remoteAdminClientGetInfo(virAdmClientPtr client, goto cleanup; rv = 0; - xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret); cleanup: + xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret); virObjectUnlock(priv); return rv; } @@ -380,10 +380,10 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv, goto cleanup; rv = 0; - xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret, - (char *) &ret); cleanup: + xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret, + (char *) &ret); virObjectUnlock(priv); return rv; } -- 2.38.1

2 1

[libvirt PATCH 0/2] docs: submitting-patches: shorten slightly
by Ján Tomko 10 Jan '23

10 Jan '23

Ján Tomko (2): docs: submimtting-patches: Remove emphasis on not cc'ing developers docs: submitting-patches: remove note about --patience docs/submitting-patches.rst | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) -- 2.39.0

3 4

[PATCH 0/2] qemu: add append mode config for serial file
by Oleg Vasilev 10 Jan '23

10 Jan '23

Serial log file contains lots of useful information for debugging configuration problems. It makes sense to preserve the log in between restarts, so that one can later figure out what was going on. Oleg Vasilev (2): qemu: add append mode config for serial file qemuxml2xmltest: add serial append=on test src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf.in | 10 ++++ src/qemu/qemu_conf.c | 4 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 13 +++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemuxml2argvdata/serial-append.xml | 56 +++++++++++++++++++ .../serial-append.x86_64-latest.xml | 56 +++++++++++++++++++ tests/qemuxml2xmltest.c | 4 ++ 9 files changed, 149 insertions(+) create mode 100644 tests/qemuxml2argvdata/serial-append.xml create mode 100644 tests/qemuxml2xmloutdata/serial-append.x86_64-latest.xml -- 2.38.1

2 6

[PATCH 1/1] qemuProcessEventSubmit : fix potential use after free
by Shaleen Bathla 10 Jan '23

10 Jan '23

Coverity scan reports use after free issue. In error case, don't free vm object as it will be unlocked+freed in the parent function like qemuProcessHandleReset(). Signed-off-by: Shaleen Bathla <shaleen.bathla(a)oracle.com> --- src/qemu/qemu_process.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9fc7eada5220..a4133b37cf22 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -287,7 +287,6 @@ qemuProcessEventSubmit(virDomainObj *vm, event->data = data; if (virThreadPoolSendJob(driver->workerPool, 0, event) < 0) { - virObjectUnref(vm); qemuProcessEventFree(event); } } -- 2.31.1

2 2

[PATCH V5 00/11] spec: Decompose the daemon subpackage
by Jim Fehlig 09 Jan '23

09 Jan '23

This is V5 of https://listman.redhat.com/archives/libvir-list/2022-December/236472.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V4: - Address more review comments from Andrea Jim Fehlig (11): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages docs/kbase/rpm-deployment.rst | 51 ++++-- libvirt.spec.in | 326 ++++++++++++++++++++++++---------- 2 files changed, 269 insertions(+), 108 deletions(-) -- 2.38.1

4 30

[PATCH] qemuBuildThreadContextProps: Generate ThreadContext less frequently
by Michal Privoznik 09 Jan '23

09 Jan '23

Currently, the ThreadContext object is generated whenever we see .host-nodes attribute for a memory-backend-* object. The idea was that when the backend is pinned to a specific set of host NUMA nodes, then the allocation could be happening on CPUs from those nodes too. But this may not be always possible. Users might configure their guests in such way that vCPUs and corresponding guest NUMA nodes are on different host NUMA nodes than emulator thread. In this case, ThreadContext won't work, because ThreadContext objects live in context of the emulator thread (vCPU threads are moved around by us later, when emulator thread finished its setup and spawned vCPU threads - see qemuProcessSetupVcpus()). Therefore, memory allocation is done by emulator thread which is pinned to a subset of host NUMA nodes, but tries to create a ThreadContext object with a disjoint subset of host NUMA nodes, which fails. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2154750 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 11 ++++++----- .../hugepages-memaccess2.x86_64-latest.args | 9 +++------ .../memory-hotplug-virtio-mem.x86_64-latest.args | 3 +-- .../numatune-memnode.x86_64-latest.args | 9 +++------ .../numatune-system-memory.x86_64-latest.args | 3 +-- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 06e29ff8ae..af17f37754 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3633,6 +3633,10 @@ qemuBuildThreadContextProps(virJSONValue **tcProps, if (!nodemask) return 0; + if (virJSONValueObjectGetBoolean(*memProps, "prealloc", &prealloc) < 0 || + !prealloc) + return 0; + memalias = virJSONValueObjectGetString(*memProps, "id"); if (!memalias) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3655,11 +3659,8 @@ qemuBuildThreadContextProps(virJSONValue **tcProps, NULL) < 0) return -1; - if (virJSONValueObjectGetBoolean(*memProps, "prealloc", &prealloc) >= 0 && - prealloc) { - priv->threadContextAliases = g_slist_prepend(priv->threadContextAliases, - g_steal_pointer(&tcAlias)); - } + priv->threadContextAliases = g_slist_prepend(priv->threadContextAliases, + g_steal_pointer(&tcAlias)); *tcProps = g_steal_pointer(&props); return 0; diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args index f73da5865d..fedc9fe1ce 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args @@ -16,17 +16,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -m size=4194304k,slots=16,maxmem=8388608k \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ --object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[0,1,2,3]}' \ --object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":false,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind","prealloc-context":"tc-ram-node0"}' \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":false,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -object '{"qom-type":"thread-context","id":"tc-ram-node1","node-affinity":[0,1,2,3]}' \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind","prealloc-context":"tc-ram-node1"}' \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ --object '{"qom-type":"thread-context","id":"tc-ram-node2","node-affinity":[0,1,2,3]}' \ --object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2","share":false,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind","prealloc-context":"tc-ram-node2"}' \ +-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2","share":false,"size":1073741824,"host-nodes":[0,1,2,3],"policy":"bind"}' \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ --object '{"qom-type":"thread-context","id":"tc-ram-node3","node-affinity":[3]}' \ --object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3","share":false,"size":1073741824,"host-nodes":[3],"policy":"bind","prealloc-context":"tc-ram-node3"}' \ +-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3","share":false,"size":1073741824,"host-nodes":[3],"policy":"bind"}' \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 04876fc044..5aa8110aeb 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -32,8 +32,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":false,"size":1073741824}' \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0","addr":"0x2"}' \ --object '{"qom-type":"thread-context","id":"tc-memvirtiomem1","node-affinity":[1,2,3]}' \ --object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind","prealloc-context":"tc-memvirtiomem1"}' \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":2147483648,"host-nodes":[1,2,3],"policy":"bind"}' \ -device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"requested-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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"}' \ diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args index f4ef91006f..7cb7e659a4 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -16,14 +16,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \ -m 24105 \ -overcommit mem-lock=off \ -smp 32,sockets=32,cores=1,threads=1 \ --object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \ --object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object '{"qom-type":"thread-context","id":"tc-ram-node1","node-affinity":[0,1,2,3,4,5,6,7]}' \ --object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3,4,5,6,7],"policy":"bind","prealloc-context":"tc-ram-node1"}' \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3,4,5,6,7],"policy":"bind"}' \ -numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ --object '{"qom-type":"thread-context","id":"tc-ram-node2","node-affinity":[1,2,5,7]}' \ --object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[1,2,5,7],"policy":"bind","prealloc-context":"tc-ram-node2"}' \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[1,2,5,7],"policy":"bind"}' \ -numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -display none \ diff --git a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args index 125dc43153..fd93abe3eb 100644 --- a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args @@ -14,8 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -accel tcg \ -cpu qemu64 \ -m 214 \ --object '{"qom-type":"thread-context","id":"tc-pc.ram","node-affinity":[0]}' \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"bind","prealloc-context":"tc-pc.ram"}' \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"bind"}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -- 2.38.2

2 1

[PATCH (pushed)] qemu: Fix variable sizing issues with 'bandwidth' argument of qemuBlockCommit
by Peter Krempa 09 Jan '23

09 Jan '23

The patch moving the code didn't faithfully represent the typecasting of the 'bandwidth' variable needed to properly convert from the legacy 'unsigned long' argument which resulted in a build failure on 32 bit systems: ../src/qemu/qemu_block.c: In function ‘qemuBlockCommit’: ../src/qemu/qemu_block.c:3249:23: error: comparison is always false due to limited range of data type [-Werror=type-limits] 3249 | if (bandwidth > LLONG_MAX >> 20) { | ^ Fix it by returning the check into qemuDomainBlockCommit as it's needed only because of the legacy argument type in the old API and use 'unsigned long long' for qemuBlockCommit. Fixes: f5a77198bf9 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. src/qemu/qemu_block.c | 15 ++------------- src/qemu/qemu_block.h | 2 +- src/qemu/qemu_driver.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 7ea42961b6..9bfb06ac08 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3205,7 +3205,7 @@ qemuBlockExportAddNBD(virDomainObj *vm, * @baseSource: disk source within backing chain to commit data into * @topSource: disk source within backing chain with data we will commit * @top_parent: disk source that has @topSource as backing disk - * @bandwidth: bandwidth limit, flags determine the unit + * @bandwidth: bandwidth limit in bytes/s * @asyncJob: qemu async job type * @autofinalize: virTristateBool controlling qemu block job finalization * @flags: bitwise-OR of virDomainBlockCommitFlags @@ -3227,7 +3227,7 @@ qemuBlockCommit(virDomainObj *vm, virStorageSource *baseSource, virStorageSource *topSource, virStorageSource *top_parent, - unsigned long bandwidth, + unsigned long long bandwidth, virDomainAsyncJob asyncJob, virTristateBool autofinalize, unsigned int flags) @@ -3244,17 +3244,6 @@ qemuBlockCommit(virDomainObj *vm, if (virDomainObjCheckActive(vm) < 0) return NULL; - /* Convert bandwidth MiB to bytes, if necessary */ - if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) { - if (bandwidth > LLONG_MAX >> 20) { - virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), - LLONG_MAX >> 20); - return NULL; - } - bandwidth <<= 20; - } - if (!qemuDomainDiskBlockJobIsSupported(disk)) return NULL; diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index a8079c2207..eac986e0f0 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -283,7 +283,7 @@ qemuBlockCommit(virDomainObj *vm, virStorageSource *baseSource, virStorageSource *topSource, virStorageSource *top_parent, - unsigned long bandwidth, + unsigned long long bandwidth, virDomainAsyncJob asyncJob, virTristateBool autofinalize, unsigned int flags); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3ea48c9049..d9f7ce234e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14994,6 +14994,7 @@ qemuDomainBlockCommit(virDomainPtr dom, virStorageSource *topSource; virStorageSource *baseSource = NULL; virStorageSource *top_parent = NULL; + unsigned long long speed = bandwidth; g_autoptr(qemuBlockJobData) job = NULL; virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW | @@ -15011,6 +15012,17 @@ qemuDomainBlockCommit(virDomainPtr dom, if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) goto cleanup; + /* Convert bandwidth MiB to bytes, if necessary */ + if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) { + if (speed > LLONG_MAX >> 20) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + LLONG_MAX >> 20); + goto endjob; + } + speed <<= 20; + } + if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -15027,7 +15039,7 @@ qemuDomainBlockCommit(virDomainPtr dom, goto endjob; job = qemuBlockCommit(vm, disk, baseSource, topSource, top_parent, - bandwidth, VIR_ASYNC_JOB_NONE, VIR_TRISTATE_BOOL_YES, + speed, VIR_ASYNC_JOB_NONE, VIR_TRISTATE_BOOL_YES, flags); if (job) ret = 0; -- 2.38.1

1 0

[PATCH V6 00/11] spec: Decompose the daemon subpackage
by Jim Fehlig 09 Jan '23

09 Jan '23

This is V6 of https://listman.redhat.com/archives/libvir-list/2022-December/236502.html The end goal is to remove the libvirt-dameon dependency on the various libvirt-daemon-driver-foo subpackages, allowing installation of a modular daemon configuration without the traditional monolithic libvirtd. Changes from V5: * Remove lockd dependency from hypervisor packages * Add virtproxyd as a weak dependency to the hypervisor packages Jim Fehlig (11): spec: Move virtlockd to a new subpackage libvirt-daemon-lock spec: Move virtlogd to a new subpackage libvirt-daemon-log spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy spec: Move lockd plugin to a new subpackage spec: Rename the libvirt-lock-sanlock subpackage spec: Move common files and dependencies to libvirt-daemon-common spec: Add module-init-tools dependency to nodedev and lxc drivers spec: Add numad dependency to qemu and lxc drivers spec: Remove libvirt-daemon dependency from drivers spec: Remove libvirt-daemon dependency from hypervisor subpackages kbase: Update rpm-deployment.rst with new subpackages docs/kbase/rpm-deployment.rst | 48 +++-- libvirt.spec.in | 325 ++++++++++++++++++++++++---------- 2 files changed, 265 insertions(+), 108 deletions(-) -- 2.38.1

3 17