- Devel - libvirt List Archives

[libvirt PATCH v2 00/10] remote: introduce a custom netcat impl for ssh tunnelling
by Daniel P. Berrangé 27 Oct '20

27 Oct '20

We have long had a problem with use of netcat for ssh tunnelling because there's no guarantee the UNIX socket path the client builds will match the UNIX socket path the remote host uses. We don't even allow session mode SSH tunnelling for this reason. We also can't easily auto-spawn libvirtd in session mode. With the introduction of modular daemons we also have potential for two completely different UNIX socket paths even for system mode, and the client can't know which to use. The solution to all these problems is to introduce a custom netcat impl. Instead passing the UNIX socket path, we pass the libvirt driver URI. The custom netcat then decides which socket path to use based on the remote build host environment. We still have to support netcat for interoperability with legacy libvirt versions, but we can default to the new virt-nc. Daniel P. Berrangé (10): rpc: merge logic for generating remote SSH shell script remote: push logic for default netcat binary into common helper remote: split off enums into separate source file remote: split out function for parsing URI scheme remote: parse the remote transport string earlier remote: split out function for constructing socket path remote: extract logic for determining daemon to connect to remote: introduce virt-ssh-helper binary rpc: switch order of args in virNetClientNewSSH rpc: use new virt-ssh-helper binary for remote tunnelling build-aux/syntax-check.mk | 2 +- docs/uri.html.in | 24 +- libvirt.spec.in | 2 + po/POTFILES.in | 2 + src/libvirt_remote.syms | 1 + src/remote/Makefile.inc.am | 33 +++ src/remote/remote_driver.c | 323 ++++--------------------- src/remote/remote_sockets.c | 277 +++++++++++++++++++++ src/remote/remote_sockets.h | 70 ++++++ src/remote/remote_ssh_helper.c | 425 +++++++++++++++++++++++++++++++++ src/rpc/virnetclient.c | 166 ++++++++----- src/rpc/virnetclient.h | 29 ++- src/rpc/virnetsocket.c | 37 +-- src/rpc/virnetsocket.h | 4 +- tests/virnetsockettest.c | 12 +- 15 files changed, 1035 insertions(+), 372 deletions(-) create mode 100644 src/remote/remote_sockets.c create mode 100644 src/remote/remote_sockets.h create mode 100644 src/remote/remote_ssh_helper.c -- 2.26.2

2 14

[PATCH 0/6] qemu: Fix cdrom as SCSI hostdev via -blockdev
by Peter Krempa 27 Oct '20

27 Oct '20

-drive detects whether a device is a cdrom automatically but we need to use 'host_cdrom' when using blockdev explicitly. Fix the hostdev code which was recently converted to -blockdev. Warning: I _don't_ have a box with a CDROM handy so this code is not tested in action! Peter Krempa (6): qemuProcessCreatePretendCmd: Split up preparation and command building qemu: hostdev: Prepare definition bits in qemuDomainPrepareHostdev qemu: Prepare hostdev data which depends on the host state separately qemuxml2argvmock: Remove mocking of 'virSCSIDeviceGetSgName' qemu: Detect whether a SCSI hostdev is a cdrom qemu: Add test cases for 'host_cdrom' blockdev backend via <disk> src/qemu/qemu_command.c | 33 +----- src/qemu/qemu_domain.c | 5 + src/qemu/qemu_driver.c | 65 ++++++++++- src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_process.c | 103 +++++++++++++++--- src/qemu/qemu_process.h | 21 ++-- tests/qemuxml2argvdata/disk-cdrom.args | 4 +- .../disk-cdrom.x86_64-2.12.0.args | 4 +- .../disk-cdrom.x86_64-latest.args | 6 +- tests/qemuxml2argvdata/disk-cdrom.xml | 5 +- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 3 + ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 + ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 4 + .../hostdev-scsi-virtio-scsi.xml | 8 ++ tests/qemuxml2argvmock.c | 13 --- tests/qemuxml2argvtest.c | 45 +++++++- tests/qemuxml2xmloutdata/disk-cdrom.xml | 5 +- .../hostdev-scsi-virtio-scsi.xml | 8 ++ 18 files changed, 252 insertions(+), 86 deletions(-) -- 2.26.2

4 24

[PATCH] qemuMonitorJSONCheckReply: Use g_autofree
by Yi Li 27 Oct '20

27 Oct '20

