- Devel - libvirt List Archives

[libvirt PATCH 0/2] conf: log error when attempting to live update device acpi index
by Laine Stump 17 Sep '21

17 Sep '21

This isn't possible (acpi index is set when devices are probed at guest startup) and libvirt wasn't even trying to communicate the change to the guest in any way, but instead of logging an error, we were just pretending the request had succeeded. Laine Stump (2): conf: reformat virDomainDefCompatibleDevice for upcoming additional check conf: log error on attempts to modify ACPI index of active device src/conf/domain_conf.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.31.1

3 11

[libvirt PATCH 0/3] Reduce stack frame size of virNWFilterRuleDefFixup
by Tim Wiederhake 17 Sep '21

17 Sep '21

When libvirt is build with sanitizers enabled, in debug mode, on clang, virNWFilterRuleDefFixup exceeds the maximum stack frame size of 8192 bytes, as specified in meson.build: ../src/conf/nwfilter_conf.c:2190:1: error: stack frame size of 10616 bytes in function 'virNWFilterRuleDefFixup' [-Werror,-Wframe-larger-than=] virNWFilterRuleDefFixup(virNWFilterRuleDef *rule) ^ 1 error generated. This series reworks the function a bit to bring the frame size below 8192. Regards, Tim Tim Wiederhake (3): virNWFilterRuleDefFixup: Factor out ethHdr as variable virNWFilterRuleDefFixup: Factor out ipHdr as variable virNWFilterRuleDefFixup: Factor out portData as variable src/conf/nwfilter_conf.c | 179 ++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 106 deletions(-) -- 2.31.1

2 10

[libvirt PATCH v3 0/1] Add a PCI/PCIe device VPD Capability
by Dmitrii Shcherbakov 17 Sep '21

17 Sep '21

Add support for deserializing the binary PCI/PCIe VPD format and exposing VPD resources as XML elements in a new nested capability of PCI/PCIe devices called 'vpd'. The VPD format is specified in "I.3. VPD Definitions" in PCI specs (2.2+) and "6.28.1 VPD Format" PCIe 4.0. As section 6.28 in PCIe 4.0 notes, the PCI Local Bus and PCIe VPD formats are binary compatible and PCIe 4.0 merely started incorporating what was already present in PCI specs. Linux kernel exposes a binary blob in the VPD format via sysfs since v2.6.26 (commit 94e6108803469a37ee1e3c92dafdd1d59298602f) which requires a parser to interpret. There are usage scenarios where information such as the board serial number needs to be retrieved from PCI(e) VPD. Projects like Nova can utilize this information for cases which involve virtual interface plugging on SmartNIC DPUs but there may be other scenarios and types of information useful to retrieve from VPD. The fact that the format is binary requires proper parsing instead of substring searching hence the full parser is proposed. Likewise, checksum validation requires proper parsing as well. The patch follows a prior discussion on the mailing list which has additional context about the use-case but a narrower proposal: https://listman.redhat.com/archives/libvir-list/2021-May/msg00873.html https://www.mail-archive.com/libvir-list@redhat.com/msg218165.html The new functionality is mostly contained in virpcivpd with a couple of new functions added to virpci. Additionally, the necessary XML serialization/deserialization and glue code is added to expose the VPD capability to external clients as XML. A new capability flag is added along with a new capability in order to allow for filtering of PCI devices with the VPD capability using virsh: virsh nodedev-list --cap vpd sudo virsh nodedev-dumpxml --device pci_dddd_bb_ss_f In this example having the root uid is required in order to access the vpd sysfs entry, therefore, the nodedev XML output will only contain the VPD capability if virsh is run as root. The capability is treated as dynamic due to the presence of read-write sections in the VPD format per PCI/PCIe specs (the idea being that read-write resource fields may potentially be altered by the DPU OS over time independently from the host OS). Unit tests cover the parser functionality (including many possible invalid cases), in-memory representation as well as XML serialization and deserialization. Manual functional testing was performed with 2 DPUs and several other NIC models which expose PCI(e) VPD. Testing have also been performed for devices that do not have VPD or those that expose a VPD capability but exhibit invalid behavior (I/O errors while reading a sysfs entry). Per the existing guidelines, the implementation relies heavily on glib for various purposes. https://libvirt.org/glib-adoption.html v3 of the patch is a rebase of v2 on top of the latest changes to the master branch. Dmitrii Shcherbakov (1): Add a PCI/PCIe device VPD Capability build-aux/syntax-check.mk | 4 +- docs/drvnodedev.html.in | 46 ++ docs/formatnode.html.in | 24 +- docs/schemas/nodedev.rng | 40 + include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/conf/node_device_conf.c | 258 ++++++ src/conf/node_device_conf.h | 6 +- src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 17 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 2 + src/util/meson.build | 1 + src/util/virpci.c | 60 ++ src/util/virpci.h | 3 + src/util/virpcivpd.c | 771 +++++++++++++++++ src/util/virpcivpd.h | 106 +++ src/util/virpcivpdpriv.h | 42 + tests/meson.build | 1 + .../pci_0000_42_00_0_vpd.xml | 33 + .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tests/testutils.c | 51 ++ tests/testutils.h | 6 + tests/virpcitest.c | 3 + tests/virpcivpdtest.c | 777 ++++++++++++++++++ tools/virsh-nodedev.c | 3 + 27 files changed, 2262 insertions(+), 5 deletions(-) create mode 100644 src/util/virpcivpd.c create mode 100644 src/util/virpcivpd.h create mode 100644 src/util/virpcivpdpriv.h create mode 100644 tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml create mode 120000 tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml create mode 100644 tests/virpcivpdtest.c -- 2.30.2

