- Devel - libvirt List Archives

[PATCH v1 00/10] move memory module align to PostParse time
by Daniel Henrique Barboza 18 Nov '20

18 Nov '20

Hi, This is a work that I intended to do after pSeries NVDIMM changes I made in commit v6.7.0-302-gd3f3c2c97f. The reasoning is that if ppc64 NVDIMM alignment can be done in PostParse time, regular ppc64 DIMMs alignment can also be done the same way. After that I realized that the same logic can be applied to x86 as well, and then I started to see where we could eliminate explicit align calls. The end result is that a bug that affects pSeries the most was found and fixed in patch 02, and now we're able to reflect the exact memory being used by the guest in the live XML since the alignment is now done in parse time. The series can be fetched from: https://gitlab.com/danielhb/libvirt/-/tree/memory_modules_postparse_v1 NOTE: I worked with the x86 logic based on what I could assert from the code itself, i.e. the aligment mechanics (2MiB align for mem modules, 1MiB align for total memory) are related to QEMU internals, not being hypervisor-agnostic. If someone with authority can guarantee that the alignment restrictions for x86 are applicable to all hypervisors (like in the pSeries case), let me know and I'll respin the series putting the x86 code in virDomainMemoryDefPostParse(). Daniel Henrique Barboza (10): domain_conf.c: handle all ppc64 dimms in virDomainNVDimmAlignSizePseries qemu_domain.c: align memory modules before calculating 'initialmem' domain_conf.c: align pSeries mem modules in virDomainMemoryDefPostParse() qemu_domain.c: simplify qemuDomainGetMemoryModuleSizeAlignment() qemu_domain.c: align x86 memory module in post parse time qemu_domain.c: move size check for mem modules after alignment qemu_hotplug.c: avoid aligning the mem obj in qemuDomainDetachPrepMemory() qemu_hotplug.c: avoid aligning the mem obj in qemuDomainAttachMemory() qemu_domain.c: remove qemuDomainMemoryDeviceAlignSize() NEWS.rs: document memory alignment improvements NEWS.rst | 14 +++ src/conf/domain_conf.c | 25 ++++- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 106 +++++++----------- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_hotplug.c | 9 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +- .../memory-hotplug-nvdimm-access.xml | 2 +- .../memory-hotplug-nvdimm-align.xml | 2 +- .../memory-hotplug-nvdimm-label.xml | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 2 +- .../memory-hotplug-nvdimm.xml | 2 +- .../memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/pages-dimm-discard.xml | 2 +- .../memory-hotplug-dimm.xml | 4 +- 17 files changed, 92 insertions(+), 90 deletions(-) -- 2.26.2

5 24

[libvirt PATCH 00/16] docs: add manpages for all the modular daemons
by Daniel P. Berrangé 18 Nov '20

18 Nov '20

Most of the modular daemon stuff has been done from a single template, but for the man pages that is more trouble than it is worth, so we create a separate man page source for each daemon, which makes it easy to extend with driver specific information. Daniel P. Berrangé (16): docs: consistently mark libvirtd as preformatted text docs: don't hardcode an ancient version in manpage examples docs: tweak heading for daemon manual pages docs: add manpage for virtproxyd docs: add manpage for virtbhyved docs: add manpage for virtinterfaced docs: add manpage for virtlxcd docs: add manpage for virtnetworkd docs: add manpage for virtnodedevd docs: add manpage for virtnwfilterd docs: add manpage for virtqemud docs: add manpage for virtsecretd docs: add manpage for virtstoraged docs: add manpage for virtvboxd docs: add manpage for virtvzd docs: add manpage for virtxend docs/manpages/index.rst | 25 ++- docs/manpages/libvirtd.rst | 50 +++--- docs/manpages/meson.build | 14 ++ docs/manpages/virtbhyved.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtinterfaced.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtlockd.rst | 2 +- docs/manpages/virtlogd.rst | 2 +- docs/manpages/virtlxcd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtnetworkd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtnodedevd.rst | 214 ++++++++++++++++++++++++++ docs/manpages/virtnwfilterd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtproxyd.rst | 256 +++++++++++++++++++++++++++++++ docs/manpages/virtqemud.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtsecretd.rst | 214 ++++++++++++++++++++++++++ docs/manpages/virtstoraged.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtvboxd.rst | 213 +++++++++++++++++++++++++ docs/manpages/virtvzd.rst | 215 ++++++++++++++++++++++++++ docs/manpages/virtxend.rst | 215 ++++++++++++++++++++++++++ 18 files changed, 2896 insertions(+), 29 deletions(-) create mode 100644 docs/manpages/virtbhyved.rst create mode 100644 docs/manpages/virtinterfaced.rst create mode 100644 docs/manpages/virtlxcd.rst create mode 100644 docs/manpages/virtnetworkd.rst create mode 100644 docs/manpages/virtnodedevd.rst create mode 100644 docs/manpages/virtnwfilterd.rst create mode 100644 docs/manpages/virtproxyd.rst create mode 100644 docs/manpages/virtqemud.rst create mode 100644 docs/manpages/virtsecretd.rst create mode 100644 docs/manpages/virtstoraged.rst create mode 100644 docs/manpages/virtvboxd.rst create mode 100644 docs/manpages/virtvzd.rst create mode 100644 docs/manpages/virtxend.rst -- 2.28.0

3 19

[PATCH] cpu_map: Support phytium processor
by yangshaojun19＠163.com 18 Nov '20

18 Nov '20

From: Shaojun Yang <yangshaojun(a)phytium.com.cn> FT-2000+ and Tengyun-S2500 are two chips by produced Phytium Technology Co., Ltd., which based on ARMv8 architecure. Shaojun Yang (1): add phytium FT-2000+ and Tengyun-S2500 support on arm architecture. src/cpu_map/arm_Phytium.xml | 10 ++++++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 src/cpu_map/arm_Phytium.xml -- 2.7.4

3 3

[PATCH 0/5] Deduplicate some of validation code
by Michal Privoznik 18 Nov '20

18 Nov '20

These stemmed from Cole's comment on my patches: https://www.redhat.com/archives/libvir-list/2020-November/msg00888.html The approach might not be that obvious at first because domCaps do qemuCaps to device model translation and during validation we want the exact opposite - we have parsed device model and want to check whether qemuCaps has corresponding capability. But what we can do, is let domCaps code fill a bitmap of supported device models and then check if the bit that corresponds to parsed device model is set. In this series I'm fixing RNG and video models, which were checked this way until very recently (until I touched the code). And also I'm introducing graphics check (which is new) because that one looked the most sane from virQEMUCapsFillDomainCaps(). The rest there not that much. Michal Prívozník (5): domain_capabilities: Introduce VIR_DOMAIN_CAPS_ENUM_IS_SET qemu_validate: Deduplicate code for video model check qemu_validate: Deduplicate code for RNG model check domcaps: Report egl-headless graphics type qemu_validate: Deduplicate code for graphics type check src/conf/domain_capabilities.c | 2 +- src/conf/domain_capabilities.h | 2 + src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_capabilities.h | 9 ++ src/qemu/qemu_validate.c | 107 ++++-------------- .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 1 + .../qemu_2.10.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + 61 files changed, 97 insertions(+), 87 deletions(-) -- 2.26.2

3 11

[PATCH] virsh: Added attach-disk support for network disk
by Ryan Gahagan 18 Nov '20

18 Nov '20

Related issue: https://gitlab.com/libvirt/libvirt/-/issues/16 Added in support for the following parameters in attach-disk: --source-protocol --source-host-name --source-host-socket --source-host-transport Added documentation to virsh.rst specifying usage. Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- docs/manpages/virsh.rst | 26 ++++++++++--- tools/virsh-domain.c | 85 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 100 insertions(+), 11 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index bfd26e3120..a4d70e9211 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -4500,14 +4500,18 @@ attach-disk [--current]] | [--persistent]] [--targetbus bus] [--driver driver] [--subdriver subdriver] [--iothread iothread] [--cache cache] [--io io] [--type type] [--alias alias] - [--mode mode] [--sourcetype sourcetype] [--serial serial] - [--wwn wwn] [--rawio] [--address address] [--multifunction] - [--print-xml] + [--mode mode] [--sourcetype sourcetype] + [--source-protocol protocol] [--source-host-name hostname:port] + [--source-host-transport transport] [--source-host-socket socket] + [--serial serial] [--wwn wwn] [--rawio] [--address address] + [--multifunction] [--print-xml] Attach a new disk device to the domain. -*source* is path for the files and devices. *target* controls the bus or -device under which the disk is exposed to the guest OS. It indicates the -"logical" device name; the optional *targetbus* attribute specifies the type +*source* is path for the files and devices unless *--source-protocol* +is specified, in which case *source* is the name of a network disk. +*target* controls the bus or device under which the disk is exposed +to the guest OS. It indicates the "logical" device name; +the optional *targetbus* attribute specifies the type of disk device to emulate; possible values are driver specific, with typical values being *ide*, *scsi*, *virtio*, *xen*, *usb*, *sata*, or *sd*, if omitted, the bus type is inferred from the style of the device name (e.g. a @@ -4541,6 +4545,16 @@ ccw:cssid.ssid.devno. Virtio-ccw devices must have their cssid set to 0xfe. *multifunction* indicates specified pci address is a multifunction pci device address. +There is also support for using a network disk. As specified, the user can +provide a *--source-protocol* in which case the *source* parameter will +be interpreted as the source name. *--source-protocol* must be provided +if the user also wishes to provide host information. +Host information can be provided using any of the tags +*--source-host-name*, *--source-host-transport*, and *--source-host-socket*, +which respectively denote the name of the host, the host's transport method, +and the socket that the host uses. The *--source-host-name* parameter +supports host:port syntax if the user wants to provide a port as well. + If *--print-xml* is specified, then the XML of the disk that would be attached is printed instead. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12b35c037d..4c43da7a2c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -222,7 +222,7 @@ static const vshCmdOptDef opts_attach_disk[] = { {.name = "source", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, - .help = N_("source of disk device") + .help = N_("source of disk device or name of network disk") }, {.name = "target", .type = VSH_OT_DATA, @@ -298,6 +298,22 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_BOOL, .help = N_("print XML document rather than attach the disk") }, + {.name = "source-protocol", + .type = VSH_OT_STRING, + .help = N_("protocol used by disk device source") + }, + {.name = "source-host-name", + .type = VSH_OT_STRING, + .help = N_("host name for source of disk device") + }, + {.name = "source-host-transport", + .type = VSH_OT_STRING, + .help = N_("host transport for source of disk device") + }, + {.name = "source-host-socket", + .type = VSH_OT_STRING, + .help = N_("host socket for source of disk device") + }, VIRSH_COMMON_OPT_DOMAIN_PERSISTENT, VIRSH_COMMON_OPT_DOMAIN_CONFIG, VIRSH_COMMON_OPT_DOMAIN_LIVE, @@ -567,6 +583,12 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) *iothread = NULL, *cache = NULL, *io = NULL, *serial = NULL, *straddr = NULL, *wwn = NULL, *targetbus = NULL, *alias = NULL; + const char *source_protocol = NULL; + const char *host_name = NULL; + const char *host_transport = NULL; + const char *host_socket = NULL; + char *host_name_copy = NULL; + char *host_port = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -604,7 +626,11 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || - vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) + vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-protocol", &source_protocol) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-name", &host_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) goto cleanup; if (!stype) { @@ -632,6 +658,13 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (wwn && !virValidateWWN(wwn)) goto cleanup; + if (!source_protocol && (host_name || host_socket || host_transport)) { + /* Error: cannot use network host without a source protocol */ + vshError(ctl, "%s", + _("Cannot use --source-host-* parameters without a --source-protocol")); + goto cleanup; + } + /* Make XML of disk */ virBufferAsprintf(&buf, "<disk type='%s'", isFile ? "file" : "block"); @@ -659,9 +692,51 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "/>\n"); } - if (source) - virBufferAsprintf(&buf, "<source %s='%s'/>\n", - isFile ? "file" : "dev", source); + if (source || source_protocol) { + virBufferAddLit(&buf, "<source"); + if (source_protocol) { + /* Using a network disk; source is --source-name */ + virBufferAsprintf(&buf, " protocol='%s'", source_protocol); + if (source) + virBufferAsprintf(&buf, " name='%s'", source); + + if (host_name || host_socket || host_transport) { + /* Host information provided, add a <host> tag */ + virBufferAddLit(&buf, ">\n"); + virBufferAdjustIndent(&buf, 2); + virBufferAddLit(&buf, "<host"); + + if (host_name) { + /* Logic for host:port syntax */ + host_name_copy = g_strdup(host_name); + host_port = strchr(host_name_copy, ':'); + + if (host_port) { + host_name_copy[(int)(host_port - host_name_copy)] = '\0'; + virBufferAsprintf(&buf, + " name='%s' port='%s'", + host_name_copy, host_port); + } else { + virBufferAsprintf(&buf, " name='%s'", host_name); + } + } + + if (host_transport) + virBufferAsprintf(&buf, " transport='%s'", host_transport); + if (host_socket) + virBufferAsprintf(&buf, " socket='%s'", host_socket); + virBufferAddLit(&buf, "/>\n"); + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "</source>\n"); + } + } else { + /* Using a local disk; source is file or dev */ + virBufferAsprintf(&buf, " %s='%s'", + isFile ? "file" : "dev", source); + virBufferAddLit(&buf, "/>\n"); + } + } + virBufferAsprintf(&buf, "<target dev='%s'", target); if (targetbus) virBufferAsprintf(&buf, " bus='%s'", targetbus); -- 2.29.0

3 3

[PATCH for-5.2] docs: Fix some typos (found by codespell)
by Stefan Weil 18 Nov '20

18 Nov '20

Fix also a similar typo in a code comment. Signed-off-by: Stefan Weil <sw(a)weilnetz.de> --- docs/can.txt | 8 ++++---- docs/interop/vhost-user.rst | 2 +- docs/replay.txt | 2 +- docs/specs/ppc-spapr-numa.rst | 2 +- docs/system/deprecated.rst | 4 ++-- docs/tools/virtiofsd.rst | 2 +- hw/vfio/igd.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/can.txt b/docs/can.txt index 5838f6620c..0d310237df 100644 --- a/docs/can.txt +++ b/docs/can.txt @@ -19,7 +19,7 @@ interface to implement because such device can be easily connected to systems with different CPU architectures (x86, PowerPC, Arm, etc.). In 2020, CTU CAN FD controller model has been added as part -of the bachelor theses of Jan Charvat. This controller is complete +of the bachelor thesis of Jan Charvat. This controller is complete open-source/design/hardware solution. The core designer of the project is Ondrej Ille, the financial support has been provided by CTU, and more companies including Volkswagen subsidiaries. @@ -31,7 +31,7 @@ testing lead to goal change to provide environment which provides complete emulated environment for testing and RTEMS GSoC slot has been donated to work on CAN hardware emulation on QEMU. -Examples how to use CAN emulation for SJA1000 based borads +Examples how to use CAN emulation for SJA1000 based boards ========================================================== When QEMU with CAN PCI support is compiled then one of the next @@ -106,8 +106,8 @@ This open-source core provides CAN FD support. CAN FD drames are delivered even to the host systems when SocketCAN interface is found CAN FD capable. -The PCIe borad emulation is provided for now (the device identifier is -ctucan_pci). The defauld build defines two CTU CAN FD cores +The PCIe board emulation is provided for now (the device identifier is +ctucan_pci). The default build defines two CTU CAN FD cores on the board. Example how to connect the canbus0-bus (virtual wire) to the host diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index 988f154144..72b2e8c7ba 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -513,7 +513,7 @@ descriptor table (split virtqueue) or descriptor ring (packed virtqueue). However, it can't work when we process descriptors out-of-order because some entries which store the information of inflight descriptors in available ring (split virtqueue) or descriptor -ring (packed virtqueue) might be overrided by new entries. To solve +ring (packed virtqueue) might be overridden by new entries. To solve this problem, slave need to allocate an extra buffer to store this information of inflight descriptors and share it with master for persistent. ``VHOST_USER_GET_INFLIGHT_FD`` and diff --git a/docs/replay.txt b/docs/replay.txt index 87a64ae068..5b008ca491 100644 --- a/docs/replay.txt +++ b/docs/replay.txt @@ -328,7 +328,7 @@ between the snapshots. Each of the passes include the following steps: 1. loading the snapshot 2. replaying to examine the breakpoints 3. if breakpoint or watchpoint was met - - loading the snaphot again + - loading the snapshot again - replaying to the required breakpoint 4. else - proceeding to the p.1 with the earlier snapshot diff --git a/docs/specs/ppc-spapr-numa.rst b/docs/specs/ppc-spapr-numa.rst index 5fca2bdd8e..ffa687dc89 100644 --- a/docs/specs/ppc-spapr-numa.rst +++ b/docs/specs/ppc-spapr-numa.rst @@ -198,7 +198,7 @@ This is how it is being done: * user distance 121 and beyond will be interpreted as 160 * user distance 10 stays 10 -The reasoning behind this aproximation is to avoid any round up to the local +The reasoning behind this approximation is to avoid any round up to the local distance (10), keeping it exclusive to the 4th NUMA level (which is still exclusive to the node_id). All other ranges were chosen under the developer discretion of what would be (somewhat) sensible considering the user input. diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 32a0e620db..63e9db1463 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -465,7 +465,7 @@ default configuration. The CPU model runnability guarantee won't apply anymore to existing CPU models. Management software that needs runnability -guarantees must resolve the CPU model aliases using te +guarantees must resolve the CPU model aliases using the ``alias-of`` field returned by the ``query-cpu-definitions`` QMP command. @@ -637,7 +637,7 @@ Splitting RAM by default between NUMA nodes had the same issues as ``mem`` parameter with the difference that the role of the user plays QEMU using implicit generic or board specific splitting rule. Use ``memdev`` with *memory-backend-ram* backend or ``mem`` (if -it's supported by used machine type) to define mapping explictly instead. +it's supported by used machine type) to define mapping explicitly instead. Users of existing VMs, wishing to preserve the same RAM distribution, should configure it explicitly using ``-numa node,memdev`` options. Current RAM distribution can be retrieved using HMP command ``info numa`` and if separate diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 34a9e40146..866b7db3ee 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -174,7 +174,7 @@ Using ':' as the separator a rule is of the form: - 'bad' - If a client tries to use a name matching 'key' it's denied using EPERM; when the server passes an attribute name matching 'prepend' it's hidden. In many ways it's use is very like - 'ok' as either an explict terminator or for special handling of certain + 'ok' as either an explicit terminator or for special handling of certain patterns. **key** is a string tested as a prefix on an attribute name originating diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index 64e332746b..470205f487 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -535,7 +535,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) } /* - * Assume we have no GMS memory, but allow it to be overrided by device + * Assume we have no GMS memory, but allow it to be overridden by device * option (experimental). The spec doesn't actually allow zero GMS when * when IVD (IGD VGA Disable) is clear, but the claim is that it's unused, * so let's not waste VM memory for it. -- 2.29.2

3 2

[libvirt PATCH 00/11] fix various issues
by Pavel Hrdina 18 Nov '20

18 Nov '20

Issues reported by coverity. Pavel Hrdina (11): domain_conf: remove unused rc variable domain_conf: fix NULL dereference on error in virDomainObjCopyPersistentDef hyperv_wmi: remove unreachable cleanup code interface_backend_udev: refactor udevListInterfacesByStatus qemu_command: fix FD usage in qemuBuildInterfaceCommandLine qemu_monitor_json: explicitly ignore return values qemu_process: no need to check for NULL remote_driver: remove unreachable cleanup code virdevmapper: fix stat comparison in virDMSanitizepath vbox_common: unlock vbox_driver_lock before return testutils: call va_end before return src/conf/domain_conf.c | 10 +++++---- src/hyperv/hyperv_wmi.c | 12 ++--------- src/interface/interface_backend_udev.c | 13 ++--------- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor_json.c | 4 ++-- src/qemu/qemu_process.c | 30 +++++++++++--------------- src/remote/remote_driver.c | 18 ++++------------ src/util/virdevmapper.c | 2 +- src/vbox/vbox_common.c | 3 +++ tests/testutils.c | 1 + 10 files changed, 35 insertions(+), 60 deletions(-) -- 2.26.2

2 27

[PATCH v2 0/6] Introduce OpenSSH authorized key file mgmt APIs
by Michal Privoznik 18 Nov '20

18 Nov '20

v2 of: https://www.redhat.com/archives/libvir-list/2020-November/msg00444.html diff to v1: - Fixed issues raised by Peter (RO connection check, switched virsh from ARGV to --file, etc.) Marc-André Lureau (1): qemu_agent: add qemuAgentSSH{Add,Remove,Get}AuthorizedKeys Michal Prívozník (5): Introduce OpenSSH authorized key file mgmt APIs remote: Implement OpenSSH authorized key file mgmt APIs virsh: Expose OpenSSH authorized key file mgmt APIs qemu: Implement OpenSSH authorized key file mgmt APIs news: Document recent OpenSSH authorized key file mgmt APIs NEWS.rst | 6 + docs/manpages/virsh.rst | 37 ++++++ include/libvirt/libvirt-domain.h | 17 +++ src/driver-hypervisor.h | 15 +++ src/libvirt-domain.c | 133 ++++++++++++++++++++++ src/libvirt_public.syms | 6 + src/qemu/qemu_agent.c | 142 +++++++++++++++++++++++ src/qemu/qemu_agent.h | 15 +++ src/qemu/qemu_driver.c | 81 ++++++++++++++ src/remote/remote_daemon_dispatch.c | 82 ++++++++++++++ src/remote/remote_driver.c | 87 +++++++++++++++ src/remote/remote_protocol.x | 34 +++++- src/remote_protocol-structs | 22 ++++ tests/qemuagenttest.c | 79 +++++++++++++ tools/virsh-domain.c | 167 ++++++++++++++++++++++++++++ 15 files changed, 922 insertions(+), 1 deletion(-) -- 2.26.2

2 15

[libvirt] improve security by adjusting the privileges of libvirtd processes
by yebiaoxiang 18 Nov '20

18 Nov '20

Hi Team The daemon libvirtd runs as root user, which against the least privilege security model. root 567642 1.2 0.0 2856020 47576 ? Ssl 15:49 0:02 /usr/sbin/libvirtd --listen In addition, the "--listen" parameter exposes TCP or TLS ports on the network, it increasing the attack surface. tcp 0 0 0.0.0.0:16509 0.0.0.0:* LISTEN 647824/libvirtd tcp 0 0 0.0.0.0:16514 0.0.0.0:* LISTEN 647824/libvirtd I have the following puzzles: 1. Whether root is the least privilege required for libvirtd to manage virtualization platforms, it's possible to run libvirtd as a non-root user? 2. Is there any plan to resolve this security weaknesses? (like move the function of "--listen" to an independent non-root process, or other better schemes) Regards, BiaoXiang

2 1

[libvirt PATCH 0/2] network: Drop UUID handling for default network
by Andrea Bolognani 18 Nov '20

18 Nov '20

<blurb>cc30b49f-6084-48da-879e-55645459f2a0</blurb> Andrea Bolognani (2): network: Drop UUID handling for default network spec: Drop UUID handling for default network libvirt.spec.in | 4 ---- src/network/meson.build | 32 +++++++------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) -- 2.26.2

4 13

[libvirt PATCH 0/4] nodedev: cleanup some historical baggage
by Daniel P. Berrangé 17 Nov '20

17 Nov '20

Daniel P. Berrangé (4): nodedev: improve debugging logs from udev device/event processing nodedev: dont rely on ignoring errors on missing properties nodedev: drop DKD_MEDIA_AVAILABLE property check nodedev: report errors about missing integer properties src/node_device/node_device_udev.c | 70 +++++++++++++----------------- 1 file changed, 30 insertions(+), 40 deletions(-) -- 2.28.0

3 7

[PATCH] add phytium FT-2000+ and Tengyun-S2500 support on arm architecture.
by yangshaojun19＠163.com 17 Nov '20

17 Nov '20

From: yangshaojun <yangshaojun(a)phytium.com.cn> Signed-off-by: yangshaojun <yangshaojun(a)phytium.com.cn> --- src/cpu_map/arm_Phytium.xml | 10 ++++++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 src/cpu_map/arm_Phytium.xml diff --git a/src/cpu_map/arm_Phytium.xml b/src/cpu_map/arm_Phytium.xml new file mode 100644 index 0000000..f8b4852 --- /dev/null +++ b/src/cpu_map/arm_Phytium.xml @@ -0,0 +1,10 @@ +<cpus> + <model name='FT-2000+'> + <vendor name='Phytium'/> + <pvr value='0x662'/> + </model> + <model name='Tengyun-S2500'> + <vendor name='Phytium'/> + <pvr value='0x663'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index ff799ef..4465463 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -11,4 +11,5 @@ <vendor name='Qualcomm' value='0x51'/> <vendor name='Marvell' value='0x56'/> <vendor name='Intel' value='0x69'/> + <vendor name='Phytium' value='0x70'/> </cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 08f052e..e2c454b 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -103,5 +103,8 @@  <include filename='arm_Kunpeng-920.xml'/> + +  + <include filename='arm_Phytium.xml'/> </arch> </cpus> -- 2.7.4

2 1

[PATCH 0/5] qemu: Don't cache domCaps
by Michal Privoznik 17 Nov '20

17 Nov '20

See 4/5 for explanation. Michal Prívozník (5): qemu: Validate RNG model qemu: Validate video model conf: Drop virDomainCapsDeviceDefValidate() qemu: Don't cache domCaps in virQEMUDriverGetDomainCapabilities() qemu: Remove virQEMUDomainCapsCache code src/conf/domain_capabilities.c | 88 ------------ src/conf/domain_capabilities.h | 4 - src/libvirt_private.syms | 1 - src/qemu/qemu_capabilities.c | 129 ------------------ src/qemu/qemu_capabilities.h | 10 -- src/qemu/qemu_conf.c | 27 ++-- src/qemu/qemu_validate.c | 77 +++++++++-- .../default-video-type-x86_64-caps-test-0.err | 2 +- .../video-invalid-multiple-devices.err | 2 +- 9 files changed, 83 insertions(+), 257 deletions(-) -- 2.26.2

3 9

[libvirt PATCH 0/2] qemu: support kvm-poll-control performance hint
by Tim Wiederhake 17 Nov '20

17 Nov '20

See the commit message of the first patch and https://bugzilla.redhat.com/show_bug.cgi?id=1895204 Tim Wiederhake (2): qemu: support kvm-poll-control performance hint tests: Add tests for kvm-poll-control feature docs/formatdomain.rst | 14 ++++++++------ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 5 +++++ tests/qemuxml2argvdata/kvm-features-off.xml | 1 + tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-features.xml | 1 + tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 + tests/qemuxml2xmloutdata/kvm-features.xml | 1 + 10 files changed, 28 insertions(+), 7 deletions(-) -- 2.26.2

2 7

[PATCH] node_device: Use "udev" monitor source
by Michal Privoznik 17 Nov '20

17 Nov '20