Eliminate cleanup code by using g_autofree. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_monitor_json.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 26ac499fc5..f76b369191 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -392,10 +392,11 @@ qemuMonitorJSONCheckErrorFull(virJSONValuePtr cmd, virJSONValuePtr reply, bool report) { + g_autofree char *cmdstr = virJSONValueToString(cmd, false); + g_autofree char *replystr = virJSONValueToString(reply, false); + if (virJSONValueObjectHasKey(reply, "error")) { virJSONValuePtr error = virJSONValueObjectGet(reply, "error"); - g_autofree char *cmdstr = virJSONValueToString(cmd, false); - g_autofree char *replystr = virJSONValueToString(reply, false); /* Log the full JSON formatted command & error */ VIR_DEBUG("unable to execute QEMU command %s: %s", @@ -417,8 +418,6 @@ qemuMonitorJSONCheckErrorFull(virJSONValuePtr cmd, return -1; } else if (!virJSONValueObjectHasKey(reply, "return")) { - g_autofree char *cmdstr = virJSONValueToString(cmd, false); - g_autofree char *replystr = virJSONValueToString(reply, false); VIR_DEBUG("Neither 'return' nor 'error' is set in the JSON reply %s: %s", NULLSTR(cmdstr), NULLSTR(replystr)); @@ -455,8 +454,8 @@ qemuMonitorJSONCheckReply(virJSONValuePtr cmd, data = virJSONValueObjectGet(reply, "return"); if (virJSONValueGetType(data) != type) { - char *cmdstr = virJSONValueToString(cmd, false); - char *retstr = virJSONValueToString(data, false); + g_autofree char *cmdstr = virJSONValueToString(cmd, false); + g_autofree char *retstr = virJSONValueToString(data, false); VIR_DEBUG("Unexpected return type %d (expecting %d) for command %s: %s", virJSONValueGetType(data), type, cmdstr, retstr); @@ -464,8 +463,6 @@ qemuMonitorJSONCheckReply(virJSONValuePtr cmd, _("unexpected type returned by QEMU command '%s'"), qemuMonitorJSONCommandName(cmd)); - VIR_FREE(cmdstr); - VIR_FREE(retstr); return -1; } -- 2.25.3

4 5

[PATCH] docs: page.xsl: Improve generation of paragraph anchor links
by Peter Krempa 27 Oct '20

27 Oct '20

Use the 'parent' axis to check whether the parent is a div with class='section' rather than looking for 'toc-backref' anchor to see whether to generate one of the headerlink alternatives. Both hare docutils-specific thus apply to docs generated from RST documents. This adds the links for pages generated from RST documents which don't have a table of contents (and thus lack the 'toc-backref' anchors) and thus fixes pages such as hacking.html and news.html to have reasonable links which can be shared. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Note that whether or not to add table of contents to hacking.rst is out of scope of this patch. docs/page.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/page.xsl b/docs/page.xsl index 36168305fa..07bfc52a4c 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -196,7 +196,7 @@ <xsl:if test="./html:a/@id"> <a class="headerlink" href="#{html:a/@id}" title="Permalink to this headline">¶</a> </xsl:if> - <xsl:if test="./html:a[@class='toc-backref']"> + <xsl:if test="parent::html:div[@class='section']"> <a class="headerlink" href="#{../@id}" title="Permalink to this headline">¶</a> </xsl:if> </xsl:element> -- 2.26.2

2 1

[PATCH 0/9] several small cleanups in virpci.c et. al.
by Laine Stump 27 Oct '20

27 Oct '20

These started with a couple small cleanups to functions I was going to change the API for, but then I decided not to change the API, and just didn't want to waste the effort spent cleaning them up. Laine Stump (9): util: simplify virHostdevPCISysfsPath() util: simplify virPCIFile() and its callers util: simplify virPCIDriverDir() and its callers util: simplify virPCIProbeStubDriver() util: avoid manual VIR_FREE of a g_autofree pointer in virPCIGetName() util: use more g_autofree in virpci.c util: remove unneeded cleanup:/ret in virpci.c util: don't use virPCIGetSysfsFile() util: remove unused function virPCIGetSysfsFile() src/hypervisor/virhostdev.c | 10 +-- src/libvirt_private.syms | 1 - src/util/virnetdev.c | 6 +- src/util/virpci.c | 146 ++++++++++++------------------------ src/util/virpci.h | 4 - 5 files changed, 53 insertions(+), 114 deletions(-) -- 2.26.2

4 15

[libvirt PATCH] meson: remove non-pkg-config fallback for devmapper
by Daniel P. Berrangé 27 Oct '20

27 Oct '20

The fallback for distros which lack pkg-config support for devmapper references an undefined variable "tmp". It appears non of our supported build platforms are triggering this bug and so the fallback code can be removed entirely rather than fixed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meson.build b/meson.build index a17d759702..c3ba34bbe0 100644 --- a/meson.build +++ b/meson.build @@ -1020,13 +1020,6 @@ endif devmapper_version = '1.0.0' devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false) -if not devmapper_dep.found() - # devmapper is missing pkg-config files in ubuntu, suse, etc - devmapper_dep = cc.find_library('devmapper', required: false) - if devmapper_dep.found() and not cc.has_function('dm_task_run', dependencies: tmp) - devmapper_dep = dependency('', required: false) - endif -endif if devmapper_dep.found() conf.set('WITH_DEVMAPPER', 1) endif -- 2.25.4

3 2

[PATCH] qemu: Add test cases for 'host_cdrom' blockdev backend via <disk>
by Peter Krempa 27 Oct '20

27 Oct '20

Simulate that the device is a cdrom when the path equals to /dev/cdrom to provide testing for the 'host_cdrom' backend. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- I've already posted this before but I mistakenly identified is as wrong and self-NACKed it, but we don't really have a test for a <disk type=cdrom> backed by a host device, so this patch makes sense. tests/qemuxml2argvdata/disk-cdrom.args | 4 ++-- tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 4 ++-- tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 6 +++--- tests/qemuxml2argvdata/disk-cdrom.xml | 5 +++-- tests/qemuxml2argvtest.c | 11 +++++++++++ tests/qemuxml2xmloutdata/disk-cdrom.xml | 5 +++-- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index cbac368129..e506a4befe 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -25,8 +25,8 @@ server,nowait \ -no-shutdown \ -no-acpi \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-0-0,readonly=on \ +-device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive if=none,id=drive-ide0-1-0,readonly=on \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index 2440acc78a..0621746a3b 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -27,8 +27,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-0-0,readonly=on \ +-device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive if=none,id=drive-ide0-1-0,readonly=on \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index 0d375ffd1c..beac75ec1d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -29,11 +29,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom",\ "node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\ +-blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw",\ "file":"libvirt-4-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-4-format,id=ide0-0-0,bootindex=1 \ +-device ide-cd,bus=ide.0,unit=0,drive=libvirt-4-format,id=ide0-0-0 \ -blockdev '{"driver":"file","filename":"/root/boot.iso",\ "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw",\ diff --git a/tests/qemuxml2argvdata/disk-cdrom.xml b/tests/qemuxml2argvdata/disk-cdrom.xml index b051b16642..54d2927ac3 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.xml +++ b/tests/qemuxml2argvdata/disk-cdrom.xml @@ -14,10 +14,11 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> + <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> + <source dev='/dev/cdrom'/> <target dev='hda' bus='ide'/> + <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c5a0095e0d..ef8a871a19 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -407,6 +407,17 @@ testCompareXMLToArgvCreateArgs(virQEMUDriverPtr drv, VIR_QEMU_PROCESS_START_COLD) < 0) return NULL; + for (i = 0; i < vm->def->ndisks; i++) { + virDomainDiskDefPtr disk = vm->def->disks[i]; + + /* host cdrom requires special treatment in qemu, mock it */ + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && + disk->src->format == VIR_STORAGE_FILE_RAW && + virStorageSourceIsBlockLocal(disk->src) && + STREQ(disk->src->path, "/dev/cdrom")) + disk->src->hostcdrom = true; + } + for (i = 0; i < vm->def->nhostdevs; i++) { virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i]; diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml index 3e6475c276..3a8c34761d 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml @@ -14,10 +14,11 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> + <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> + <source dev='/dev/cdrom'/> <target dev='hda' bus='ide'/> + <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='file' device='cdrom'> -- 2.26.2

2 1

[PATCH 0/1] virt-aa-helper: allow hard links for mounts
by Christian Schoenebeck 27 Oct '20

27 Oct '20

I'm suggesting to add the AppArmor permission "l" on libvirt export pathes to allow guests creating hard links, which is currently a problem for 9pfs mounts. Since the suggested patch would affect virtiofs as well, I would ask David and Stefan for feedback. If necessary I would change the patch to exclude virtiofs from this change. Christian Schoenebeck (1): virt-aa-helper: allow hard links for mounts src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1

3 6

[libvirt PATCH] NEWS: Fix vertical spacing between sections
by Andrea Bolognani 26 Oct '20

26 Oct '20

Looking at the entire repository reveals we're not too consistent about this, but at least in this specific document we mostly have two blank lines between sections, so let's stick with that. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. NEWS.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 6b7735b9a0..3587bc2c13 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -46,6 +46,7 @@ v6.9.0 (unreleased) Relying on the "Description" field caused queries to fail on non-"en-US" systems. The queries have been updated to avoid using localized strings. + v6.8.0 (2020-10-01) =================== @@ -143,6 +144,7 @@ v6.8.0 (2020-10-01) in libvirt. udev backend is used on Linux OSes and devd can be eventually implemented as replacement for FreeBSD. + v6.7.0 (2020-09-01) =================== -- 2.26.2

1 0

[PATCH v5 06/12] nbd: Update qapi to support exporting multiple bitmaps
by Eric Blake 26 Oct '20

26 Oct '20

Since 'nbd-server-add' is deprecated, and 'block-export-add' is new to 5.2, we can still tweak the interface. Allowing 'bitmaps':['str'] is nicer than 'bitmap':'str'. This wires up the qapi and qemu-nbd changes to permit passing multiple bitmaps as distinct metadata contexts that the NBD client may request, but the actual support for more than one will require a further patch to the server. Signed-off-by: Eric Blake <eblake(a)redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> --- docs/system/deprecated.rst | 4 +++- qapi/block-export.json | 18 ++++++++++++------ blockdev-nbd.c | 13 +++++++++++++ nbd/server.c | 19 +++++++++++++------ qemu-nbd.c | 10 +++++----- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 905628f3a0cb..d6cd027ac740 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -268,7 +268,9 @@ the 'wait' field, which is only applicable to sockets in server mode '''''''''''''''''''''''''''''''''''''''''''''''''''''''' Use the more generic commands ``block-export-add`` and ``block-export-del`` -instead. +instead. As part of this deprecation, it is now preferred to export a +list of dirty bitmaps via ``bitmaps``, rather than a single bitmap via +``bitmap``. Human Monitor Protocol (HMP) commands ------------------------------------- diff --git a/qapi/block-export.json b/qapi/block-export.json index 893d5cde5dfe..c7c749d61097 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -74,10 +74,10 @@ # @description: Free-form description of the export, up to 4096 bytes. # (Since 5.0) # -# @bitmap: Also export the dirty bitmap reachable from @device, so the -# NBD client can use NBD_OPT_SET_META_CONTEXT with the -# metadata context name "qemu:dirty-bitmap:NAME" to inspect the -# bitmap. (since 4.0) +# @bitmaps: Also export each of the named dirty bitmaps reachable from +# @device, so the NBD client can use NBD_OPT_SET_META_CONTEXT with +# the metadata context name "qemu:dirty-bitmap:BITMAP" to inspect +# each bitmap. (since 5.2) # # @allocation-depth: Also export the allocation depth map for @device, so # the NBD client can use NBD_OPT_SET_META_CONTEXT with @@ -88,7 +88,7 @@ ## { 'struct': 'BlockExportOptionsNbd', 'data': { '*name': 'str', '*description': 'str', - '*bitmap': 'str', '*allocation-depth': 'bool' } } + '*bitmaps': ['str'], '*allocation-depth': 'bool' } } ## # @NbdServerAddOptions: @@ -100,12 +100,18 @@ # @writable: Whether clients should be able to write to the device via the # NBD connection (default false). # +# @bitmap: Also export a single dirty bitmap reachable from @device, so the +# NBD client can use NBD_OPT_SET_META_CONTEXT with the metadata +# context name "qemu:dirty-bitmap:BITMAP" to inspect the bitmap +# (since 4.0). Mutually exclusive with @bitmaps, and newer +# clients should use that instead. +# # Since: 5.0 ## { 'struct': 'NbdServerAddOptions', 'base': 'BlockExportOptionsNbd', 'data': { 'device': 'str', - '*writable': 'bool' } } + '*writable': 'bool', '*bitmap': 'str' } } ## # @nbd-server-add: diff --git a/blockdev-nbd.c b/blockdev-nbd.c index cee9134b12eb..cfd46223bf4d 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -192,6 +192,19 @@ void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp) return; } + /* + * New code should use the list 'bitmaps'; but until this code is + * gone, we must support the older single 'bitmap'. Use only one. + */ + if (arg->has_bitmap) { + if (arg->has_bitmaps) { + error_setg(errp, "Can't mix 'bitmap' and 'bitmaps'"); + return; + } + arg->has_bitmaps = true; + QAPI_LIST_ADD(arg->bitmaps, g_strdup(arg->bitmap)); + } + /* * block-export-add would default to the node-name, but we may have to use * the device name as a default here for compatibility. diff --git a/nbd/server.c b/nbd/server.c index 30cfe0eee467..884ffa00f1bd 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1495,6 +1495,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, uint64_t perm, shared_perm; bool readonly = !exp_args->writable; bool shared = !exp_args->writable; + strList *bitmaps; int ret; assert(exp_args->type == BLOCK_EXPORT_TYPE_NBD); @@ -1556,12 +1557,18 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, } exp->size = QEMU_ALIGN_DOWN(size, BDRV_SECTOR_SIZE); - if (arg->bitmap) { + /* XXX Allow more than one bitmap */ + if (arg->bitmaps && arg->bitmaps->next) { + error_setg(errp, "multiple bitmaps per export not supported yet"); + return -EOPNOTSUPP; + } + for (bitmaps = arg->bitmaps; bitmaps; bitmaps = bitmaps->next) { + const char *bitmap = bitmaps->value; BlockDriverState *bs = blk_bs(blk); BdrvDirtyBitmap *bm = NULL; while (bs) { - bm = bdrv_find_dirty_bitmap(bs, arg->bitmap); + bm = bdrv_find_dirty_bitmap(bs, bitmap); if (bm != NULL) { break; } @@ -1571,7 +1578,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, if (bm == NULL) { ret = -ENOENT; - error_setg(errp, "Bitmap '%s' is not found", arg->bitmap); + error_setg(errp, "Bitmap '%s' is not found", bitmap); goto fail; } @@ -1585,15 +1592,15 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, ret = -EINVAL; error_setg(errp, "Enabled bitmap '%s' incompatible with readonly export", - arg->bitmap); + bitmap); goto fail; } bdrv_dirty_bitmap_set_busy(bm, true); exp->export_bitmap = bm; - assert(strlen(arg->bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); + assert(strlen(bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); exp->export_bitmap_context = g_strdup_printf("qemu:dirty-bitmap:%s", - arg->bitmap); + bitmap); assert(strlen(exp->export_bitmap_context) < NBD_MAX_STRING_SIZE); } diff --git a/qemu-nbd.c b/qemu-nbd.c index 847fde435a7f..5473821216f7 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -572,7 +572,7 @@ int main(int argc, char **argv) const char *export_name = NULL; /* defaults to "" later for server mode */ const char *export_description = NULL; bool alloc_depth = false; - const char *bitmap = NULL; + strList *bitmaps = NULL; const char *tlscredsid = NULL; bool imageOpts = false; bool writethrough = true; @@ -701,7 +701,7 @@ int main(int argc, char **argv) alloc_depth = true; break; case 'B': - bitmap = optarg; + QAPI_LIST_ADD(bitmaps, g_strdup(optarg)); break; case 'k': sockpath = optarg; @@ -798,7 +798,7 @@ int main(int argc, char **argv) } if (export_name || export_description || dev_offset || device || disconnect || fmt || sn_id_or_name || alloc_depth || - bitmap || seen_aio || seen_discard || seen_cache) { + bitmaps || seen_aio || seen_discard || seen_cache) { error_report("List mode is incompatible with per-device settings"); exit(EXIT_FAILURE); } @@ -1082,8 +1082,8 @@ int main(int argc, char **argv) .name = g_strdup(export_name), .has_description = !!export_description, .description = g_strdup(export_description), - .has_bitmap = !!bitmap, - .bitmap = g_strdup(bitmap), + .has_bitmaps = !!bitmaps, + .bitmaps = bitmaps, .has_allocation_depth = alloc_depth, .allocation_depth = alloc_depth, }, -- 2.29.0

2 2

[libvirt PATCH v5 0/6] Add support for vDPA network devices
by Jonathon Jongsma 26 Oct '20

26 Oct '20

vDPA network devices allow high-performance networking in a virtual machine by providing a wire-speed data path. These devices require a vendor-specific host driver but the data path follows the virtio specification. The support for vDPA devices was recently added to qemu. This allows libvirt to support these devices. This patchset requires that the device is configured on the host with the appropriate vendor-specific driver. This will create a chardev on the host at e.g. /dev/vhost-vdpa-0. That chardev path can then be used to define a new interface with type=3D'vdpa'. Note that in order for hot-unplug to work properly, you may need to apply a qemu patch[1] for now. Without the patch, qemu will not close the fd properly and any subsequent attempts to use the vdpa chardev will fail like this: virsh # attach-device guest1 vdpa.xml error: Failed to attach device from vdpa.xml error: Unable to open '/dev/vhost-vdpa-0' for vdpa device: Device or reso= urce busy [1] https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg06374.html Changes in v5: - rebased to latest master - fixed a case where qemuDomainObjExitMonitor() was not called on an error p= ath - Improved the nodedev xml. It now includes the path to the chardev in /dev - also updated the nodedev xml schema - added sample nodedev-dumpxml output to the commit message of patch #6 Jonathon Jongsma (6): conf: Add support for vDPA network devices qemu: add vhost-vdpa capability qemu: add vdpa support qemu: add monitor functions for handling file descriptors qemu: support hotplug of vdpa devices Include vdpa devices in node device list docs/formatdomain.rst | 24 +++ docs/formatnode.html.in | 9 + docs/schemas/domaincommon.rng | 15 ++ docs/schemas/nodedev.rng | 10 + include/libvirt/libvirt-nodedev.h | 1 + src/conf/domain_conf.c | 31 ++++ src/conf/domain_conf.h | 4 + src/conf/netdev_bandwidth_conf.c | 1 + src/conf/node_device_conf.c | 14 ++ src/conf/node_device_conf.h | 11 +- src/conf/virnodedeviceobj.c | 4 +- src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 + src/lxc/lxc_process.c | 1 + src/node_device/node_device_udev.c | 53 ++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 36 +++- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_hotplug.c | 75 +++++++- src/qemu/qemu_interface.c | 25 +++ src/qemu/qemu_interface.h | 2 + src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_monitor.c | 93 ++++++++++ src/qemu/qemu_monitor.h | 41 +++++ src/qemu/qemu_monitor_json.c | 173 ++++++++++++++++++ src/qemu/qemu_monitor_json.h | 12 ++ src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 15 ++ src/vmx/vmx.c | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + tests/qemuhotplugmock.c | 9 + tests/qemuhotplugtest.c | 16 ++ .../qemuhotplug-interface-vdpa.xml | 4 + .../qemuhotplug-base-live+interface-vdpa.xml | 57 ++++++ .../net-vdpa.x86_64-latest.args | 38 ++++ tests/qemuxml2argvdata/net-vdpa.xml | 28 +++ tests/qemuxml2argvmock.c | 11 +- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/net-vdpa.xml | 34 ++++ tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 1 + tools/virsh-nodedev.c | 3 + 47 files changed, 870 insertions(+), 16 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-interface-vdpa.x= ml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+interf= ace-vdpa.xml create mode 100644 tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-vdpa.xml create mode 100644 tests/qemuxml2xmloutdata/net-vdpa.xml --=20 2.26.2

4 14

[PATCH 0/2] qemu: Two almost trivial migration fixes
by Michal Privoznik 26 Oct '20

26 Oct '20

The report on libvirt-users [1] got me into testing and I've found another problem fixed in the other patch. 1: https://www.redhat.com/archives/libvirt-users/2020-October/msg00035.html Michal Prívozník (2): qemu: Don't try to start NBD server twice qemu_migration: Don't mangle NBD part of migration cookie src/qemu/qemu_migration.c | 8 +++++--- src/qemu/qemu_migration_cookie.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) -- 2.26.2

2 4

[PATCH v2] news: introduce memory failure event
by zhenwei pi 26 Oct '20

26 Oct '20

Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com> --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index d0454b7840..428928e80b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,16 @@ v6.9.0 (unreleased) * **New features** + * Introduce memory failure event + + Libvirt could handle domain's memory failure event. Drivers need to + implement their own method. + + * qemu: Implement memory failure event + + New event is implemented that is emitted whenever a guest encounters a + memory failure. + * qemu: Implement support for ``<transient/>`` disks VMs based on the QEMU hypervisor now can use ``<transient/>`` option for -- 2.11.0

2 1

[PATCH v2 0/7] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 26 Oct '20

26 Oct '20

V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part -- DomainGetDirtyRateInfo API and corresponding virsh api -- "getdirtyrate". instructions: bash# virsh getdirtyrate --help NAME getdirtyrate - Get a vm's memory dirty rate SYNOPSIS getdirtyrate <domain> [--seconds <number>] [--calculate] [--query] DESCRIPTION Get memory dirty rate of a domain in order to decide whether it's proper to be migrated out or not. OPTIONS [--domain] <string> domain name, id or uuid --seconds <number> calculate memory dirty rate within specified seconds, a valid range of values is [1, 60], and would default to 1s. --calculate calculate dirty rate only, can be used together with --query, either or both is expected, otherwise would default to both. --query query dirty rate only, can be used together with --calculate, either or both is expected, otherwise would default to both. example: bash# virsh getdirtyrate --calculate --query --domain vm0 --seconds 1 status: measured startTime: 820148 calcTime: 1 s dirtyRate: 6 MB/s Hao Wang (7): migration/dirtyrate: Introduce virDomainDirtyRateInfo structure migration/dirtyrate: Implement qemuMonitorJSONExtractDirtyRateInfo migration/dirtyrate: Implement qemuDomainQueryDirtyRate migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Introduce virDomainDirtyRateFlags migration/dirtyrate: Introduce DomainGetDirtyRateInfo API migration/dirtyrate: Introduce getdirtyrate virsh api include/libvirt/libvirt-domain.h | 64 ++++++++++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 46 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 70 +++++++++++++++++++ src/qemu/qemu_migration.c | 59 ++++++++++++++++ src/qemu/qemu_migration.h | 10 +++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 8 +++ src/qemu/qemu_monitor_json.c | 97 ++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +++++- tools/virsh-domain.c | 112 +++++++++++++++++++++++++++++++ 14 files changed, 531 insertions(+), 1 deletion(-) -- 2.23.0

3 11

Re: [PATCH] pci: Refuse to hotplug PCI Devices when the Guest OS is not ready
by Igor Mammedov 26 Oct '20

26 Oct '20

On Fri, 23 Oct 2020 11:54:40 -0400 "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > On Fri, Oct 23, 2020 at 09:47:14AM +0300, Marcel Apfelbaum wrote: > > Hi David, > > > > On Fri, Oct 23, 2020 at 6:49 AM David Gibson <dgibson(a)redhat.com> wrote: > > > > On Thu, 22 Oct 2020 11:01:04 -0400 > > "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > > > > > On Thu, Oct 22, 2020 at 05:50:51PM +0300, Marcel Apfelbaum wrote: > > >Ã‚Â [...]Ã‚Â > > > > > > Right. After detecting just failing unconditionally it a bit too > > > simplistic IMHO. > > > > There's also another factor here, which I thought I'd mentioned > > already, but looks like I didn't: I think we're still missing some > > details in what's going on. > > > > The premise for this patch is that plugging while the indicator is in > > transition state is allowed to fail in any way on the guest side.Ã‚Â I > > don't think that's a reasonable interpretation, because it's unworkable > > for physical hotplug.Ã‚Â If the indicator starts blinking while you're in > > the middle of shoving a card in, you'd be in trouble. > > > > So, what I'm assuming here is that while "don't plug while blinking" is > > the instruction for the operator to obey as best they can, on the guest > > side the rule has to be "start blinking, wait a while and by the time > > you leave blinking state again, you can be confident any plugs or > > unplugs have completed".Ã‚Â Obviously still racy in the strict computer > > science sense, but about the best you can do with slow humans in the > > mix. > > > > So, qemu should of course endeavour to follow that rule as though it > > was a human operator on a physical machine and not plug when the > > indicator is blinking.Ã‚Â *But* the qemu plug will in practice be fast > > enough that if we're hitting real problems here, it suggests the guest > > is still doing something wrong. > > > > > > I personally think there is a little bit of over-engineeringÃ‚Â here. > > Let's start with the spec: > > > > Ã‚Â Ã‚Â Power Indicator Blinking > > Ã‚Â Ã‚Â A blinking Power Indicator indicates that the slot is powering up or > > powering down and that > > Ã‚Â Ã‚Â insertion or removal of the adapter is not permitted. > > > > What exactly is an interpretation here? > > As you stated, the races are theoretical, the whole point of the indicator > > is to let the operator know he can't plug the device just yet. > > > > I understand it would be more user friendly if the QEMU would wait internally > > for the > > blinking to end, but the whole point of the indicator is to let the operatorÃ‚Â > > (human or machine) > > know they can't plug the device at a specific time. > > Should QEMU take the responsibilityÃ‚Â of the operator? Is it even correct? > > > > Even if we would want such a feature, how is it related to this patch? > > The patch simply refuses to start a hotplug operation when it knows it will not > > succeed.Ã‚Â > > Ã‚Â > > Another way that would make sense to me would beÃ‚Â is a new QEMU interface other > > than > > "add_device", let's say "adding_device_allowed", that would return true if the > > hotplug is allowed > > at this point of time. (I am aware of the theoretical races)Ã‚Â > > Rather than adding_device_allowed, something like "query slot" > might be helpful for debugging. That would help user figure out > e.g. why isn't device visible without any races. Would be new command useful tough? What we end up is broken guest (if I read commit message right) and a user who has no idea if device_add was successful or not. So what user should do in this case - wait till it explodes? - can user remove it or it would be stuck there forever? - poll slot before hotplug, manually? (if this is the case then failing device_add cleanly doesn't sound bad, it looks similar to another error we have "/* Check if hot-plug is disabled on the slot */" in pcie_cap_slot_pre_plug_cb) CCing libvirt, as it concerns not only QEMU. > > > The above will at least mimic the mechanics of the pyhsÃ‚Â world.Ã‚Â The operator > > looks at the indicator, > > the management software checks if adding the device is allowed. > > Since it is a corner case I would prefer the device_add to fail rather than > > introducing a new interface, > > but that's just me. > > > > Thanks, > > Marcel > > > > I think we want QEMU management interface to be reasonably > abstract and agnostic if possible. Pushing knowledge of hardware > detail to management will just lead to pain IMHO. > We supported device_add which practically never fails for years, For CPUs and RAM, device_add can fail so maybe management is also prepared to handle errors on PCI hotplug path. > at this point it's easier to keep supporting it than > change all users ... > > > > > > -- > > David Gibson <dgibson(a)redhat.com> > > Principal Software Engineer, Virtualization, Red Hat > > > >

3 2

[libvirt PATCH 1/2] qemu: fix memory leak reported by coverity
by Jonathon Jongsma 24 Oct '20

24 Oct '20

Let g_autoptr clean up on early return. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index cba9ec7b19..2491cbf9b8 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4013,7 +4013,7 @@ int qemuMonitorJSONAddFileHandleToSet(qemuMonitorPtr mon, const char *opaque, qemuMonitorAddFdInfoPtr fdinfo) { - virJSONValuePtr args = NULL; + g_autoptr(virJSONValue) args = NULL; g_autoptr(virJSONValue) reply = NULL; g_autoptr(virJSONValue) cmd = NULL; @@ -4024,7 +4024,8 @@ int qemuMonitorJSONAddFileHandleToSet(qemuMonitorPtr mon, if (virJSONValueObjectAdd(args, "j:fdset-id", fdset, NULL) < 0) return -1; - if (!(cmd = qemuMonitorJSONMakeCommandInternal("add-fd", args))) + if (!(cmd = qemuMonitorJSONMakeCommandInternal("add-fd", + g_steal_pointer(&args)))) return -1; if (qemuMonitorJSONCommandWithFd(mon, cmd, fd, &reply) < 0) -- 2.26.2

2 3

[PATCH 0/6] qemu: Switch from 'nbd-server-add' to 'block-export-add'
by Peter Krempa 24 Oct '20

24 Oct '20

QEMU deprecated nbd-server-add in favor of block-export-add recently (and didn't let us know via the standard means). Adapt to this change. Peter Krempa (6): qemu: block: Extract code for adding NBD exports to 'qemuBlockExportAddNBD' qemumonitorjsontest: Allow deprecation of 'nbd-server-add' QMP command tests: qemucapabilities: Update capabilities for qemu-5.2 dev cycle qemu: capabilities: Add QEMU_CAPS_BLOCK_EXPORT_ADD qemu: Add infrastructure for 'block-export-add' to export NBD qemuBlockExportAddNBD: Use 'block-export-add' when available src/qemu/qemu_backup.c | 11 +- src/qemu/qemu_block.c | 75 + src/qemu/qemu_block.h | 15 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 12 +- src/qemu/qemu_monitor.c | 10 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 21 + src/qemu/qemu_monitor_json.h | 4 + .../caps_5.2.0.x86_64.replies | 5090 +++++++++-------- .../caps_5.2.0.x86_64.xml | 6 +- tests/qemumonitorjsontest.c | 25 +- 13 files changed, 2890 insertions(+), 2386 deletions(-) -- 2.26.2

3 10

[PATCH] qemu: Don't pass mode when opening domain log file for reading
by Michal Privoznik 24 Oct '20

24 Oct '20

In qemuDomainLogContextNew() the domain log file is opened. Twice, the first time for writing, and the second time for reading (if required by caller). When opening the log file for reading a mode is provided. This doesn't do much harm, but is unnecessary. Drop the mode. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 161b369712..d7dbca487a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6251,7 +6251,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQEMUDriverPtr driver, } if (mode == QEMU_DOMAIN_LOG_CONTEXT_MODE_START) { - if ((ctxt->readfd = open(ctxt->path, O_RDONLY, S_IRUSR | S_IWUSR)) < 0) { + if ((ctxt->readfd = open(ctxt->path, O_RDONLY)) < 0) { virReportSystemError(errno, _("failed to open logfile %s"), ctxt->path); goto error; -- 2.26.2

2 1

[libvirt PATCH] qemu: fix potential resource leak
by Jonathon Jongsma 23 Oct '20

23 Oct '20

Coverity reported a potential resource leak. While it's probably not a real-world scenario, the code could technically jump to cleanup between the time that vdpafd is opened and when it is used. Ensure that it gets cleaned up in that case. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5c4e37bd9e..cbe7a6e331 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8135,6 +8135,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, addfdarg = g_strdup_printf("%s,opaque=%s", fdset, net->data.vdpa.devicepath); virCommandAddArgList(cmd, "-add-fd", addfdarg, NULL); + vdpafd = -1; } if (chardev) @@ -8204,6 +8205,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, VIR_FREE(tapfdName); VIR_FREE(vhostfd); VIR_FREE(tapfd); + if (vdpafd >= 0) + VIR_FORCE_CLOSE(vdpafd); return ret; } -- 2.26.2

4 7

[PATCH 0/4] hyperv: Deduplicate and reformat
by Michal Privoznik 23 Oct '20

23 Oct '20

The more I look into the code the more things to fix I find. Well, here are some fixes. Michal Prívozník (4): hyperv: Don't overwrite errors from hypervCreateInvokeParamsList() hyperv: Use hypervRequestStateChange() in hypervDomainSuspend() hyperv: Use two empty lines between functions hyperv: Reformat src/hyperv/hyperv_driver.c | 186 +++++++++--------------- src/hyperv/hyperv_util.c | 1 - src/hyperv/hyperv_wmi.c | 288 +++++++++++++++++++------------------ src/hyperv/hyperv_wmi.h | 15 +- 4 files changed, 229 insertions(+), 261 deletions(-) -- 2.26.2

3 8

[libvirt PATCH] qemu: honour fatal errors dealing with qemu slirp helper
by Daniel P. Berrangé 23 Oct '20

23 Oct '20

Currently all errors from qemuInterfacePrepareSlirp() are completely ignored by the callers. The intention is that missing qemu-slirp binary should cause the caller to fallback to the built-in slirp impl. Many of the possible errors though should indeed be considered fatal. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_hotplug.c | 7 +++++-- src/qemu/qemu_interface.c | 21 +++++++++++++++------ src/qemu/qemu_interface.h | 5 +++-- src/qemu/qemu_process.c | 8 ++++++-- src/qemu/qemu_slirp.c | 3 --- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 79fc8baa5c..dc998236de 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1311,9 +1311,12 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_USER: if (!priv->disableSlirp && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) { - qemuSlirpPtr slirp = qemuInterfacePrepareSlirp(driver, net); + qemuSlirpPtr slirp = NULL; + int rv = qemuInterfacePrepareSlirp(driver, net, &slirp); - if (!slirp) + if (rv == -1) + return -1; + if (rv == 0) break; QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp = slirp; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index cbf3d99981..b4ab809970 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -636,30 +636,39 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, } -qemuSlirpPtr +/* + * Returns: -1 on error, 0 if slirp isn't available, 1 on succcess + */ +int qemuInterfacePrepareSlirp(virQEMUDriverPtr driver, - virDomainNetDefPtr net) + virDomainNetDefPtr net, + qemuSlirpPtr *slirpret) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(qemuSlirp) slirp = NULL; size_t i; + if (!cfg->slirpHelperName || + !virFileExists(cfg->slirpHelperName)) + return 0; /* fallback to builtin slirp impl */ + if (!(slirp = qemuSlirpNewForHelper(cfg->slirpHelperName))) - return NULL; + return -1; for (i = 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip = net->guestIP.ips[i]; if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET) && !qemuSlirpHasFeature(slirp, QEMU_SLIRP_FEATURE_IPV4)) - return NULL; + return 0; if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6) && !qemuSlirpHasFeature(slirp, QEMU_SLIRP_FEATURE_IPV6)) - return NULL; + return 0; } - return g_steal_pointer(&slirp); + *slirpret = g_steal_pointer(&slirp); + return 1; } diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 3dcefc6a12..b5e91e3ab2 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -56,5 +56,6 @@ int qemuInterfaceOpenVhostNet(virDomainDefPtr def, int *vhostfd, size_t *vhostfdSize) G_GNUC_NO_INLINE; -qemuSlirpPtr qemuInterfacePrepareSlirp(virQEMUDriverPtr driver, - virDomainNetDefPtr net); +int qemuInterfacePrepareSlirp(virQEMUDriverPtr driver, + virDomainNetDefPtr net, + qemuSlirpPtr *slirp); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5bc76a75e3..59206a17fb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5697,9 +5697,13 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr driver, } else if (actualType == VIR_DOMAIN_NET_TYPE_USER && !priv->disableSlirp && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) { - qemuSlirpPtr slirp = qemuInterfacePrepareSlirp(driver, net); + qemuSlirpPtr slirp = NULL; + int rv = qemuInterfacePrepareSlirp(driver, net, &slirp); - QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp = slirp; + if (rv == -1) + return -1; + if (rv == 1) + QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp = slirp; } } diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index d2e4ed79be..dfb36125f0 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -101,9 +101,6 @@ qemuSlirpNewForHelper(const char *helper) virJSONValuePtr featuresJSON; size_t i, nfeatures; - if (!helper) - return NULL; - slirp = qemuSlirpNew(); if (!slirp) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.26.2

