September 2014 - Devel - libvirt List Archives

[libvirt] [PATCH] Renamed internal __mon_yday into __vir_mon_yday to avoid conflicts
by Cédric Bosdonnat 28 Oct '14

28 Oct '14

libc has another constant with the same name, which leads to redefinition error when building against static libvirt --- src/util/virtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index acbec41..7b3ec44 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -105,7 +105,7 @@ int virTimeFieldsNowRaw(struct tm *fields) #define DIV(a, b) ((a) / (b) - ((a) % (b) < 0)) #define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400)) -const unsigned short int __mon_yday[2][13] = { +const unsigned short int __vir_mon_yday[2][13] = { /* Normal years. */ { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, /* Leap years. */ @@ -160,7 +160,7 @@ void virTimeFieldsThen(unsigned long long when, struct tm *fields) fields->tm_year = y - 1900; fields->tm_yday = days; - ip = __mon_yday[is_leap_year(y)]; + ip = __vir_mon_yday[is_leap_year(y)]; for (y = 11; days < (long int) ip[y]; --y) continue; days -= ip[y]; -- 1.8.4.5

3 2

[libvirt] [PATCH 0/3] lxc: Implement emulator pin APIs to set/get cpuset
by Wang Rui 28 Oct '14

28 Oct '14

We can specify cpuset for a container defined with the xml like <vcpu placement='static' cpuset='0-3'> to achieve cpu isolation. It works when container is started. But there is no implements we can use to either change or get cpuset. The following patches implement the lxc driver methods for virDomainPinEmulator and virDomainGetEmulatorPinInfo. Also support container startup with emulator affinity info in xml. After these patches, we can set and get libvirt_lxc cpuset. Yue Wenyuan (3): lxc: Implement pin emulator for container startup lxc: Implement emulator pin API in lxc driver lxc: Implement geting emulator pin info API in lxc driver src/lxc/lxc_cgroup.c | 88 ++++++++++++++++++++ src/lxc/lxc_cgroup.h | 7 ++ src/lxc/lxc_controller.c | 4 + src/lxc/lxc_driver.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 305 insertions(+) -- 1.7.12.4

3 9

[libvirt] [PATCH] qemu: add capability probing for block-stream
by Shanzhi Yu 24 Oct '14

24 Oct '14

Since block-stream is not supported on qemu-kvm, so libvirt should post more accurate error info when do blockpull with qemu-kvm but not "Command 'block-stream' is not found" Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140981 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 13 +++++-------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 81ada48..5674f4f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -269,6 +269,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "splash-timeout", /* 175 */ "iothread", + "block-stream", ); @@ -1426,6 +1427,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-spice", QEMU_CAPS_SPICE }, { "query-kvm", QEMU_CAPS_KVM }, { "block-commit", QEMU_CAPS_BLOCK_COMMIT }, + { "block-stream", QEMU_CAPS_BLOCK_STREAM }, { "query-vnc", QEMU_CAPS_VNC }, { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0980c00..6701965 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -216,6 +216,7 @@ typedef enum { QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ + QEMU_CAPS_BLOCK_STREAM = 177, /* block-stream */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 73edda3..b38bc91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14980,15 +14980,12 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("block jobs not supported with this QEMU binary")); goto cleanup; - } else if (base) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("partial block pull not supported with this " - "QEMU binary")); - goto cleanup; - } else if (mode == BLOCK_JOB_PULL && bandwidth) { + } + + if (mode == BLOCK_JOB_PULL && + !(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_STREAM))){ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting bandwidth at start of block pull not " - "supported with this QEMU binary")); + _("block pull is not supported with this QEMU binary")); goto cleanup; } -- 1.8.3.1

2 3

[libvirt] [PATCH] Add support for /run/initctl
by Rick Harris 22 Oct '14

22 Oct '14