In v6.3.0-rc1~67 I've made a switch: instead of listening on udev events the nodedev driver started listening for kernel events. This was because when a device changes its name (e.g. NICs) we will get "move" event with DEVPATH_OLD property set, which we can then use to remove the old device and thus keep our internal list up to date. The switch to "kernel" source was made because if the old NICs naming (eth0, eth1, ...) is enabled (e.g. via net.ifnames=0 on the kernel cmd line) then udev overwrites the property with the new name making our internal list go out of sync. Interestingly, when the od NICs naming is not enabled then the DEVPATH_OLD contains the correct value. But as it turns out, "kernel" source might be missing some other important properties, e.g. USB vendor/product IDs. Therefore, switch back to "udev" source and wish the best of luck to users using the old NICs naming. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1897625 Fixes: 9a13704818e4a018723e0ec5b9e97b176f1c8584 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/node_device/node_device_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 65f312d8f4..dec19a3166 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1983,7 +1983,7 @@ nodeStateInitialize(bool privileged, virObjectLock(priv); - priv->udev_monitor = udev_monitor_new_from_netlink(udev, "kernel"); + priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); if (!priv->udev_monitor) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("udev_monitor_new_from_netlink returned NULL")); -- 2.26.2

2 3

[Question] sg_persist failed when using qemu-pr-helper
by Zihao Chang 17 Nov '20

17 Nov '20

Hi all, When using qemu-pr-helper，"sg_persist" in guest return Aborted Command after iscsiadm logout & login. My confusion: Is this problem caused by bugs of libvirt/qemu-pr-helper? Or iscsiadm logout & login should be forbidden when using qemu-pr-helper? Or There is something wrong with my config. Steps to Reproduce: 1. setup multipath env 1) set /etc/iscsi/initiatorname.iscsi 2) iscsiadm discovery & login 3) start multipathd 2. add the following xml to guest <disk type='block' device='lun'> <driver name='qemu' type='raw' cache='none' io='native'/> <source dev='/dev/mapper/XXXXXXXXXXXXXXXXX'> **<reservations managed='yes'/>** </source> <target dev='sdc' bus='scsi'/> </disk> 3. start the guest 1) "sg_persist -v -i -n -k -d /dev/sdc" works well in the guest 2) here /dev/sdc(guest) -> /dev/sdht(host) 4. iscsiadm logout & login on host 1) iscsiadm -m node -u (host) 2) iscsiadm -m node -l (host) 3) here /dev/sdc(guest) -(change)-> /dev/sdfo(host) 5. exec "sg_persist -v -i -n -k -d /dev/sdc" in the guest 1) command return: Persistent Reservation In cmd: 5e 00 00 00 00 00 00 20 00 00 persistent reservation in: Fixed format, current; Sense key: Aborted Command Additional sense: Logical unit communication failure PR in (Read keys): Aborted command sense key, other than protection related (asc=0x10) 2) strace qemu-pr-helper show: openat(AT_FDCWD, "/dev/sdht", O_RDONLY) = -1 ENOENT (No such file or directory) Additional info: 1. strace qemu-pr-helper show: openat(AT_FDCWD, "/dev/sdht", O_RDONLY) = -1 ENOENT (No such file or directory) 2. This problem may be related to mnt(namespace). I try to set mnt of qemu-pr-helper as pid 1, sg_persist works well after logout & login.

2 3

[libvirt PATCH 0/3] Define and enable Snowridge model
by Tim Wiederhake 17 Nov '20

17 Nov '20

This series adds a CPU model for Snowridge to libvirt. Snowridge was added to QEMU in v4.1.0. Tim Wiederhake (3): cpu_map: Add support for core-capability CPU feature cpu_map: Add support for split-lock-detect CPU feature cpu_map: Define and enable Snowridge model src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_Snowridge.xml | 71 +++++++++++++++++++ src/cpu_map/x86_features.xml | 8 +++ .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + 19 files changed, 96 insertions(+) create mode 100644 src/cpu_map/x86_Snowridge.xml -- 2.26.2

1 3

[libvirt PATCH v3] Do not disable incompatible-pointer-types-discards-qualifiers
by Martin Kletzander 17 Nov '20

17 Nov '20

This reverts commit b3710e9a2af402a2b620de570b062294e11190eb. That check is very valuable for our code, but it causes issue with glib >= 2.67.0 when building with clang. The reason is a combination of two commits in glib, firstly fdda405b6b1b which adds a g_atomic_pointer_{set,get} variants that enforce stricter type checking (by removing an extra cast) for compilers that support __typeof__, and commit dce24dc4492d which effectively enabled the new variant of glib's atomic code for clang. This will not be necessary when glib's issue #600 [0] (8 years old) is fixed. Thankfully, MR #1719 [1], which is supposed to deal with this issue was opened 3 weeks ago, so there is a slight sliver of hope. [0] https://gitlab.gnome.org/GNOME/glib/-/issues/600 [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: - added check for glib version v2: - override _G_DEFINE_TYPE_EXTENDED_BEGIN in gcompat.h meson.build | 3 --- src/util/glibcompat.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cecaad199d4c..04646e3a078c 100644 --- a/meson.build +++ b/meson.build @@ -405,9 +405,6 @@ cc_flags += [ # so use this Clang-specific arg to keep it quiet '-Wno-typedef-redefinition', - # Clang complains about casts in G_DEFINE_TYPE(...) - '-Wno-incompatible-pointer-types-discards-qualifiers', - # We don't use -Wc++-compat so we have to enable it explicitly '-Wjump-misses-init', diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 6f50a76f3c2b..457f6ba797f3 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -20,6 +20,30 @@ #include <glib.h> #include <glib/gstdio.h> +#include <glib-object.h> + +#if defined(__clang__) && GLIB_CHECK_VERSION(2, 67, 0) +/* + * Clang detects (valid) issue in G_DEFINE_TYPE and derivatives starting with + * glib >= 2.67.0. See https://gitlab.gnome.org/GNOME/glib/-/issues/600 + * + * For that we need to disable the one check that produces an error in our + * builds when using any G_DEFINE_TYPE* macro. Thankfully all those macros end + * up using _G_DEFINE_TYPE_EXTENDED_BEGIN. Because with that we can redefine + * this one macro to cover all use cases. The macro is defined the same way it + * is defined in glib (with a very low probability of being changed thanks to a + * comment above it). + */ +# undef _G_DEFINE_TYPE_EXTENDED_BEGIN + +# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types-discards-qualifiers\"") \ + _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \ + _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \ + _Pragma("GCC diagnostic pop") + +#endif /* __clang__ */ gchar * vir_g_canonicalize_filename(const gchar *filename, const gchar *relative_to); -- 2.29.2

2 1

[libvirt] improve security by adjusting the privileges of libvirtd processes
by yebiaoxiang 17 Nov '20

17 Nov '20

Hi Team The daemon libvirtd runs as root user, which against the least privilege security model. root 567642 1.2 0.0 2856020 47576 ? Ssl 15:49 0:02 /usr/sbin/libvirtd --listen In addition, the "--listen" parameter exposes TCP or TLS ports on the network, it increasing the attack surface. tcp 0 0 0.0.0.0:16509 0.0.0.0:* LISTEN 647824/libvirtd tcp 0 0 0.0.0.0:16514 0.0.0.0:* LISTEN 647824/libvirtd I have the following puzzles: 1. Whether root is the least privilege required for libvirtd to manage virtualization platforms, it's possible to run libvirtd as a non-root user? 2. Is there any plan to resolve this security weaknesses? (like move the function of "--listen" to an independent non-root process, or other good idea) Regards, BiaoXiang

2 2

nwfilter issue with new ebtables
by Christian Ehrhardt 17 Nov '20

17 Nov '20

Hi, I have last week discussed breakage in nwfilter usage on IRC <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> </filterref> virsh start <guest> error: Failed to start domain <guest> error: internal error: applyDHCPOnlyRules failed - spoofing not protect With debug in the logs enabled I got confirmation by Daniel (thanks!) that the command sequence libvirt issued looked kind of "normal". Hereby I wanted to let you know that some further debugging identified a part of the sequence that libvirt issues as being broken in recent ebtables versions. # ebtables --concurrent -t nat -N testrule3 # ebtables --concurrent -t nat -E testrule3 testrule3-renamed ebtables v1.8.6 (nf_tables): Chain 'testrule3' doesn't exists This led to upstream ebtables bug [1] - for now just FYI in case you want/need to subscribe for your own tracking. [1]: https://bugzilla.netfilter.org/show_bug.cgi?id=1481 -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd

3 4

[libvirt PATCH v2] qemu_command: fix FD usage in qemuBuildInterfaceCommandLine
by Pavel Hrdina 16 Nov '20

16 Nov '20

If virCommandPassFD() is called with VIR_COMMAND_PASS_FD_CLOSE_PARENT the passed FD is closed. If qemuVirCommandGetFDSet() returns NULL we would jump to cleanup where the vdpafd is closed again if not set to -1. In order to fix it use a different variable where we will copy FD number. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_command.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0eec35da16..2a786e34dd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8141,18 +8141,20 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (vdpafd > 0) { g_autofree char *fdset = NULL; g_autofree char *addfdarg = NULL; + int vdpafd_copy = vdpafd; virCommandPassFD(cmd, vdpafd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - fdset = qemuVirCommandGetFDSet(cmd, vdpafd); + vdpafd = -1; + + fdset = qemuVirCommandGetFDSet(cmd, vdpafd_copy); if (!fdset) goto cleanup; - vdpafdName = qemuVirCommandGetDevSet(cmd, vdpafd); + vdpafdName = qemuVirCommandGetDevSet(cmd, vdpafd_copy); /* set opaque to the devicepath so that we can look up the fdset later * if necessary */ addfdarg = g_strdup_printf("%s,opaque=%s", fdset, net->data.vdpa.devicepath); virCommandAddArgList(cmd, "-add-fd", addfdarg, NULL); - vdpafd = -1; } if (chardev) -- 2.26.2

1 0

[libvirt PATCH v2] Do not disable incompatible-pointer-types-discards-qualifiers
by Martin Kletzander 16 Nov '20

16 Nov '20

This reverts commit b3710e9a2af402a2b620de570b062294e11190eb. That check is very valuable for our code, but it causes issue with glib >= 2.67.0 when building with clang. The reason is a combination of two commits in glib, firstly fdda405b6b1b which adds a g_atomic_pointer_{set,get} variants that enforce stricter type checking (by removing an extra cast) for compilers that support __typeof__, and commit dce24dc4492d which effectively enabled the new variant of glib's atomic code for clang. This will not be necessary when glib's issue #600 [0] (8 years old) is fixed. Thankfully, MR #1719 [1], which is supposed to deal with this issue was opened 3 weeks ago, so there is a slight sliver of hope. [0] https://gitlab.gnome.org/GNOME/glib/-/issues/600 [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- meson.build | 3 --- src/util/glibcompat.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cecaad199d4c..04646e3a078c 100644 --- a/meson.build +++ b/meson.build @@ -405,9 +405,6 @@ cc_flags += [ # so use this Clang-specific arg to keep it quiet '-Wno-typedef-redefinition', - # Clang complains about casts in G_DEFINE_TYPE(...) - '-Wno-incompatible-pointer-types-discards-qualifiers', - # We don't use -Wc++-compat so we have to enable it explicitly '-Wjump-misses-init', diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h index 6f50a76f3c2b..f4867f3eadbc 100644 --- a/src/util/glibcompat.h +++ b/src/util/glibcompat.h @@ -20,6 +20,30 @@ #include <glib.h> #include <glib/gstdio.h> +#include <glib-object.h> + +#ifdef __clang__ +/* + * Clang detects (valid) issue in G_DEFINE_TYPE and derivatives starting with + * glib >= 2.67.0. See https://gitlab.gnome.org/GNOME/glib/-/issues/600 + * + * For that we need to disable the one check that produces an error in our + * builds when using any G_DEFINE_TYPE* macro. Thankfully all those macros end + * up using _G_DEFINE_TYPE_EXTENDED_BEGIN. Because with that we can redefine + * this one macro to cover all use cases. The macro is defined the same way it + * is defined in glib (with a very low probability of being changed thanks to a + * comment above it). + */ +# undef _G_DEFINE_TYPE_EXTENDED_BEGIN + +# define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types-discards-qualifiers\"") \ + _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \ + _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \ + _Pragma("GCC diagnostic pop") + +#endif /* __clang__ */ gchar * vir_g_canonicalize_filename(const gchar *filename, const gchar *relative_to); -- 2.29.2

2 1

[PATCH 1/1] qemu_tmp.c: fix 'shortName' leak
by Daniel Henrique Barboza 16 Nov '20

16 Nov '20

This is a Coverity fix pointed out by John in IRC. This code was introduced in 19d74fdf0eb, when the TPM Proxy device for for ppc64 was introduced. This will leak in case we have 2 TPMs in the same domain, a possible scenario with the protected Ultravisor execution in PowerPC guests. Fixes: 19d74fdf0eb5d2e89e80ceedea736425160ffccb Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/qemu/qemu_tpm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 8adb0e42b8..872be16570 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -841,10 +841,11 @@ qemuExtTPMStop(virQEMUDriverPtr driver, virDomainObjPtr vm) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - g_autofree char *shortName = NULL; size_t i; for (i = 0; i < vm->def->ntpms; i++) { + g_autofree char *shortName = NULL; + if (vm->def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR) continue; @@ -866,12 +867,13 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver, virCgroupPtr cgroup) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - g_autofree char *shortName = NULL; int rc; pid_t pid; size_t i; for (i = 0; i < def->ntpms; i++) { + g_autofree char *shortName = NULL; + if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR) continue; -- 2.26.2

2 1

[libvirt PATCH 0/4] Misc version updates
by Daniel P. Berrangé 16 Nov '20

16 Nov '20

In both yajl and wireshark we can bump our min version per our platform support matrix and thus eliminate some historical cruft. Daniel P. Berrangé (4): meson: assume pkg-config support for yajl meson: bump min wireshark to 2.6.0 rpm: remove version checks for wireshark rpm: enable wireshark build for RHEL-8 and later libvirt.spec.in | 8 +++---- meson.build | 63 ++++++++++++++----------------------------------- 2 files changed, 22 insertions(+), 49 deletions(-) -- 2.28.0

2 5

[libvirt PATCH] Do not disable incompatible-pointer-types-discards-qualifiers
by Martin Kletzander 16 Nov '20

16 Nov '20

This reverts commit b3710e9a2af402a2b620de570b062294e11190eb. That check is very valuable for our code, but it causes issue with glib >= 2.67.0 when building with clang. The reason is a combination of two commits in glib, firstly fdda405b6b1b which adds a g_atomic_pointer_{set,get} variants that enforce stricter type checking (by removing an extra cast) for compilers that support __typeof__, and commit dce24dc4492d which effectively enabled the new variant of glib's atomic code for clang. This will not be necessary when glib's issue #600 [0] (8 years old) is fixed. Thankfully, MR #1719 [1], which is supposed to deal with this issue was opened 3 weeks ago, so there is a slight sliver of hope. [0] https://gitlab.gnome.org/GNOME/glib/-/issues/600 [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- meson.build | 3 --- src/qemu/qemu_domain.c | 7 +++++++ src/util/vireventthread.c | 6 ++++++ src/util/viridentity.c | 6 ++++++ src/util/virobject.c | 6 ++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cecaad199d4c..04646e3a078c 100644 --- a/meson.build +++ b/meson.build @@ -405,9 +405,6 @@ cc_flags += [ # so use this Clang-specific arg to keep it quiet '-Wno-typedef-redefinition', - # Clang complains about casts in G_DEFINE_TYPE(...) - '-Wno-incompatible-pointer-types-discards-qualifiers', - # We don't use -Wc++-compat so we have to enable it explicitly '-Wjump-misses-init', diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2158080a56ad..3349476cceae 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -330,7 +330,14 @@ struct _qemuDomainLogContext { virLogManagerPtr manager; }; +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers" + G_DEFINE_TYPE(qemuDomainLogContext, qemu_domain_log_context, G_TYPE_OBJECT); + +#pragma clang diagnostic pop + static virClassPtr qemuDomainSaveCookieClass; static void qemuDomainLogContextFinalize(GObject *obj); diff --git a/src/util/vireventthread.c b/src/util/vireventthread.c index 8342f420f666..4e202c94d0f0 100644 --- a/src/util/vireventthread.c +++ b/src/util/vireventthread.c @@ -32,8 +32,14 @@ struct _virEventThread { GMainLoop *loop; }; +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers" + G_DEFINE_TYPE(virEventThread, vir_event_thread, G_TYPE_OBJECT) +#pragma clang diagnostic pop + #define VIR_FROM_THIS VIR_FROM_EVENT static void diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 2cb9042a846a..43f447f629fe 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -50,8 +50,14 @@ struct _virIdentity { virTypedParameterPtr params; }; +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers" + G_DEFINE_TYPE(virIdentity, vir_identity, G_TYPE_OBJECT) +#pragma clang diagnostic pop + static virThreadLocal virIdentityCurrent; static void virIdentityFinalize(GObject *obj); diff --git a/src/util/virobject.c b/src/util/virobject.c index a6305354c35e..8d1f26618334 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -53,8 +53,14 @@ struct _virObjectPrivate { }; +#pragma clang diagnostic push +/* Workaround for glib's issue #600 on clang */ +#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers" + G_DEFINE_TYPE_WITH_PRIVATE(virObject, vir_object, G_TYPE_OBJECT) +#pragma clang diagnostic pop + #define VIR_OBJECT_NOTVALID(obj) (!obj || !VIR_IS_OBJECT(obj)) #define VIR_OBJECT_USAGE_PRINT_WARNING(anyobj, objclass) \ -- 2.29.2

4 10

[libvirt PATCH] news: Fix vertical and horizontal spacing
by Andrea Bolognani 16 Nov '20

16 Nov '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. NEWS.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index f4fc407b77..98303432f0 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -33,6 +33,7 @@ v6.10.0 (unreleased) This drops support for Windows Server 2008R2 and 2012. The earliest supported version is now Windows 2012R2. + v6.9.0 (2020-11-02) =================== @@ -165,17 +166,17 @@ v6.8.0 (2020-10-01) * qemu: Preserve qcow2 cluster size after external snapshots - The new overlay image which is installed on top of the current chain when - taking an external snapshot now preserves the cluser size of the original - top image to preserve any performance tuning done on the original image. + The new overlay image which is installed on top of the current chain when + taking an external snapshot now preserves the cluser size of the original + top image to preserve any performance tuning done on the original image. * **Bug fixes** * qemu: Various (i)SCSI backed hostdev fixes - (i)SCSI backed hostdevs now work again with an arbitrarily long - user-specified device alias and also honor the 'readonly' property after a - recent rewrite. + (i)SCSI backed hostdevs now work again with an arbitrarily long + user-specified device alias and also honor the 'readonly' property after a + recent rewrite. * **Removed features** -- 2.26.2

1 0

[PATCH] News: Several apparmor improvements at v6.7.0[v3]
by jgao 16 Nov '20

16 Nov '20

From: Jianan Gao <jgao(a)redhat.com> Add news about apparmor about the improvements. Signed-off-by: Jianan Gao <jgao(a)redhat.com> --- Clarified news content and revised commit information --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 905deba5a8..fd3254d47f 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -224,6 +224,11 @@ v6.7.0 (2020-09-01) forbidden and no size auto-alignment will be made. Instead, libvirt will suggest an aligned round up size for the user. + * apparmor: Several improvements + + Add support for virtiofs filesystem and allow qemu load old shared objects after + upgrade. + * **Bug fixes** * virdevmapper: Deal with kernels without DM support -- 2.21.3

2 1

Issues 14 and 90 Contribution Details
by Dustan B Helm 15 Nov '20

15 Nov '20

Hey Libvirt team. We are looking into issue 14 <https://gitlab.com/libvirt/libvirt/-/issues/14> and issue 90 <https://gitlab.com/libvirt/libvirt/-/issues/90> to make possible contributions to one or both of them. However, before we start preparing patches for either of these issues, we have some clarifying questions about the scope of the necessary changes. Issue 14: Mostly we wanted to know what was wrong with Guannan's previous attempt at patching this. Was it incorrect, incomplete, or otherwise lacking? We also were confused on how Peter's usb-audio commit actually addressed an issue. It seems like most of the changes were documentation and constant and only a few changes changed significant amounts of code. We understand that QEMU is the program actually handling the sound card, but how do Peter's changes actually hook up the sound card with QEMU? Would the changes needed for the usb-net device be the same as Peter's usb-audio changes except in different sections of each file, or would the changes need to be made elsewhere? We saw that Peter and Guannan both had changes to tests/qemuhelptest.c and src/qemu/qemu_capabilities.c (to name a few). Issue 90:In order to implement a new network disk protocol, we believe there should be changes to the parameters in virsh/attach-disk, but we also know that there will likely be changes elsewhere in the codebase to allow support for a new protocol type. Ex: diskSourceNetworkProtocol definitions in docs/schemas/domaincommon.rng. Is there documentation available on what files/sections of the codebase handle supporting network disk protocols, so we can find more reference examples and begin to make changes in the appropriate locations? Thanks in advance, Dustan Helm, Ryan Gahagan, Barrett Schonefeld

1 0

[PATCH] News: Several apparmor improvements at v6.7.0
by jgao 14 Nov '20

14 Nov '20

From: jgao <jgao(a)redhat.com> Add news about apparmor about the improvements. Signed-off-by: jgao <jgao(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 905deba5a8..30a4f1065a 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -224,6 +224,11 @@ v6.7.0 (2020-09-01) forbidden and no size auto-alignment will be made. Instead, libvirt will suggest an aligned round up size for the user. + * apparmor: Several improvements + + Add support for virtiofs filesystem, allowing qemu load old shared objects after + upgrades. + * **Bug fixes** * virdevmapper: Deal with kernels without DM support -- 2.21.3

4 3

[PATCH] util: remove ATTRIBUTE_NONNULL from virDirClose declaration
by Laine Stump 13 Nov '20

13 Nov '20

Before commit 24d8968c, virDirClose took a DIR**, and that was never NULL, so its declaration included ATTRIBUTE_NONNULL(1). Since that commit, virDirClose takes a DIR*, and it may be NULL (e.g. if the DIR* is initialized to NULL and was never closed). Even though virDirClose() is currently only called implicitly (as the cleanup for a g_autoptr(DIR)), and (as I've just newly learned) the autocleanup function g_autoptr will only be called if the pointer in question is non-null (see the definition of _GLIB_AUTOPTR_CLEAR_FUNC_NAME in /usr/include/glib-2.0/glib/gmacros.h), it does still cause Coverity to complain that it *could* be called with a NULL, and it's also possible that in the future someone might add code that explicitly calls virDirClose. To eliminate the Coverity complaints, and protect against the hypothetical future where someone both explicitly calls virDirClose() with a potentially NULL value, *and* re-enables the nonnull directive when not building with Coverity (disabled by commit eefb881) this patch removes the ATTRIBUTE_NONNULL(1) from the declaration of virDirClose(). Fixes: 24d8968cd0a718af4badbbc858b1b449fea7205a Details-Research-by: Dan Berrange <berrange(a)redhat.com> Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/util/virfile.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virfile.h b/src/util/virfile.h index ba31a78e58..32505826ee 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -269,8 +269,7 @@ int virDirOpenQuiet(DIR **dirp, const char *dirname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; -void virDirClose(DIR *dirp) - ATTRIBUTE_NONNULL(1); +void virDirClose(DIR *dirp); G_DEFINE_AUTOPTR_CLEANUP_FUNC(DIR, virDirClose); int virFileMakePath(const char *path) G_GNUC_WARN_UNUSED_RESULT; -- 2.28.0

1 1

[PATCH 1/1] qemu_driver.c: do not redefine 'event' in qemuDomainDefineXMLFlags()
by Daniel Henrique Barboza 13 Nov '20

13 Nov '20

A bad merge while rebasing 74b2834333a caused the @event variable to be defined twice, inside the 'cleanup' label, causing coverity errors. This code was originally moved outside of the label by commit 773c7c43611a. Delete the unintended code in the 'cleanup' label. Fixes: 74b2834333ab3bf500f870e0a6d4e8309379d96a Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/qemu/qemu_driver.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 78ccf96df5..ac38edf009 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6748,15 +6748,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, } } - event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_DEFINED, - !oldDef ? - VIR_DOMAIN_EVENT_DEFINED_ADDED : - VIR_DOMAIN_EVENT_DEFINED_UPDATED); - - VIR_INFO("Creating domain '%s'", vm->def->name); - dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); - virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return dom; -- 2.26.2

2 1

[PATCH v1 00/10] more simple g_autoptr() cleanups
by Daniel Henrique Barboza 13 Nov '20

13 Nov '20

I intended to clean up the virDomainDefFree() calls that I kept seeing in qemu_driver.c, ended up doing a bit more than that. Daniel Henrique Barboza (10): qemu_driver.c: use g_autoptr() with virDomainDef pointers qemu_driver.c: use g_autoptr() with qemuMigrationParams pointers qemu_driver.c: use g_autoptr() with virDomainDeviceDefPtr qemu_driver.c: remove unneeded 'cleanup' labels qemu_snapshot.c: remove uneeded 'cleanup' label in qemuSnapshotDelete() qemu_domain.c: use g_autoptr() with virDomainDef pointers qemu_domain.c: remove unneeded cleanup labels qemu_domain.c: modernize qemuDomainFixupCPUs() qemu_domain.c: modernize qemuDomainWriteMasterKeyFile() qemu_domain.c: modernize qemuMonitorGetCpuHalted() src/qemu/qemu_domain.c | 100 ++++++------------ src/qemu/qemu_driver.c | 219 +++++++++++++++------------------------ src/qemu/qemu_snapshot.c | 3 +- 3 files changed, 119 insertions(+), 203 deletions(-) -- 2.26.2

3 14

[PATCH] virnetdevopenvswitch: Fix ATTRIBUTE_NONNULL() tag for virNetDevOpenvswitchGetVhostuserIfname()
by Michal Privoznik 13 Nov '20

13 Nov '20

After e4c29e2904 the function has one argument more and the argument that can't be NULL moved from second to third position. Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/util/virnetdevopenvswitch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index 5cd1d22ae3..8409aa92ac 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -63,7 +63,7 @@ int virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) int virNetDevOpenvswitchGetVhostuserIfname(const char *path, bool server, char **ifname) - ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE; + ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE; int virNetDevOpenvswitchUpdateVlan(const char *ifname, const virNetDevVlan *virtVlan) -- 2.26.2

1 0

[libvirt PATCH] kbase: Shorten "less verbose QEMU logging" example
by Andrea Bolognani 13 Nov '20

13 Nov '20

Rationale for the changes: * util.dbus produces very little logging, so it doesn't really make sense to filter it out; * util.udev doesn't exist; * access can be filtered out entirely, as nothing very interesting is produced by the only other component in the same package (access.accessdriverpolkit). Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/kbase/debuglogs.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index 7945cf8bed..fed998efd8 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -178,13 +178,12 @@ Less verbose logging for QEMU VMs Some subsystems are very noisy and usually not the culprit of the problems. They can be silenced individually for a less verbose log while still logging -everything else. Usual suspects are the JSON code, udev, authentication and such. +everything else. Usual suspects are the JSON code, RPC, authentication and such. A permissive filter is good for development use cases. :: - 3:remote 4:event 3:util.json 3:util.object 3:util.dbus 3:util.udev 3:node_device 3:rpc 3:access.accessmanager 3:util.netlink 1:* - + 3:remote 4:event 3:util.json 3:util.object 3:util.netlink 3:node_device 3:rpc 3:access 1:* Minimalistic QEMU QMP monitor logging ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- 2.26.2