2 3

[libvirt PATCH] Fix typos
by Tim Wiederhake 17 Sep '21

17 Sep '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/ch/ch_monitor.c | 2 +- tests/virstoragetest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 4ed7cbfee7..d277466262 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -789,7 +789,7 @@ virCHMonitorResumeVM(virCHMonitor *mon) * @mon: Pointer to the monitor * @info: Get VM info * - * Retrive the VM info and store in @info + * Retrieve the VM info and store in @info * * Returns 0 on success. */ diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index ec185d8660..ccfc9f7001 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -100,7 +100,7 @@ testPrepImages(void) return NULL; } - /* create the folowing real backing chain with qcow2 images with absolute + /* create the following real backing chain with qcow2 images with absolute * backing and different qcow2 versions: * datadir/raw <- datadir/qcow2 (qcow2v2) <- datadir/wrap (qcow2v3) */ cmdraw = virCommandNewArgList(qemuimg, "create", -- 2.31.1

2 1

[PATCH] vsh: Move 'vshReadlineOptionsGenerator' out of '#if WITH_READLINE'
by Peter Krempa 17 Sep '21

17 Sep '21

It's now also used in vshCompleteHelpCommand which is outside of the conditionally compiled code. Fixes: 80f70c74a7 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-fix rule. tools/vsh.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index cf24586b25..9057310077 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2543,17 +2543,12 @@ vshTreePrint(vshControl *ctl, vshTreeLookup lookup, void *opaque, return ret; } -#if WITH_READLINE - -/* ----------------- - * Readline stuff - * ----------------- - */ /** * vshReadlineCommandGenerator: * - * Generator function for command completion. + * Generator function for command completion. Used also for completing the + * '--command' option of the 'help' command. * * Returns a string list of all commands, or NULL on failure. */ @@ -2590,6 +2585,15 @@ vshReadlineCommandGenerator(void) return g_steal_pointer(&ret); } + +#if WITH_READLINE + +/* ----------------- + * Readline stuff + * ----------------- + */ + + static char ** vshReadlineOptionsGenerator(const vshCmdDef *cmd, vshCmd *last) -- 2.31.1

1 0

[PATCH v2 0/5] network create: add support for validation against schema
by Kristina Hanicova 16 Sep '21

16 Sep '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-August/msg00871.html diff to v1: - rebased onto the current master - changed the way of working with flags to make the code more readable (suggested by Jano and Daniel). I added a comment in one case when it was not possible without further refactoring of more functions. Kristina Hanicova (5): api: add public virNetworkCreateXMLFlags() and remote protocol src: add driver support for networkCreateXMLFlags() api: add virNetworkCreateFlags network: allow VIR_NETWORK_CREATE_VALIDATE flag virsh: add support for '--validate' option in create network docs/manpages/virsh.rst | 4 ++- include/libvirt/libvirt-network.h | 7 ++++++ src/driver-network.h | 6 +++++ src/libvirt-network.c | 41 +++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/network/bridge_driver.c | 21 +++++++++++++--- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 +++++++++++++- src/remote_protocol-structs | 8 ++++++ src/test/test_driver.c | 16 ++++++++++-- src/vbox/vbox_network.c | 13 +++++++++- tools/virsh-network.c | 13 +++++++++- 12 files changed, 139 insertions(+), 10 deletions(-) -- 2.31.1

2 8

[PATCH] tools/virsh-pool: refactor smaller functions
by Kristina Hanicova 16 Sep '21

16 Sep '21