Newer versions of Debian use `/run/initctl` instead of `/dev/initctl`. This patch updates the code to search for the FIFO from a list of well-known locations. In the FreeBSD case, as before, we fall-back to the `/etc/.initctl` stub. --- src/util/virinitctl.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index a6fda3b..c4b48d4 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -46,12 +46,6 @@ * Copyright (C) 1995-2004 Miquel van Smoorenburg */ -# if defined(__FreeBSD_kernel__) -# define VIR_INITCTL_FIFO "/etc/.initctl" -# else -# define VIR_INITCTL_FIFO "/dev/initctl" -# endif - # define VIR_INITCTL_MAGIC 0x03091969 # define VIR_INITCTL_CMD_START 0 # define VIR_INITCTL_CMD_RUNLVL 1 @@ -124,6 +118,13 @@ virInitctlSetRunLevel(virInitctlRunLevel level) struct virInitctlRequest req; int fd = -1; int ret = -1; + const char *initctl_fifo = NULL; + size_t i = 0; + const char *initctl_fifos[] = { + "/run/initctl", + "/dev/initctl", + "/etc/.initctl", + }; memset(&req, 0, sizeof(req)); @@ -133,22 +134,31 @@ virInitctlSetRunLevel(virInitctlRunLevel level) /* Yes it is an 'int' field, but wants a numeric character. Go figure */ req.runlevel = '0' + level; - if ((fd = open(VIR_INITCTL_FIFO, - O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) < 0) { - if (errno == ENOENT) { - ret = 0; + for (i = 0; i < ARRAY_CARDINALITY(initctl_fifos); i++) { + initctl_fifo = initctl_fifos[i]; + + if ((fd = open(initctl_fifo, + O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) >= 0) + break; + + if (errno != ENOENT) { + virReportSystemError(errno, + _("Cannot open init control %s"), + initctl_fifo); goto cleanup; } - virReportSystemError(errno, - _("Cannot open init control %s"), - VIR_INITCTL_FIFO); + } + + /* Ensure we found a valid initctl fifo */ + if (fd < 0) { + ret = 0; goto cleanup; } if (safewrite(fd, &req, sizeof(req)) != sizeof(req)) { virReportSystemError(errno, _("Failed to send request to init control %s"), - VIR_INITCTL_FIFO); + initctl_fifo); goto cleanup; } -- 1.9.1

2 2

[libvirt] [PATCHv2 0/4] Another attempt at improving virsh autocompletion
by Solly Ross 17 Oct '14

17 Oct '14

Version 2: Electric Boogaloo Version 1: https://www.redhat.com/archives/libvir-list/2014-March/msg01898.html This version of the patch introduces the following new things: - Tests (a whole bunch of them, in fact)! - A new `complete` command to run get newline-separated completion results from the command line - Support for completing partial quotes (e.g. `virsh complete "fake-command ab \"i "`) - Passing the syntax checks (sorry about that) A brief overview of the patch set follows: 1. Extract parsing logic from the vshCommandParse so that it can be used elsewhere. The new method returns states and sets passed in pointers. Calling methods can interpret these states and deal with them as needed (completion ignores many, while vshCommandParse throws errors). 2. Implement (and test!) an improved completion engine with support for virsh quoting rules, flags, positional arguments, no duplication, and more. 3. Add (and test!) a method for retrieve a global vshControl object should readline be enabled. This allows for "smart completion" of options like "domain". 4. Extract the domain listing code from virsh-domain-monitor, and move it to virsh-completer. Implement a domain completer, which is then used for all the cases of "domain" options (note that it current does not have any flags specified for which commands should list active vs inactive domains, as this commit is mainly to allow people to test out "smart completion") Solly Ross (4): Improve virsh autocompletion (extract parser) Improve virsh autocompletion (base framework) Improve virsh autocompletion (global ctl object) Improve virsh autocompletion (domain completer) po/POTFILES.in | 1 + tests/virshtest.c | 268 +++++++++++++ tools/Makefile.am | 3 +- tools/virsh-completer.c | 355 +++++++++++++++++ tools/virsh-completer.h | 85 +++++ tools/virsh-domain-monitor.c | 287 +------------- tools/virsh-domain.c | 72 ++++ tools/virsh-snapshot.c | 11 + tools/virsh.c | 880 +++++++++++++++++++++++++++++++++++++------ tools/virsh.h | 20 + 10 files changed, 1582 insertions(+), 400 deletions(-) create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h -- 1.8.3.2

2 6

[libvirt] [PATCH 0/5] libxl: user-specified domain config improvements
by Jim Fehlig 16 Oct '14