3 3

[PATCH 0/2] virnetdevopenvswitch: Get names for dpdkvhostuserclient too
by Michal Privoznik 13 Nov '20

13 Nov '20

The first patch fixes the actual problem, the second is just a cleanup I've came up with whilst looking at the code. Michal Prívozník (2): virnetdevopenvswitch: Get names for dpdkvhostuserclient too virnetdevopenvswitch: Simplify OVS_VSCTL cmd creation src/qemu/qemu_command.c | 1 + src/qemu/qemu_hotplug.c | 1 + src/util/virnetdevopenvswitch.c | 92 +++++++++++++++++++-------------- src/util/virnetdevopenvswitch.h | 1 + tests/qemuxml2argvmock.c | 1 + 5 files changed, 56 insertions(+), 40 deletions(-) -- 2.26.2

3 5

[libvirt PATCH] docs: compiling.html: pass -d to xz to decompress
by Daniel P. Berrangé 13 Nov '20

13 Nov '20

From: Jonathan Watt <jwatt(a)jwatt.org> tar on macOS recognizes XZ compression automatically, but that is not the case for GNU tar (1.32 at least). On Fedora 33 the current instructions result in the following error: $ xz -c libvirt-6.9.0.tar.xz | tar xvf - tar: Archive is compressed. Use -J option tar: Error is not recoverable: exiting now Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Jonathan Watt <jwatt(a)jwatt.org> --- Pushed as a trivial patch from gitlab docs/compiling.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/compiling.html.in b/docs/compiling.html.in index c898d16313..c2c9d9f0ed 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -14,7 +14,7 @@ </p> <pre> -$ xz -c libvirt-x.x.x.tar.xz | tar xvf - +$ xz -dc libvirt-x.x.x.tar.xz | tar xvf - $ cd libvirt-x.x.x $ meson build</pre> -- 2.28.0

1 0

[PATCH 0/6] qemu: Enable client TLS certificate validation by default for chardev, migration, and backup servers
by Peter Krempa 13 Nov '20

13 Nov '20

See patches 6 for a explanation. Peter Krempa (6): qemu: conf: Allow individual control of default value for *_tls_x509_verify qemu: conf: Clarify default of "vnc_tls_x509_verify" qemu: conf: Enable 'chardev_tls_x509_verify' by default qemu: conf: Enable 'migrate_tls_x509_verify' by default qemu: conf: Enable 'backup_tls_x509_verify' by default NEWS: Mention change of default for TLS certificate verification NEWS.rst | 11 +++++++++++ src/qemu/qemu.conf | 18 ++++++++++++++---- src/qemu/qemu_conf.c | 22 ++++++++++++++-------- src/qemu/qemu_conf.h | 1 + 4 files changed, 40 insertions(+), 12 deletions(-) -- 2.28.0

5 14

Re: [PATCH] Added attach-disk parameters for network disk support
by Peter Krempa 13 Nov '20

13 Nov '20

On Thu, Nov 12, 2020 at 15:15:27 -0600, Ryan Gahagan wrote: > Hey Peter, Hi Ryan, firstly I'd like to ask you to keep the conversation on-list. (use reply-all all the time). This ensures that the response is public and also other people can jump in and respont. At the very least it can be used for future reference. I'll be re-adding the mailing list in this response. Also please avoid top-posting in techincal lists. It's always best to respond inline at the proper context that is being discussed. > Sorry about all the issues with our commit, we're new to this and trying to > make our first contribution to this repo. We had a couple questions over > your feedback and wanted to run them by you before making another request. Sure thing, you can always ask on the mailing list even without patches. > In the original code, the --source parameter is marked as required but okay > to be empty. If the string is empty, then we think the parameter read in by > vshCommandOptStringReq would be NULL, in which case no <source> tag would > be generated at all. If this is the case, then why is --source required in > the first place? We see that --source-name is mutually exclusive witha That's a quirk of it being a positional argument (VSH_OT_DATA). A positional argument is mandatory. > --source, but is it also okay to be empty? For example, in the issue > <https://gitlab.com/libvirt/libvirt/-/issues/16> this patch was based on, > there's an example XML which has a <source> with neither a file nor a name. > Is this example incorrect, or is it fine to have neither and only have a > protocol? That is correct for example with the NBD protocol where a missing name actually means the default unnamed export. The thing is that we can't really change --source to be something else than VSH_OT_DATA since it would change the semantics of the virsh command. You probably will need to use it also for the 'name' attribute and switch the name according to the presence of the 'protocol' attribute/option. > When it comes to making these mutually exclusive, we also were confused on > what flags to give them. Would it be proper behavior to give them both no > flags or only the VSH_OFLAG_EMPTY_OK flag and then check that one is > defined in the cmdAttachDisk method (using VSH_EXCLUSIVE_OPTIONS_VAR) and > error there instead? Those are two separate things. If it makes sense for a flag to be specified but empty and it impacts behaviour then you need to use VSH_OFLAG_EMPTY_OK. Any non-positional arguments (those which need --) can be made optional. On the other hand that does not say anything about how they can or can't be combined with other options and thus you need to declare that in the code. > If the user provides an empty source without any protocol, but provides > --source-host-* parameters, what should be generated instead? Would this This should be an error. --source-host must require the use of --source-protocol > cause an error, would it generate an in-line <host> tag, or would it > generate a completely empty <source> tag followed by the host information? The protocol option flag should be mandatory if you want to use the host/socket. > > -Ryan Gahagan > > On Thu, Nov 12, 2020 at 2:57 AM Peter Krempa <pkrempa(a)redhat.com> wrote: > > > On Wed, Nov 11, 2020 at 17:00:51 -0600, Ryan Gahagan wrote: > > > Related issue: https://gitlab.com/libvirt/libvirt/-/issues/16 > > > Added in support for the following parameters in attach-disk: > > > --source-name > > > --source-protocol > > > --source-host-name > > > --source-host-socket > > > --source-host-transport Please trim parts of the message that are no longer relevant. [...]

1 0

[PATCH] viridentitytest: Run more frequently
by Michal Privoznik 13 Nov '20

13 Nov '20

The viridentitytest tests our viridentity module which is compiled on all platforms and OSes. There is no need to have SELinux secdriver as individual test cases are skipped if SELinux is missing. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Successfully build here: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/213586713 While technically this is a v2 of: https://www.redhat.com/archives/libvir-list/2020-November/msg00308.html it's implementing completely different approach and thus I did not mark it as v2. tests/meson.build | 2 +- tests/viridentitytest.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index 8decdfa20c..9f0051303d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -312,6 +312,7 @@ tests += [ { 'name': 'virfirewalltest' }, { 'name': 'virhostcputest', 'link_whole': [ test_file_wrapper_lib ] }, { 'name': 'virhostdevtest' }, + { 'name': 'viridentitytest' }, { 'name': 'viriscsitest' }, { 'name': 'virkeycodetest' }, { 'name': 'virkmodtest' }, @@ -480,7 +481,6 @@ if conf.has('WITH_SECDRIVER_SELINUX') if conf.has('WITH_LIBATTR') tests += [ { 'name': 'securityselinuxtest' }, - { 'name': 'viridentitytest' }, ] if conf.has('WITH_QEMU') diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index fd01eeaa80..afb9fdaec4 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -88,8 +88,7 @@ static int testIdentityGetSystem(const void *data) #if !WITH_SELINUX if (context) { VIR_DEBUG("libvirt not compiled with SELinux, skipping this test"); - ret = EXIT_AM_SKIP; - return -1; + return EXIT_AM_SKIP; } #endif -- 2.26.2

3 2

[PATCH 0/9] docs: kbase style change and cleanups
by Peter Krempa 13 Nov '20

13 Nov '20

Some patches are taken from an older series where we've discussed that the kbase page should look more like 'docs.html' as more articles appear, this series delivers that: https://www.redhat.com/archives/libvir-list/2020-August/msg00172.html ... and a few other changes. Final output: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/830387801/artifacts/website/docs… Peter Krempa (9): docs: Fix title of 'docs' page docs: xslt: Use 'Link' rather than 'Permalink' in header links docs: css: Add a gray box around table of contents of RST based docs docs: kbase: Move index page to docs/kbase docs: kbase: Remove extra container from index page docs: kbase: Split articles into sections docs: xsl: Unify stylability of main container element docs: css: Modify appearance of the kbase directory page docs: kbase: Reorder some articles in the 'Usage' section docs/docs.html.in | 5 ++-- docs/index.html.in | 4 +-- docs/kbase.rst | 53 --------------------------------- docs/kbase/index.rst | 57 +++++++++++++++++++++++++++++++++++ docs/kbase/meson.build | 1 + docs/libvirt.css | 67 +++++++++++++++++++++++++++--------------- docs/meson.build | 1 - docs/page.xsl | 27 ++++++++++------- scripts/hvsupport.py | 2 +- 9 files changed, 124 insertions(+), 93 deletions(-) delete mode 100644 docs/kbase.rst create mode 100644 docs/kbase/index.rst -- 2.26.2

2 11

[PATCH 0/3] kbase: Port 'debuglogs' from wiki and convert directory to rst
by Peter Krempa 13 Nov '20

13 Nov '20

This patchset: 1) converts the 'kbase' directory page to RST 2) increases width of the container holding the kbase articles: before: https://libvirt.org/kbase.html after: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/663385238/artifacts/website/kbas… 3) ports 'debuglogs' wiki article to the kbase: original: https://wiki.libvirt.org/page/DebugLogs converted: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/663385238/artifacts/website/kbas… Note that this patchset requires Pavel's meson rewrite. Peter Krempa (3): docs: kbase: Convert 'kbase' article registry to RST docs: kbase: Make kbase article directory wider docs: kbase: Port 'debuglogs' document from libvirt's wiki docs/kbase.html.in | 54 -------------- docs/kbase.rst | 46 ++++++++++++ docs/kbase/debuglogs.rst | 148 +++++++++++++++++++++++++++++++++++++++ docs/kbase/meson.build | 1 + docs/libvirt.css | 8 +++ docs/meson.build | 2 +- 6 files changed, 204 insertions(+), 55 deletions(-) delete mode 100644 docs/kbase.html.in create mode 100644 docs/kbase.rst create mode 100644 docs/kbase/debuglogs.rst -- 2.26.2

6 13

[PATCH 0/4] qemu: hotplug: Fix check whether controler is used
by Peter Krempa 13 Nov '20

13 Nov '20

Patch 2/4 is the actual fix, other patches are additional cleanups. Peter Krempa (4): qemuDomain(Disk)ControllerIsBusy: Fix function header format qemuDomainDiskControllerIsBusy: Fix logic of matching disk bus to controller type qemuDomainDiskControllerIsBusy: Optimize checking for SCSI hostdevs qemuDomainControllerIsBusy: Fully populate switch statement src/qemu/qemu_hotplug.c | 92 ++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 23 deletions(-) -- 2.28.0

2 5

[PATCH] qemu: backup: Install bitmap for incremental backup to appropriate node only
by Peter Krempa 13 Nov '20

13 Nov '20

Libvirt's backup code has two modes: 1) push - where qemu actively writes the difference since the checkpoint into the output file 2) pull - where we instruct qemu to expose a frozen disk state along with a bitmap of blocks which changed since the checkpoint For push mode qemu needs the temporary bitmap we use where we calculate the actual changes to be present on the block node backing the disk. For pull mode where we expose the bitmap via NBD qemu actually wants the bitmap to be present for the exported block node which is the scratch file. Until now we've calculated the bitmap twice and installed it both to the scratch file and to the disk node, but we don't need to since we know when it's needed. Pass in the 'pull' flag and decide where to install the bitmap according to it and also when to register the bitmap name with the blockjob. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_backup.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 99dee46c4f..09f7921ea7 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -109,6 +109,7 @@ struct qemuBackupDiskData { virStorageSourcePtr terminator; virStorageSourcePtr backingStore; char *incrementalBitmap; + const char *domdiskIncrementalBitmap; /* name of temporary bitmap installed on disk source */ qemuBlockStorageSourceChainDataPtr crdata; bool labelled; bool initialized; @@ -201,6 +202,7 @@ qemuBackupDiskPrepareOneBitmapsChain(virStorageSourcePtr backingChain, static int qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd, virJSONValuePtr actions, + bool pull, GHashTable *blockNamedNodeData) { if (!qemuBlockBitmapChainIsValid(dd->domdisk->src, @@ -212,21 +214,29 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd, return -1; } - if (qemuBackupDiskPrepareOneBitmapsChain(dd->domdisk->src, - dd->domdisk->src, - dd->incrementalBitmap, - dd->backupdisk->incremental, - actions, - blockNamedNodeData) < 0) - return -1; + /* For pull-mode backup, we need the bitmap to be present in the scratch + * file as that will be exported. For push-mode backup the bitmap is + * actually required on top of the image backing the disk */ - if (qemuBackupDiskPrepareOneBitmapsChain(dd->domdisk->src, - dd->store, - dd->incrementalBitmap, - dd->backupdisk->incremental, - actions, - blockNamedNodeData) < 0) - return -1; + if (pull) { + if (qemuBackupDiskPrepareOneBitmapsChain(dd->domdisk->src, + dd->store, + dd->incrementalBitmap, + dd->backupdisk->incremental, + actions, + blockNamedNodeData) < 0) + return -1; + } else { + if (qemuBackupDiskPrepareOneBitmapsChain(dd->domdisk->src, + dd->domdisk->src, + dd->incrementalBitmap, + dd->backupdisk->incremental, + actions, + blockNamedNodeData) < 0) + return -1; + + dd->domdiskIncrementalBitmap = dd->backupdisk->incremental; + } return 0; } @@ -293,12 +303,12 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm, else dd->incrementalBitmap = g_strdup_printf("backup-%s", dd->domdisk->dst); - if (qemuBackupDiskPrepareOneBitmaps(dd, actions, blockNamedNodeData) < 0) + if (qemuBackupDiskPrepareOneBitmaps(dd, actions, pull, blockNamedNodeData) < 0) return -1; } if (!(dd->blockjob = qemuBlockJobDiskNewBackup(vm, dd->domdisk, dd->store, - dd->incrementalBitmap))) + dd->domdiskIncrementalBitmap))) return -1; /* use original disk as backing to prevent opening the backing chain */ -- 2.28.0

2 2

[PATCH] migration.html: Fix the spelling of the --persistent parameter
by Thomas Huth 13 Nov '20

13 Nov '20

"--persist" is missing the "ent" at the end. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- Sorry, I just noticed this after my previous "--undefinesource" patch had been merged - otherwise I had sent both fixes in one patch together... docs/migration.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 194cf7d209..77731eeb37 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -253,7 +253,7 @@ migration by default. The <code>virsh</code> command has two flags to influence this behaviour. The <code>--undefinesource</code> flag will cause the configuration file to be removed on the source host - after a successful migration. The <code>--persist</code> flag will + after a successful migration. The <code>--persistent</code> flag will cause a configuration file to be created on the destination host after a successful migration. The following table summarizes the configuration file handling in all possible state and flag @@ -272,7 +272,7 @@ <th>Source config</th> <th>Dest config</th> <th>--undefinesource</th> - <th>--persist</th> + <th>--persistent</th> <th>Dest type</th> <th>Source config</th> <th>Dest config</th> -- 2.18.4

2 1

[PATCH 0/6] Introduce OpenSSH authorized key file mgmt APIs
by Michal Privoznik 13 Nov '20

13 Nov '20

Marc-André posted a patch that implements agent handling. I've written the rest. Marc-André Lureau (1): qemu_agent: add qemuAgentSSH{Add,Remove,Get}AuthorizedKeys Michal Prívozník (5): Introduce OpenSSH authorized key file mgmt APIs remote: Implement OpenSSH authorized key file mgmt APIs virsh: Expose OpenSSH authorized key file mgmt APIs qemu: Implement OpenSSH authorized key file mgmt APIs news: Document recent OpenSSH authorized key file mgmt APIs NEWS.rst | 6 ++ docs/manpages/virsh.rst | 37 +++++++ include/libvirt/libvirt-domain.h | 17 ++++ src/driver-hypervisor.h | 15 +++ src/libvirt-domain.c | 115 +++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 140 +++++++++++++++++++++++++ src/qemu/qemu_agent.h | 15 +++ src/qemu/qemu_driver.c | 81 +++++++++++++++ src/remote/remote_daemon_dispatch.c | 82 +++++++++++++++ src/remote/remote_driver.c | 87 ++++++++++++++++ src/remote/remote_protocol.x | 34 ++++++- src/remote_protocol-structs | 22 ++++ tests/qemuagenttest.c | 79 +++++++++++++++ tools/virsh-domain.c | 152 ++++++++++++++++++++++++++++ 15 files changed, 887 insertions(+), 1 deletion(-) -- 2.26.2

4 22

[PATCH] migration.html: Fix the spelling of the --undefinesource parameter
by Thomas Huth 13 Nov '20

13 Nov '20

There is no dash between "undefine" and "source" in this parameter. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/migration.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index dd5eddd6f4..194cf7d209 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -251,7 +251,7 @@ <p> As mentioned above, libvirt will not modify configuration files during migration by default. The <code>virsh</code> command has two flags to - influence this behaviour. The <code>--undefine-source</code> flag + influence this behaviour. The <code>--undefinesource</code> flag will cause the configuration file to be removed on the source host after a successful migration. The <code>--persist</code> flag will cause a configuration file to be created on the destination host @@ -271,7 +271,7 @@ <th>Source type</th> <th>Source config</th> <th>Dest config</th> - <th>--undefine-source</th> + <th>--undefinesource</th> <th>--persist</th> <th>Dest type</th> <th>Source config</th> -- 2.18.4

2 1

[PATCH v2 00/10] qemu: support renaming domains with snapshots/checkpoints
by Nikolay Shirokovskiy 13 Nov '20

13 Nov '20

This is basically just rebase of [1] as it was not get any attention at that time. [1] [PATCH 0/8] qemu: support renaming domains with snapshots/checkpoints https://www.redhat.com/archives/libvir-list/2020-March/msg00018.html Nikolay Shirokovskiy (10): qemu: qemuDomainRenameCallback: fix sending false undefined event qemu: rename: send events only on success qemu: rename: return instead of goto if no cleanup required qemu: remove duplicate code for removing remnant files qemu: rename: support renaming snapshots directory qemu: rename: support renaming checkpoints directory qemu: update name on reverting from snapshot qemu: rename: remove snapshot/checkpoint restriction qemu: qemuDomainDefineXMLFlags: move cleanup logic to cleanup section qemu: remove possible garbage left from previous rename/undefine src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_checkpoint.h | 6 ++ src/qemu/qemu_domain.c | 43 ++++++++++++ src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_driver.c | 158 ++++++++++++++++++++++++++------------------- src/qemu/qemu_migration.c | 3 + src/qemu/qemu_snapshot.c | 10 +++ 7 files changed, 160 insertions(+), 67 deletions(-) -- 1.8.3.1

2 15

[PATCH v1] wireshark: fix build with with 2.4.0
by Olaf Hering 13 Nov '20

13 Nov '20

wireshark/epan/proto.h uses WS_NORETURN, which is defined in wireshark/config.h, without including this header first. Fixes commit caa9560c150b3df46965582388d0a8a0bafa97ae Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- tools/wireshark/src/packet-libvirt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index f43919b05d..5bddeb3763 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -18,6 +18,7 @@ */ #include <config.h> +#include <wireshark/config.h> #include <wireshark/epan/proto.h> #include <wireshark/epan/packet.h> #include <wireshark/epan/dissectors/packet-tcp.h>

2 5

[PATCH v1] meson: fix yajl detection
by Olaf Hering 13 Nov '20

13 Nov '20

yajl_tree_parse is declared in yajl/yajl_tree.h autoconf is more forgiving, the error did not trigger because yajl_tree_parse is not actually used. Fixes commit 44b8df4cb4b3f0c143e0330f543812e6bcd5c9f0 Fixes commit 88ab32a4e555f67dae3204fbc3bcf63d3da8ad2b Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 9ee8dffa60..2b2ce6dfb1 100644 --- a/meson.build +++ b/meson.build @@ -1471,7 +1471,7 @@ if not get_option('yajl').disabled() if not yajl_dep.found() yajl_dep = cc.find_library('yajl', required: get_option('yajl')) if yajl_dep.found() - has_func = cc.has_function('yajl_tree_parse', dependencies: yajl_dep, prefix: '#include <yajl/yajl_common.h>') + has_func = cc.has_function('yajl_tree_parse', dependencies: yajl_dep, prefix: '#include <yajl/yajl_tree.h>') if not has_func and get_option('yajl').enabled() error('yajl >= @0@ was not found'.format(yajl_version)) elif not has_func

3 2

[PATCH] kbase: Document minimal libvirt version for NUMA-less virtiofs
by Michal Privoznik 13 Nov '20

13 Nov '20

Using virtiofs without NUMA was implemented in v6.9.0-rc1~161 but our kbase document only mentions QEMU version which may confuse users. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/kbase/virtiofs.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst index 01440420d7..c0bc07a68d 100644 --- a/docs/kbase/virtiofs.rst +++ b/docs/kbase/virtiofs.rst @@ -25,8 +25,9 @@ means that QEMU needs to allocate the backing memory for all the guest RAM as shared memory. As of QEMU 4.2, it is possible to explicitly specify a memory backend when specifying the NUMA topology. This method is however only viable for machine types that do support -NUMA. As of QEMU 5.0.0, it is possible to specify the memory backend -without NUMA (using the so called memobject interface). +NUMA. As of QEMU 5.0.0 and libvirt 6.9.0, it is possible to +specify the memory backend without NUMA (using the so called +memobject interface). Either of the following: -- 2.26.2

2 2

Races / crashes in shutdown of libvirtd daemon
by Daniel P. Berrangé 13 Nov '20

13 Nov '20

We got a new BZ filed about a libvirtd crash in shutdown https://bugzilla.redhat.com/show_bug.cgi?id=1828207 We can see from the stack trace that the "interface" driver is in the middle of servicing an RPC call for virConnectListAllInterfaces() Meanwhile the libvirtd daemon is doing virObjectUnref(dmn) on the virNetDaemonPtr object. The fact that it is doing this unref, means that it must have already call virStateCleanup(), given the code sequence: /* Run event loop. */ virNetDaemonRun(dmn); ret = 0; virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_SHUTDOWN, 0, "shutdown", NULL, NULL); cleanup: /* Keep cleanup order in inverse order of startup */ virNetDaemonClose(dmn); virNetlinkEventServiceStopAll(); if (driversInitialized) { /* NB: Possible issue with timing window between driversInitialized * setting if virNetlinkEventServerStart fails */ driversInitialized = false; virStateCleanup(); } virObjectUnref(adminProgram); virObjectUnref(srvAdm); virObjectUnref(qemuProgram); virObjectUnref(lxcProgram); virObjectUnref(remoteProgram); virObjectUnref(srv); virObjectUnref(dmn); Unless I'm missing something non-obvious, this cleanup code path is inherantly broken & racy. When virNetDaemonRun() returns the RPC worker threads are all still active. They are all liable to still be executing RPC calls, which means any of the drivers may be in use. So calling virStateCleanup() is an inherantly dangerous thing to do. There is the further complication that once we have exitted the main loop we may prevent the RPC calls from ever completing, as they may be waiting on an event to be dispatched. I know we're had various patch proposals in the past to improve the robustness of shutdown cleanup but I can't remember the outcome of the reviews. Hopefully people involved in those threads can jump in here... IMHO the key problem here is the virNetDeamonRun() method which just looks at the "quit" flag and immediately returns if it is set. This needs to be changed so that when it sees quit == true, it takes the following actions 1. Call virNetDaemonClose() to drop all RPC clients and thus prevent new RPC calls arriving 2. Flush any RPC calls which are queued but not yet assigned to a worker thread 3. Tell worker threads to exit after finishing their current job 4. Wait for all worker threads to exit 5. Now virNetDaemonRun may return At this point we can call virStateCleanup and the various other things, as we know no drivers are still active in RPC calls. Having said that, there could be background threads in the the drivers which are doing work that uses the event loop thread. So we probably need a virStateClose() method that we call from virNetDaemonRun, *after* all worker threads are gone, which would cleanup any background threads while the event loop is still running. The issue is that step 4 above ("Wait for all worker threads to exit") may take too long, or indeed never complete. To deal with this, it will need a timeout. In the remote_daemon.c cleanup code path, if there are still worker threads present, then we need to skip all cleanup and simply call _exit(0) to terminate the process with no attempt at cleanup, since it would be unsafe to try anything else. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

3 4

[PATCH 0/2] char: Deprecate backend aliases
by Kevin Wolf 13 Nov '20

13 Nov '20

These aliases only work the command line, but not in QMP. Command line QAPIfication involves writing some compatibility glue for them, which I'm doing, but I think it's desirable to unify accepted values of both paths. So deprecate the aliases so that we can drop the compatibility glue later. In the deprecation documentation I assumed that this is for 6.0, but if we want to include it in 5.2 still, this can be changed, of course. Kevin Wolf (2): char: Skip CLI aliases in query-chardev-backends char: Deprecate backend aliases 'tty' and 'parport' docs/system/deprecated.rst | 6 ++++++ chardev/char.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) -- 2.28.0

3 6

[PATCH] qemu: domfsinfo should print a target name on s390x, not a complete device path
by Thomas Huth 13 Nov '20

13 Nov '20

While fixing domfsinfo for non-PCI (i.e. CCW) devices on s390x, I accidentally used the whole device path for the devAlias field. However, it should only contain the base target name. Currently we have the wrong output: $ virsh domfsinfo guestname Mountpoint Name Type Target --------------------------------------- / sda3 xfs /dev/sda3 /boot sda1 xfs /dev/sda1 It should look like this instead: $ virsh domfsinfo guestname Mountpoint Name Type Target ------------------------------------ / sda3 xfs sda /boot sda1 xfs sda Thus we have to strip the "/dev/" prefix and the partition number from the string. Fixes: f8333b3b0a ("qemu: Fix domfsinfo for non-PCI device information ...") Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1858771 Reported-by: Sebastian Mitterle <smitterl(a)redhat.com> --- src/qemu/qemu_driver.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05f8eb2cb7..d92bee1d35 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18874,6 +18874,30 @@ qemuDomainGetFSInfoAgent(virQEMUDriverPtr driver, return ret; } +/* Turn device node string like "/dev/vda1" into a target name like "vda" */ +static char * +qemuAgentDevNodeToTarget(const char *devnode) +{ + char *str = g_strdup(devnode); + size_t len = strlen(str); + + /* Remove the "/dev/" prefix from the string */ + if (g_str_has_prefix(str, "/dev/")) { + len -= 5; + memmove(str, str + 5, len + 1); + } + + /* Remove the partition number from the end of the string */ + while (len > 0) { + len--; + if (!g_ascii_isdigit(str[len])) + break; + str[len] = 0; + } + + return str; +} + static virDomainFSInfoPtr qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent, virDomainDefPtr vmdef) @@ -18903,7 +18927,7 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent, if (diskDef != NULL) ret->devAlias[i] = g_strdup(diskDef->dst); else if (agentdisk->devnode != NULL) - ret->devAlias[i] = g_strdup(agentdisk->devnode); + ret->devAlias[i] = qemuAgentDevNodeToTarget(agentdisk->devnode); else VIR_DEBUG("Missing devnode name for '%s'.", ret->mountpoint); } -- 2.18.4