I think these functions look much more readable with just simple if conditions. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- tools/virsh-pool.c | 68 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 1a2ab8cc53..c65e8163a6 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -269,7 +269,6 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; const char *from = NULL; - bool ret = true; g_autofree char *buffer = NULL; bool build; bool overwrite; @@ -297,17 +296,15 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; - pool = virStoragePoolCreateXML(priv->conn, buffer, flags); - - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s created from %s\n"), - virStoragePoolGetName(pool), from); - virStoragePoolFree(pool); - } else { + if (!(pool = virStoragePoolCreateXML(priv->conn, buffer, flags))) { vshError(ctl, _("Failed to create pool from %s"), from); - ret = false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Pool %s created from %s\n"), + virStoragePoolGetName(pool), from); + virStoragePoolFree(pool); + return true; } static const vshCmdOptDef opts_pool_define_as[] = { @@ -490,17 +487,16 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { vshPrint(ctl, "%s", xml); - } else { - pool = virStoragePoolCreateXML(priv->conn, xml, flags); + return true; + } - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s created\n"), name); - virStoragePoolFree(pool); - } else { - vshError(ctl, _("Failed to create pool %s"), name); - return false; - } + if (!(pool = virStoragePoolCreateXML(priv->conn, xml, flags))) { + vshError(ctl, _("Failed to create pool %s"), name); + return false; } + + vshPrintExtra(ctl, _("Pool %s created\n"), name); + virStoragePoolFree(pool); return true; } @@ -532,7 +528,6 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; const char *from = NULL; - bool ret = true; g_autofree char *buffer = NULL; unsigned int flags = 0; virshControl *priv = ctl->privData; @@ -546,17 +541,15 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; - pool = virStoragePoolDefineXML(priv->conn, buffer, flags); - - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s defined from %s\n"), - virStoragePoolGetName(pool), from); - virStoragePoolFree(pool); - } else { + if (!(pool = virStoragePoolDefineXML(priv->conn, buffer, flags))) { vshError(ctl, _("Failed to define pool from %s"), from); - ret = false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Pool %s defined from %s\n"), + virStoragePoolGetName(pool), from); + virStoragePoolFree(pool); + return true; } /* @@ -586,17 +579,16 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { vshPrint(ctl, "%s", xml); - } else { - pool = virStoragePoolDefineXML(priv->conn, xml, 0); + return true; + } - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s defined\n"), name); - virStoragePoolFree(pool); - } else { - vshError(ctl, _("Failed to define pool %s"), name); - return false; - } + if (!(pool = virStoragePoolDefineXML(priv->conn, xml, 0))) { + vshError(ctl, _("Failed to define pool %s"), name); + return false; } + + vshPrintExtra(ctl, _("Pool %s defined\n"), name); + virStoragePoolFree(pool); return true; } -- 2.31.1

2 1

[libvirt PATCH 1/2] docs: Expand manpage documentation for nodedev commands
by Jonathon Jongsma 16 Sep '21

16 Sep '21

Bring the documentation for nodedev-list up to date with the latest code, especially documenting the --active and -all options. Also add documentation for the nodedev-define, nodedev-undefine, and nodedev-start commands. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/manpages/virsh.rst | 48 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index ce98283ae3..73daf2735f 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5020,6 +5020,44 @@ Note that this makes libvirt quit managing a host device, and may even make that device unusable by the rest of the physical host until a reboot. +nodedev-define +-------------- + +**Syntax:** + +:: + + nodedev-define FILE + +Define an inactive persistent device or modify an existing persistent one from +the XML *FILE*. + + +nodedev-undefine +---------------- + +**Syntax:** + +:: + + nodedev-undefine device + +Undefine the configuration for a persistent device. If the device is active, +make it transient. + + +nodedev-start +------------- + +**Syntax:** + +:: + + nodedev-start network + +Start a (previously defined) inactive device. + + nodedev-detach -------------- @@ -5076,16 +5114,18 @@ nodedev-list :: - nodedev-list cap --tree + nodedev-list [--cap capability] [--tree] [--inactive | --all] List all of the devices available on the node that are known by libvirt. *cap* is used to filter the list by capability types, the types must be separated by comma, e.g. --cap pci,scsi. Valid capability types include 'system', 'pci', 'usb_device', 'usb', 'net', 'scsi_host', 'scsi_target', 'scsi', 'storage', 'fc_host', 'vports', 'scsi_generic', 'drm', 'mdev', -'mdev_types', 'ccw', 'css', 'ap_card', 'ap_queue', 'ap_matrix'. -If *--tree* is used, the output is formatted in a tree representing parents of each -node. *cap* and *--tree* are mutually exclusive. +'mdev_types', 'ccw', 'css', 'ap_card', 'ap_queue', 'ap_matrix'. By default, +only active devices are listed. *--inactive* is used to list only inactive +devices, and *-all* is used to list both active and inactive devices. +If *--tree* is used, the output is formatted in a tree representing parents of +each node. *--tree* is mutually exclusive with all other options. nodedev-reattach -- 2.31.1

2 2

[PATCH] qemu: Fix typo in qemuBuilNumaCellCache
by Michal Privoznik 16 Sep '21

16 Sep '21