16 Oct '14

This is essentially a V2 of Stefan's patch to add support for user-specified video device in the libxl driver. https://www.redhat.com/archives/libvir-list/2014-September/msg01157.html It goes a bit further and adds support for user-specfied <emulator>, which was trivial to add after introducing libxlDomainGetEmulatorType in patch 3. To ease review, the series has been split up as follows: - Missed keymap config from commit 4dfc34c3 split out to patch 1 - Patch 2 added to defer setting default vram value to the Xen drivers - Patch 3 added to detect old qemu-dm vs qemu with xen support - Patch 4 is a slightly reworked version of Stefan's patch - Patch 5 added to support user-specified <emulator> Jim Fehlig (4): libxl: Copy user-specified keymap to libxl build info struct Xen: Defer setting default vram value to Xen drivers libxl: Add function to determine device model type libxl: Support user-specified <emulator> Stefan Bader (1): libxl: Implement basic video device selection src/conf/domain_conf.c | 4 ++ src/libxl/libxl_conf.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_domain.c | 22 +++++++++ src/xen/xen_driver.c | 19 ++++++++ 5 files changed, 172 insertions(+) -- 1.8.4.5

3 13

[libvirt] [PATCH V3 0/3] Some improvements for video model
by Wang Rui 09 Oct '14

09 Oct '14

From: Zeng Junliang <zengjunliang(a)huawei.com> http://www.redhat.com/archives/libvir-list/2014-July/msg00644.html diff to v2: - hide vram attribute silently instead of reporting an error. - introduce three new capabilities for vga.vgamem_mb, vmvga.vgamem_mb and qxl.vgamem_mb. - fix some error reported by building libvirt. Zeng Junliang (3): qemu: Hide vram attribute for some useless cases. qemu: Introduce vgamem attribute for video model qemu: Add secondary-vga support docs/formatdomain.html.in | 46 +++--- docs/schemas/domaincommon.rng | 6 + src/conf/domain_conf.c | 57 +++++++- src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 17 +++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 162 +++++++++++++++------ src/qemu/qemu_domain.c | 12 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 + tests/qemuhelptest.c | 10 +- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-controller-order.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 5 +- ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 4 +- .../qemuxml2argv-graphics-spice-agentmouse.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 4 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-listen-network.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice-sasl.args | 3 +- .../qemuxml2argv-graphics-spice-sasl.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.args | 5 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-policy.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-secondary-vga.args | 7 + .../qemuxml2argv-graphics-vnc-secondary-vga.xml | 39 +++++ .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-std-vga.args | 4 + .../qemuxml2argv-graphics-vnc-std-vga.xml | 36 +++++ .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argv-graphics-vnc-vmware-svga.args | 4 + .../qemuxml2argv-graphics-vnc-vmware-svga.xml | 36 +++++ .../qemuxml2argv-graphics-vnc-websocket.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- .../qemuxml2argv-pci-autoadd-addr.xml | 2 +- .../qemuxml2argv-pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +- .../qemuxml2argv-pcihole64-q35.args | 3 +- .../qemuxml2argv-pcihole64-q35.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +- .../qemuxml2argv-serial-spiceport.args | 4 +- .../qemuxml2argv-serial-spiceport.xml | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 9 +- .../qemuxml2argv-video-device-pciaddr-default.xml | 6 +- tests/qemuxml2argvtest.c | 26 +++- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/qemuxml2xmltest.c | 3 + 68 files changed, 494 insertions(+), 121 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-secondary-vga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-secondary-vga.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-std-vga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-std-vga.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-vmware-svga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-vmware-svga.xml -- 1.7.12.4

3 11

[libvirt] [Question] capabilities.pidfile is left behind while starting and stopping libvirtd repeatly
by Wang Yufei 09 Oct '14

09 Oct '14