2 2

[PATCH 0/2] qemu: Check if driver is still available in qemuStateStop()
by Michal Privoznik 13 Nov '20

13 Nov '20

The second patch is the interesting one. Michal Prívozník (2): DO NOT MERGE qemu: Check if driver is still available in qemuStateStop() src/qemu/qemu_driver.c | 7 ++++- src/remote/remote_daemon.c | 64 +++++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 29 deletions(-) -- 2.26.2

2 3

[libvirt PATCH] util: Make virFileClose() quiet on success
by Andrea Bolognani 12 Nov '20

12 Nov '20

While it's certainly good to log events like "failed to close fd" and "tried to close invalid fd", which are likely to be the consequence of some bug in libvirt, logging a message every single time a file descriptor is closed successfully is perhaps excessive and can lead to useful information being missed among the noise. Log filters don't help in this situation, because filtering out all of util.file is too big a hammer and would cause important messages to be left out as well. To give an idea of just how much noise this single debug statement can cause, here's a real life example from a quite large libvirtd log I had to look at recently: $ grep virFile libvirt.log | wc -l 1307 $ grep virFile libvirt.log | grep -v 'Closed fd' | wc -l 343 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/virfile.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 9a7dcfc9a6..f57272ca2f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -131,8 +131,6 @@ int virFileClose(int *fdptr, virFileCloseFlags flags) VIR_DEBUG("Failed to close fd %d: %s", *fdptr, g_strerror(errno)); } - } else { - VIR_DEBUG("Closed fd %d", *fdptr); } } *fdptr = -1; -- 2.26.2

2 1

[PATCH v2 0/6] hyperv: implement vCPU APIs
by Matt Coleman 12 Nov '20

12 Nov '20

Changes since v1: * use an enum for the real CPU constants * remove the forward declaration Here's a GitLab merge request, if you'd prefer to review it there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/11 Matt Coleman (6): domain: introduce constants for virVcpuInfo->cpu state values hyperv: implement domainGetVcpus hyperv: implement domainGetVcpusFlags hyperv: implement domainGetMaxVcpus hyperv: implement domainSetVcpus and domainSetVcpusFlags news: implement vCPU APIs in the Hyper-V driver NEWS.rst | 8 +- include/libvirt/libvirt-domain.h | 7 +- src/hyperv/hyperv_driver.c | 175 +++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 4 deletions(-) -- 2.27.0

2 7

[PATCH 0/6] hyperv: implement vCPU APIs
by Matt Coleman 12 Nov '20

12 Nov '20

Here's a GitLab merge request, if you'd prefer to review it there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/10 Matt Coleman (6): domain: introduce constants for virVcpuInfo->cpu state values hyperv: implement domainGetVcpus hyperv: implement domainGetVcpusFlags hyperv: implement domainGetMaxVcpus hyperv: implement domainSetVcpus and domainSetVcpusFlags news: implement vCPU APIs in the Hyper-V driver NEWS.rst | 8 +- include/libvirt/libvirt-domain.h | 16 ++- src/hyperv/hyperv_driver.c | 180 +++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 4 deletions(-) -- 2.27.0

2 13

[PATCH 0/8] tools: vsh: Fix validation of command parameter lists
by Peter Krempa 12 Nov '20

12 Nov '20

Recent patch: https://www.redhat.com/archives/libvir-list/2020-November/msg00555.html passes build check but then virsh complains when started that the command list is wrong. Fix it by moving the check to the appropriate place. You can use the above patch as reproducer. Peter Krempa (8): tools: vsh: Unexport vshCmddefHelp tools: vshCmddefCheckInternals: Add parameter name to error message tools: vshCmddefCheckInternals: Port mandatory options check from vshCmddefOptParse tools: cmdSelfTest: Drop misleading comment tools: vshCmddefOptParse: Remove 'optional' command validation tools: vshCmddefHelp: Don't call vshCmddefOptParse tools: vshCmddefOptParse: Remove return value tools: virsh: Reset error when keepalive registration fails tools/virsh.c | 1 + tools/vsh.c | 108 +++++++++++++++++++++----------------------------- tools/vsh.h | 1 - 3 files changed, 47 insertions(+), 63 deletions(-) -- 2.28.0

2 11

[PATCH 00/28] a bunch of domain_conf cleanup
by Matt Coleman 12 Nov '20

12 Nov '20

Most of this is making functions void that unnecessarily return an int. It also includes some conversion to GLib. Feel free to squash related commits, if you'd like. I left them separate to make it easier to review. Matt Coleman (28): domain_conf: make virDomainDiskSetDriver() void domain_conf: make virDomainPostParseCheckISCSIPath() void domain_conf: use g_free() in virDomainPostParseCheckISCSIPath() domain_conf: make virDomainHostdevAssignAddress() void domain_conf: make virDomainChr/RNG/Video/VsockDefPostParse() and virDomainNVRAMDefFormat() void domain_conf: make virDomainDeviceInfoFormat() void domain_conf: make virDomainGraphicsDefParseXMLEGLHeadless() void domain_conf: make virDomainLeaseDefFormat() void domain_conf: make virDomainDiskSourceFormatNetwork() void domain_conf: make virDomainDiskDefFormatIotune() void domain_conf: make virDomainDiskDefFormatDriver() void domain_conf: make virDomainControllerDriverFormat() void domain_conf: make virDomainVirtioNetGuestOpts/HostOpts/DriverFormat() void domain_conf: make virDomainRedirFilterDefFormat() void domain_conf: make virDomainIOMMUDefFormat() void domain_conf: make virDomainDefFormatBlkiotune() void domain_conf: make virDomainChrSourceDefFormat() void domain_conf: make virDomainDiskSetBlockIOTune() void domain_conf: use g_free in virDomainDiskSetBlockIOTune() domain_conf: use g_renew in virDomainDiskInsert() and virDomainControllerInsert() domain_conf: make virDomainDiskInsert() void domain_conf: make virDomainControllerInsert() void domain_conf: use g_renew in virDomainLeaseInsertPreAlloc() domain_conf: make virDomainLeaseInsertPreAlloc() void domain_conf: make virDomainLeaseInsert() void domain_conf: make virDomainPanicDefFormat() void domain_conf: make virDomainShmemDefFormat() void domain_conf: make virDomainVsockDefFormat() void src/conf/domain_conf.c | 349 ++++++++++++++------------------------- src/conf/domain_conf.h | 21 +-- src/libxl/libxl_conf.c | 5 +- src/libxl/libxl_domain.c | 5 +- src/libxl/libxl_driver.c | 9 +- src/libxl/xen_xl.c | 12 +- src/libxl/xen_xm.c | 10 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_driver.c | 15 +- src/qemu/qemu_hotplug.c | 3 +- src/test/test_driver.c | 3 +- src/vz/vz_sdk.c | 9 +- tests/qemublocktest.c | 5 +- 14 files changed, 158 insertions(+), 296 deletions(-) -- 2.27.0

5 39

[PATCH] qemu: virtiofs: Stop virtiofsd when the qemu guest fails to start
by Masayoshi Mizuma 12 Nov '20

12 Nov '20

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> A qemu guest which has virtiofs config fails to start if the previous starting failed because of invalid option or something. For example of the reproduction: # virsh start guest error: Failed to start domain guest error: internal error: process exited while connecting to monitor: qemu-system-x86_64: -foo: invalid option ... fix the option ... # virsh start guest error: Failed to start domain guest error: Cannot open log file: '/var/log/libvirt/qemu/guest-fs0-virtiofsd.log': Device or resource busy # That's because the virtiofsd which was executed on the former staring remains and virtlogd keeps to opening the log file. Stop virtiofsd when the qemu guest fails to start. Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_virtiofs.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index ca041e207b..7d47c030bd 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -426,6 +426,7 @@ struct _qemuDomainFSPrivate { virObject parent; char *vhostuser_fs_sock; + pid_t virtiofsd_pid; }; diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 2e239cad66..8684219915 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -250,6 +250,7 @@ qemuVirtioFSStart(virLogManagerPtr logManager, } QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock = g_steal_pointer(&socket_path); + QEMU_DOMAIN_FS_PRIVATE(fs)->virtiofsd_pid = pid; ret = 0; cleanup: @@ -273,6 +274,7 @@ qemuVirtioFSStop(virQEMUDriverPtr driver G_GNUC_UNUSED, { g_autofree char *pidfile = NULL; virErrorPtr orig_err; + pid_t pid = QEMU_DOMAIN_FS_PRIVATE(fs)->virtiofsd_pid; virErrorPreserveLast(&orig_err); @@ -286,6 +288,9 @@ qemuVirtioFSStop(virQEMUDriverPtr driver G_GNUC_UNUSED, unlink(QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock); } + if (virProcessKill(pid, 0) == 0) + virProcessKillPainfully(pid, true); + cleanup: virErrorRestore(&orig_err); } -- 2.27.0

4 5

[PATCH] tests: qemucapabilities: Update latest qemu caps to qemu v5.2.0-rc1
by Peter Krempa 12 Nov '20

12 Nov '20