The function should be named qemuBuildNumaCellCache (note the missing 'd' in Build). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d29313f45..73868ab4b7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7281,9 +7281,9 @@ qemuBuildIOThreadCommandLine(virCommand *cmd, static int -qemuBuilNumaCellCache(virCommand *cmd, - const virDomainDef *def, - size_t cell) +qemuBuildNumaCellCache(virCommand *cmd, + const virDomainDef *def, + size_t cell) { size_t ncaches = virDomainNumaGetNodeCacheCount(def->numa, cell); size_t i; @@ -7540,7 +7540,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, /* This can't be moved into any of the loops above, * because hmat-cache can be specified only after hmat-lb. */ for (i = 0; i < ncells; i++) { - if (qemuBuilNumaCellCache(cmd, def, i) < 0) + if (qemuBuildNumaCellCache(cmd, def, i) < 0) goto cleanup; } } -- 2.32.0

1 0

[PATCH v2 0/3] qapi & doc: deprecate drive-backup
by Vladimir Sementsov-Ogievskiy 15 Sep '21

15 Sep '21

Hi all! See 03 commit message for details. 01-02 are preparation docs update. v2: add a lot of documentation changes v1 was "[PATCH] qapi: deprecate drive-backup" Supersedes: <20210423125900.3640-1-vsementsov(a)virtuozzo.com> Vladimir Sementsov-Ogievskiy (3): docs/block-replication: use blockdev-backup docs/interop/bitmaps: use blockdev-backup qapi: deprecate drive-backup docs/block-replication.txt | 4 +- docs/interop/bitmaps.rst | 285 +++++++++++++++++++------ docs/interop/live-block-operations.rst | 47 ++-- docs/system/deprecated.rst | 11 + qapi/block-core.json | 5 +- 5 files changed, 263 insertions(+), 89 deletions(-) -- 2.29.2

4 17

[libvirt PATCH] virsh: Make code flow in cmdManagedSaveRemove more straightforward
by Jiri Denemark 15 Sep '21

15 Sep '21

By doing so we can get rid of the code which violates our coding style guidelines. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-domain.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e5bd1fdd75..ca56c3b33d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4788,18 +4788,19 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) return false; } - if (hassave) { - if (virDomainManagedSaveRemove(dom, 0) < 0) { - vshError(ctl, _("Failed to remove managed save image for domain '%s'"), - name); - return false; - } - else - vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); - } - else + if (hassave == 0) { vshPrintExtra(ctl, _("Domain '%s' has no manage save image; removal skipped"), name); + return true; + } + + if (virDomainManagedSaveRemove(dom, 0) < 0) { + vshError(ctl, _("Failed to remove managed save image for domain '%s'"), + name); + return false; + } + + vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); return true; } -- 2.33.0

2 1

[PATCH] docs: fix migration_features element name in formatcaps.html.in
by Andrea Bolognani 15 Sep '21

15 Sep '21

From: Robin Lee <cheeselee(a)fedoraproject.org> Signed-off-by: Robin Lee <cheeselee(a)fedoraproject.org> Reviewed-by: Andrea Bolognani <abologna(a)redhat.com> --- Taken from https://gitlab.com/libvirt/libvirt/-/merge_requests/106 I've pushed it already. docs/formatcaps.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 59d21a7d9e..09662f78c8 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -43,7 +43,7 @@ <dd>whether host is capable of memory suspend, disk hibernation, or hybrid suspend.</dd> - <dt><code>migration</code></dt> + <dt><code>migration_features</code></dt> <dd>This element exposes information on the hypervisor's migration capabilities, like live migration, supported URI transports, and so on.</dd> -- 2.31.1

1 0

[PATCH] virsh: Add QMP command wrapping for 'qemu-monitor-command'
by Peter Krempa 15 Sep '21

15 Sep '21