Hi, all I started and stopped libvirtd service repeatly with high frequency(1 per second), and found that the file capabilities.pidfile is left behind, as well as a qemu process. If I then restart libvirtd, qemu-kvm will fail to start as it's unable to flock capabilities.pidfile's fd. Steps to reproduce the problem: 1. start libvirtd service per second with a shell script. 2. meanwhile, stop libvirtd service per second with another shell script. 3. then, a process qemu is left behind: /usr/bin/qemu-kvm -S -no-user-config -nodefaults -nographic -M none -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize 4. file /var/lib/libvirt/qemu/capabilities.pidfile is left behind 5. start libvirtd again, the process qemu-kvm fails to start. The cause of the problem: This file is generated by qemu, and deleted by libvirtd. If libvirtd got killed before it removes the pidfile, it would be left behind then. Question: Would it be fine if I kill qemu-kvm process and unlink capabilities.pidfile, just before virQEMUCapsInitQMP runs this qemu-kvm process? -- Best Regards Wang Yufei

4 5

[libvirt] [PATCH v3 0/3] Add support for shared memory devices
by Martin Kletzander 09 Oct '14

09 Oct '14

v3: - removed the dead code for server start attribute - fixed default path in documentation - removed unnecessary check for shmem size v2 is here: https://www.redhat.com/archives/libvir-list/2014-September/msg01519.html v1 (Maxime's) is here: https://www.redhat.com/archives/libvir-list/2014-August/msg01032.html Martin Kletzander (2): docs, conf, schema: add support for shmem device qemu: Build command line for ivshmem device Maxime Leroy (1): qemu: add capability probing for ivshmem device docs/formatdomain.html.in | 52 ++++++ docs/schemas/domaincommon.rng | 39 ++++ src/conf/domain_conf.c | 198 ++++++++++++++++++++- src/conf/domain_conf.h | 24 +++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 118 +++++++++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemuhelptest.c | 15 +- .../qemuxml2argv-shmem-invalid-size.xml | 24 +++ .../qemuxml2argv-shmem-msi-only.xml | 24 +++ .../qemuxml2argv-shmem-small-size.xml | 24 +++ tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 ++ tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 51 ++++++ tests/qemuxml2argvtest.c | 7 + tests/qemuxml2xmltest.c | 1 + 24 files changed, 598 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-invalid-size.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-msi-only.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-small-size.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem.xml -- 2.1.1

5 16

[libvirt] [PATCH v2] hotplug: Fix libvirtd crash on qemu-attached guest
by John Ferlan 08 Oct '14

08 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1141621 The crash in this case was because the qemu-attach code did not create aliases for qemu cli args. When the detach-interface code was called it assumed aliases were set resulting in a core when dereferencing the still NULL alias. Adding a call to qemuAssignDeviceAliases() resolves the path for qemu-attach; however, to prevent future issues an additional check for a NULL value is made and an error provided in the deatch path. Add some more verbiage to the virsh man page. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1 is here: http://www.redhat.com/archives/libvir-list/2014-September/msg01331.html Changes since v1: - Add the call to qemuAssignDeviceAliases() in qemuDomainQemuAttach(). - Move the check for NULL alias inside the CAPS_DEVICE check and emit an error rather than trying to remove as an "else" condition. src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_hotplug.c | 7 +++++++ tools/virsh.pod | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 117138a..ef4ecd2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14746,6 +14746,9 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (qemuCanonicalizeMachine(def, qemuCaps) < 0) goto cleanup; + if (qemuAssignDeviceAliases(def, qemuCaps) < 0) + goto cleanup; + if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) goto cleanup; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d631887..daebe82 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3521,6 +3521,13 @@ qemuDomainDetachNetDevice(virConnectPtr conn, qemuDomainObjEnterMonitor(driver, vm); if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + if (!detach->info.alias) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device alias not found: cannot delete the " + "net device")); + qemuDomainObjExitMonitor(driver, vm); + goto cleanup; + } if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, detach, NULL, "detach", false); diff --git a/tools/virsh.pod b/tools/virsh.pod index eae9195..bd17f68 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3698,8 +3698,9 @@ using the UNIX driver. Ideally the process will also have had the Not all functions of libvirt are expected to work reliably after attaching to an externally launched QEMU process. There may be -issues with the guest ABI changing upon migration, and hotunplug -may not work. +issues with the guest ABI changing upon migration and device hotplug +or hotunplug may not work. The attached environment should be considered +primarily read-only. =item B<qemu-monitor-command> I<domain> { [I<--hmp>] | [I<--pretty>] } I<command>... -- 1.9.3

2 3