Synchronize with the latest release candidate. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../caps_5.2.0.x86_64.replies | 684 +++++++++--------- .../caps_5.2.0.x86_64.xml | 6 +- 2 files changed, 349 insertions(+), 341 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies index 37b17afba9..140a3312a5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, + "micro": 91, "minor": 1, "major": 5 }, - "package": "v5.1.0-2827-g2c6605389c" + "package": "v5.2.0-rc1" }, "id": "libvirt-2" } @@ -690,8 +690,8 @@ "parent": "pci-device" }, { - "name": "sev-guest", - "parent": "object" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { "name": "usb-redir", @@ -714,8 +714,8 @@ "parent": "pci-vga" }, { - "name": "virtio-blk-pci-transitional", - "parent": "virtio-blk-pci-base" + "name": "kvm-pit", + "parent": "pit-common" }, { "name": "Haswell-v1-x86_64-cpu", @@ -738,8 +738,8 @@ "parent": "generic-pc-machine" }, { - "name": "kvm-pit", - "parent": "pit-common" + "name": "sev-guest", + "parent": "object" }, { "name": "ich9-usb-uhci5", @@ -793,10 +793,6 @@ "name": "usb-hub", "parent": "usb-device" }, - { - "name": "chardev-pty", - "parent": "chardev" - }, { "name": "virtio-blk-device", "parent": "virtio-device" @@ -838,8 +834,8 @@ "parent": "accel" }, { - "name": "kvmclock", - "parent": "sys-bus-device" + "name": "chardev-pty", + "parent": "chardev" }, { "name": "vhost-user-vsock-pci", @@ -862,21 +858,25 @@ "parent": "scsi-device" }, { - "name": "e1000e", - "parent": "pci-device" - }, - { - "name": "x3130-upstream", - "parent": "pcie-port" + "name": "kvmclock", + "parent": "sys-bus-device" }, { "name": "virtio-serial-pci-transitional", "parent": "virtio-serial-pci-base" }, + { + "name": "x3130-upstream", + "parent": "pcie-port" + }, { "name": "memory-backend-ram", "parent": "memory-backend" }, + { + "name": "e1000e", + "parent": "pci-device" + }, { "name": "PCIE", "parent": "PCI" @@ -1086,8 +1086,8 @@ "parent": "pci-device" }, { - "name": "virtio-input-host-pci", - "parent": "virtio-input-host-pci-base-type" + "name": "virtio-9p-pci-transitional", + "parent": "virtio-9p-pci-base" }, { "name": "nvdimm", @@ -1098,8 +1098,8 @@ "parent": "generic-pc-machine" }, { - "name": "virtio-9p-pci-transitional", - "parent": "virtio-9p-pci-base" + "name": "virtio-input-host-pci", + "parent": "virtio-input-host-pci-base-type" }, { "name": "Opteron_G1-x86_64-cpu", @@ -1154,12 +1154,8 @@ "parent": "sys-bus-device" }, { - "name": "chardev-memory", - "parent": "chardev-ringbuf" - }, - { - "name": "i82557a", - "parent": "pci-device" + "name": "pc-q35-2.8-machine", + "parent": "generic-pc-machine" }, { "name": "vhost-user-scsi-pci-non-transitional", @@ -1170,13 +1166,17 @@ "parent": "isa-device" }, { - "name": "pc-q35-2.8-machine", - "parent": "generic-pc-machine" + "name": "chardev-udp", + "parent": "chardev" }, { "name": "generic-sdhci", "parent": "sys-bus-device" }, + { + "name": "i82557a", + "parent": "pci-device" + }, { "name": "virtio-scsi-pci-non-transitional", "parent": "virtio-scsi-pci-base" @@ -1194,8 +1194,8 @@ "parent": "x86_64-cpu" }, { - "name": "chardev-udp", - "parent": "chardev" + "name": "chardev-memory", + "parent": "chardev-ringbuf" }, { "name": "EPYC-Rome-v1-x86_64-cpu", @@ -1266,16 +1266,16 @@ "parent": "vhost-scsi-common" }, { - "name": "usb-tablet", - "parent": "usb-hid" + "name": "sd-card", + "parent": "device" }, { "name": "sysbus-ahci", "parent": "sys-bus-device" }, { - "name": "sd-card", - "parent": "device" + "name": "usb-tablet", + "parent": "usb-hid" }, { "name": "pc-q35-4.0.1-machine", @@ -1313,10 +1313,18 @@ "name": "tcg-accel", "parent": "accel" }, + { + "name": "piix4-ide", + "parent": "pci-ide" + }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" }, + { + "name": "Cascadelake-Server-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "qemu:memory-region", "parent": "object" @@ -1325,10 +1333,6 @@ "name": "virtio-gpu-device", "parent": "virtio-gpu-base" }, - { - "name": "Cascadelake-Server-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "e1000", "parent": "e1000-base" @@ -1345,10 +1349,6 @@ "name": "ES1370", "parent": "pci-device" }, - { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" - }, { "name": "i82551", "parent": "pci-device" @@ -1366,8 +1366,8 @@ "parent": "x86_64-cpu" }, { - "name": "piix4-ide", - "parent": "pci-ide" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { "name": "SandyBridge-x86_64-cpu", @@ -1405,14 +1405,14 @@ "name": "kvm-apic", "parent": "apic-common" }, - { - "name": "isa-pit", - "parent": "pit-common" - }, { "name": "kvm64-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "isa-pit", + "parent": "pit-common" + }, { "name": "Broadwell-v4-x86_64-cpu", "parent": "x86_64-cpu" @@ -1485,10 +1485,6 @@ "name": "vhost-user-blk-pci-non-transitional", "parent": "vhost-user-blk-pci-base" }, - { - "name": "virtio-rng-pci-non-transitional", - "parent": "virtio-rng-pci-base" - }, { "name": "cirrus-vga", "parent": "pci-device" @@ -1505,13 +1501,17 @@ "name": "pc-i440fx-2.1-machine", "parent": "generic-pc-machine" }, + { + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" + }, { "name": "i82559er", "parent": "pci-device" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "virtio-rng-pci-non-transitional", + "parent": "virtio-rng-pci-base" }, { "name": "Skylake-Client-x86_64-cpu", @@ -1750,11 +1750,11 @@ "parent": "base-sysbus-fdc" }, { - "name": "i82559c", + "name": "AMDVI-PCI", "parent": "pci-device" }, { - "name": "AMDVI-PCI", + "name": "i82559c", "parent": "pci-device" }, { @@ -1802,11 +1802,11 @@ "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82559a", + "name": "kvaser_pci", "parent": "pci-device" }, { - "name": "kvaser_pci", + "name": "i82559a", "parent": "pci-device" }, { @@ -1830,8 +1830,8 @@ "parent": "chardev-spice" }, { - "name": "tls-creds-x509", - "parent": "tls-creds" + "name": "qio-channel-command", + "parent": "qio-channel" }, { "name": "Opteron_G3-v1-x86_64-cpu", @@ -1846,8 +1846,8 @@ "parent": "virtio-blk-pci-base" }, { - "name": "qio-channel-command", - "parent": "qio-channel" + "name": "tls-creds-x509", + "parent": "tls-creds" }, { "name": "pc-i440fx-2.4-machine", @@ -1870,8 +1870,8 @@ "parent": "x86_64-cpu" }, { - "name": "qio-channel-websock", - "parent": "qio-channel" + "name": "qio-net-listener", + "parent": "object" }, { "name": "pc-q35-4.1-machine", @@ -1894,8 +1894,8 @@ "parent": "x86_64-cpu" }, { - "name": "qio-net-listener", - "parent": "object" + "name": "qio-channel-websock", + "parent": "qio-channel" }, { "name": "edu", @@ -1973,6 +1973,10 @@ "name": "chardev-socket", "parent": "chardev" }, + { + "name": "clock", + "parent": "object" + }, { "name": "Haswell-v2-x86_64-cpu", "parent": "x86_64-cpu" @@ -1985,14 +1989,14 @@ "name": "usb-ehci", "parent": "pci-ehci-usb" }, - { - "name": "pxb", - "parent": "pci-device" - }, { "name": "pc-i440fx-2.11-machine", "parent": "generic-pc-machine" }, + { + "name": "pxb", + "parent": "pci-device" + }, { "name": "AC97", "parent": "pci-device" @@ -2006,8 +2010,8 @@ "parent": "virtio-device" }, { - "name": "clock", - "parent": "object" + "name": "nvme-bus", + "parent": "bus" }, { "name": "virtconsole", @@ -2022,8 +2026,8 @@ "parent": "isa-device" }, { - "name": "hyperv-testdev", - "parent": "isa-device" + "name": "virtio-iommu-pci-non-transitional", + "parent": "virtio-iommu-device-base" }, { "name": "scsi-hd", @@ -2070,29 +2074,29 @@ "parent": "x86_64-cpu" }, { - "name": "virtio-iommu-pci-non-transitional", - "parent": "virtio-iommu-device-base" + "name": "hyperv-testdev", + "parent": "isa-device" }, { "name": "s3c-sdhci", "parent": "generic-sdhci" }, { - "name": "tpm-tis", - "parent": "isa-device" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "fw_cfg_mem", "parent": "fw_cfg" }, - { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ccid-card-emulated", "parent": "ccid-card" }, + { + "name": "tpm-tis", + "parent": "isa-device" + }, { "name": "pc-q35-5.1-machine", "parent": "generic-pc-machine" @@ -2281,6 +2285,10 @@ "name": "colo-compare", "parent": "object" }, + { + "name": "virtio-mmio", + "parent": "sys-bus-device" + }, { "name": "pxb-bus", "parent": "PCI" @@ -2289,10 +2297,6 @@ "name": "pentium2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-mmio", - "parent": "sys-bus-device" - }, { "name": "Broadwell-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -2321,18 +2325,26 @@ "name": "Skylake-Server-v4-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "kvmvapic", + "parent": "sys-bus-device" + }, { "name": "Nehalem-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "kvmvapic", - "parent": "sys-bus-device" + "name": "nvme-ns", + "parent": "device" }, { "name": "Opteron_G2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "pc-1.1-machine", + "parent": "generic-pc-machine" + }, { "name": "megasas-gen2", "parent": "megasas-base" @@ -2365,10 +2377,6 @@ "name": "Broadwell-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "pc-1.1-machine", - "parent": "generic-pc-machine" - }, { "name": "u2f-passthru", "parent": "u2f-key" @@ -2509,14 +2517,14 @@ "name": "vhost-user-gpu", "parent": "virtio-gpu-base" }, - { - "name": "pentium-v1-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "hda-duplex", "parent": "hda-audio" }, + { + "name": "pentium-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "amd-iommu-iommu-memory-region", "parent": "qemu:iommu-memory-region" @@ -2526,24 +2534,24 @@ "parent": "object" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-balloon-device", + "parent": "virtio-device" }, { - "name": "Cascadelake-Server-v3-x86_64-cpu", + "name": "Cooperlake-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "cfi.pflash01", - "parent": "sys-bus-device" + "name": "Cascadelake-Server-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "virtio-balloon-device", - "parent": "virtio-device" + "name": "Nehalem-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Cooperlake-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "cfi.pflash01", + "parent": "sys-bus-device" }, { "name": "pc-q35-2.7-machine", @@ -2774,8 +2782,8 @@ "parent": "x86_64-cpu" }, { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" + "name": "kvm64-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "IDE", @@ -2786,8 +2794,8 @@ "parent": "x86_64-cpu" }, { - "name": "kvm64-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { "name": "mptsas1068", @@ -2886,8 +2894,8 @@ "parent": "qio-channel" }, { - "name": "chardev-stdio", - "parent": "chardev-fd" + "name": "virtio-blk-pci-transitional", + "parent": "virtio-blk-pci-base" }, { "name": "virtio-vga", @@ -8366,6 +8374,14 @@ "deprecated": false, "default-ram-id": "pc.ram" }, + { + "hotpluggable-cpus": false, + "name": "none", + "numa-mem-supported": false, + "cpu-max": 1, + "deprecated": false, + "default-ram-id": "ram" + }, { "hotpluggable-cpus": true, "name": "pc-1.1", @@ -8375,14 +8391,6 @@ "deprecated": true, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "none", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false, - "default-ram-id": "ram" - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.7", @@ -10583,248 +10591,94 @@ "emulator" ], "id": "libvirt-43" -} - -{ - "execute": "query-command-line-options", - "id": "libvirt-44" -} - -{ - "return": [ - { - "parameters": [ - { - "name": "timeout", - "help": "Request timeout in seconds (default 0 = no timeout)", - "type": "number" - }, - { - "name": "initiator-name", - "help": "Initiator iqn name to use when connecting", - "type": "string" - }, - { - "name": "header-digest", - "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", - "type": "string" - }, - { - "name": "password-secret", - "help": "ID of the secret providing password for CHAP authentication to target", - "type": "string" - }, - { - "name": "password", - "help": "password for CHAP authentication to target", - "type": "string" - }, - { - "name": "user", - "help": "username for CHAP authentication to target", - "type": "string" - } - ], - "option": "iscsi" - }, - { - "parameters": [ - { - "name": "audiodev", - "type": "string" - }, - { - "name": "non-adaptive", - "type": "boolean" - }, - { - "name": "lossy", - "type": "boolean" - }, - { - "name": "sasl-authz", - "type": "string" - }, - { - "name": "tls-authz", - "type": "string" - }, - { - "name": "acl", - "type": "boolean" - }, - { - "name": "sasl", - "type": "boolean" - }, - { - "name": "key-delay-ms", - "type": "number" - }, - { - "name": "lock-key-sync", - "type": "boolean" - }, - { - "name": "reverse", - "type": "boolean" - }, - { - "name": "password", - "type": "boolean" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "to", - "type": "number" - }, - { - "name": "connections", - "type": "number" - }, - { - "name": "head", - "type": "number" - }, - { - "name": "display", - "type": "string" - }, - { - "name": "share", - "type": "string" - }, - { - "name": "tls-creds", - "type": "string" - }, - { - "name": "websocket", - "type": "string" - }, - { - "name": "vnc", - "type": "string" - } - ], - "option": "vnc" - }, - { - "parameters": [ - ], - "option": "acpi" - }, - { - "parameters": [ - { - "name": "rendernode", - "type": "string" - }, - { - "name": "gl", - "type": "boolean" - }, - { - "name": "head", - "type": "number" - }, - { - "name": "display", - "type": "string" - }, - { - "name": "seamless-migration", - "type": "boolean" - }, - { - "name": "playback-compression", - "type": "boolean" - }, - { - "name": "agent-mouse", - "type": "boolean" - }, - { - "name": "streaming-video", - "type": "string" - }, +} + +{ + "execute": "query-command-line-options", + "id": "libvirt-44" +} + +{ + "return": [ + { + "parameters": [ { - "name": "zlib-glz-wan-compression", - "type": "string" + "name": "timeout", + "help": "Request timeout in seconds (default 0 = no timeout)", + "type": "number" }, { - "name": "jpeg-wan-compression", + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", "type": "string" }, { - "name": "image-compression", + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", "type": "string" }, { - "name": "plaintext-channel", + "name": "password-secret", + "help": "ID of the secret providing password for CHAP authentication to target", "type": "string" }, { - "name": "tls-channel", + "name": "password", + "help": "password for CHAP authentication to target", "type": "string" }, { - "name": "tls-ciphers", + "name": "user", + "help": "username for CHAP authentication to target", "type": "string" - }, + } + ], + "option": "iscsi" + }, + { + "parameters": [ { - "name": "x509-dh-key-file", + "name": "audiodev", "type": "string" }, { - "name": "x509-cacert-file", - "type": "string" + "name": "non-adaptive", + "type": "boolean" }, { - "name": "x509-cert-file", - "type": "string" + "name": "lossy", + "type": "boolean" }, { - "name": "x509-key-password", + "name": "sasl-authz", "type": "string" }, { - "name": "x509-key-file", + "name": "tls-authz", "type": "string" }, { - "name": "x509-dir", - "type": "string" + "name": "acl", + "type": "boolean" }, { "name": "sasl", "type": "boolean" }, { - "name": "disable-agent-file-xfer", - "type": "boolean" + "name": "key-delay-ms", + "type": "number" }, { - "name": "disable-copy-paste", + "name": "lock-key-sync", "type": "boolean" }, { - "name": "disable-ticketing", + "name": "reverse", "type": "boolean" }, { "name": "password", - "type": "string" - }, - { - "name": "unix", "type": "boolean" }, { @@ -10836,19 +10690,39 @@ "type": "boolean" }, { - "name": "addr", - "type": "string" + "name": "to", + "type": "number" }, { - "name": "tls-port", + "name": "connections", "type": "number" }, { - "name": "port", + "name": "head", "type": "number" + }, + { + "name": "display", + "type": "string" + }, + { + "name": "share", + "type": "string" + }, + { + "name": "tls-creds", + "type": "string" + }, + { + "name": "websocket", + "type": "string" + }, + { + "name": "vnc", + "type": "string" } ], - "option": "spice" + "option": "vnc" }, { "parameters": [ @@ -11041,8 +10915,132 @@ }, { "parameters": [ + { + "name": "rendernode", + "type": "string" + }, + { + "name": "gl", + "type": "boolean" + }, + { + "name": "head", + "type": "number" + }, + { + "name": "display", + "type": "string" + }, + { + "name": "seamless-migration", + "type": "boolean" + }, + { + "name": "playback-compression", + "type": "boolean" + }, + { + "name": "agent-mouse", + "type": "boolean" + }, + { + "name": "streaming-video", + "type": "string" + }, + { + "name": "zlib-glz-wan-compression", + "type": "string" + }, + { + "name": "jpeg-wan-compression", + "type": "string" + }, + { + "name": "image-compression", + "type": "string" + }, + { + "name": "plaintext-channel", + "type": "string" + }, + { + "name": "tls-channel", + "type": "string" + }, + { + "name": "tls-ciphers", + "type": "string" + }, + { + "name": "x509-dh-key-file", + "type": "string" + }, + { + "name": "x509-cacert-file", + "type": "string" + }, + { + "name": "x509-cert-file", + "type": "string" + }, + { + "name": "x509-key-password", + "type": "string" + }, + { + "name": "x509-key-file", + "type": "string" + }, + { + "name": "x509-dir", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "disable-agent-file-xfer", + "type": "boolean" + }, + { + "name": "disable-copy-paste", + "type": "boolean" + }, + { + "name": "disable-ticketing", + "type": "boolean" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "unix", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "addr", + "type": "string" + }, + { + "name": "tls-port", + "type": "number" + }, + { + "name": "port", + "type": "number" + } ], - "option": "smbios" + "option": "spice" }, { "parameters": [ @@ -11069,6 +11067,16 @@ ], "option": "sandbox" }, + { + "parameters": [ + ], + "option": "acpi" + }, + { + "parameters": [ + ], + "option": "smbios" + }, { "parameters": [ { @@ -24745,12 +24753,12 @@ "type": "str" }, { - "name": "tight", + "name": "abstract", "default": null, "type": "bool" }, { - "name": "abstract", + "name": "tight", "default": null, "type": "bool" } @@ -26652,7 +26660,7 @@ "sse4.1": true, "family": 23, "vmx-vmwrite-vmexit-fields": false, - "kvm-asyncpf-int": false, + "kvm-asyncpf-int": true, "vmx-vnmi": false, "vmx-true-ctls": false, "vmx-ept-execonly": false, @@ -26975,7 +26983,7 @@ "sse4.1": true, "family": 23, "vmx-vmwrite-vmexit-fields": false, - "kvm-asyncpf-int": false, + "kvm-asyncpf-int": true, "vmx-vnmi": false, "vmx-true-ctls": false, "vmx-ept-execonly": false, @@ -30357,6 +30365,14 @@ "deprecated": false, "default-ram-id": "pc.ram" }, + { + "hotpluggable-cpus": false, + "name": "none", + "numa-mem-supported": false, + "cpu-max": 1, + "deprecated": false, + "default-ram-id": "ram" + }, { "hotpluggable-cpus": true, "name": "pc-1.1", @@ -30366,14 +30382,6 @@ "deprecated": true, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "none", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false, - "default-ram-id": "ram" - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.7", diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 94a1945639..6706a8b8d4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -249,10 +249,10 @@ <flag name='block-export-add'/> <flag name='netdev.vhost-vdpa'/> <flag name='fsdev.createmode'/> - <version>5001050</version> + <version>5001091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v5.1.0-2827-g2c6605389c</package> + <package>v5.2.0-rc1</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -286,7 +286,7 @@ <property name='sse4.1' type='boolean' value='true' migratable='yes'/> <property name='family' type='number' value='23'/> <property name='vmx-vmwrite-vmexit-fields' type='boolean' value='false'/> - <property name='kvm-asyncpf-int' type='boolean' value='false'/> + <property name='kvm-asyncpf-int' type='boolean' value='true' migratable='yes'/> <property name='vmx-vnmi' type='boolean' value='false'/> <property name='vmx-true-ctls' type='boolean' value='false'/> <property name='vmx-ept-execonly' type='boolean' value='false'/> -- 2.26.2

2 1

[libvirt PATCH] Fix capitalization "CLang" -> "Clang"
by Andrea Bolognani 12 Nov '20

12 Nov '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. config.h | 2 +- docs/programming-languages.rst | 2 +- meson.build | 4 ++-- tests/qemusecuritymock.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.h b/config.h index 0f12b728b6..2ee7f7bff6 100644 --- a/config.h +++ b/config.h @@ -26,7 +26,7 @@ #endif #ifndef __GNUC__ -# error "Libvirt requires GCC >= 4.8, or CLang" +# error "Libvirt requires GCC >= 4.8, or Clang" #endif /* diff --git a/docs/programming-languages.rst b/docs/programming-languages.rst index 9d7dbdcd37..80a997f63b 100644 --- a/docs/programming-languages.rst +++ b/docs/programming-languages.rst @@ -11,7 +11,7 @@ some of the existing languages. The preferred languages at this time are: - C - for the main libvirt codebase. Dialect supported by - GCC/CLang only. + GCC/Clang only. - Python - for supporting build scripts / tools. Code must run with both version 2.7 and 3.x at this time. diff --git a/meson.build b/meson.build index 5fec644fc7..8133d094c8 100644 --- a/meson.build +++ b/meson.build @@ -401,8 +401,8 @@ cc_flags += [ # We do "bad" function casts all the time for event callbacks '-Wno-cast-function-type', - # CLang incorrectly complains about dup typedefs win gnu99 mode - # so use this CLang-specific arg to keep it quiet + # Clang incorrectly complains about dup typedefs win gnu99 mode + # so use this Clang-specific arg to keep it quiet '-Wno-typedef-redefinition', # Clang complains about casts in G_DEFINE_TYPE(...) diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index d6858dc821..1fa4e522cc 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -183,7 +183,7 @@ virFileGetXAttrQuiet(const char *path, * return value from virFileGetXAttrQuiet gets scrambled * if we mock virFileGetXAttrQuiet, returning -1 instead * of 0 despite succeeding. This happens on FreeBSD 11/12 - * hosts with CLang, and is suspected to be some kind of + * hosts with Clang, and is suspected to be some kind of * compiler optimization. By mocking this function too we * can workaround it. */ -- 2.26.2

1 0

[libvirt PATCH] Set -Wno-incompatible-pointer-types-discards-qualifiers
by Daniel P. Berrangé 12 Nov '20

12 Nov '20

With CLang we're getting failures from cats in GLib macros ../dist-unpack/libvirt-6.10.0/src/util/vireventthread.c:35:1: error: passing 'typeof (*(&g_define_type_id__volatile)) *' (aka 'volatile unsigned long *') to parameter of type 'gsize *' (aka 'unsigned long *') discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] G_DEFINE_TYPE(virEventThread, vir_event_thread, G_TYPE_OBJECT) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The cast is valid and there's no way for libvirt to workaround the issue, so we must disable this CLang warning flag. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meson.build b/meson.build index f2e4f2cc23..e4b7fa0728 100644 --- a/meson.build +++ b/meson.build @@ -405,6 +405,9 @@ cc_flags += [ # so use this CLang-specific arg to keep it quiet '-Wno-typedef-redefinition', + # CLang complains about casts in G_DEFINE_TYPE(...) + '-Wno-incompatible-pointer-types-discards-qualifiers', + # We don't use -Wc++-compat so we have to enable it explicitly '-Wjump-misses-init', -- 2.25.4

4 5

[PATCH] Added attach-disk parameters for network disk support
by Ryan Gahagan 12 Nov '20

12 Nov '20

Related issue: https://gitlab.com/libvirt/libvirt/-/issues/16 Added in support for the following parameters in attach-disk: --source-name --source-protocol --source-host-name --source-host-socket --source-host-transport Allowed for multiple hosts to be added to a single source. Multiple hosts can be defined by providing multiple instances of --source-host-name, followed by optional transport and socket parameters. Using a single host does not require a host name. Added documentation to virsh.rst specifying usage. Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- docs/manpages/virsh.rst | 24 +++++++- tools/virsh-domain.c | 125 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 138 insertions(+), 11 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index bfd26e3120..60e5f5ebe4 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -4500,9 +4500,11 @@ attach-disk [--current]] | [--persistent]] [--targetbus bus] [--driver driver] [--subdriver subdriver] [--iothread iothread] [--cache cache] [--io io] [--type type] [--alias alias] - [--mode mode] [--sourcetype sourcetype] [--serial serial] - [--wwn wwn] [--rawio] [--address address] [--multifunction] - [--print-xml] + [--mode mode] [--sourcetype sourcetype] [--source-name name] + [--source-protocol protocol] [--source-host-name hostname:port] + [--source-host-transport transport] [--source-host-socket socket] + [--serial serial] [--wwn wwn] [--rawio] [--address address] + [--multifunction] [--print-xml] Attach a new disk device to the domain. *source* is path for the files and devices. *target* controls the bus or @@ -4541,6 +4543,22 @@ ccw:cssid.ssid.devno. Virtio-ccw devices must have their cssid set to 0xfe. *multifunction* indicates specified pci address is a multifunction pci device address. +If *--source-protocol* or *--source-name* is specified, then the parameters +will be inserted into the XML that is generated for the source. +If any of *--source-host-name*, *--source-host-transport*, or +*--source-host-socket* are specified, then a ``<host>`` tag +will be generated under the ``<source>`` tag containing whichever +parameters were provided. If needed, the user can provide multiple hosts +by providing each host with a *--source-host-name*. Each host will +receive the host parameters which come between it and the next instance +of *--source-host-name* or between it and the end of the command. +If a user tries to provide multiple of the same host parameter +for any single host, only the first one will be generated as +part of the XML output. + +--source-host-name me --source-host-transport t1 --source-host-transport t2 --source-host-transport t3 --soure-host-name you +<host transport='t1' transport='t2' transport='t3'> + If *--print-xml* is specified, then the XML of the disk that would be attached is printed instead. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12b35c037d..609189e398 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -224,6 +224,26 @@ static const vshCmdOptDef opts_attach_disk[] = { .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, .help = N_("source of disk device") }, + {.name = "source-protocol", + .type = VSH_OT_STRING, + .help = N_("protocol used by disk device source") + }, + {.name = "source-name", + .type = VSH_OT_STRING, + .help = N_("name of disk device source") + }, + {.name = "source-host-name", + .type = VSH_OT_STRING, + .help = N_("host name for source of disk device") + }, + {.name = "source-host-transport", + .type = VSH_OT_STRING, + .help = N_("host transport for source of disk device") + }, + {.name = "source-host-socket", + .type = VSH_OT_STRING, + .help = N_("host socket for source of disk device") + }, {.name = "target", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, @@ -558,15 +578,68 @@ static int str2DiskAddress(const char *str, struct DiskAddress *diskAddr) return -1; } +static void attachDiskHostGen(virBufferPtr buf, const vshCmd *cmd) +{ + // Can be multiple hosts so we have to scan + // the cmd options to find all the host params + // <source tag in XML not yet closed + vshCmdOpt *candidate = cmd->opts; + char *host_name = NULL, *host_port = NULL; + int close_tag = 0, seen_socket = 0, seen_transport = 0; + + while (candidate) { + // Iterate candidates to find each host-name + if (STREQ(candidate->def->name, "source-host-name")) { + // After the first host-name, we need to terminate + // the <host ... tag + // It's left open so socket and transport can be added later + + // Only include the first example of socket or transport per host + // When a socket or transport is seen, these are set to true + // until the next name is encountered. + seen_socket = 0; + seen_transport = 0; + + if (close_tag) + virBufferAddLit(buf, "/>\n"); + else + close_tag = 1; + + host_name = candidate->data; + host_port = strchr(host_name, ':'); + + if (!host_port) { + // If port isn't provided, only print name + virBufferAsprintf(buf, "<host name='%s'", host_name); + } else { + // If port is provided, manipulate strings and print both + host_name[(int)(host_port - host_name)] = '\0'; + virBufferAsprintf(buf, "<host name='%s' port='%s'", host_name, host_port + 1); + } + } else if (!seen_socket && STREQ(candidate->def->name, "source-host-socket")) { + seen_socket = 1; + virBufferAsprintf(buf, " socket='%s'", candidate->data); + } else if (!seen_transport && STREQ(candidate->def->name, "source-host-transport")) { + seen_transport = 1; + virBufferAsprintf(buf, " transport='%s'", candidate->data); + } + + candidate = candidate->next; + } + // Close final <host tag + virBufferAddLit(buf, "/>\n"); +} + static bool cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *source = NULL, *target = NULL, *driver = NULL, - *subdriver = NULL, *type = NULL, *mode = NULL, - *iothread = NULL, *cache = NULL, *io = NULL, - *serial = NULL, *straddr = NULL, *wwn = NULL, - *targetbus = NULL, *alias = NULL; + const char *source = NULL, *source_name = NULL, *source_protocol = NULL, + *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, + *mode = NULL, *iothread = NULL, *cache = NULL, + *io = NULL, *serial = NULL, *straddr = NULL, + *wwn = NULL, *targetbus = NULL, *alias = NULL, + *host_transport = NULL, *host_name = NULL, *host_socket = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -591,6 +664,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-name", &source_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-protocol", &source_protocol) < 0 || vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || vshCommandOptStringReq(ctl, cmd, "driver", &driver) < 0 || vshCommandOptStringReq(ctl, cmd, "subdriver", &subdriver) < 0 || @@ -604,7 +679,10 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || - vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) + vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-name", (const char **) &host_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) goto cleanup; if (!stype) { @@ -659,9 +737,40 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "/>\n"); } - if (source) - virBufferAsprintf(&buf, "<source %s='%s'/>\n", + if (source || source_protocol || source_name || + host_name || host_transport || host_socket) { + virBufferAddLit(&buf, "<source"); + + if (source) + virBufferAsprintf(&buf, " %s='%s'", isFile ? "file" : "dev", source); + if (source_protocol) + virBufferAsprintf(&buf, " protocol='%s'", source_protocol); + if (source_name) + virBufferAsprintf(&buf, " name='%s'", source_name); + + if (!(host_name || host_transport || host_socket)) { + // Close source if no host is provided + virBufferAddLit(&buf, "/>\n"); + } else if (!host_name) { + // If no host name is provided but there is a host, + // we have a single host with params + virBufferAddLit(&buf, ">\n<host"); + + if (host_transport) + virBufferAsprintf(&buf, " transport='%s'", host_transport); + if (host_socket) + virBufferAsprintf(&buf, " socket='%s'", host_socket); + + virBufferAddLit(&buf, "/>\n</source>\n"); + } else { + // May have multiple hosts, use helper method + virBufferAddLit(&buf, ">\n"); + attachDiskHostGen(&buf, cmd); + virBufferAddLit(&buf, "</source>\n"); + } + } + virBufferAsprintf(&buf, "<target dev='%s'", target); if (targetbus) virBufferAsprintf(&buf, " bus='%s'", targetbus); -- 2.29.0

2 1

[PATCH 0/7] hyperv: some memory and scheduler APIs
by Matt Coleman 12 Nov '20

12 Nov '20

Here's a GitLab merge request, if you'd prefer to review it there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/9 Matt Coleman (7): hyperv: implement domainGetMaxMemory hyperv: move hypervDomainSetMemory and hypervDomainSetMemoryFlags hyperv: implement domainSetMaxMemory hyperv: add hypervMsvmVSMSModifyResourceSettings hyperv: refactor hypervDomainSetMemoryProperty hyperv: implement domainGetScheduler* news: some memory and scheduler Hyper-V APIs NEWS.rst | 7 + src/hyperv/hyperv_driver.c | 253 ++++++++++++++++++++++++++----------- src/hyperv/hyperv_wmi.c | 37 ++++++ src/hyperv/hyperv_wmi.h | 8 ++ 4 files changed, 233 insertions(+), 72 deletions(-) -- 2.27.0

2 8

[PATCH] selinux label: restore all labels when some labels fail to set
by Jin Yan 12 Nov '20

12 Nov '20

When migration fails, qemuMigrationDstPrepareAny will call qemuProcessStop to restore labels only after all labels are successfully set. If some labels fail to set, the labels that have been set will not be restore. Signed-off-by: Jin Yan <jinyan12(a)huawei.com> --- src/qemu/qemu_security.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 3bda96272c..e4d5e13516 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -51,13 +51,20 @@ qemuSecuritySetAllLabel(virQEMUDriverPtr driver, incomingPath, priv->chardevStdioLogd, migrated) < 0) - goto cleanup; + goto restorelabel; if (virSecurityManagerTransactionCommit(driver->securityManager, pid, priv->rememberOwner) < 0) - goto cleanup; + goto restorelabel; ret = 0; + + restorelabel: + virSecurityManagerRestoreAllLabel(driver->securityManager, + vm->def, + migrated, + priv->chardevStdioLogd); + cleanup: virSecurityManagerTransactionAbort(driver->securityManager); return ret; -- 2.23.0

1 0

[libvirt PATCH] qemu: Do not require TSC frequency to strictly match host
by Jiri Denemark 12 Nov '20

12 Nov '20

Some CPUs provide a way to read exact TSC frequency, while measuring it is required on other CPUs. However, measuring is never exact and the result may slightly differ across reboots. For this reason both Linux kernel and QEMU recently started allowing for guests TSC frequency to fall into +/- 250 ppm tolerance interval around the host TSC frequency. Let's do the same to avoid unnecessary failures (esp. during migration) in case the host frequency does not exactly match the frequency configured in a domain XML. https://bugzilla.redhat.com/show_bug.cgi?id=1839095 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0a36b49c85..7f56ddf114 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5358,12 +5358,18 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm, } +/* 250 parts per million (ppm) is a half of NTP threshold */ +#define TSC_TOLERANCE 250 + static int qemuProcessStartValidateTSC(virQEMUDriverPtr driver, virDomainObjPtr vm) { size_t i; unsigned long long freq = 0; + unsigned long long tolerance; + unsigned long long minFreq; + unsigned long long maxFreq; virHostCPUTscInfoPtr tsc; g_autoptr(virCPUDef) cpu = NULL; @@ -5389,23 +5395,34 @@ qemuProcessStartValidateTSC(virQEMUDriverPtr driver, } tsc = cpu->tsc; - VIR_DEBUG("Host TSC frequency %llu Hz, scaling %s", - tsc->frequency, virTristateBoolTypeToString(tsc->scaling)); + tolerance = tsc->frequency * TSC_TOLERANCE / 1000000; + minFreq = tsc->frequency - tolerance; + maxFreq = tsc->frequency + tolerance; + + VIR_DEBUG("Host TSC frequency %llu Hz, scaling %s, tolerance +/- %llu Hz", + tsc->frequency, virTristateBoolTypeToString(tsc->scaling), + tolerance); + + if (freq > minFreq && freq < maxFreq) { + VIR_DEBUG("Requested TSC frequency is within tolerance interval"); + return 0; + } - if (freq == tsc->frequency || tsc->scaling == VIR_TRISTATE_BOOL_YES) + if (tsc->scaling == VIR_TRISTATE_BOOL_YES) return 0; if (tsc->scaling == VIR_TRISTATE_BOOL_ABSENT) { - VIR_DEBUG("TSC frequencies do not match and scaling support is " - "unknown, QEMU will try and possibly fail later"); + VIR_DEBUG("Requested TSC frequency falls outside tolerance range and " + "scaling support is unknown, QEMU will try and possibly " + "fail later"); return 0; } virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Requested TSC frequency %llu Hz does not match " - "host (%llu Hz) and TSC scaling is not supported " - "by the host CPU"), - freq, tsc->frequency); + _("Requested TSC frequency %llu Hz is outside tolerance " + "range ([%llu, %llu] Hz) around host frequency %llu Hz " + "and TSC scaling is not supported by the host CPU"), + freq, minFreq, maxFreq, tsc->frequency); return -1; } -- 2.29.2

2 1

[PATCH] Added attach-disk parameters for network disk support
by Ryan Gahagan 11 Nov '20

11 Nov '20

Related issue: https://gitlab.com/libvirt/libvirt/-/issues/16 Added in support for the following parameters in attach-disk: --source-name --source-protocol --source-host-name --source-host-socket --source-host-transport Allowed for multiple hosts to be added to a single source. Multiple hosts can be defined by providing multiple instances of --source-host-name, followed by optional transport and socket parameters. Using a single host does not require a host name. Added documentation to virsh.rst specifying usage. Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- docs/manpages/virsh.rst | 24 +++++++- tools/virsh-domain.c | 125 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 138 insertions(+), 11 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index bfd26e3120..60e5f5ebe4 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -4500,9 +4500,11 @@ attach-disk [--current]] | [--persistent]] [--targetbus bus] [--driver driver] [--subdriver subdriver] [--iothread iothread] [--cache cache] [--io io] [--type type] [--alias alias] - [--mode mode] [--sourcetype sourcetype] [--serial serial] - [--wwn wwn] [--rawio] [--address address] [--multifunction] - [--print-xml] + [--mode mode] [--sourcetype sourcetype] [--source-name name] + [--source-protocol protocol] [--source-host-name hostname:port] + [--source-host-transport transport] [--source-host-socket socket] + [--serial serial] [--wwn wwn] [--rawio] [--address address] + [--multifunction] [--print-xml] Attach a new disk device to the domain. *source* is path for the files and devices. *target* controls the bus or @@ -4541,6 +4543,22 @@ ccw:cssid.ssid.devno. Virtio-ccw devices must have their cssid set to 0xfe. *multifunction* indicates specified pci address is a multifunction pci device address. +If *--source-protocol* or *--source-name* is specified, then the parameters +will be inserted into the XML that is generated for the source. +If any of *--source-host-name*, *--source-host-transport*, or +*--source-host-socket* are specified, then a ``<host>`` tag +will be generated under the ``<source>`` tag containing whichever +parameters were provided. If needed, the user can provide multiple hosts +by providing each host with a *--source-host-name*. Each host will +receive the host parameters which come between it and the next instance +of *--source-host-name* or between it and the end of the command. +If a user tries to provide multiple of the same host parameter +for any single host, only the first one will be generated as +part of the XML output. + +--source-host-name me --source-host-transport t1 --source-host-transport t2 --source-host-transport t3 --soure-host-name you +<host transport='t1' transport='t2' transport='t3'> + If *--print-xml* is specified, then the XML of the disk that would be attached is printed instead. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12b35c037d..469665f0f0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -224,6 +224,26 @@ static const vshCmdOptDef opts_attach_disk[] = { .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, .help = N_("source of disk device") }, + {.name = "source-protocol", + .type = VSH_OT_STRING, + .help = N_("protocol used by disk device source") + }, + {.name = "source-name", + .type = VSH_OT_STRING, + .help = N_("name of disk device source") + }, + {.name = "source-host-name", + .type = VSH_OT_STRING, + .help = N_("host name for source of disk device") + }, + {.name = "source-host-transport", + .type = VSH_OT_STRING, + .help = N_("host transport for source of disk device") + }, + {.name = "source-host-socket", + .type = VSH_OT_STRING, + .help = N_("host socket for source of disk device") + }, {.name = "target", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, @@ -558,15 +578,68 @@ static int str2DiskAddress(const char *str, struct DiskAddress *diskAddr) return -1; } +static void attachDiskHostGen(virBufferPtr buf, const vshCmd *cmd) +{ + // Can be multiple hosts so we have to scan + // the cmd options to find all the host params + // <source tag in XML not yet closed + vshCmdOpt *candidate = cmd->opts; + char *host_name = NULL, *host_port = NULL; + int close_tag = 0, seen_socket, seen_transport; + + while (candidate) { + // Iterate candidates to find each host-name + if (STREQ(candidate->def->name, "source-host-name")) { + // After the first host-name, we need to terminate + // the <host ... tag + // It's left open so socket and transport can be added later + + // Only include the first example of socket or transport per host + // When a socket or transport is seen, these are set to true + // until the next name is encountered. + seen_socket = 0; + seen_transport = 0; + + if (close_tag) + virBufferAddLit(buf, "/>\n"); + else + close_tag = 1; + + host_name = candidate->data; + host_port = strchr(host_name, ':'); + + if (!host_port) { + // If port isn't provided, only print name + virBufferAsprintf(buf, "<host name='%s'", host_name); + } else { + // If port is provided, manipulate strings and print both + host_name[(int)(host_port - host_name)] = '\0'; + virBufferAsprintf(buf, "<host name='%s' port='%s'", host_name, host_port + 1); + } + } else if (!seen_socket && STREQ(candidate->def->name, "source-host-socket")) { + seen_socket = 1; + virBufferAsprintf(buf, " socket='%s'", candidate->data); + } else if (!seen_transport && STREQ(candidate->def->name, "source-host-transport")) { + seen_transport = 1; + virBufferAsprintf(buf, " transport='%s'", candidate->data); + } + + candidate = candidate->next; + } + // Close final <host tag + virBufferAddLit(buf, "/>\n"); +} + static bool cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *source = NULL, *target = NULL, *driver = NULL, - *subdriver = NULL, *type = NULL, *mode = NULL, - *iothread = NULL, *cache = NULL, *io = NULL, - *serial = NULL, *straddr = NULL, *wwn = NULL, - *targetbus = NULL, *alias = NULL; + const char *source = NULL, *source_name = NULL, *source_protocol = NULL, + *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, + *mode = NULL, *iothread = NULL, *cache = NULL, + *io = NULL, *serial = NULL, *straddr = NULL, + *wwn = NULL, *targetbus = NULL, *alias = NULL, + *host_transport = NULL, *host_name = NULL, *host_socket = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -591,6 +664,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-name", &source_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-protocol", &source_protocol) < 0 || vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || vshCommandOptStringReq(ctl, cmd, "driver", &driver) < 0 || vshCommandOptStringReq(ctl, cmd, "subdriver", &subdriver) < 0 || @@ -604,7 +679,10 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || - vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) + vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-name", (const char **) &host_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) goto cleanup; if (!stype) { @@ -659,9 +737,40 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "/>\n"); } - if (source) - virBufferAsprintf(&buf, "<source %s='%s'/>\n", + if (source || source_protocol || source_name || + host_name || host_transport || host_socket) { + virBufferAddLit(&buf, "<source"); + + if (source) + virBufferAsprintf(&buf, " %s='%s'", isFile ? "file" : "dev", source); + if (source_protocol) + virBufferAsprintf(&buf, " protocol='%s'", source_protocol); + if (source_name) + virBufferAsprintf(&buf, " name='%s'", source_name); + + if (!(host_name || host_transport || host_socket)) { + // Close source if no host is provided + virBufferAddLit(&buf, "/>\n"); + } else if (!host_name) { + // If no host name is provided but there is a host, + // we have a single host with params + virBufferAddLit(&buf, ">\n<host"); + + if (host_transport) + virBufferAsprintf(&buf, " transport='%s'", host_transport); + if (host_socket) + virBufferAsprintf(&buf, " socket='%s'", host_socket); + + virBufferAddLit(&buf, "/>\n</source>\n"); + } else { + // May have multiple hosts, use helper method + virBufferAddLit(&buf, ">\n"); + attachDiskHostGen(&buf, cmd); + virBufferAddLit(&buf, "</source>\n"); + } + } + virBufferAsprintf(&buf, "<target dev='%s'", target); if (targetbus) virBufferAsprintf(&buf, " bus='%s'", targetbus); -- 2.29.0

1 0

[libvirt PATCH] conf: Use unsigned long long for timer frequency
by Jiri Denemark 11 Nov '20

11 Nov '20

Although the code in qemuProcessStartValidateTSC works as if the timer frequency was already unsigned long long (by using an appropriate temporary variable), the virDomainTimerDef structure actually defines frequency as unsigned long, which is not guaranteed to be 64b. Fixes support for frequencies higher than 2^32 - 1 on 32b systems. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 6 +++--- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a3ca332279..9199771dc0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14053,7 +14053,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, } } - ret = virXPathULong("string(./@frequency)", ctxt, &def->frequency); + ret = virXPathULongLong("string(./@frequency)", ctxt, &def->frequency); if (ret == -1) { def->frequency = 0; } else if (ret < 0) { @@ -22851,7 +22851,7 @@ virDomainTimerDefCheckABIStability(virDomainTimerDefPtr src, if (src->name == VIR_DOMAIN_TIMER_NAME_TSC) { if (src->frequency != dst->frequency) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target TSC frequency %lu does not match source %lu"), + _("Target TSC frequency %llu does not match source %llu"), dst->frequency, src->frequency); return false; } @@ -28166,7 +28166,7 @@ virDomainTimerDefFormat(virBufferPtr buf, if (def->name == VIR_DOMAIN_TIMER_NAME_TSC) { if (def->frequency > 0) - virBufferAsprintf(buf, " frequency='%lu'", def->frequency); + virBufferAsprintf(buf, " frequency='%llu'", def->frequency); if (def->mode != -1) { const char *mode diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 77656c8ae3..16c050a3ea 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2207,7 +2207,7 @@ struct _virDomainTimerDef { int track; /* boot|guest|wall */ /* frequency & mode are only valid for name='tsc' */ - unsigned long frequency; /* in Hz, unspecified = 0 */ + unsigned long long frequency; /* in Hz, unspecified = 0 */ int mode; /* auto|native|emulate|paravirt */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b0c2a5efb5..0fecb9f6e7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6357,7 +6357,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_TIMER_NAME_TSC: if (timer->frequency > 0) - virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency); + virBufferAsprintf(&buf, ",tsc-frequency=%llu", timer->frequency); break; case VIR_DOMAIN_TIMER_NAME_ARMVTIMER: switch (timer->tickpolicy) { -- 2.29.2

2 2

[libvirt PATCH] util: fix insert/instead documentation mixup
by Jonathon Jongsma 11 Nov '20

11 Nov '20

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/util/virhash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virhash.c b/src/util/virhash.c index 5d5b6389b5..d105820bfa 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -147,8 +147,8 @@ virHashFree(GHashTable *table) * Add the @userdata to the hash @table. This can later be retrieved * by using @name. Duplicate entries generate errors. * - * Deprecated: Consider using g_hash_table_insert insert. Note that - * g_hash_table_instead doesn't fail if entry exists. Also note that + * Deprecated: Consider using g_hash_table_insert instead. Note that + * g_hash_table_insert doesn't fail if entry exists. Also note that * g_hash_table_insert doesn't copy the key. * * Returns 0 the addition succeeded and -1 in case of error. -- 2.26.2

2 1

[PATCH v3 0/3] Support mdev_types on CSS devices
by Boris Fiuczynski 11 Nov '20

11 Nov '20

All refactoring patches of this series in v1 were accepted except for the patch enabling the mdev_types support on CSS devices. v2 added one more refactoring patch in docs before the already sent enablement patch follows again. v3 adds another tiny renaming patch and changes some references in the docs. Boris Fiuczynski (3): docs: refactor mdev_types into new paragraph docs: rename reference MDEVCap into MDEVTypesCapPCI node_device: detecting mdev_types capability on CSS devices docs/drvnodedev.html.in | 4 +- docs/formatnode.html.in | 86 +++++++++++------ docs/schemas/nodedev.rng | 4 + src/conf/node_device_conf.c | 92 ++++++++++++++++++- src/conf/node_device_conf.h | 11 +++ src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 3 + .../css_0_0_fffe_mdev_types.xml | 17 ++++ tests/nodedevxml2xmltest.c | 1 + 10 files changed, 191 insertions(+), 35 deletions(-) create mode 100644 tests/nodedevschemadata/css_0_0_fffe_mdev_types.xml -- 2.26.2

2 5

[libvirt PATCH v2 00/16] Add support for persistent mediated devices
by Jonathon Jongsma 11 Nov '20

11 Nov '20

This patch series follows the previously-merged series which added support for transient mediated devices. This series expands mdev support to include persistent device definitions. Again, it relies on mdevctl as the backend. It follows the common libvirt pattern of APIs by adding the following new APIs for node devices: - virNodeDeviceDefineXML() - defines a persistent device - virNodeDeviceUndefine() - undefines a persistent device - virNodeDeviceCreate() - starts a previously-defined device It also adds virsh commands mapping to these new APIs: nodedev-define, nodedev-undefine, and nodedev-start. The method of staying up-to-date with devices defined by mdevctl is currently= a little bit crude due to the fact that mdevctl does not emit any events when n= ew devices are added or removed. As a workaround, we create a file monitor for t= he mdevctl config directory and re-query mdevctl when we detect changes within that directory. In the future, mdevctl may introduce a more elegant solution. Changes in v2: - rebase to latest git master Jonathon Jongsma (16): tests: remove extra trailing semicolon nodedev: introduce concept of 'active' node devices nodedev: Add ability to filter by active state virsh: Add --active, --inactive, --all to nodedev-list nodedev: add ability to list and parse defined mdevs nodedev: add STOPPED/STARTED lifecycle events nodedev: add mdevctl devices to node device list nodedev: handle mdevs that disappear from mdevctl nodedev: add an mdevctl thread api: add virNodeDeviceDefineXML() virsh: add nodedev-define command api: add virNodeDeviceUndefine() virsh: Factor out function to find node device virsh: add nodedev-undefine command api: add virNodeDeviceCreate() virsh: add "nodedev-start" command examples/c/misc/event-test.c | 4 + include/libvirt/libvirt-nodedev.h | 19 +- src/conf/node_device_conf.h | 9 + src/conf/virnodedeviceobj.c | 24 + src/conf/virnodedeviceobj.h | 7 + src/driver-nodedev.h | 14 + src/libvirt-nodedev.c | 115 ++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/node_device/node_device_driver.c | 525 +++++++++++++++++- src/node_device/node_device_driver.h | 38 ++ src/node_device/node_device_udev.c | 275 ++++++++- src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 40 +- src/remote_protocol-structs | 16 + src/rpc/gendispatch.pl | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.argv | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.json | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.argv | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.json | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.argv | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.json | 1 + tests/nodedevmdevctldata/mdevctl-create.argv | 1 + .../mdevctl-list-defined.argv | 1 + .../mdevctl-list-multiple-parents.json | 59 ++ .../mdevctl-list-multiple-parents.out.xml | 39 ++ .../mdevctl-list-multiple.json | 59 ++ .../mdevctl-list-multiple.out.xml | 39 ++ .../mdevctl-list-single-noattr.json | 11 + .../mdevctl-list-single-noattr.out.xml | 8 + .../mdevctl-list-single.json | 31 ++ .../mdevctl-list-single.out.xml | 14 + .../nodedevmdevctldata/mdevctl-undefine.argv | 1 + tests/nodedevmdevctltest.c | 227 +++++++- tools/virsh-nodedev.c | 281 ++++++++-- 35 files changed, 1787 insertions(+), 88 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.json create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.json create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.json create mode 100644 tests/nodedevmdevctldata/mdevctl-create.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-defined.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple-parents.js= on create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple-parents.ou= t.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single-noattr.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single-noattr.out.x= ml create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-single.out.xml create mode 100644 tests/nodedevmdevctldata/mdevctl-undefine.argv --=20 2.26.2

5 44

[libvirt PATCH] schema: Add support for high TSC frequency
by Jiri Denemark 11 Nov '20

11 Nov '20

The unsignedInt XML schema type allows for values up to 2^32 - 1, i.e., using 4294967296 or greater TSC frequency would fail schema validation. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/schemas/domaincommon.rng | 2 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 38 +++++++++++++++++++ .../cpu-tsc-high-frequency.xml | 35 +++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 97fa873977..e0d09f9c03 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1235,7 +1235,7 @@ </optional> <optional> <attribute name="frequency"> - <ref name="unsignedInt"/> + <ref name="unsignedLong"/> </attribute> </optional> <optional> diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args new file mode 100644 index 0000000000..16a4282ab1 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ +arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,\ +rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,invtsc=on,\ +tsc-frequency=4567890000 \ +-m 214 \ +-object memory-backend-ram,id=pc.ram,size=224395264 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml new file mode 100644 index 0000000000..afaef6e8e5 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml @@ -0,0 +1,35 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <title>A description of the test machine.</title> + <description> + A test of qemu's minimal configuration. + This test also tests the description and title elements. + </description> + <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> + <cpu mode='host-model'> + <model fallback='allow'/> + <feature policy='require' name='invtsc'/> + </cpu> + <clock offset='utc'> + <timer name='tsc' frequency='4567890000'/> + </clock> + <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'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec33134a97..174294c0f1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1953,6 +1953,7 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0"); DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM); DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0"); + DO_TEST_CAPS_LATEST("cpu-tsc-high-frequency"); DO_TEST_CAPS_VER("cpu-translation", "4.0.0"); DO_TEST_CAPS_LATEST("cpu-translation"); qemuTestSetHostCPU(&driver, driver.hostarch, NULL); -- 2.29.2

3 2

[PATCH v2] qemu: Move qemuExtDevicesStop() before removing the pidfiles
by Masayoshi Mizuma 11 Nov '20

11 Nov '20

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> A qemu guest which has virtiofs config fails to start if the previous starting failed because of invalid option or something. That's because the virtiofsd isn't killed by virPidFileForceCleanupPath() on the former failure because the pidfile was already removed by virFileDeleteTree(priv->libDir) in qemuProcessStop(), so virPidFileForceCleanupPath() just returned. Move qemuExtDevicesStop() before virFileDeleteTree(priv->libDir) so that virPidFileForceCleanupPath() can kill virtiofsd correctly. For example of the reproduction: # virsh start guest error: Failed to start domain guest error: internal error: process exited while connecting to monitor: qemu-system-x86_64: -foo: invalid option ... fix the option ... # virsh start guest error: Failed to start domain guest error: Cannot open log file: '/var/log/libvirt/qemu/guest-fs0-virtiofsd.log': Device or resource busy # Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0a36b49c85..1963de9fb8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7638,6 +7638,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, /* Do this before we delete the tree and remove pidfile. */ qemuProcessKillManagedPRDaemon(vm); + qemuExtDevicesStop(driver, vm); + virFileDeleteTree(priv->libDir); virFileDeleteTree(priv->channelTargetDir); @@ -7654,8 +7656,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuDomainCleanupRun(driver, vm); - qemuExtDevicesStop(driver, vm); - qemuDBusStop(driver, vm); vm->def->id = -1; -- 2.27.0

2 1

[PATCH v7 0/4] qemu: Support rbd namespace in rbd source name
by Han Han 11 Nov '20

11 Nov '20

Diff from v6: rebase to 6.9.0 v6: https://www.redhat.com/archives/libvir-list/2020-October/msg00707.html gitlab repo: https://gitlab.com/hhan2/libvirt/-/commits/rbd-namespace-v7 Han Han (4): qemu_capabilities: Add QEMU_CAPS_RBD_NAMESPACE util: Add member ns to the storage source struct conf: Support to parse rbd namespace from source name qemu: Implement rbd namespace to the source name attribute docs/formatdomain.rst | 16 ++++++ src/conf/domain_conf.c | 47 ++++++++++++++++-- src/qemu/qemu_block.c | 1 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_domain.c | 8 +++ src/util/virstoragefile.c | 2 + src/util/virstoragefile.h | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + ...k-network-rbd-namespace.x86_64-latest.args | 49 +++++++++++++++++++ .../disk-network-rbd-namespace.xml | 40 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...sk-network-rbd-namespace.x86_64-latest.xml | 49 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 19 files changed, 224 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86_64-latest.xml -- 2.28.0

2 7

[PATCH v2 0/2] Support mdev_types on CSS devices
by Boris Fiuczynski 11 Nov '20

11 Nov '20

All refactoring patches of this series in v1 were accepted except for actual patch enabling the mdev_types support on CSS devices. v2 adds one more refactoring patch in docs before the already sent enablement patch follows again. Boris Fiuczynski (2): docs: refactor mdev_types into new paragraph node_device: detecting mdev_types capability on CSS devices docs/drvnodedev.html.in | 5 +- docs/formatnode.html.in | 85 +++++++++++------ docs/schemas/nodedev.rng | 4 + src/conf/node_device_conf.c | 92 ++++++++++++++++++- src/conf/node_device_conf.h | 11 +++ src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 3 + .../css_0_0_fffe_mdev_types.xml | 17 ++++ tests/nodedevxml2xmltest.c | 1 + 10 files changed, 192 insertions(+), 34 deletions(-) create mode 100644 tests/nodedevschemadata/css_0_0_fffe_mdev_types.xml -- 2.26.2

3 8

[PATCH 1/8] Added a few attach-disk parameters
by Ryan Gahagan 11 Nov '20

11 Nov '20

Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- tools/virsh-domain.c | 76 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 12b35c037d..16227085cc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -224,6 +224,26 @@ static const vshCmdOptDef opts_attach_disk[] = { .flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, .help = N_("source of disk device") }, + {.name = "source-protocol", + .type = VSH_OT_STRING, + .help = N_("protocol used by disk device source") + } + {.name = "source-name", + .type = VSH_OT_STRING, + .help = N_("name of disk device source") + }, + {.name = "source-host-name", + .type = VSH_OT_STRING, + .help = N_("host name for source of disk device") + }, + {.name = "source-host-transport", + .type = VSH_OT_STRING, + .help = N_("host transport for source of disk device") + }, + {.name = "source-host-socket", + .type = VSH_OT_STRING, + .help = N_("host socket for source of disk device") + }, {.name = "target", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, @@ -562,11 +582,13 @@ static bool cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *source = NULL, *target = NULL, *driver = NULL, - *subdriver = NULL, *type = NULL, *mode = NULL, - *iothread = NULL, *cache = NULL, *io = NULL, - *serial = NULL, *straddr = NULL, *wwn = NULL, - *targetbus = NULL, *alias = NULL; + const char *source = NULL, *source_name = NULL, *source_protocol = NULL, + *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, + *mode = NULL, *iothread = NULL, *cache = NULL, + *io = NULL, *serial = NULL, *straddr = NULL, + *wwn = NULL, *targetbus = NULL, *alias = NULL, + *host_name = NULL, *host_transport = NULL, + *host_port = NULL, *host_socket = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -591,6 +613,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-name", &source_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-protocol", &source_protocol) < 0 || vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || vshCommandOptStringReq(ctl, cmd, "driver", &driver) < 0 || vshCommandOptStringReq(ctl, cmd, "subdriver", &subdriver) < 0 || @@ -604,7 +628,10 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || - vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) + vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-name", &host_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) goto cleanup; if (!stype) { @@ -659,9 +686,42 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "/>\n"); } - if (source) - virBufferAsprintf(&buf, "<source %s='%s'/>\n", + if (source || source_protocol || source_name || + host_name || host_transport || host_socket) { + virBufferAsprintf(&buf, "<source"); + + if (source) + virBufferAsprintf(&buf, " %s='%s'", isFile ? "file" : "dev", source); + if (source_protocol) + virBufferAsprintf(&buf, " protocol='%s'", source_protocol); + if (source_name) + virBufferAsprintf(&buf, " name='%s'", source_name); + + if (host_name || host_transport || host_socket) { + virBufferAsprintf(">\n<host"); + + if (host_name) { + host_port = strchr(host_name, ':'); + + if (!host_port) + virBufferAsprintf(" name='%s'", host_name); + else { + host_name[host_port - host_name] = '\0'; + virBufferAsprintf(" name='%s' port='%s'", host_name, host_port + 1); + } + } + if (host_transport) + virBufferAsprintf(" transport='%s'", host_transport); + if (host_socket) + virBufferAsprintf(" socket='%s'", host_socket); + + virBufferAsprintf(" />\n</source>\n"); + } else { + virBufferAsprintf(" />\n"); + } + } + virBufferAsprintf(&buf, "<target dev='%s'", target); if (targetbus) virBufferAsprintf(&buf, " bus='%s'", targetbus); -- 2.29.0

3 12

[libvirt] [PATCH v2 00/13] virsh completion improvement
by Lin Ma 10 Nov '20

10 Nov '20

Add more bash completions for some of virsh subcommands/subparameters. v1->v2 * Follow Michal's suggestions: - guestvcpus command: complete offlined vCPUs if --enable, complete onlined vCPUs if --disable - Added a static helper function for interface string provider, - Adjusted some needlessly complicated loops. * Refered to Peter and Michal's comments, I droped the vnc completion patches. * Concentrate on completion itself, Drop all of patches which related to macros to make review easier. Lin Ma (13): virsh: Add vcpu list completion to guestvcpus command virsh: Add logical CPU IDs completion for nodecpustats command virsh: Add serial/parallel device name completion to console command virsh-interface: Add a static helper virshInterfaceStringHelper virsh: Add interface mac completion to iface-name command virsh: Add interface name completion to iface-bridge command virsh: Add interface name completion to iface-mac command vsh: Fix completion error in case of multiple mac addresses virsh: Add mac completion to net-dhcp-leases command virsh: Move/add some of function declarations to virsh-domain.h virsh: Add signal name completion to send-process-signal command virsh: Add lifecycle type completion to set-lifecycle-action command Add lifecycle action completion to set-lifecycle-action command tools/bash-completion/vsh | 1 + tools/virsh-completer-domain.c | 190 ++++++++++++++++++++++++++++++ tools/virsh-completer-domain.h | 20 ++++ tools/virsh-completer-host.c | 31 +++++ tools/virsh-completer-host.h | 4 + tools/virsh-completer-interface.c | 34 ++++-- tools/virsh-completer-interface.h | 7 ++ tools/virsh-completer-network.c | 44 +++++++ tools/virsh-completer-network.h | 4 + tools/virsh-domain.c | 6 +- tools/virsh-domain.h | 4 + tools/virsh-host.c | 1 + tools/virsh-interface.c | 3 + tools/virsh-network.c | 15 ++- 14 files changed, 349 insertions(+), 15 deletions(-) -- 2.26.0

2 20

[libvirt PATCH] qemu: add qemuAgentSSH{Add,Remove,Get}AuthorizedKeys
by marcandre.lureau＠redhat.com 10 Nov '20

10 Nov '20

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> In QEMU 5.2, the guest agent learned to manipulate a user ~/.ssh/authorized_keys. Bind the JSON API to libvirt. https://wiki.qemu.org/ChangeLog/5.2#Guest_agent Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1888537 Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- src/qemu/qemu_agent.c | 158 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 26 +++++++ tests/qemuagenttest.c | 80 +++++++++++++++++++++ 3 files changed, 264 insertions(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 7fbb4a9431..75e7fea9e4 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2496,3 +2496,161 @@ qemuAgentSetResponseTimeout(qemuAgentPtr agent, { agent->timeout = timeout; } + +void qemuAgentSSHAuthorizedKeyFree(qemuAgentSSHAuthorizedKeyPtr key) +{ + if (!key) + return; + + g_free(key->key); + g_free(key); +} + +/* Returns: 0 on success + * -2 when agent command is not supported by the agent and + * 'report_unsupported' is false (libvirt error is not reported) + * -1 otherwise (libvirt error is reported) + */ +int qemuAgentSSHGetAuthorizedKeys(qemuAgentPtr agent, + const char *user, + qemuAgentSSHAuthorizedKeyPtr **keys, + bool report_unsupported) +{ + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; + virJSONValuePtr data = NULL; + size_t ndata; + size_t i; + int rc; + qemuAgentSSHAuthorizedKeyPtr *keys_ret = NULL; + + if (!(cmd = qemuAgentMakeCommand("guest-ssh-get-authorized-keys", + "s:username", user, + NULL))) + return -1; + + if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported)) < 0) + return rc; + + if (!(data = virJSONValueObjectGetArray(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu agent didn't return an array of keys")); + return -1; + } + ndata = virJSONValueArraySize(data); + + keys_ret = g_new0(qemuAgentSSHAuthorizedKeyPtr, ndata); + + for (i = 0; i < ndata; i++) { + virJSONValuePtr entry = virJSONValueArrayGet(data, i); + + if (!entry) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("array element missing in guest-ssh-get-authorized-keys return " + "value")); + goto cleanup; + } + + keys_ret[i] = g_new0(qemuAgentSSHAuthorizedKey, 1); + keys_ret[i]->key = g_strdup(virJSONValueGetString(entry)); + } + + *keys = g_steal_pointer(&keys_ret); + return ndata; + + cleanup: + if (keys_ret) { + for (i = 0; i < ndata; i++) + qemuAgentSSHAuthorizedKeyFree(keys_ret[i]); + g_free(keys_ret); + } + return -1; +} + +static virJSONValuePtr +makeJSONArrayFromKeys(qemuAgentSSHAuthorizedKeyPtr *keys, + size_t nkeys) +{ + g_autoptr(virJSONValue) jkeys = NULL; + size_t i; + + jkeys = virJSONValueNewArray(); + + for (i = 0; i < nkeys; i++) { + qemuAgentSSHAuthorizedKeyPtr k = keys[i]; + + if (virJSONValueArrayAppendString(jkeys, k->key) < 0) + return NULL; + } + + return g_steal_pointer(&jkeys); +} + +/* Returns: 0 on success + * -2 when agent command is not supported by the agent and + * 'report_unsupported' is false (libvirt error is not reported) + * -1 otherwise (libvirt error is reported) + */ +int qemuAgentSSHAddAuthorizedKeys(qemuAgentPtr agent, + const char *user, + qemuAgentSSHAuthorizedKeyPtr *keys, + size_t nkeys, + bool reset, + bool report_unsupported) +{ + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) jkeys = NULL; + int rc; + + jkeys = makeJSONArrayFromKeys(keys, nkeys); + if (jkeys == NULL) + return -1; + + if (!(cmd = qemuAgentMakeCommand("guest-ssh-add-authorized-keys", + "s:username", user, + "a:keys", &jkeys, + "b:reset", reset, + NULL))) + return -1; + + if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported)) < 0) + return rc; + + return 0; +} + +/* Returns: 0 on success + * -2 when agent command is not supported by the agent and + * 'report_unsupported' is false (libvirt error is not reported) + * -1 otherwise (libvirt error is reported) + */ +int qemuAgentSSHRemoveAuthorizedKeys(qemuAgentPtr agent, + const char *user, + qemuAgentSSHAuthorizedKeyPtr *keys, + size_t nkeys, + bool report_unsupported) +{ + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; + g_autoptr(virJSONValue) jkeys = NULL; + int rc; + + jkeys = makeJSONArrayFromKeys(keys, nkeys); + if (jkeys == NULL) + return -1; + + if (!(cmd = qemuAgentMakeCommand("guest-ssh-remove-authorized-keys", + "s:username", user, + "a:keys", &jkeys, + NULL))) + return -1; + + if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported)) < 0) + return rc; + + return 0; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 2eeb376a68..3e70a55c19 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -67,6 +67,12 @@ typedef enum { QEMU_AGENT_SHUTDOWN_LAST, } qemuAgentShutdownMode; +typedef struct _qemuAgentSSHAuthorizedKey qemuAgentSSHAuthorizedKey; +typedef qemuAgentSSHAuthorizedKey *qemuAgentSSHAuthorizedKeyPtr; +struct _qemuAgentSSHAuthorizedKey { + char *key; +}; + typedef struct _qemuAgentDiskInfo qemuAgentDiskInfo; typedef qemuAgentDiskInfo *qemuAgentDiskInfoPtr; struct _qemuAgentDiskInfo { @@ -170,3 +176,23 @@ int qemuAgentGetTimezone(qemuAgentPtr mon, void qemuAgentSetResponseTimeout(qemuAgentPtr mon, int timeout); + +void qemuAgentSSHAuthorizedKeyFree(qemuAgentSSHAuthorizedKeyPtr key); + +int qemuAgentSSHGetAuthorizedKeys(qemuAgentPtr agent, + const char *user, + qemuAgentSSHAuthorizedKeyPtr **keys, + bool report_unsupported); + +int qemuAgentSSHAddAuthorizedKeys(qemuAgentPtr agent, + const char *user, + qemuAgentSSHAuthorizedKeyPtr *keys, + size_t nkeys, + bool reset, + bool report_unsupported); + +int qemuAgentSSHRemoveAuthorizedKeys(qemuAgentPtr agent, + const char *user, + qemuAgentSSHAuthorizedKeyPtr *keys, + size_t nkeys, + bool report_unsupported); diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 607bd97b5c..eda688850f 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -35,6 +35,85 @@ virQEMUDriver driver; +static int +testQemuAgentSSHKeys(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + qemuAgentSSHAuthorizedKeyPtr *keys = NULL; + int nkeys = 0, i; + int ret = -1; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-ssh-get-authorized-keys", + "{ \"return\" : [\"algo1 key1 comments1\"," + " \"algo2 key2 comments2\"] }") < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-ssh-add-authorized-keys", + "{ \"return\" : {} }") < 0) + goto cleanup; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-ssh-remove-authorized-keys", + "{ \"return\" : {} }") < 0) + goto cleanup; + + if ((nkeys = qemuAgentSSHGetAuthorizedKeys(qemuMonitorTestGetAgent(test), + "user", + &keys, + true)) < 0) + goto cleanup; + + if (nkeys != 2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 2 keys, got %d", nkeys); + ret = -1; + goto cleanup; + } + + if (STRNEQ(keys[1]->key, "algo2 key2 comments2")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "Unexpected key returned: %s", keys[1]->key); + ret = -1; + goto cleanup; + } + + if ((ret = qemuAgentSSHAddAuthorizedKeys(qemuMonitorTestGetAgent(test), + "user", + keys, + nkeys, + true, + true)) < 0) + goto cleanup; + + if ((ret = qemuAgentSSHRemoveAuthorizedKeys(qemuMonitorTestGetAgent(test), + "user", + keys, + nkeys, + true)) < 0) + goto cleanup; + + ret = 0; + + cleanup: + for (i = 0; i < nkeys; i++) + qemuAgentSSHAuthorizedKeyFree(keys[i]); + VIR_FREE(keys); + qemuMonitorTestFree(test); + return ret; +} + + static int testQemuAgentFSFreeze(const void *data) { @@ -1315,6 +1394,7 @@ mymain(void) DO_TEST(Users); DO_TEST(OSInfo); DO_TEST(Timezone); + DO_TEST(SSHKeys); DO_TEST(Timeout); /* Timeout should always be called last */ -- 2.29.0

3 2

[libvirt] [PATCH 00/19] virsh completion improvement
by Lin Ma 10 Nov '20

10 Nov '20

Lin Ma (19): virsh: Add current vcpu list completion to guestvcpus command virsh: Add logical CPU IDs completion for nodecpustats command virsh: Add serial/parallel device name completion to console command virsh: Rename virshInterfaceNameCompleter to virshInterfaceCompleter virsh: create a macro with a _FULL suffix for common --interface option virsh: Add interface name completion to iface-bridge command virsh: Add interface name completion to iface-mac command virsh: Add interface mac completion to iface-name command virdomainobjlist: Add vnc into filter group to check the vnc existence of guest virsh: Only return domains that have VNC display to vncdisplay command vsh: Fix completion error in case of multiple mac addresses virsh: Add mac completion to net-dhcp-leases command virsh-domain: Introduce 2 macros for domain options 'interface' and 'mac' virsh-domain: Apply macro VIRSH_DOMAIN_OPT_INTERFACE for interface option virsh-domain: Apply macro VIRSH_DOMAIN_OPT_MAC for mac option virsh: Move/add some of function declarations to virsh-domain.h virsh: Add signal name completion to send-process-signal command virsh: Add lifecycle type completion to set-lifecycle-action command virsh: Add lifecycle action completion to set-lifecycle-action command include/libvirt/libvirt-domain.h | 3 + src/conf/virdomainobjlist.c | 15 +++ src/conf/virdomainobjlist.h | 7 +- tools/bash-completion/vsh | 1 + tools/virsh-completer-domain.c | 153 +++++++++++++++++++++++++++++- tools/virsh-completer-domain.h | 20 ++++ tools/virsh-completer-host.c | 35 +++++++ tools/virsh-completer-host.h | 4 + tools/virsh-completer-interface.c | 19 ++-- tools/virsh-completer-interface.h | 10 +- tools/virsh-completer-network.c | 45 +++++++++ tools/virsh-completer-network.h | 4 + tools/virsh-domain-monitor.c | 20 +--- tools/virsh-domain-monitor.h | 1 + tools/virsh-domain.c | 30 ++---- tools/virsh-domain.h | 22 +++++ tools/virsh-host.c | 1 + tools/virsh-interface.c | 39 ++++---- tools/virsh-network.c | 15 ++- 19 files changed, 367 insertions(+), 77 deletions(-) -- 2.26.0

4 30

[PATCH] util: convert char pointers to use g_autofree
by Ryan Gahagan 10 Nov '20

10 Nov '20

From: Barrett Schonefeld <bschoney(a)utexas.edu> additional conversions to the GLib API in src/util per issue #11. files updated are: - src/util/vircgroupv1.c - src/util/virhostcpu.c - src/util/virlockspace.c - src/util/virmacmap.c - src/util/virresctrl.c - src/util/virsysinfo.c Related issue: https://gitlab.com/libvirt/libvirt/-/issues/11 Signed-off-by: bschoney <bschoney(a)utexas.edu> Signed-off-by: Barrett Schonefeld <bschoney(a)utexas.edu> --- src/util/vircgroupv1.c | 3 +-- src/util/virhostcpu.c | 4 +--- src/util/virlockspace.c | 6 ++---- src/util/virmacmap.c | 3 +-- src/util/virresctrl.c | 25 ++++++++----------------- src/util/virsysinfo.c | 9 +++------ 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 731e9d61d4..984cd50409 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1549,7 +1549,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, unsigned long long *unevictable) { int ret = -1; - char *stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1614,7 +1614,6 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, ret = 0; cleanup: - VIR_FREE(stat); return ret; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c531d65f86..4f6c3390ce 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -87,7 +87,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, int *nparams) { const char *sysctl_name; - long *cpu_times; + g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; int cpu_times_num, offset, hz, stathz, ret = -1; @@ -172,8 +172,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, ret = 0; cleanup: - VIR_FREE(cpu_times); - return ret; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index b90e13f506..71d5dfb83e 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -515,7 +515,7 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -538,7 +538,6 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } @@ -547,7 +546,7 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -575,7 +574,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index f9047d0fb1..e68742de10 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -129,7 +129,7 @@ static int virMacMapLoadFile(virMacMapPtr mgr, const char *file) { - char *map_str = NULL; + g_autofree char *map_str = NULL; virJSONValuePtr map = NULL; int map_str_len = 0; size_t i; @@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr, ret = 0; cleanup: - VIR_FREE(map_str); virJSONValueFree(map); return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index d3087b98c1..1c2d175295 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -709,7 +709,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) { int ret = -1; int rv = -1; - char *featurestr = NULL; + g_autofree char *featurestr = NULL; char **features = NULL; size_t nfeatures = 0; virResctrlInfoMongrpPtr info_monitor = NULL; @@ -771,7 +771,6 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) ret = 0; cleanup: - VIR_FREE(featurestr); g_strfreev(features); VIR_FREE(info_monitor); return ret; @@ -1736,7 +1735,7 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, const char *groupname, virResctrlAllocPtr *alloc) { - char *schemata = NULL; + g_autofree char *schemata = NULL; int rv = virFileReadValueString(&schemata, SYSFS_RESCTRL_PATH "/%s/schemata", groupname); @@ -1753,11 +1752,9 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, if (virResctrlAllocParse(resctrl, *alloc, schemata) < 0) goto error; - VIR_FREE(schemata); return 0; error: - VIR_FREE(schemata); virObjectUnref(*alloc); *alloc = NULL; return -1; @@ -2354,8 +2351,8 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, const char *machinename) { - char *schemata_path = NULL; - char *alloc_str = NULL; + g_autofree char *schemata_path = NULL; + g_autofree char *alloc_str = NULL; int ret = -1; int lockfd = -1; @@ -2403,8 +2400,6 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, ret = 0; cleanup: virResctrlUnlock(lockfd); - VIR_FREE(alloc_str); - VIR_FREE(schemata_path); return ret; } @@ -2413,8 +2408,8 @@ static int virResctrlAddPID(const char *path, pid_t pid) { - char *tasks = NULL; - char *pidstr = NULL; + g_autofree char *tasks = NULL; + g_autofree char *pidstr = NULL; int ret = 0; if (!path) { @@ -2436,8 +2431,6 @@ virResctrlAddPID(const char *path, ret = 0; cleanup: - VIR_FREE(tasks); - VIR_FREE(pidstr); return ret; } @@ -2657,8 +2650,8 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, size_t i = 0; unsigned long long val = 0; g_autoptr(DIR) dirp = NULL; - char *datapath = NULL; - char *filepath = NULL; + g_autofree char *datapath = NULL; + g_autofree char *filepath = NULL; struct dirent *ent = NULL; virResctrlMonitorStatsPtr stat = NULL; @@ -2737,8 +2730,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, ret = 0; cleanup: - VIR_FREE(datapath); - VIR_FREE(filepath); virResctrlMonitorStatsFree(stat); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 217f842a37..e1336bf566 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -532,9 +532,9 @@ static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { const char *tmp_base; - char *manufacturer = NULL; - char *procline = NULL; - char *ncpu = NULL; + g_autofree char *manufacturer = NULL; + g_autofree char *procline = NULL; + g_autofree char *ncpu = NULL; int result = -1; virSysinfoProcessorDefPtr processor; @@ -593,9 +593,6 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) result = 0; error: - VIR_FREE(manufacturer); - VIR_FREE(procline); - VIR_FREE(ncpu); return result; } -- 2.29.0

3 2

[libvirt PATCH] virgdbus: fix getting non-shared DBus connection
by Pavel Hrdina 09 Nov '20

09 Nov '20

We need to pass some flags in order to properly initialize the connection otherwise it will not work. This copies what GLib does for g_bus_get_sync() internally. This fixes an issue with LXC driver where libvirt was not able to register any VM with machined. Reported-by: Matthias Maier <tamiko(a)gentoo.org> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virgdbus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virgdbus.c b/src/util/virgdbus.c index 19fd7e2fe4..4ad1a5c842 100644 --- a/src/util/virgdbus.c +++ b/src/util/virgdbus.c @@ -54,11 +54,15 @@ virGDBusBusInit(GBusType type, GError **error) if (sharedBus) { return g_bus_get_sync(type, NULL, error); } else { + GDBusConnectionFlags dbusFlags = + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT | + G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION; + address = g_dbus_address_get_for_bus_sync(type, NULL, error); if (*error) return NULL; return g_dbus_connection_new_for_address_sync(address, - G_DBUS_CONNECTION_FLAGS_NONE, + dbusFlags, NULL, NULL, error); -- 2.26.2

2 1

[PATCH] domain_conf: make virDomainDiskSetSource() void
by Matt Coleman 09 Nov '20

09 Nov '20

The function only returns zero or aborts, so it might as well be void. This has the added benefit of simplifying the code that calls it. Signed-off-by: Matt Coleman <matt(a)datto.com> --- src/conf/domain_conf.c | 3 +-- src/conf/domain_conf.h | 3 +-- src/libxl/libxl_driver.c | 6 ++---- src/libxl/xen_xl.c | 3 +-- src/libxl/xen_xm.c | 13 ++++--------- src/lxc/lxc_controller.c | 13 ++----------- src/vbox/vbox_common.c | 6 +----- src/vmx/vmx.c | 36 ++++++++++++------------------------ src/vz/vz_sdk.c | 4 ++-- 9 files changed, 26 insertions(+), 61 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7696b12ef9..5c8ec19da8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2241,13 +2241,12 @@ virDomainDiskGetSource(virDomainDiskDef const *def) } -int +void virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src) { char *tmp = g_strdup(src); g_free(def->src->path); def->src->path = tmp; - return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8a487e9de3..c164b28ea1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3040,8 +3040,7 @@ void virDomainLeaseDefFree(virDomainLeaseDefPtr def); int virDomainDiskGetType(virDomainDiskDefPtr def); void virDomainDiskSetType(virDomainDiskDefPtr def, int type); const char *virDomainDiskGetSource(virDomainDiskDef const *def); -int virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src) - G_GNUC_WARN_UNUSED_RESULT; +void virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src); void virDomainDiskEmptySource(virDomainDiskDefPtr def); const char *virDomainDiskGetDriver(const virDomainDiskDef *def); int virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 824ed60dfd..00a74dcb49 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3022,8 +3022,7 @@ libxlDomainChangeEjectableMedia(virDomainObjPtr vm, virDomainDiskDefPtr disk) goto cleanup; } - if (virDomainDiskSetSource(origdisk, virDomainDiskGetSource(disk)) < 0) - goto cleanup; + virDomainDiskSetSource(origdisk, virDomainDiskGetSource(disk)); virDomainDiskSetType(origdisk, virDomainDiskGetType(disk)); virDomainDiskDefFree(disk); @@ -4084,8 +4083,7 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) return -1; } - if (virDomainDiskSetSource(orig, virDomainDiskGetSource(disk)) < 0) - return -1; + virDomainDiskSetSource(orig, virDomainDiskGetSource(disk)); virDomainDiskSetType(orig, virDomainDiskGetType(disk)); virDomainDiskSetFormat(orig, virDomainDiskGetFormat(disk)); if (virDomainDiskSetDriver(orig, virDomainDiskGetDriver(disk)) < 0) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 74f48e4117..d195f866c5 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -641,8 +641,7 @@ xenParseXLDiskSrc(virDomainDiskDefPtr disk, char *srcstr) disk->src->protocol = VIR_STORAGE_NET_PROTOCOL_RBD; ret = virStorageSourceParseRBDColonString(tmpstr, disk->src); } else { - if (virDomainDiskSetSource(disk, srcstr) < 0) - goto cleanup; + virDomainDiskSetSource(disk, srcstr); ret = 0; } diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 9063a43135..283ed1ee8b 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -129,14 +129,11 @@ xenParseXMDisk(char *entry, int hvm) if (offset == head) { /* No source file given, eg CDROM with no media */ - ignore_value(virDomainDiskSetSource(disk, NULL)); + virDomainDiskSetSource(disk, NULL); } else { tmp = g_strndup(head, offset - head); - if (virDomainDiskSetSource(disk, tmp) < 0) { - VIR_FREE(tmp); - goto error; - } + virDomainDiskSetSource(disk, tmp); VIR_FREE(tmp); } @@ -175,8 +172,7 @@ xenParseXMDisk(char *entry, int hvm) VIR_FREE(tmp); /* Strip the prefix we found off the source file name */ - if (virDomainDiskSetSource(disk, src + len + 1) < 0) - goto error; + virDomainDiskSetSource(disk, src + len + 1); src = virDomainDiskGetSource(disk); } @@ -206,8 +202,7 @@ xenParseXMDisk(char *entry, int hvm) } /* Strip the prefix we found off the source file name */ - if (virDomainDiskSetSource(disk, src + len + 1) < 0) - goto error; + virDomainDiskSetSource(disk, src + len + 1); src = virDomainDiskGetSource(disk); } } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 4f77a6ace8..97de0408b6 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -479,7 +479,6 @@ static int virLXCControllerSetupLoopDeviceDisk(virDomainDiskDefPtr disk) int lofd; g_autofree char *loname = NULL; const char *src = virDomainDiskGetSource(disk); - int ret = -1; if ((lofd = virFileLoopDeviceAssociate(src, &loname)) < 0) return -1; @@ -492,14 +491,7 @@ static int virLXCControllerSetupLoopDeviceDisk(virDomainDiskDefPtr disk) * the rest of container setup 'just works' */ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK); - if (virDomainDiskSetSource(disk, loname) < 0) - goto cleanup; - - ret = 0; - - cleanup: - if (ret < 0) - VIR_FORCE_CLOSE(lofd); + virDomainDiskSetSource(disk, loname); return lofd; @@ -561,8 +553,7 @@ static int virLXCControllerSetupNBDDeviceDisk(virDomainDiskDefPtr disk) * the rest of container setup 'just works' */ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK); - if (virDomainDiskSetSource(disk, dev) < 0) - return -1; + virDomainDiskSetSource(disk, dev); return 0; } diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index d072ca8015..26168c3c5b 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3309,11 +3309,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) VBOX_UTF16_TO_UTF8(mediumLocUtf16, &mediumLocUtf8); - if (virDomainDiskSetSource(disk, mediumLocUtf8) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not set disk source")); - goto cleanup; - } + virDomainDiskSetSource(disk, mediumLocUtf8); rc = gVBoxAPI.UIMedium.GetReadOnly(medium, &readOnly); if (NS_FAILED(rc)) { diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 5fac290a5e..4001174380 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2410,10 +2410,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); if (!(tmp = ctx->parseFileName(fileName, ctx->opaque))) goto cleanup; - if (virDomainDiskSetSource(*def, tmp) < 0) { - VIR_FREE(tmp); - goto cleanup; - } + virDomainDiskSetSource(*def, tmp); VIR_FREE(tmp); (*def)->cachemode = writeThrough ? VIR_DOMAIN_DISK_CACHE_WRITETHRU : VIR_DOMAIN_DISK_CACHE_DEFAULT; @@ -2450,19 +2447,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); if (!(tmp = ctx->parseFileName(fileName, ctx->opaque))) goto cleanup; - if (virDomainDiskSetSource(*def, tmp) < 0) { - VIR_FREE(tmp); - goto cleanup; - } + virDomainDiskSetSource(*def, tmp); VIR_FREE(tmp); } else if (deviceType && STRCASEEQ(deviceType, "atapi-cdrom")) { virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); if (fileName && STRCASEEQ(fileName, "auto detect")) { - ignore_value(virDomainDiskSetSource(*def, NULL)); + virDomainDiskSetSource(*def, NULL); (*def)->startupPolicy = VIR_DOMAIN_STARTUP_POLICY_OPTIONAL; - } else if (virDomainDiskSetSource(*def, fileName) < 0) { - goto cleanup; + } else { + virDomainDiskSetSource(*def, fileName); } } else if (deviceType && STRCASEEQ(deviceType, "cdrom-raw")) { /* Raw access CD-ROMs actually are device='lun' */ @@ -2470,10 +2464,10 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); if (fileName && STRCASEEQ(fileName, "auto detect")) { - ignore_value(virDomainDiskSetSource(*def, NULL)); + virDomainDiskSetSource(*def, NULL); (*def)->startupPolicy = VIR_DOMAIN_STARTUP_POLICY_OPTIONAL; - } else if (virDomainDiskSetSource(*def, fileName) < 0) { - goto cleanup; + } else { + virDomainDiskSetSource(*def, fileName); } } else if (busType == VIR_DOMAIN_DISK_BUS_SCSI && deviceType && STRCASEEQ(deviceType, "scsi-passthru")) { @@ -2481,9 +2475,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con /* SCSI-passthru CD-ROMs actually are device='lun' */ (*def)->device = VIR_DOMAIN_DISK_DEVICE_LUN; virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); - - if (virDomainDiskSetSource(*def, fileName) < 0) - goto cleanup; + virDomainDiskSetSource(*def, fileName); } else { /* * This function was called in order to parse a CDROM device, @@ -2502,7 +2494,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con } virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); - ignore_value(virDomainDiskSetSource(*def, NULL)); + virDomainDiskSetSource(*def, NULL); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -2514,18 +2506,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { if (fileType != NULL && STRCASEEQ(fileType, "device")) { virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); - if (virDomainDiskSetSource(*def, fileName) < 0) - goto cleanup; + virDomainDiskSetSource(*def, fileName); } else if (fileType != NULL && STRCASEEQ(fileType, "file")) { char *tmp = NULL; virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); if (fileName && !(tmp = ctx->parseFileName(fileName, ctx->opaque))) goto cleanup; - if (virDomainDiskSetSource(*def, tmp) < 0) { - VIR_FREE(tmp); - goto cleanup; - } + virDomainDiskSetSource(*def, tmp); VIR_FREE(tmp); } else { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7877974628..6a0ab5c862 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -674,8 +674,8 @@ prlsdkGetDiskInfo(vzDriverPtr driver, if (!(buf = prlsdkGetStringParamVar(PrlVmDev_GetFriendlyName, prldisk))) goto cleanup; - if (*buf != '\0' && virDomainDiskSetSource(disk, buf) < 0) - goto cleanup; + if (*buf != '\0') + virDomainDiskSetSource(disk, buf); if (prlsdkGetDiskId(prldisk, &disk->bus, &disk->dst) < 0) goto cleanup; -- 2.27.0

4 5

[PATCH] convert char pointers to use g_autofree
by Ryan Gahagan 09 Nov '20

09 Nov '20

From: bschoney <bschoney(a)utexas.edu> additional conversions to the GLib API in src/util per issue #11. Please let me know if there are additional changes I should make in the files updated so far. I intend to submit work on additional files, and I want to be sure the changes so far are correct. Related issue: https://gitlab.com/libvirt/libvirt/-/issues/11 Signed-off-by: bschoney <bschoney(a)utexas.edu> --- src/util/vircgroupv1.c | 3 +-- src/util/virhostcpu.c | 4 +--- src/util/virlockspace.c | 6 ++---- src/util/virmacmap.c | 3 +-- src/util/virresctrl.c | 25 ++++++++----------------- src/util/virsysinfo.c | 9 +++------ 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 731e9d61d4..984cd50409 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1549,7 +1549,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, unsigned long long *unevictable) { int ret = -1; - char *stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1614,7 +1614,6 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, ret = 0; cleanup: - VIR_FREE(stat); return ret; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c531d65f86..4f6c3390ce 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -87,7 +87,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, int *nparams) { const char *sysctl_name; - long *cpu_times; + g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; int cpu_times_num, offset, hz, stathz, ret = -1; @@ -172,8 +172,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, ret = 0; cleanup: - VIR_FREE(cpu_times); - return ret; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 2731d46dfc..c88a24be36 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -515,7 +515,7 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -538,7 +538,6 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } @@ -547,7 +546,7 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -575,7 +574,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 2d203e72af..70b148acac 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -129,7 +129,7 @@ static int virMacMapLoadFile(virMacMapPtr mgr, const char *file) { - char *map_str = NULL; + g_autofree char *map_str = NULL; virJSONValuePtr map = NULL; int map_str_len = 0; size_t i; @@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr, ret = 0; cleanup: - VIR_FREE(map_str); virJSONValueFree(map); return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index d3087b98c1..1c2d175295 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -709,7 +709,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) { int ret = -1; int rv = -1; - char *featurestr = NULL; + g_autofree char *featurestr = NULL; char **features = NULL; size_t nfeatures = 0; virResctrlInfoMongrpPtr info_monitor = NULL; @@ -771,7 +771,6 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) ret = 0; cleanup: - VIR_FREE(featurestr); g_strfreev(features); VIR_FREE(info_monitor); return ret; @@ -1736,7 +1735,7 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, const char *groupname, virResctrlAllocPtr *alloc) { - char *schemata = NULL; + g_autofree char *schemata = NULL; int rv = virFileReadValueString(&schemata, SYSFS_RESCTRL_PATH "/%s/schemata", groupname); @@ -1753,11 +1752,9 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, if (virResctrlAllocParse(resctrl, *alloc, schemata) < 0) goto error; - VIR_FREE(schemata); return 0; error: - VIR_FREE(schemata); virObjectUnref(*alloc); *alloc = NULL; return -1; @@ -2354,8 +2351,8 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, const char *machinename) { - char *schemata_path = NULL; - char *alloc_str = NULL; + g_autofree char *schemata_path = NULL; + g_autofree char *alloc_str = NULL; int ret = -1; int lockfd = -1; @@ -2403,8 +2400,6 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, ret = 0; cleanup: virResctrlUnlock(lockfd); - VIR_FREE(alloc_str); - VIR_FREE(schemata_path); return ret; } @@ -2413,8 +2408,8 @@ static int virResctrlAddPID(const char *path, pid_t pid) { - char *tasks = NULL; - char *pidstr = NULL; + g_autofree char *tasks = NULL; + g_autofree char *pidstr = NULL; int ret = 0; if (!path) { @@ -2436,8 +2431,6 @@ virResctrlAddPID(const char *path, ret = 0; cleanup: - VIR_FREE(tasks); - VIR_FREE(pidstr); return ret; } @@ -2657,8 +2650,8 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, size_t i = 0; unsigned long long val = 0; g_autoptr(DIR) dirp = NULL; - char *datapath = NULL; - char *filepath = NULL; + g_autofree char *datapath = NULL; + g_autofree char *filepath = NULL; struct dirent *ent = NULL; virResctrlMonitorStatsPtr stat = NULL; @@ -2737,8 +2730,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, ret = 0; cleanup: - VIR_FREE(datapath); - VIR_FREE(filepath); virResctrlMonitorStatsFree(stat); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 217f842a37..e1336bf566 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -532,9 +532,9 @@ static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { const char *tmp_base; - char *manufacturer = NULL; - char *procline = NULL; - char *ncpu = NULL; + g_autofree char *manufacturer = NULL; + g_autofree char *procline = NULL; + g_autofree char *ncpu = NULL; int result = -1; virSysinfoProcessorDefPtr processor; @@ -593,9 +593,6 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) result = 0; error: - VIR_FREE(manufacturer); - VIR_FREE(procline); - VIR_FREE(ncpu); return result; } -- 2.29.0

2 1

[libvirt PATCH] Fix name prefix of VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE
by Daniel P. Berrangé 09 Nov '20

09 Nov '20

The enum constant names should all have a prefix that matches the enum name. VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE was missing the "CREATE_" part of the name prefix. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- include/libvirt/libvirt-domain-checkpoint.h | 4 ++-- src/libvirt-domain-checkpoint.c | 4 ++-- src/qemu/qemu_checkpoint.c | 4 ++-- tools/virsh-checkpoint.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt-domain-checkpoint.h b/include/libvirt/libvirt-domain-checkpoint.h index 58932c8a6a..a2f97531f8 100644 --- a/include/libvirt/libvirt-domain-checkpoint.h +++ b/include/libvirt/libvirt-domain-checkpoint.h @@ -57,8 +57,8 @@ typedef enum { quiesce all mounted file systems within the domain */ - VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE = (1 << 2), /* validate disk data state - when redefining a checkpoint */ + VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE = (1 << 2), /* validate disk data state + when redefining a checkpoint */ } virDomainCheckpointCreateFlags; /* Create a checkpoint using the current VM state. */ diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoint.c index e0c2527ccb..e6ad4f4f5d 100644 --- a/src/libvirt-domain-checkpoint.c +++ b/src/libvirt-domain-checkpoint.c @@ -125,7 +125,7 @@ virDomainCheckpointGetConnect(virDomainCheckpointPtr checkpoint) * has a way to resupply correct defaults). Not all hypervisors support * this flag. * - * If @flags includes VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE along with + * If @flags includes VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE along with * VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE the state of the metadata related * to the disk state of the redefined checkpoint is validated. Note that * hypervisors may require that the @domain is running to perform validation. @@ -160,7 +160,7 @@ virDomainCheckpointCreateXML(virDomainPtr domain, VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE, error); - VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE, + VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE, error); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index c24376dbe8..eb33633a11 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -538,13 +538,13 @@ qemuCheckpointCreateXML(virDomainPtr domain, virDomainCheckpointPtr checkpoint = NULL; bool update_current = true; bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; - bool validate_bitmaps = flags & VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE; + bool validate_bitmaps = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE; unsigned int parse_flags = 0; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virDomainCheckpointDef) def = NULL; virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE | - VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE, NULL); + VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, NULL); if (redefine) { parse_flags |= VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index cc2bbdae8a..f6396d16eb 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -125,7 +125,7 @@ cmdCheckpointCreate(vshControl *ctl, if (vshCommandOptBool(cmd, "redefine")) flags |= VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; if (vshCommandOptBool(cmd, "redefine-validate")) - flags |= VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE; + flags |= VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE; if (vshCommandOptBool(cmd, "quiesce")) flags |= VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE; -- 2.28.0

2 1

[libvirt PATCH 0/2] Fix dependencies for python scripts
by Daniel P. Berrangé 09 Nov '20

09 Nov '20

Daniel P. Berrangé (2): meson: ensure python script is run in utf8 env meson: drop use of .path() for python args docs/manpages/meson.build | 4 ++-- docs/meson.build | 8 ++++---- src/access/meson.build | 2 +- src/admin/meson.build | 4 ++-- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 18 +++++++++--------- src/qemu/meson.build | 2 +- src/util/meson.build | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) -- 2.28.0

2 3

[PATCH 0/7] drop support for Windows versions prior to 2012R2
by Matt Coleman 09 Nov '20

09 Nov '20

Microsoft no longer supports Windows 2008R2 at all. Windows 2012 and 2012 R2 are still within extended support until October 9, 2023. Hyper-V's WMI API has two versions. V1 is supported by 2008R2 and 2012. 2012 also offered initial support for V2, but it's incomplete. 2012R2 was the first version to offer full support for the V2 API. This patchset drops support for the V1 WMI API. Here's a GitLab merge request, if you'd prefer to review it there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/7 Matt Coleman (7): hyperv: remove V1 classes from the WMI generator input hyperv: remove hypervPrivate->wmiVersion hyperv: remove support for multiple API versions from the WMI generator hyperv: remove hypervWmiClassInfoList, hypervWmiClassInfoListPtr, and _hypervWmiClassInfoList hyperv: do not generate *_CLASSNAME constants docs: drop support for Windows versions prior to 2012R2 news: drop support for Windows versions prior to 2012R2 NEWS.rst | 6 + docs/drvhyperv.html.in | 17 +- docs/platforms.rst | 3 +- scripts/hyperv_wmi_generator.py | 275 ++++------------- src/hyperv/hyperv_driver.c | 299 +++++------------- src/hyperv/hyperv_private.h | 7 - src/hyperv/hyperv_wmi.c | 108 ++----- src/hyperv/hyperv_wmi.h | 39 +-- src/hyperv/hyperv_wmi_classes.h | 13 - src/hyperv/hyperv_wmi_generator.input | 422 +------------------------- 10 files changed, 180 insertions(+), 1009 deletions(-) -- 2.27.0

2 18

[PATCH] qemustatusxml2xmltest: Remove 'virdeterministichash' mocking
by Peter Krempa 09 Nov '20

09 Nov '20

Commit 89a3115bac2c92ac67516 was not updated after recent changes to hash table usage and was still referencing the now removed deterministic hash mock, which caused CI failure. Fixes: 89a3115bac2c92ac67516d04df6a45769f69a37c Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as fix for CI. tests/qemustatusxml2xmltest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qemustatusxml2xmltest.c b/tests/qemustatusxml2xmltest.c index 3168622be6..67a070c986 100644 --- a/tests/qemustatusxml2xmltest.c +++ b/tests/qemustatusxml2xmltest.c @@ -151,5 +151,4 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("virrandom"), - VIR_TEST_MOCK("domaincaps"), - VIR_TEST_MOCK("virdeterministichash")) + VIR_TEST_MOCK("domaincaps")) -- 2.26.2