Issuing simple QMP commands is pain as they need to be wrapped by the JSON wrapper: { "execute": "COMMAND" } and optionally also: { "execute": "COMMAND", "arguments":...} For simple commands without arguments we can add syntax sugar to virsh which allows simple usage of QMP and additionally prepares also for passing through of the 'arguments' section: virsh qemu-monitor-command --qmpwrap $VM query-status is equivalent to virsh qemu-monitor-command $VM '{"execute":"query-status"}' and virsh qemu-monitor-command --qmpwrap $VM query-named-block-nodes '{"flat":true}' is equivalent to virsh qemu-monitor-command $VM '{"execute":"query-named-block-nodes", "arguments":{"flat":true}}' Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- I originally called the flag '--qmp' but that could be confusing given that we have '--hmp'. On the other hand it's shorter so I wouldn't mind turning it back to '--qmp'. docs/manpages/virsh.rst | 9 ++++++++- tools/virsh-domain.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 9561b3f59d..b8cb3cfbc2 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -7694,7 +7694,8 @@ qemu-monitor-command :: - qemu-monitor-command domain { [--hmp] | [--pretty] [--return-value] } command... + qemu-monitor-command domain { [--hmp] | [--qmpwrap] [--pretty] + [--return-value] } command... Send an arbitrary monitor command *command* to domain *domain* through the QEMU monitor. The results of the command will be printed on stdout. @@ -7705,6 +7706,12 @@ a space in between before passing the single command to the monitor. Note that libvirt uses the QMP to talk to qemu so *command* must be valid JSON in QMP format to work properly. +If *--qmpwrap* is passed the first argument passed as *command* is used as a QMP +command name and appropriately wrapped into a JSON block. Additionally a second +argument passed as *command* is appended as value of the 'arguments' parameter +of the QMP command verbatim. *Note* that in the future automatic formatting +*--qmpwrap* of the arguments might be added, so scripts should format their own JSON. + If *--pretty* is given the QMP reply is pretty-printed. If *--return-value* is given the 'return' key of the QMP response object is diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e5bd1fdd75..ac57196b20 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9380,6 +9380,10 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { .type = VSH_OT_BOOL, .help = N_("extract the value of the 'return' key from the returned string") }, + {.name = "qmpwrap", + .type = VSH_OT_BOOL, + .help = N_("wrap the 'cmd' argument in JSON wrapper for QMP") + }, {.name = "cmd", .type = VSH_OT_ARGV, .flags = VSH_OFLAG_REQ, @@ -9405,14 +9409,35 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("hmp", "pretty"); VSH_EXCLUSIVE_OPTIONS("hmp", "return-value"); + VSH_EXCLUSIVE_OPTIONS("hmp", "qmpwrap"); if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - while ((opt = vshCommandOptArgv(ctl, cmd, opt))) - virBufferAsprintf(&buf, "%s ", opt->data); + if (vshCommandOptBool(cmd, "qmpwrap")) { + const char *command = NULL; + const char *arguments = NULL; - virBufferTrim(&buf, " "); + if ((opt = vshCommandOptArgv(ctl, cmd, opt))) + command = opt->data; + if ((opt = vshCommandOptArgv(ctl, cmd, opt))) + arguments = opt->data; + + if (!command || (arguments && vshCommandOptArgv(ctl, cmd, opt))) { + vshError(ctl, "%s", _("--qmpwrap option requires 1 or 2 arguments")); + return false; + } + + virBufferAsprintf(&buf, "{\"execute\":\"%s\"", command); + if (arguments) + virBufferAsprintf(&buf, ", \"arguments\":%s", arguments); + virBufferAddLit(&buf, "}"); + } else { + while ((opt = vshCommandOptArgv(ctl, cmd, opt))) + virBufferAsprintf(&buf, "%s ", opt->data); + + virBufferTrim(&buf, " "); + } monitor_cmd = virBufferContentAndReset(&buf); -- 2.31.1

3 2

[libvirt PATCH v2] news: mention new nodedev API
by Jonathon Jongsma 15 Sep '21

15 Sep '21

Add news item about the new API for node devices. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NEWS.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 4521499db7..fd20e50d18 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,18 @@ v7.8.0 (unreleased) * **New features** + * nodedev: Add ability to automatically start mediated devices + + The autostart status of a persistent mediated devices can be managed with + the new APIs ``virNodeDeviceSetAutostart()`` and + ``virNodeDeviceGetAutostart()``. The corresponding virsh command is + ``nodedev-autostart``. In addition, two new APIs were added to get + additional information about node devices: ``virNodeDeviceIsPersistent()`` + checks whether the device is persistently defined, and + ``virNodeDeviceIsActive()`` checks whether the node device is currently + active. This information can also be retrieved with the new virsh command + ``nodedev-info``. + * **Improvements** * **Bug fixes** -- 2.31.1

2 1

[PATCH] qemu: validate: Allow 'preserve' action for on_crash lifecycle action
by Peter Krempa 15 Sep '21

15 Sep '21

In fact keeping the VM around for debugging is a desirable configuration and actually the implementation has no code as we keep the VM around. Remove the validation and add a note that it's actually used. Fixes: b1b85a475fb251b9068b75f629479f5c452f1b43 Reported-by: Christian Borntraeger <borntraeger(a)de.ibm.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + src/qemu/qemu_validate.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dfc27572c4..6ae678b165 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3647,6 +3647,7 @@ processGuestPanicEvent(virQEMUDriver *driver, break; case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + /* the VM is kept around for debugging */ break; default: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 9d93f373ab..6b685881a8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1083,10 +1083,9 @@ qemuValidateLifecycleAction(virDomainLifecycleAction onPoweroff, /* The qemu driver doesn't yet implement any meaningful handling for * VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE */ if (onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE || - onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE || - onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) { + onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("qemu driver doesn't support the 'preserve' action for 'on_reboot'/'on_poweroff'/'on_crash'")); + _("qemu driver doesn't support the 'preserve' action for 'on_reboot'/'on_poweroff'")); return -1; } -- 2.31.1