2 1

[PATCH 0/3] Fix stat mocks on macOS
by Roman Bolshakov 23 Oct '20

23 Oct '20

Hi, The series partially addresses https://gitlab.com/libvirt/libvirt/-/issues/58 by enabling stat mocks and that fixes qemufirmwaretest, domaincapstest and qemuvhostusertest. Thanks, Roman Roman Bolshakov (3): tests: Fix lstat() mock initialization on macOS tests: Re-introduce stat/lstat mocks on macOS tests: Use flat namespace for qemu test driver tests/meson.build | 1 + tests/virmockstathelpers.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) -- 2.28.0

2 4

where can i find the sourcecode from virDomainDestroy ?
by Lentes, Bernd 23 Oct '20

23 Oct '20

Hi, i have some questions concerning the destroying of domains, and i hope i'm right here. If not sorry for the disturbance. I'm running a two node HA cluster with pacemaker and KVM domains as resources. >From time to time when i try to stop a domain with the cluster manager that does not work, so the domain is destroyed. That's ok. But seldom and irregular also destroy does not work, so the node this domain is running on is fenced. That's ugly. Fencing is the worst which can happen to a cluster and i try to avoid it. Maybe destroy does not work because of heavy load, i'm currently examing that. I installed the source package from libvirt-4.0.0, i have a SLES 12 SP4. I found a virsh-domain.c which i assume is responsible for the domains. Right ? I found a function called "virDomainDestroy", which i believe has the purpose to destroy the domain. Right ? But i don't find the source for that function. I greped the whole source code for it, but didn't find it. I'd like to know what this function returns in success or failure. Could you please help me ? Thanks. Bernd -- Bernd Lentes Systemadministration Institute for Metabolism and Cell Death (MCD) Building 25 - office 122 HelmholtzZentrum München bernd.lentes(a)helmholtz-muenchen.de phone: +49 89 3187 1241 phone: +49 89 3187 3827 fax: +49 89 3187 2294 http://www.helmholtz-muenchen.de/mcd stay healthy Helmholtz Zentrum MÃ¼nchen Helmholtz Zentrum MÃ¼nchen

3 3

[PATCH] news: introduce memory failure event
by zhenwei pi 23 Oct '20

23 Oct '20

Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index d0454b7840..a01481801e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,11 @@ v6.9.0 (unreleased) * **New features** + * Introduce memory failure event + + Libvirt could handle domain's memory failure event. Drivers need to + implement their own method. Currently, only QEMU supports this feature. + * qemu: Implement support for ``<transient/>`` disks VMs based on the QEMU hypervisor now can use ``<transient/>`` option for -- 2.11.0

2 1

[libvirt PATCH] libvirt-guests: Sync time for autostarted guests
by Tim Wiederhake 23 Oct '20

23 Oct '20

From: Orion Poplawski <orion(a)nwra.com> Setting SYNC_TIME=1 does not work on autostarted guests. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tools/libvirt-guests.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index d69df908d2..87f96af14d 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -206,9 +206,9 @@ start() { retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ gettext "done"; echo - if "$sync_time"; then - run_virsh "$uri" domtime --sync "$name" >/dev/null - fi + fi + if "$sync_time"; then + run_virsh "$uri" domtime --sync "$name" >/dev/null fi fi done -- 2.26.2

2 1