1 0

[libvirt PATCH 0/2] Switch our build repo CI recipes in the ci subdirectory to meson
by Erik Skultety 09 Nov '20

09 Nov '20

Erik Skultety (2): ci: Switch to meson build system ci: Drop env variables related to autotools and make ci/Makefile | 29 ++++++----------------------- ci/build.sh | 21 ++++++--------------- 2 files changed, 12 insertions(+), 38 deletions(-) -- 2.26.2

2 5

[PULL 0/3] MIPS patches for 5.2-rc1
by Philippe Mathieu-Daudé 09 Nov '20

09 Nov '20

The following changes since commit 3493c36f0371777c62d1d72b205b0eb6117e2156: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (2020-11-06 13:43:28 +0000) are available in the Git repository at: https://gitlab.com/philmd/qemu.git tags/mips-fixes-20201109 for you to fetch changes up to bf4ee88ab63fcf2dcb75f0d68cc6c8d2edb68212: hw/mips/boston: Fix memory leak in boston_fdt_filter() error-handling paths (2020-11-09 00:40:44 +0100) ---------------------------------------------------------------- MIPS patches queue - Deprecate nanoMIPS ISA - Fix PageMask with variable page size (Huacai Chen) - Fix memory leak in boston_fdt_filter (Coverity CID 1432275, Peter Maydell) CI jobs results: . https://cirrus-ci.com/build/5439131968864256 . https://gitlab.com/philmd/qemu/-/pipelines/213403385 . https://travis-ci.org/github/philmd/qemu/builds/742312387 ---------------------------------------------------------------- Jiaxun Yang (1): target/mips: Fix PageMask with variable page size Peter Maydell (1): hw/mips/boston: Fix memory leak in boston_fdt_filter() error-handling paths Philippe Mathieu-Daudé (1): target/mips: Deprecate nanoMIPS ISA docs/system/deprecated.rst | 23 +++++++++++++++++++++++ target/mips/cpu.h | 1 + hw/mips/boston.c | 10 ++++------ target/mips/cp0_helper.c | 27 +++++++++++++++++++++------ MAINTAINERS | 6 +++++- 5 files changed, 54 insertions(+), 13 deletions(-) -- 2.26.2