3 2

[PATCH 00/22] qemu: Fix mess with lifecycle actions and unbreak transient disks
by Peter Krempa 15 Sep '21

15 Sep '21

While investigating how to fix issue with transient disks breaking when -no-shutdown is not used I've ended up figuring out that lifecycle action handling in the qemu driver is very broken. Unbreak the handling by rejecting some actions which were never implemented, add support for 'set-action' qmp command and use it to update the 'reset' action in qemu and always use '-no-shutdown'. Peter Krempa (22): qemuMonitorJSONSetWatchdogAction: Use automatic memory clearing qemuDomainSetLifecycleAction: Add a note about argument range-check qemu: driver: Use 'qemuDomainSaveStatus' for saving status XML qemu: validate: Reformat header and purge unused includes qemu: Reject 'rename-restart' action for 'on_reboot'/'on_poweroff'/'on_crash' qemu: driver: Validate lifecycle actions in 'qemuDomainSetLifecycleAction' qemu: Reject 'preserve' action for 'on_reboot'/'on_poweroff'/'on_crash' qemu: Honor 'restart' action for 'on_poweroff' qemu: capablities: Detect presence of 'set-action' as QEMU_CAPS_SET_ACTION qemu: monitor: Implement monitor code for 'set-action' command qemuDomainAttachWatchdog: Use 'set-action' instead of 'watchdog-set-action' if supported qemuxml2argvtest: Add 'LATEST' version of 'misc-no-reboot' test case qemuDomainObjPrivate: Annotate 'allowReboot' field qemu: migration: Don't transfer 'allowReboot' flag qemu: domain: Remove qemuDomainIsUsingNoShutdown qemuDomainSetLifecycleAction: Forbid live update of 'on_reboot' qemuProcessHandleReset: Don't emulate lifecycle actions for RESET event qemuProcessLaunch: Setup handling of 'on_reboot' via QMP when starting the process qemu: command: Always use '-no-shutdown' qemu: process: Don't set 'allowReboot' when qemu supports 'set-action' qemuDomainSetLifecycleAction: Properly update 'onReboot' action in qemu qemu: process: Ignore 'RESET' event during startup docs/formatdomain.rst | 8 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 +- src/qemu/qemu_domain.c | 16 -- src/qemu/qemu_domain.h | 11 +- src/qemu/qemu_driver.c | 201 +++++++++++------- src/qemu/qemu_hotplug.c | 54 ++++- src/qemu/qemu_migration.c | 5 - src/qemu/qemu_migration_cookie.c | 22 -- src/qemu/qemu_migration_cookie.h | 4 - src/qemu/qemu_monitor.c | 16 ++ src/qemu/qemu_monitor.h | 49 +++++ src/qemu/qemu_monitor_json.c | 95 ++++++++- src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 85 +++++--- src/qemu/qemu_validate.c | 51 +++++ src/qemu/qemu_validate.h | 31 +-- .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../basic-xml2xml-out.xml | 1 - .../full-xml2xml-out.xml | 1 - .../modern-dom-out-dest.xml | 1 - .../modern-dom-out-source.xml | 1 - .../nbd-bitmaps-xml2xml-out.xml | 1 - tests/qemumonitorjsontest.c | 6 + .../misc-no-reboot.x86_64-latest.args | 35 +++ tests/qemuxml2argvtest.c | 1 + 30 files changed, 529 insertions(+), 194 deletions(-) create mode 100644 tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args -- 2.31.1

4 27

[PATCH 0/1] qemu_tpm: Start swtpm(8) daemon with --terminate switch
by Nick Chevsky 15 Sep '21

15 Sep '21

libvirt expects the swtpm(8) daemon to auto-terminate along with QEMU. While that's already the case, it's currently happening for the wrong reason: swtpm's documented way of achieving this behavior is via the --terminate switch (which causes the daemon to shut down when the data channel connection drops), but libvirt isn't currently using this switch--and it should. The reason this currently works anyway, even without the --terminate switch, is two-fold: (1) When QEMU terminates gracefully, it sends command CMD_SHUTDOWN to swtpm which triggers a shutdown. Nothing wrong with this one. (2) When QEMU dies abruptly (e.g. SIGKILL, SIGSEGV) without issuing CMD_SHUTDOWN, swtpm should (a) shut down if the --terminate switch was given OR (b) stay alive if --terminate wasn't given. At the moment this isn't being respected, and swtpm unconditionally shuts down (regardless of whether --terminate was given or not) due to a bug in swtpm's connection handling logic [1]. libvirt currently relies on this incorrect and undocumented upstream behavior, trusting swtpm to shut itself down even when --terminate wasn't given, which is wrong and bound to break. The discussion [1] between swtpm's author and I shows that --terminate (a) is the proper way to achieve--and guarantee--the current behavior, (b) is innocuous to add since it won't alter existing behavior, (c) should've been used by libvirt all along, and (d) should be enforced by swtpm going forward. Since libvirt presently relies on swtpm's current (incorrect) behavior and we don't want to break libvirt, we need libvirt to start invoking swtpm with the --terminate switch ASAP so that the upstream bug can be fixed as soon as it's safe. Fixing the bug is the first step toward eventually enabling non-libvirt swtpm users to optionally run swtpm as a persistent service, allowing a VM to connect to and disconnect from it without the daemon dying. Proxmox VE, to which I also contribute, is already using --terminate in its (WIP) swtpm implementation. [1] https://github.com/stefanberger/swtpm/pull/509 -- Note that this already-merged PR addresses only one half of the bug; the other half (which will actually effect the change) remains on hold until libvirt implements --terminate. Nick Chevsky (1): qemu_tpm: Start swtpm(8) daemon with --terminate switch src/qemu/qemu_tpm.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.30.2