2 4

Libvirt Open Source Contribution
by Barrett J Schonefeld 09 Nov '20

09 Nov '20

Hey libvirt team, We (Ryan Gahagan, Dustan Helm, and Barrett Schonefeld) are computer science students at the University of Texas at Austin. We are taking a course in virtualization, and we’d like to contribute to the libvirt repository as part of this course. Here are the issues we are most interested in: https://gitlab.com/libvirt/libvirt/-/issues/11 https://gitlab.com/libvirt/libvirt/-/issues/16 Additionally, we would like to take a look at issue 4 ( https://gitlab.com/libvirt/libvirt/-/issues/4) the UDP slowdown for QEMU. We expect issue 4 to be more time-intensive, and we would like to communicate with you to ensure we’re solving the problem effectively. Our course only runs until the end of the fall semester, so our time to contribute to this project is somewhat limited. If you think any of the issues we picked would be too difficult to accomplish during that time frame, we would appreciate alternative suggestions. We really hope to contribute to this project and help make improvements where we can. Best regards, Dustan Helm: dustan.helm(a)yahoo.com Barrett Schonefeld: bschoney(a)utexas.edu Ryan Gahagan: ryangahagan18(a)gmail.com

7 12

[PATCH 0/9] tests: Add testing of qemu migration cookie
by Peter Krempa 09 Nov '20