2 4

[PATCH] libxl: Don't autostart domains on driver reload
by Jim Fehlig 14 Sep '21

14 Sep '21

When libxlAutostartDomain was introduced with commit fb92307f0d, one hunk mistakenly added a call site in libxlStateReload. Domains should not be autostarted when reloading the driver, so remove the offending hunk. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c5dbcaafa5..7ea157f9c4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -825,10 +825,6 @@ libxlStateReload(void) libxl_driver->xmlopt, NULL, libxl_driver); - virDomainObjListForEach(libxl_driver->domains, false, - libxlAutostartDomain, - libxl_driver); - virObjectUnref(cfg); return 0; } -- 2.33.0

2 1

[PATCH] node_device_conf: Don't prealloc @vfs in virNodeDeviceGetPCISRIOVCaps()
by Michal Privoznik 14 Sep '21

14 Sep '21

The array of virtual functions @vfs in virNodeDeviceGetPCISRIOVCaps() is allocated twice: the first time during its declaration and the second time inside virPCIGetVirtualFunctions() which leads to a memleak: ==16691== 1,128 bytes in 47 blocks are definitely lost in loss record 1,771 of 1,803 ==16691== at 0x4844CC1: calloc (vg_replace_malloc.c:1117) ==16691== by 0x4E50070: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6800.3) ==16691== by 0x4A7B034: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2649) ==16691== by 0x4A7B5E2: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:2762) ==16691== by 0xA7F6E18: udevProcessPCI (node_device_udev.c:418) Fixes: c97518d9b833a607f29b9bb02e3fbe74c011c088 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b4c1acb6a5..9bbff97ffd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2646,7 +2646,7 @@ static int virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, virNodeDevCapPCIDev *pci_dev) { - g_autoptr(virPCIVirtualFunctionList) vfs = g_new0(virPCIVirtualFunctionList, 1); + g_autoptr(virPCIVirtualFunctionList) vfs = NULL; size_t i; int ret; -- 2.32.0

2 1

[PATCH] docs: Format @variable properly
by Michal Privoznik 14 Sep '21

14 Sep '21

When documenting our public API in some places we use '@' to refer to the variable. For instance: * This API tries to set guest time to the given value. The time * to set (@seconds and @nseconds) should be in seconds relative * to the Epoch of 1970-01-01 00:00:00 in UTC. However, when generating HTML documentation these tokens are copied verbatim. What we can do is drop the '@' character and wrap the variable in <code/> so that it is formatted properly. Due to the way we 'parse' docs a token might actually be slightly more than just '@variable'. For instance in the example above we will have the following tokens: '(@seconds' and '@nseconds)'. Thus we need to handle possible substring before and after variable. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/newapi.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 7ac8caa35d..e56a5f2a27 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -139,6 +139,12 @@ </a> <xsl:value-of select="substring-after($token, '>')"/> </xsl:when> + <xsl:when test="contains($token, '@')"> + <xsl:variable name="prologue" select="substring-before($token, '@')"/> + <xsl:value-of select="$prologue"/> + <code><xsl:value-of select="$stem"/></code> + <xsl:value-of select="substring($token, string-length($prologue) + string-length($stem) + 2)"/> + </xsl:when> <xsl:otherwise> <xsl:value-of select="$token"/> </xsl:otherwise> -- 2.32.0

2 1

[PATCH] libxl: Fix driver reload
by Jim Fehlig 14 Sep '21

14 Sep '21

On reload, the libxl driver calls virDomainObjListLoadAllConfigs to load all configs from /etc/libvirt/libxl/ but incorrectly passes 'true' for the liveStatus parameter, resulting in error messages such as libvirtd[21053]: XML error: unexpected root element <domain>, expecting <domstatus> libvirtd[21053]: Failed to load config for domain 'sles15sp3' Fix by not requesting live status when re-reading the persistent VM config files. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6a3938ead4..c5dbcaafa5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -821,7 +821,7 @@ libxlStateReload(void) virDomainObjListLoadAllConfigs(libxl_driver->domains, cfg->configDir, cfg->autostartDir, - true, + false, libxl_driver->xmlopt, NULL, libxl_driver); -- 2.33.0

2 2

question on vhost, limiting kernel threads and NPROC
by Mike Christie 14 Sep '21

14 Sep '21

Hi, The goal of this email is to try and figure how we want to track/limit the number of kernel threads created by vhost devices. Background: ----------- For vhost-scsi, we've hit a issue where the single vhost worker thread can't handle all IO the being sent from multiple queues. IOPs is stuck at around 500K. To fix this, we did this patchset: https://lore.kernel.org/linux-scsi/20210525180600.6349-1-michael.christie@o… which allows userspace to create N threads and map them to a dev's virtqueues. With this we can get around 1.4M IOPs. Problem: -------- While those patches were being reviewed, a concern about tracking all these new possible threads was raised here: https://lore.kernel.org/linux-scsi/YL45CfpHyzSEcAJv@stefanha-x1.localdomain/ To save you some time, the question is what does other kernel code using the kthread API do to track the number of kernel threads created on behalf of a userspace thread. The answer is they don't do anything so we will have to add that code. I started to do that here: https://lkml.org/lkml/2021/6/23/1233 where those patches would charge/check the vhost device owner's RLIMIT_NPROC value. But, the question of if we really want to do this has come up which is why I'm bugging lists like libvirt now. Question/Solution: ------------------ I'm bugging everyone so we can figure out: If we need to specifically track the number of kernel threads being made for the vhost kernel use case by the RLIMIT_NPROC limit? Or, is it ok to limit the number of devices with the RLIMIT_NOFILE limit. Then each device has a limit on the number of threads it can create.

4 4

[libvirt PATCH 0/2] ci: Add Debian 11 builds
by Andrea Bolognani 14 Sep '21

14 Sep '21

It's been out for a bit. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/368763275 Andrea Bolognani (2): ci: Add Debian 11 builds ci: Regenerate configuration from manifest .../debian-11-cross-aarch64.Dockerfile | 126 +++++++++++++++++ .../debian-11-cross-armv6l.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-armv7l.Dockerfile | 126 +++++++++++++++++ ci/containers/debian-11-cross-i686.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-mips64el.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-mipsel.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-ppc64le.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-s390x.Dockerfile | 125 +++++++++++++++++ ci/containers/debian-11.Dockerfile | 106 ++++++++++++++ ci/gitlab.yml | 130 ++++++++++++++---- ci/manifest.yml | 42 +++++- 11 files changed, 1248 insertions(+), 32 deletions(-) create mode 100644 ci/containers/debian-11-cross-aarch64.Dockerfile create mode 100644 ci/containers/debian-11-cross-armv6l.Dockerfile create mode 100644 ci/containers/debian-11-cross-armv7l.Dockerfile create mode 100644 ci/containers/debian-11-cross-i686.Dockerfile create mode 100644 ci/containers/debian-11-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-11-cross-mipsel.Dockerfile create mode 100644 ci/containers/debian-11-cross-ppc64le.Dockerfile create mode 100644 ci/containers/debian-11-cross-s390x.Dockerfile create mode 100644 ci/containers/debian-11.Dockerfile -- 2.31.1

2 3

[PATCH] qemuxml2argvdata: Remove unused '.err' files
by Peter Krempa 14 Sep '21

14 Sep '21

These are no longer referenced by any existing test as of: os-firmware-invalid-type -> a9b1375d7d2f7d240dce09c5f8b62e568e386051 tseg-explicit-size -> 604990a1758bfdc302f3c576c5766c0763912dfd Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err | 1 - tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err | 1 - 2 files changed, 2 deletions(-) delete mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err delete mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err diff --git a/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err b/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err deleted file mode 100644 index c8174b1c8b..0000000000 --- a/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: firmware attribute and firmware type has to be the same diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err deleted file mode 100644 index 82f8685a90..0000000000 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: Setting TSEG size is not supported with this QEMU binary -- 2.31.1

2 1

[libvirt PATCH 0/2] docs: virtiofs: move legacy docs to the bottom
by Stefan Hajnoczi 14 Sep '21

14 Sep '21

The virtiofs kbase article includes a lot of information that is only relevant to old versions of QEMU and libvirt. Setting up virtiofs can seem intimidating but it's actually easier than the article lets on. Move the legacy information out of the way. Stefan Hajnoczi (2): docs: virtiofs: move legacy docs to the bottom docs: virtiofs: use the preferred virtiofs spelling docs/kbase/virtiofs.rst | 183 +++++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 86 deletions(-) -- 2.31.1

3 8