09 Nov '20

Note that this series probably depends on the hash table refactor. Add testing of migration cookie as we don't have any schema or examples of it to prevent breakage and help with development. Peter Krempa (9): qemuxml2xmltest: Remove 'WITH_QEMU' conditional qemuxml2xmltest: Split out status XML testing to qemustatusxml2xmltest.c qemu_migration_cookie: Make header standalone qemu_migration_cookie: Export qemuMigrationCookieXMLFormat for tests tests: Add mock library for virGetHostname and virGetHostUUID qemu_migration_cookie: Make cookie parsing robust against missing domain job tests: Add testing of qemu migration cookie qemumigrationcookiexmltest: Add synthetic test case virCPUDefFormatBufFull: Use virXMLFormatElement src/conf/cpu_conf.c | 16 +- src/qemu/qemu_migration_cookie.c | 4 +- src/qemu/qemu_migration_cookie.h | 9 + src/util/virutil.h | 2 +- src/util/viruuid.h | 2 +- tests/hostidmock.c | 36 ++ tests/meson.build | 3 + .../basic-xml2xml-in.xml | 6 + .../basic-xml2xml-out.xml | 9 + .../full-xml2xml-in.xml | 221 ++++++++++++ .../full-xml2xml-out.xml | 219 ++++++++++++ .../modern-dom-out-dest.xml | 12 + .../modern-dom-out-source.xml | 12 + tests/qemumigrationcookiexmltest.c | 337 ++++++++++++++++++ tests/qemustatusxml2xmltest.c | 159 +++++++++ tests/qemuxml2xmltest.c | 136 ++----- 16 files changed, 1048 insertions(+), 135 deletions(-) create mode 100644 tests/hostidmock.c create mode 100644 tests/qemumigrationcookiexmldata/basic-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/basic-xml2xml-out.xml create mode 100644 tests/qemumigrationcookiexmldata/full-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/full-xml2xml-out.xml create mode 100644 tests/qemumigrationcookiexmldata/modern-dom-out-dest.xml create mode 100644 tests/qemumigrationcookiexmldata/modern-dom-out-source.xml create mode 100644 tests/qemumigrationcookiexmltest.c create mode 100644 tests/qemustatusxml2xmltest.c -- 2.26.2

2 11

[PATCH v2] virsh: Allow listing just domain IDs
by Michal Privoznik 09 Nov '20

09 Nov '20

Some completers for libvirt related tools might want to list domain IDs only. Just like the one I've implemented for virt-viewer [1]. I've worked around it using some awk magic, but if it was possible to just 'virsh list --id' then I could drop awk. 1: https://www.redhat.com/archives/virt-tools-list/2019-May/msg00014.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - Documented the new switch in the manpage - Allowed --id to be used with --all docs/manpages/virsh.rst | 21 +++++++++--------- tools/virsh-domain-monitor.c | 42 +++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index d34a1c8684..848e1a6458 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -621,7 +621,7 @@ list list [--inactive | --all] [--managed-save] [--title] - { [--table] | --name | --uuid } + { [--table] | --name | --uuid | --id } [--persistent] [--transient] [--with-managed-save] [--without-managed-save] [--autostart] [--no-autostart] @@ -758,16 +758,15 @@ If *--managed-save* is specified, then domains that have managed save state in the listing. This flag is usable only with the default *--table* output. Note that this flag does not filter the list of domains. -If *--name* is specified, domain names are printed instead of the table -formatted one per line. If *--uuid* is specified domain's UUID's are printed -instead of names. Flag *--table* specifies that the legacy table-formatted -output should be used. This is the default. - -If both *--name* and *--uuid* are specified, domain UUID's and names -are printed side by side without any header. Flag *--table* specifies -that the legacy table-formatted output should be used. This is the -default if neither *--name* nor *--uuid* are specified. Option -*--table* is mutually exclusive with options *--uuid* and *--name*. +If *--name* is specified, domain names are printed instead of the +table formatted one per line. If *--uuid* is specified domain's UUID's +are printed instead of names. If *--id* is specified then domain's ID's +are printed indead of names. However, it is possible to combine +*--name*, *--uuid* and *--id* to select only desired fields for +printing. Flag *--table* specifies that the legacy table-formatted +output should be used, but it is mutually exclusive with *--name*, +*--uuid* and *--id*. This is the default and will be used if neither of +*--name*, *--uuid* or *--id* is specified. If *--title* is specified, then the short domain description (title) is printed in an extra column. This flag is usable only with the default diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index e0491d48ac..5d0a03afa9 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1919,6 +1919,10 @@ static const vshCmdOptDef opts_list[] = { .type = VSH_OT_BOOL, .help = N_("list domain names only") }, + {.name = "id", + .type = VSH_OT_BOOL, + .help = N_("list domain IDs only") + }, {.name = "table", .type = VSH_OT_BOOL, .help = N_("list table (default)") @@ -1945,6 +1949,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) bool optTable = vshCommandOptBool(cmd, "table"); bool optUUID = vshCommandOptBool(cmd, "uuid"); bool optName = vshCommandOptBool(cmd, "name"); + bool optID = vshCommandOptBool(cmd, "id"); size_t i; char *title; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -1988,8 +1993,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("table", "name"); VSH_EXCLUSIVE_OPTIONS("table", "uuid"); + VSH_EXCLUSIVE_OPTIONS("table", "id"); - if (!optUUID && !optName) + if (!optUUID && !optName && !optID) optTable = true; if (!(list = virshDomainListCollect(ctl, flags))) @@ -2007,6 +2013,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < list->ndomains; i++) { + const char *sep = ""; + dom = list->domains[i]; id = virDomainGetID(dom); if (id != (unsigned int) -1) @@ -2044,20 +2052,28 @@ cmdList(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - } else if (optUUID && optName) { - if (virDomainGetUUIDString(dom, uuid) < 0) { - vshError(ctl, "%s", _("Failed to get domain's UUID")); - goto cleanup; + } else { + if (optUUID) { + if (virDomainGetUUIDString(dom, uuid) < 0) { + vshError(ctl, "%s", _("Failed to get domain's UUID")); + goto cleanup; + } + vshPrint(ctl, "%s", uuid); + sep = " "; } - vshPrint(ctl, "%-36s %-30s\n", uuid, virDomainGetName(dom)); - } else if (optUUID) { - if (virDomainGetUUIDString(dom, uuid) < 0) { - vshError(ctl, "%s", _("Failed to get domain's UUID")); - goto cleanup; + if (optID) { + /* If we are asked to print IDs only then do that + * only for live domains. */ + if (id == (unsigned int) -1 && !optUUID && !optName) + continue; + vshPrint(ctl, "%s%s", sep, id_buf); + sep = " "; } - vshPrint(ctl, "%s\n", uuid); - } else if (optName) { - vshPrint(ctl, "%s\n", virDomainGetName(dom)); + if (optName) { + vshPrint(ctl, "%s%s", sep, virDomainGetName(dom)); + sep = " "; + } + vshPrint(ctl, "\n"); } } -- 2.26.2

3 3

[PATCH] News: Several apparmor improvements at v6.8.0
by jgao 09 Nov '20

09 Nov '20

From: jgao <jgao(a)redhat.com> Add news about apparmor about the improvements. Signed-off-by: jgao <jgao(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 905deba5a8..1db8648536 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -154,6 +154,11 @@ v6.8.0 (2020-10-01) taking an external snapshot now preserves the cluser size of the original top image to preserve any performance tuning done on the original image. + * apparmor: Several improvements + + Add support for virtiofs filesystem,allowing qemu load old shared objects after + upgrades. + * **Bug fixes** * qemu: Various (i)SCSI backed hostdev fixes -- 2.21.3

2 1

[PATCH] convert char pointers to use g_autofree
by Ryan Gahagan 08 Nov '20

08 Nov '20

From: bschoney <bschoney(a)utexas.edu> additional conversions to the GLib API in src/util per issue #11. Please let me know if there are additional changes I should make in the files updated so far. I intend to submit work on additional files, and I want to be sure the changes so far are correct. Related issue: https://gitlab.com/libvirt/libvirt/-/issues/11 Signed-off-by: bschoney <bschoney(a)utexas.edu> --- src/util/vircgroupv1.c | 3 +-- src/util/virhostcpu.c | 4 +--- src/util/virlockspace.c | 6 ++---- src/util/virmacmap.c | 3 +-- src/util/virresctrl.c | 25 ++++++++----------------- src/util/virsysinfo.c | 9 +++------ 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 731e9d61d4..984cd50409 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1549,7 +1549,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, unsigned long long *unevictable) { int ret = -1; - char *stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1614,7 +1614,6 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, ret = 0; cleanup: - VIR_FREE(stat); return ret; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c531d65f86..4f6c3390ce 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -87,7 +87,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, int *nparams) { const char *sysctl_name; - long *cpu_times; + g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; int cpu_times_num, offset, hz, stathz, ret = -1; @@ -172,8 +172,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, ret = 0; cleanup: - VIR_FREE(cpu_times); - return ret; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index b90e13f506..71d5dfb83e 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -515,7 +515,7 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -538,7 +538,6 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } @@ -547,7 +546,7 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -575,7 +574,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index f9047d0fb1..e68742de10 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -129,7 +129,7 @@ static int virMacMapLoadFile(virMacMapPtr mgr, const char *file) { - char *map_str = NULL; + g_autofree char *map_str = NULL; virJSONValuePtr map = NULL; int map_str_len = 0; size_t i; @@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr, ret = 0; cleanup: - VIR_FREE(map_str); virJSONValueFree(map); return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index d3087b98c1..1c2d175295 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -709,7 +709,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) { int ret = -1; int rv = -1; - char *featurestr = NULL; + g_autofree char *featurestr = NULL; char **features = NULL; size_t nfeatures = 0; virResctrlInfoMongrpPtr info_monitor = NULL; @@ -771,7 +771,6 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) ret = 0; cleanup: - VIR_FREE(featurestr); g_strfreev(features); VIR_FREE(info_monitor); return ret; @@ -1736,7 +1735,7 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, const char *groupname, virResctrlAllocPtr *alloc) { - char *schemata = NULL; + g_autofree char *schemata = NULL; int rv = virFileReadValueString(&schemata, SYSFS_RESCTRL_PATH "/%s/schemata", groupname); @@ -1753,11 +1752,9 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, if (virResctrlAllocParse(resctrl, *alloc, schemata) < 0) goto error; - VIR_FREE(schemata); return 0; error: - VIR_FREE(schemata); virObjectUnref(*alloc); *alloc = NULL; return -1; @@ -2354,8 +2351,8 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, const char *machinename) { - char *schemata_path = NULL; - char *alloc_str = NULL; + g_autofree char *schemata_path = NULL; + g_autofree char *alloc_str = NULL; int ret = -1; int lockfd = -1; @@ -2403,8 +2400,6 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, ret = 0; cleanup: virResctrlUnlock(lockfd); - VIR_FREE(alloc_str); - VIR_FREE(schemata_path); return ret; } @@ -2413,8 +2408,8 @@ static int virResctrlAddPID(const char *path, pid_t pid) { - char *tasks = NULL; - char *pidstr = NULL; + g_autofree char *tasks = NULL; + g_autofree char *pidstr = NULL; int ret = 0; if (!path) { @@ -2436,8 +2431,6 @@ virResctrlAddPID(const char *path, ret = 0; cleanup: - VIR_FREE(tasks); - VIR_FREE(pidstr); return ret; } @@ -2657,8 +2650,8 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, size_t i = 0; unsigned long long val = 0; g_autoptr(DIR) dirp = NULL; - char *datapath = NULL; - char *filepath = NULL; + g_autofree char *datapath = NULL; + g_autofree char *filepath = NULL; struct dirent *ent = NULL; virResctrlMonitorStatsPtr stat = NULL; @@ -2737,8 +2730,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, ret = 0; cleanup: - VIR_FREE(datapath); - VIR_FREE(filepath); virResctrlMonitorStatsFree(stat); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 217f842a37..e1336bf566 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -532,9 +532,9 @@ static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { const char *tmp_base; - char *manufacturer = NULL; - char *procline = NULL; - char *ncpu = NULL; + g_autofree char *manufacturer = NULL; + g_autofree char *procline = NULL; + g_autofree char *ncpu = NULL; int result = -1; virSysinfoProcessorDefPtr processor; @@ -593,9 +593,6 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) result = 0; error: - VIR_FREE(manufacturer); - VIR_FREE(procline); - VIR_FREE(ncpu); return result; } -- 2.29.0

1 0

[PATCH] convert char pointers to use g_autofree
by Ryan Gahagan 06 Nov '20

06 Nov '20

From: bschoney <bschoney(a)utexas.edu> additional conversions to the GLib API in src/util per issue #11. Please let me know if there are additional changes I should make in the files updated so far. I intend to submit work on additional files, and I want to be sure the changes so far are correct. Related issue: https://gitlab.com/libvirt/libvirt/-/issues/11 Signed-off-by: bschoney <bschoney(a)utexas.edu> --- src/util/vircgroupv1.c | 3 +-- src/util/virhostcpu.c | 4 +--- src/util/virlockspace.c | 6 ++---- src/util/virmacmap.c | 3 +-- src/util/virresctrl.c | 25 ++++++++----------------- src/util/virsysinfo.c | 9 +++------ 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 731e9d61d4..984cd50409 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1549,7 +1549,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, unsigned long long *unevictable) { int ret = -1; - char *stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1614,7 +1614,6 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, ret = 0; cleanup: - VIR_FREE(stat); return ret; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c531d65f86..4f6c3390ce 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -87,7 +87,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, int *nparams) { const char *sysctl_name; - long *cpu_times; + g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; int cpu_times_num, offset, hz, stathz, ret = -1; @@ -172,8 +172,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, ret = 0; cleanup: - VIR_FREE(cpu_times); - return ret; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 2731d46dfc..c88a24be36 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -515,7 +515,7 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -538,7 +538,6 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } @@ -547,7 +546,7 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -575,7 +574,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 2d203e72af..70b148acac 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -129,7 +129,7 @@ static int virMacMapLoadFile(virMacMapPtr mgr, const char *file) { - char *map_str = NULL; + g_autofree char *map_str = NULL; virJSONValuePtr map = NULL; int map_str_len = 0; size_t i; @@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr, ret = 0; cleanup: - VIR_FREE(map_str); virJSONValueFree(map); return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index d3087b98c1..1c2d175295 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -709,7 +709,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) { int ret = -1; int rv = -1; - char *featurestr = NULL; + g_autofree char *featurestr = NULL; char **features = NULL; size_t nfeatures = 0; virResctrlInfoMongrpPtr info_monitor = NULL; @@ -771,7 +771,6 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) ret = 0; cleanup: - VIR_FREE(featurestr); g_strfreev(features); VIR_FREE(info_monitor); return ret; @@ -1736,7 +1735,7 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, const char *groupname, virResctrlAllocPtr *alloc) { - char *schemata = NULL; + g_autofree char *schemata = NULL; int rv = virFileReadValueString(&schemata, SYSFS_RESCTRL_PATH "/%s/schemata", groupname); @@ -1753,11 +1752,9 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, if (virResctrlAllocParse(resctrl, *alloc, schemata) < 0) goto error; - VIR_FREE(schemata); return 0; error: - VIR_FREE(schemata); virObjectUnref(*alloc); *alloc = NULL; return -1; @@ -2354,8 +2351,8 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, const char *machinename) { - char *schemata_path = NULL; - char *alloc_str = NULL; + g_autofree char *schemata_path = NULL; + g_autofree char *alloc_str = NULL; int ret = -1; int lockfd = -1; @@ -2403,8 +2400,6 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, ret = 0; cleanup: virResctrlUnlock(lockfd); - VIR_FREE(alloc_str); - VIR_FREE(schemata_path); return ret; } @@ -2413,8 +2408,8 @@ static int virResctrlAddPID(const char *path, pid_t pid) { - char *tasks = NULL; - char *pidstr = NULL; + g_autofree char *tasks = NULL; + g_autofree char *pidstr = NULL; int ret = 0; if (!path) { @@ -2436,8 +2431,6 @@ virResctrlAddPID(const char *path, ret = 0; cleanup: - VIR_FREE(tasks); - VIR_FREE(pidstr); return ret; } @@ -2657,8 +2650,8 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, size_t i = 0; unsigned long long val = 0; g_autoptr(DIR) dirp = NULL; - char *datapath = NULL; - char *filepath = NULL; + g_autofree char *datapath = NULL; + g_autofree char *filepath = NULL; struct dirent *ent = NULL; virResctrlMonitorStatsPtr stat = NULL; @@ -2737,8 +2730,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, ret = 0; cleanup: - VIR_FREE(datapath); - VIR_FREE(filepath); virResctrlMonitorStatsFree(stat); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 217f842a37..e1336bf566 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -532,9 +532,9 @@ static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { const char *tmp_base; - char *manufacturer = NULL; - char *procline = NULL; - char *ncpu = NULL; + g_autofree char *manufacturer = NULL; + g_autofree char *procline = NULL; + g_autofree char *ncpu = NULL; int result = -1; virSysinfoProcessorDefPtr processor; @@ -593,9 +593,6 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) result = 0; error: - VIR_FREE(manufacturer); - VIR_FREE(procline); - VIR_FREE(ncpu); return result; } -- 2.29.0

1 0

[PATCH 5/5] Fixed error where char** not being promoted to const
by Ryan Gahagan 06 Nov '20

06 Nov '20

Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8abca1b65e..10ff7175a2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -227,7 +227,7 @@ static const vshCmdOptDef opts_attach_disk[] = { {.name = "source-protocol", .type = VSH_OT_STRING, .help = N_("protocol used by disk device source") - } + }, {.name = "source-name", .type = VSH_OT_STRING, .help = N_("name of disk device source") @@ -629,7 +629,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-host-name", &host_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-name", (const char **) &host_name) < 0 || vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) goto cleanup; -- 2.29.0

1 0

[PATCH] qemu: virtiofs: Add pool element to limit thread pool
by Masayoshi Mizuma 06 Nov '20

06 Nov '20

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> virtiofsd has --thread-pool-size=NUM option to limit the thread pool size. It will be useful to tune the performance. Add pool element to use the option like as: <filesystem type='mount' accessmode='passthrough'> <driver type='virtiofs' queue='1024'/> <binary path='/usr/libexec/virtiofsd' xattr='on' pool='32'/> <source dir='/path'/> <target dir='mount_tag'/> </filesystem> Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- docs/formatdomain.rst | 6 ++++-- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 12 ++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_virtiofs.c | 3 +++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index bfa80e4bc2..0f66af5dc3 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3070,7 +3070,7 @@ A directory on the host that can be accessed directly from the guest. </filesystem> <filesystem type='mount' accessmode='passthrough'> <driver type='virtiofs' queue='1024'/> - <binary path='/usr/libexec/virtiofsd' xattr='on'> + <binary path='/usr/libexec/virtiofsd' xattr='on' pool='32'> <cache mode='always'/> <lock posix='on' flock='on'/> </binary> @@ -3188,7 +3188,9 @@ A directory on the host that can be accessed directly from the guest. the use of filesystem extended attributes. Caching can be tuned via the ``cache`` element, possible ``mode`` values being ``none`` and ``always``. Locking can be controlled via the ``lock`` element - attributes ``posix`` and - ``flock`` both accepting values ``on`` or ``off``. ( :since:`Since 6.2.0` ) + ``flock`` both accepting values ``on`` or ``off``. ( :since:`Since 6.2.0` ). + Thread pool size limit can be tuned via the ``pool`` element. + ( :since:`Since 6.9.0` ) ``source`` The resource on the host that is being accessed in the guest. The ``name`` attribute must be used with ``type='template'``, and the ``dir`` attribute diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c25a742581..cd5de2ba80 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2839,6 +2839,11 @@ <ref name="virOnOff"/> </attribute> </optional> + <optional> + <attribute name="pool"> + <ref name="unsignedInt"/> + </attribute> + </optional> <optional> <element name="cache"> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index efa5ac527b..9d06f8c75f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11588,6 +11588,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *cache = virXPathString("string(./binary/cache/@mode)", ctxt); g_autofree char *posix_lock = virXPathString("string(./binary/lock/@posix)", ctxt); g_autofree char *flock = virXPathString("string(./binary/lock/@flock)", ctxt); + g_autofree char *thread_pool_size = virXPathString("string(./binary/@pool)", ctxt); int val; if (queue_size && virStrToLong_ull(queue_size, NULL, 10, &def->queue_size) < 0) { @@ -11597,6 +11598,14 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } + if (thread_pool_size && + virStrToLong_ull(thread_pool_size, NULL, 10, &def->thread_pool_size) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse thread pool size '%s' for virtiofs"), + thread_pool_size); + goto error; + } + if (binary) def->binary = virFileSanitizePath(binary); @@ -26191,6 +26200,9 @@ virDomainFSDefFormat(virBufferPtr buf, virTristateSwitchTypeToString(def->xattr)); } + if (def->thread_pool_size) + virBufferAsprintf(&binaryAttrBuf, " pool='%llu'", def->thread_pool_size); + if (def->cache != VIR_DOMAIN_FS_CACHE_MODE_DEFAULT) { virBufferAsprintf(&binaryBuf, "<cache mode='%s'/>\n", virDomainFSCacheModeTypeToString(def->cache)); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cd344716a3..98ab0a51c7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -860,6 +860,7 @@ struct _virDomainFSDef { bool symlinksResolved; char *binary; unsigned long long queue_size; + unsigned long long thread_pool_size; virTristateSwitch xattr; virDomainFSCacheMode cache; virTristateSwitch posix_lock; diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 2e239cad66..e35c278a1b 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -126,6 +126,9 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfigPtr cfg, virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd = -1; + if (fs->thread_pool_size) + virCommandAddArgFormat(cmd, "--thread-pool-size=%llu", fs->thread_pool_size); + virCommandAddArg(cmd, "-o"); virBufferAddLit(&opts, "source="); virQEMUBuildBufferEscapeComma(&opts, fs->src->path); -- 2.27.0

3 4

[PATCH] lxc: Cleanup after failed startup
by Michal Privoznik 06 Nov '20

06 Nov '20

If starting an container fails, the virLXCProcessStop() is called. But since vm->def->id is not set until libvirt_lxc is spawned (the domain's ID is PID of that process), virLXCProcessStop() returns early as virDomainObjIsActive() returns false. But doing so leaves behind resources reserved for the containers during the startup process. Most notably, hostdevs are not re-attached to the host, the domain's transient XML is not removed, etc. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c5a710fc3f..08c82b0e9a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -855,7 +855,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, vm->def->name, (int)vm->pid, (int)reason); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); - return 0; + goto cleanup; } priv = vm->privateData; -- 2.26.2

2 1

[PATCH 0/2] qemu: migration corner case fix and cleanup
by Nikolay Shirokovskiy 06 Nov '20

06 Nov '20

Nikolay Shirokovskiy (2): qemu: fix qemuMigrationSrcCleanup to use qemuMigrationJobFinish qemu: don't needlessly unset close callback during perform phase src/qemu/qemu_migration.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) -- 1.8.3.1

3 9