- Devel - libvirt List Archives

[libvirt] [PATCH] qemuDomainUpdateDeviceConfig: Allow full disk update
by Michal Privoznik 26 Sep '16

26 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1368417 So far, when it comes to 'virsh update-device --config' of disks we are limiting ourselves for just the disk source update and just for CDROMs and floppies. This makes no sense. Especially if you look around and see that we already allow full update to graphics and net devices. So let's just take whatever XML user wants to have there and replace our internal definition with it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2efaa2a..b5abb0c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8104,35 +8104,23 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, unsigned int parse_flags, virDomainXMLOptionPtr xmlopt) { - virDomainDiskDefPtr orig, disk; + virDomainDiskDefPtr newDisk; virDomainGraphicsDefPtr newGraphics; virDomainNetDefPtr net; int pos; switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: - disk = dev->data.disk; - if (!(orig = virDomainDiskByName(vmdef, disk->dst, false))) { + newDisk = dev->data.disk; + if ((pos = virDomainDiskIndexByName(vmdef, newDisk->dst, false)) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("target %s doesn't exist."), disk->dst); + _("target %s doesn't exist."), newDisk->dst); return -1; } - if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && - !(orig->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("this disk doesn't support update")); - return -1; - } - /* - * Update 'orig' - * We allow updating src/type//driverType/cachemode/ - */ - orig->cachemode = disk->cachemode; - orig->startupPolicy = disk->startupPolicy; - virStorageSourceFree(orig->src); - orig->src = disk->src; - disk->src = NULL; + virDomainDiskDefFree(vmdef->disks[pos]); + vmdef->disks[pos] = newDisk; + dev->data.disk = NULL; break; case VIR_DOMAIN_DEVICE_GRAPHICS: -- 2.8.4

3 2

[libvirt] [PATCH 2/2] tests/qemuxml2argvdata:Add a testcase
by Nitesh Konkar 25 Sep '16

25 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- .../qemuxml2argv-memory-hotplug-dimm-alias.args | 35 ++++++++ .../qemuxml2argv-memory-hotplug-dimm-alias.xml | 94 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 131 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args new file mode 100644 index 0000000..0e9f8e0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/home/usr/qemu/x86_64-softmmu/qemu-system-x86_64 \ +-name Fedora \ +-S \ +-M pc-i440fx-2.7 \ +-m size=1048576k,slots=32,maxmem=3145728k \ +-smp 8,maxcpus=160,sockets=40,cores=2,threads=2 \ +-numa node,nodeid=0,cpus=0-3,mem=512 \ +-numa node,nodeid=1,cpus=4-7,mem=512 \ +-object memory-backend-ram,id=memdimm2,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2,addr=4563402752 \ +-object memory-backend-ram,id=memdimm4,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm4,id=dimm4,slot=4,addr=4966055936 \ +-object memory-backend-ram,id=memdimm0,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ +-object memory-backend-ram,id=memdimm1,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1,addr=4429185024 \ +-object memory-backend-ram,id=memdimm3,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm3,id=dimm3,slot=3,addr=4697620480 \ +-uuid aecf3e5e-6f9a-42a3-9d6a-223a75569a66 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-Fedora/monitor.sock,server,nowait \ +-boot c \ +-usb \ +-drive file=/home/nitesh/Fedora24.qcow2,format=qcow2,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-serial pty \ +-device usb-mouse,id=input0,bus=usb.0,port=1 \ +-vga cirrus \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml new file mode 100644 index 0000000..9c0625d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml @@ -0,0 +1,94 @@ +<domain type='kvm'> + <name>Fedora</name> + <uuid>aecf3e5e-6f9a-42a3-9d6a-223a75569a66</uuid> + <maxMemory slots='32' unit='KiB'>3145728</maxMemory> + <memory unit='KiB'>1703936</memory> + <currentMemory unit='KiB'>1572864</currentMemory> + <vcpu placement='static' current='8'>160</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.7'>hvm</type> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <cpu> + <topology sockets='40' cores='2' threads='2'/> + <numa> + <cell id='0' cpus='0-3' memory='524288' unit='KiB'/> + <cell id='1' cpus='4-7' memory='524288' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/home/usr/qemu/x86_64-softmmu/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/home/nitesh/Fedora24.qcow2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='usb'> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </memballoon> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='2' base='0x110000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='4' base='0x128000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='0' base='0x100000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='1' base='0x108000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='3' base='0x118000000'/> + </memory> + </devices> + <seclabel type='none' model='none'/> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index aaf00c2..a592c40 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1992,6 +1992,8 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("memory-hotplug-dimm-alias", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, + QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("machine-aeskeywrap-on-caps", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, -- 1.9.3

1 0

[libvirt] [libvirt-php][PATCH] libvirt_domain_get_screenshot_api: Don't unlink screenshot file on success
by Michal Privoznik 24 Sep '16

24 Sep '16

In 5120ba28a2021 I've tried to fix couple of problems with this API (all kinds of resource leaks, bad conditions to some checks and so on). However, my clumsy fix introduced unlink even to a success path so after all callers were left with a non-existent path to screenshot file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-php.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 7916d07..693f911 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -4790,7 +4790,6 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) VIRT_ADD_ASSOC_STRING(return_value, "file", fileNew); VIRT_ADD_ASSOC_STRING(return_value, "mime", "image/png"); } else { - unlink(file); close(fd); fd = -1; VIRT_ADD_ASSOC_STRING(return_value, "file", file); -- 2.8.4

1 0

[libvirt] [libvirt-php][PATCH 00/14] Fix code styling in libvirt-php
by Katerina Koukiou 24 Sep '16

24 Sep '16

Fixed some basic code styling issues in libvirt-php.c that made the code hard to read. Katerina Koukiou (14): libvirt-php.c: Fix coding style issues: space required after ',' libvirt-php.c: Fix coding style issues: spaces required around '==', '>=', '<=' etc. libvirt-php.c: Fix coding style issues: space prohibited between function name and open parenthesis '(' libvirt-php.c: Fix coding style issues: remove unwanted spaces after '(' and before ')' libvirt-php.c: Fix code styling issues: no space needed after '[' and before ']' libvirt-php.c: Fix code styling issues: if then else statement style issues libvirt-php.c: Fix coding style issues with braces libvirt-php.c Fix coding style issues with if statements libvirt-php.c: Fix coding style issues: space required around '=' in assignments libvirt-php.c: Fix code styling issues with for loops libvirt-php.c: Fix coding style issues: "(foo*)" should be "(foo *)" libvirt-php.c: Fix coding style issues with operators libvirt-php.c: Fix coding style issues with extra/less spaces libvirt-php.c: Fix coding style issues in macros src/libvirt-php.c | 2220 ++++++++++++++++++++++++++--------------------------- 1 file changed, 1101 insertions(+), 1119 deletions(-) -- 2.7.3

2 15

[libvirt] [PATCH] libxl: increase usbdevice list only when finding such an input device
by Cédric Bosdonnat 23 Sep '16

23 Sep '16

If passing an empty usbdevice_list to libxl, qemu will always get an -usb parameter for HVM guests with only non-USB input devices. This causes qemu to crash when passing pvusb device on HVM guests. The solution is to allocate the list only when an item to put in it is found. --- src/libxl/libxl_conf.c | 58 ++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 306e441..f85f005 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -298,6 +298,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_build_info *b_info = &d_config->b_info; int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; size_t i; + size_t nusbdevice = 0; libxl_domain_build_info_init(b_info); @@ -469,47 +470,54 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_defbool_set(&b_info->u.hvm.vnc.enable, 0); libxl_defbool_set(&b_info->u.hvm.sdl.enable, 0); - if (def->ninputs) { + for (i = 0; i < def->ninputs; i++) { + char **usbdevice; + + if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) + continue; + #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - if (VIR_ALLOC_N(b_info->u.hvm.usbdevice_list, def->ninputs+1) < 0) + if (VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) return -1; #else - if (def->ninputs > 1) { + if (i > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("libxenlight supports only one input device")); return -1; } #endif - for (i = 0; i < def->ninputs; i++) { - char **usbdevice; - - if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) - continue; #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - usbdevice = &b_info->u.hvm.usbdevice_list[i]; + usbdevice = &b_info->u.hvm.usbdevice_list[i]; #else - usbdevice = &b_info->u.hvm.usbdevice; + usbdevice = &b_info->u.hvm.usbdevice; #endif - switch (def->inputs[i]->type) { - case VIR_DOMAIN_INPUT_TYPE_MOUSE: - VIR_FREE(*usbdevice); - if (VIR_STRDUP(*usbdevice, "mouse") < 0) - return -1; - break; - case VIR_DOMAIN_INPUT_TYPE_TABLET: - VIR_FREE(*usbdevice); - if (VIR_STRDUP(*usbdevice, "tablet") < 0) - return -1; - break; - default: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Unknown input device type")); + switch (def->inputs[i]->type) { + case VIR_DOMAIN_INPUT_TYPE_MOUSE: + VIR_FREE(*usbdevice); + if (VIR_STRDUP(*usbdevice, "mouse") < 0) return -1; - } + break; + case VIR_DOMAIN_INPUT_TYPE_TABLET: + VIR_FREE(*usbdevice); + if (VIR_STRDUP(*usbdevice, "tablet") < 0) + return -1; + break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unknown input device type")); + return -1; } } +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST + if (nusbdevice > 0 && + VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) { + VIR_DISPOSE_N(b_info->u.hvm.usbdevice_list, nusbdevice); + return -1; + } +#endif + /* Allow libxl to calculate shadow memory requirements */ b_info->shadow_memkb = libxl_get_required_shadow_memory(b_info->max_memkb, -- 2.9.3

2 1

[libvirt] [PATCH] Replacing for (; ; ) with while (1) for better code.
by Nitesh Konkar 23 Sep '16

23 Sep '16

As mentioned in https://libvirt.org/hacking.html, using while (1) is better than for (;;). --- src/libvirt-stream.c | 4 ++-- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetclient.c | 6 +++--- src/security/security_selinux.c | 2 +- src/util/vircgroup.c | 2 +- src/util/vircommand.c | 2 +- src/util/virdbus.c | 4 ++-- src/util/virfile.c | 2 +- tests/commandhelper.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index 8384b37..41daaa1 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -349,7 +349,7 @@ virStreamSendAll(virStreamPtr stream, if (VIR_ALLOC_N(bytes, want) < 0) goto cleanup; - for (;;) { + while (1) { int got, offset = 0; got = (handler)(stream, bytes, want, opaque); if (got < 0) { @@ -443,7 +443,7 @@ virStreamRecvAll(virStreamPtr stream, if (VIR_ALLOC_N(bytes, want) < 0) goto cleanup; - for (;;) { + while (1) { int got, offset = 0; got = virStreamRecv(stream, bytes, want); if (got < 0) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 3dd8927..50cf1ae 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -187,7 +187,7 @@ phypExec(LIBSSH2_SESSION *session, const char *cmd, int *exit_status, if (rc != 0) goto err; - for (;;) { + while (1) { /* loop until we block */ do { rc = libssh2_channel_read(channel, buffer, buffer_size); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8a220d9..bc7d268 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4398,7 +4398,7 @@ static void qemuMigrationIOFunc(void *arg) fds[0].fd = data->sock; fds[1].fd = data->wakeupRecvFD; - for (;;) { + while (1) { int ret; fds[0].events = fds[1].events = POLLIN; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 3b8b796..b0c4440 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4055,7 +4055,7 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, /* Loop-the-loop... * Even if the server has completed, the client must *always* do at least one step * in this loop to verify the server isn't lying about something. Mutual auth */ - for (;;) { + while (1) { if ((err = virNetSASLSessionClientStep(sasl, serverin, serverinlen, diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 361dc1a..f3457be 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -777,7 +777,7 @@ int virNetClientSetTLSSession(virNetClientPtr client, virNetSocketSetTLSSession(client->sock, client->tls); - for (;;) { + while (1) { ret = virNetTLSSessionHandshake(client->tls); if (ret < 0) @@ -1258,7 +1258,7 @@ virNetClientIOHandleInput(virNetClientPtr client) /* Read as much data as is available, until we get * EAGAIN */ - for (;;) { + while (1) { ssize_t ret; if (client->msg.nfds == 0) { @@ -1463,7 +1463,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, fds[0].fd = virNetSocketGetFD(client->sock); fds[1].fd = client->wakeupReadFD; - for (;;) { + while (1) { char ignore; sigset_t oldmask, blockedsigs; int timeout = -1; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 4be946d..153e6e9 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -137,7 +137,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, VIR_DEBUG("Using sensitivity level '%s' cat min %d max %d range %d", sens, catMin, catMax, catRange); - for (;;) { + while (1) { int c1 = virRandomInt(catRange); int c2 = virRandomInt(catRange); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 8b52816..cc83cf7 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1587,7 +1587,7 @@ virCgroupNewMachineSystemd(const char *name, goto cleanup; - for (;;) { + while (1) { virCgroupPtr tmp; char *t = strchr(offset + 1, '/'); if (t) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 2a59bd1..bfc130d 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2033,7 +2033,7 @@ virCommandProcessIO(virCommandPtr cmd) goto cleanup; ret = -1; - for (;;) { + while (1) { size_t i; struct pollfd fds[3]; int nfds = 0; diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 3f4dbe3..413229c 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -627,7 +627,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, narray = (size_t)-1; nstruct = strlen(types); - for (;;) { + while (1) { const char *t; VIR_DEBUG("Loop nstack=%zu narray=%zd nstruct=%zu types='%s'", @@ -904,7 +904,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, narray = (size_t)-1; nstruct = strlen(types); - for (;;) { + while (1) { const char *t; bool advanceiter = true; diff --git a/src/util/virfile.c b/src/util/virfile.c index a45279a..f246b29 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1269,7 +1269,7 @@ saferead_lim(int fd, size_t max_len, size_t *length) size_t size = 0; int save_errno; - for (;;) { + while (1) { int count; int requested; diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 015efda..5a77108 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -138,7 +138,7 @@ int main(int argc, char **argv) { fprintf(stderr, "BEGIN STDERR\n"); fflush(stderr); - for (;;) { + while (1) { got = read(STDIN_FILENO, buf, sizeof(buf)); if (got < 0) goto cleanup; -- 2.1.0

2 2

[libvirt] [PATCH 0/9] Couple of vhost-user fixes and cleanups
by Michal Privoznik 23 Sep '16

23 Sep '16

While working on this, I've discovered a qemu crasher [1], so there are not tested properly. If you have pointers how to test vhost-user without need to install openvswitch, I'm all ears. 1: http://lists.nongnu.org/archive/html/qemu-devel/2016-08/msg02933.html Michal Privoznik (9): qemuDomainAttachNetDevice: Explicitly list allowed types for hotplug qemuDomain{Attach,Remove}NetDevice: Prefer qemuDomainSupportsNetdev qemuBuildChrChardevStr: Introduce @nowait argument qemuBuildVhostuserCommandLine: Reuse qemuBuildChrChardevStr qemuBuildHostNetStr: Realign qemuBuildHostNetStr: Explicitly enumerate net types qemuBuildVhostuserCommandLine: Unify -netdev creation qemuBuildHostNetStr: Support VIR_DOMAIN_NET_TYPE_VHOSTUSER qemu_hotplug: Support interface type of vhost-user hotplug src/qemu/qemu_command.c | 169 ++++++++++++--------- src/qemu/qemu_hotplug.c | 83 ++++++++-- .../qemuxml2argv-net-vhostuser-multiq.args | 6 +- .../qemuxml2argv-net-vhostuser.args | 4 +- 4 files changed, 176 insertions(+), 86 deletions(-) -- 2.8.4

4 25

[libvirt] [PATCH] virsh: send-process-signal: add support for '-NUM' style of signal nums
by Chen Hanxiao 23 Sep '16

23 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As kill(1), add support for sending signal in form of "9" as well as "-9". Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7194153..b96b8fd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8254,9 +8254,14 @@ static int getSignalNumber(vshControl *ctl, const char *signame) for (i = 0; signame[i]; i++) lower[i] = c_tolower(signame[i]); + if (STRPREFIX(lower, "-")) + lower += 1; + if (virStrToLong_i(lower, NULL, 10, &signum) >= 0) goto cleanup; + lower = tmp; + if (STRPREFIX(lower, "sig_")) lower += 4; else if (STRPREFIX(lower, "sig")) -- 1.8.3.1

2 1

[libvirt] qemu - how add -object when no numa topology
by Safka, JaroslavX 23 Sep '16

23 Sep '16

Hi guys, I’m trying to figure out how to generate this arg line: “-object memory-backend-file,id=ram,mem-path=/var/lib/libvirt/qemu/,share=yes,size=14336 -numa node, memdev=ram” without numa. I see there are two functions which are capable of building backends: “qemuBuildNumaArgStr” and “qemuBuildMemoryDeviceCommandLine” The “qemuBuildNumaArgStr” I’m already using for creating backend+object when numa is enabled. But I’m not sure how to “activate” code inside “qemuBuildMemoryDeviceCommandLine” when numa is disabled. I found there must be (in xml) record “devices/memory” to create record def->mems. But I do not know if I should add this element into xml or I should allocate this structure by myself. Or create duplicated function, and create arg string with “-object …” inside on my own. This all is needed for new feature and new xml elements: (hugepages will not be used) <memoryBacking> <source type='file' path='/path/to/qemu'/> <access mode='shared'/> <allocation mode='immediate'/> </memoryBacking> Many thanks for any tips or help ☺ Best regards Jarek PS: I’m quite new in the libvirt code/community -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

1 0

[libvirt] [PATCH 0/8] cleanup and regenerate data for qemuhelptest
by Pavel Hrdina 23 Sep '16

23 Sep '16

Pavel Hrdina (8): qemuhelptest: remove downstream test data qemuhelptest: regenerate data for qemu-0.12.1 qemuhelptest: regenerate data for qemu-1.0 qemuhelptest: regenerate data for qemu-1.1.0 qemuhelptest: regenerate data for qemu-1.2.0 qemuhelptest: regenerate data for qemu-kvm-0.12.3 qemuhelptest: regenerate data for qemu-kvm-0.13.0 qemuhelptest: regenerate data for qemu-kvm-1.2.0 tests/qemuhelpdata/qemu-0.12.1 | 7 +- tests/qemuhelpdata/qemu-0.12.1-device | 62 ++++++ tests/qemuhelpdata/qemu-1.0 | 1 + tests/qemuhelpdata/qemu-1.0-device | 146 ++++++------- tests/qemuhelpdata/qemu-1.1.0 | 1 + tests/qemuhelpdata/qemu-1.1.0-device | 20 +- tests/qemuhelpdata/qemu-1.2.0 | 1 + tests/qemuhelpdata/qemu-1.2.0-device | 226 -------------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60 | 227 -------------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device | 57 ----- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61 | 229 -------------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device | 99 --------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta | 230 --------------------- .../qemu-kvm-0.12.1.2-rhel62-beta-device | 120 ----------- tests/qemuhelpdata/qemu-kvm-0.12.3 | 7 +- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 ++++++ tests/qemuhelpdata/qemu-kvm-0.13.0 | 1 - tests/qemuhelpdata/qemu-kvm-0.13.0-device | 4 +- tests/qemuhelpdata/qemu-kvm-1.2.0 | 1 + tests/qemuhelptest.c | 150 ++------------ 20 files changed, 234 insertions(+), 1418 deletions(-) delete mode 100644 tests/qemuhelpdata/qemu-1.2.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device -- 2.10.0

2 16

[libvirt] [PATCH v2 0/3] pass the path of compress prog directly
by Chen Hanxiao 23 Sep '16

23 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This series will pass the path of compress programe directly to functions such as doCoreDump, qemuDomainSaveInternal, etc. this can avoid one extra virFindFileInPath call in during virExec. Also reduce code duplication by macros. Chen Hanxiao (3): qemu_driver: pass path of compress prog directly qemu_driver: simplify compress prog check by macros qemu_driver: pass path of compress prog directly to doCoreDump src/qemu/qemu_driver.c | 242 ++++++++++++++++++++++++++----------------------- 1 file changed, 128 insertions(+), 114 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH 0/7] Pass the path of compress program (redo)
by John Ferlan 22 Sep '16

22 Sep '16

Rather than try to describe what I was thinking about for the passing the compress program directly series from Chen Hanxiao: http://www.redhat.com/archives/libvir-list/2016-September/msg00677.html and http://www.redhat.com/archives/libvir-list/2016-August/msg01237.html I took the liberty of creating my own set of patches which should end in the more or less same result. The primary benefit is not calling virFileInPath twice since we already get it at least once for the various compressed program callers, let's pass what we originally found. John Ferlan (7): qemu: Move getCompressionType qemu: Adjust doCoreDump to call getCompressionType qemu: Introduce helper qemuGetCompressionProgram qemu: Remove getCompressionType qemu: Use qemuGetCompressionProgram for error paths qemu: Remove qemuCompressProgramAvailable qemu: Get/return compressedpath program src/qemu/qemu_driver.c | 235 +++++++++++++++++++++++-------------------------- 1 file changed, 111 insertions(+), 124 deletions(-) -- 2.7.4

2 10

[libvirt] ANNOUNCE: ruby-libvirt 0.7.0
by Chris Lalancette 22 Sep '16

22 Sep '16

I'm pleased to release ruby-libvirt 0.7.0. ruby-libvirt is a ruby wrapper around the libvirt API. The changelog between 0.6.0 and 0.7.0 is: * Fix network lease API to allow arguments that libvirt allows * Implement VIRT_STORAGE_POOL_CREATE flags * Implement more VIR_STORAGE_VOL flags * Implement VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN * Implement virDomainDefineXMLFlags * Implement virDomainRename * Implement virDomainSetUserPassword * Implement VIR_DOMAIN_TIME_SYNC * Fix the return value from virStreamSourceFunc so volume upload works Version 0.7.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.7.0.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.7.0.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt Packages for it are also built for Fedora, and will be released shortly. As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette at gmail.com) and the libvirt mailing list. Thanks to those who contributed to this release.

1 0

[libvirt] [PATCH] qemu: Fix improper indention
by John Ferlan 22 Sep '16

22 Sep '16

Commit id 'ce61c164' indented wrong - not sure how I did that... Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed under the trivial rule src/qemu/qemu_command.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f6d26b0..1ac0fa1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5041,20 +5041,20 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, telnet ? ",telnet" : "", dev->data.tcp.listen ? ",server,nowait" : ""); - if (cfg->chardevTLS) { - char *objalias = NULL; + if (cfg->chardevTLS) { + char *objalias = NULL; - if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir, - dev->data.tcp.listen, - cfg->chardevTLSx509verify, - alias, qemuCaps) < 0) - goto error; + if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir, + dev->data.tcp.listen, + cfg->chardevTLSx509verify, + alias, qemuCaps) < 0) + goto error; - if (!(objalias = qemuAliasTLSObjFromChardevAlias(alias))) - goto error; - virBufferAsprintf(&buf, ",tls-creds=%s", objalias); - VIR_FREE(objalias); - } + if (!(objalias = qemuAliasTLSObjFromChardevAlias(alias))) + goto error; + virBufferAsprintf(&buf, ",tls-creds=%s", objalias); + VIR_FREE(objalias); + } break; case VIR_DOMAIN_CHR_TYPE_UNIX: -- 2.7.4

1 0

[libvirt] [PATCH] Fix Multiple Typos
by Nitesh Konkar 22 Sep '16

22 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 2 +- src/conf/storage_conf.c | 2 +- src/esx/esx_driver.c | 4 ++-- src/interface/interface_backend_udev.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5fede3d..dd34cec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14165,7 +14165,7 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, virDomainControllerDefPtr controller) { int idx; - /* Tenatively plan to insert controller at the end. */ + /* Tentatively plan to insert controller at the end. */ int insertAt = -1; virDomainControllerDefPtr current = NULL; @@ -19847,7 +19847,7 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, /* virDomainSourceDefFormatSeclabel: * - * This function automaticaly closes the <source> element and formats any + * This function automatically closes the <source> element and formats any * possible seclabels. */ static void diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d4a84c3..ce90c27 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -300,7 +300,7 @@ typedef enum { /* the backend driver used for PCI hostdev devices */ typedef enum { - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, /* detect automaticaly, prefer VFIO */ + VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, /* detect automatically, prefer VFIO */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM, /* force legacy kvm style */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO, /* force vfio */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN, /* force legacy xen style, use pciback */ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 05a1a49..7e7bb72 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2476,7 +2476,7 @@ virStoragePoolSourceFindDuplicate(virConnectPtr conn, if (def->type != pool->def->type) continue; - /* Don't mach against ourself if re-defining existing pool ! */ + /* Don't match against ourself if re-defining existing pool ! */ if (STREQ(pool->def->name, def->name)) continue; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3d90b69..5ce98b3 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -78,7 +78,7 @@ esxFreePrivate(esxPrivate **priv) /* * Parse a file name from a .vmx file and convert it to datastore path format - * if possbile. A .vmx file can contain file names in various formats: + * if possible. A .vmx file can contain file names in various formats: * * - A single name referencing a file in the same directory as the .vmx file: * @@ -969,7 +969,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, STRNEQ(vCenterIPAddress, potentialVCenterIPAddress)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("This host is managed by a vCenter with IP " - "address %s, but a mismachting vCenter '%s' " + "address %s, but a mismatching vCenter '%s' " "(%s) has been specified"), potentialVCenterIPAddress, priv->parsedUri->vCenter, vCenterIPAddress); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 27a772d..5d0fc64 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -884,7 +884,7 @@ udevGetIfaceDefBridge(struct udev *udev, goto error; ifacedef->data.bridge.nbItf = member_count; - /* Get the interface defintions for each member of the bridge */ + /* Get the interface definitions for each member of the bridge */ for (i = 0; i < member_count; i++) { ifacedef->data.bridge.itf[i] = udevGetIfaceDef(udev, member_list[i]->d_name); -- 2.1.0

2 1

[libvirt] [PATCH v2] qemu: enable user-defined cache bypassing while invoking
by fuweiwei 22 Sep '16

22 Sep '16

in the previous version, I mentioned the scenario of long-term pause while writing external memory checkpoints: v1: https://www.redhat.com/archives/libvir-list/2016-August/msg01194.html Daniel suggested not to hardcode the flag, but wire this upto the API. When the user invokes the snapshot they can request the VIR_DOMAIN_SAVE_BYPASS_CACHE flag explicitly. So in this version I introduce the --bypass-cache option in libvirt snapshot API. When invoking an external VM snapshots, we may use the command like this: virsh snapshot-create-as VM snap --memspec /path/to/memsnap --live --bypass-cache The VM snapshot can be done with inapparent VM suspend now. Without "--bypass-cache" flag, one may experience long-term VM suspend (so that the implication of "--live" option is not significant), provided that the VM has a large amount of dirty pages to save. Signed-off-by: fuweiwei <fuweiwei2(a)huawei.com> --- include/libvirt/libvirt-domain-snapshot.h | 3 +++ src/qemu/qemu_driver.c | 20 ++++++++++++++++++-- tools/virsh-snapshot.c | 12 ++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h index 0f73f24..aeff665 100644 --- a/include/libvirt/libvirt-domain-snapshot.h +++ b/include/libvirt/libvirt-domain-snapshot.h @@ -70,6 +70,9 @@ typedef enum { VIR_DOMAIN_SNAPSHOT_CREATE_LIVE = (1 << 8), /* create the snapshot while the guest is running */ + VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE = (1 << 9), i/* Bypass cache + while writing external + checkpoint files. */ } virDomainSnapshotCreateFlags; /* Take a snapshot of the current VM state */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2089359..d5f441f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14036,6 +14036,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed = QEMU_SAVE_FORMAT_RAW; + unsigned int save_memory_flag = 0; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. @@ -14116,8 +14117,12 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true))) goto cleanup; + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE) + save_memory_flag |= VIR_DOMAIN_SAVE_BYPASS_CACHE; + if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, - xml, compressed, resume, 0, + xml, compressed, resume, + save_memory_flag, QEMU_ASYNC_JOB_SNAPSHOT)) < 0) goto cleanup; @@ -14224,7 +14229,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT | VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE | VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC | - VIR_DOMAIN_SNAPSHOT_CREATE_LIVE, NULL); + VIR_DOMAIN_SNAPSHOT_CREATE_LIVE | + VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE, NULL); VIR_REQUIRE_FLAG_RET(VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE, VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY, @@ -14297,6 +14303,16 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, goto cleanup; } + /* the option of bypass cache is only supported for external checkpoints */ + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE && + (def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL || + redefine)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("only external memory snapshots support " + "cache bypass.")); + goto cleanup; + } + /* allow snapshots only in certain states */ switch ((virDomainState) vm->state.state) { /* valid states */ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index f879e7a..0627baf 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -160,6 +160,10 @@ static const vshCmdOptDef opts_snapshot_create[] = { .type = VSH_OT_BOOL, .help = N_("require atomic operation") }, + {.name = "bypass-cache", + .type = VSH_OT_BOOL, + .help = N_("bypass system cache while writing external checkpoints") + }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), {.name = NULL} }; @@ -191,6 +195,8 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "bypass-cache")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; @@ -358,6 +364,10 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { .type = VSH_OT_BOOL, .help = N_("require atomic operation") }, + {.name = "bypass-cache", + .type = VSH_OT_BOOL, + .help = N_("bypass system cache while writing external checkpoints") + }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), {.name = "memspec", .type = VSH_OT_STRING, @@ -404,6 +414,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "bypass-cache")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.9.5.msysgit.1

3 2

[libvirt] [PATCH 0/9] Couple of migration fixes
by Michal Privoznik 22 Sep '16

22 Sep '16

Looks like nobody tried migrations lately. I just did and found interesting bug. On the destination qemu binary was at different path. So I've dumped domain XML I was trying ti migrate and just changed the emulator path. All of a sudden I observed plenty of errors. Problem is that whilst parsing the user provided migration XML (and doing other operations on it), because of parse callbacks we need qemuCaps for the binary. However, we just take the def->emulator and expect it to exist. Well, it doesn't. Michal Privoznik (9): conf: Introduce virDomainDefPostParseOpaque conf: Introduce virDomainDefParseStringOpaque qemuDomainDefPostParse: Fetch qemuCaps from domain object conf: Extend virDomainDeviceDefPostParse for parseOpaque qemuDomainDeviceDefPostParse: Fetch caps from domain object conf: Extend virDomainDefAssignAddressesCallback for parseOpaque qemuDomainDefAssignAddresses: Fetch caps from domain object domain_conf: Introduce VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE conf: Skip post parse callbacks when creating copy src/bhyve/bhyve_domain.c | 6 ++-- src/conf/domain_conf.c | 80 +++++++++++++++++++++++++++++++++++++--------- src/conf/domain_conf.h | 43 +++++++++++++++++++++---- src/libvirt_private.syms | 3 ++ src/libxl/libxl_domain.c | 6 ++-- src/lxc/lxc_domain.c | 6 ++-- src/openvz/openvz_driver.c | 6 ++-- src/phyp/phyp_driver.c | 6 ++-- src/qemu/qemu_domain.c | 50 ++++++++++++++++++++++------- src/qemu/qemu_migration.c | 6 ++-- src/uml/uml_driver.c | 6 ++-- src/vbox/vbox_common.c | 6 ++-- src/vmware/vmware_driver.c | 6 ++-- src/vmx/vmx.c | 6 ++-- src/vz/vz_driver.c | 6 ++-- src/xen/xen_driver.c | 6 ++-- src/xenapi/xenapi_driver.c | 6 ++-- 17 files changed, 195 insertions(+), 59 deletions(-) -- 2.8.4

2 11

[libvirt] [PATCH v2 00/45] Enhance guest CPU configuration code
by Jiri Denemark 22 Sep '16

22 Sep '16

Version 2: - review comments addressed; see individual patches for details This patch series does several things: - fixes tests to avoid relying on bugs in our code - adds support for advertising supported CPU modes and models in domain capabilities - starts adding better and higher level APIs to our cpu driver (the old low level APIs will be removed once this process is over) - prepares qemu driver for asking QEMU what a host CPU looks like and what CPU models can be run on it - makes QEMU CPU command line builder build command line and nothing else The added part of domain capabilities XML looks like this: <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> <model fallback='allow'>Broadwell</model> <vendor>Intel</vendor> <feature policy='disable' name='aes'/> <feature policy='require' name='vmx'/> </mode> <mode name='custom' supported='yes'> <model usable='no'>Broadwell</model> <model usable='yes'>Broadwell-noTSX</model> ... </mode> </cpu> and host-passthrough is only advertised as supported for KVM domains, host-model is only supported when guest architecture is compatible with host and overall it should just work the way one would expect (in contrast to the current state of the code). Jiri Denemark (45): cpuGetModels: Switch to virArch domcaps: Add support for listing supported CPU models qemu: Use virDomainCapsCPUModels for cpuDefinitions qemuxml2argvtest: Rename extraFlags as qemuCaps qemuxml2argvtest: Rename "out" labels as "cleanup" qemuxml2argvtest: Get rid of testCompareXMLToArgvHelper qemuxml2argvtest: Reorder functions qemuxml2argvtest: Update qemuCaps after parsing domain XML qemuxml2argvtest: Properly initialize qemuCaps->arch testutilsqemu: Helpers for changing host CPU and arch testutilsqemu: Add default CPU for PPC64 architectures qemu: Separate guest CPU validation from command line creation qemuxml2argvtest: Properly setup CPU models in qemuCaps qemuxml2argvtest: Set correct architecture for KVM guests qemuxml2argvtest: Reorder CPU features qemu: Introduce virQEMUCapsGuestIsNative qemu: Fill in CPU domain capabilities cpu: Special case models == NULL in cpuGetModels cpu: Don't overwrite errors in cpuGetModels domcaps: Show only CPU models supported by libvirt domcaps: Add CPU usable flag schema: Separate CPU related definitions into cputypes.rng qemu: Propagate virCapsPtr to virQEMUCapsNewForBinaryInternal conf: Introduce virCPUDefCopyWithoutModel conf: Introduce virCPUDefStealModel conf: Introduce virCPUDefCopyModelFilter qemu: Store host-model CPU in qemu capabilities cpu: Drop false support for ARM cpu-model Show host model in domain capabilities qemu: Introduce virQEMUCapsGetHostModel qemu: Introduce virQEMUCapsIsCPUModeSupported cpu: Make x86ModelFromCPU easier to read cpu: Make x86ModelFromCPU a bit smarter cpu: Report error for unknown features in x86HasFeature cpu: Add x86FeatureInData cpu: Rework cpuUpdate cpu: Set nfeatures_max correctly in x86Decode cpu: Introduce virCPUTranslate cpu: Rename cpuHasFeature to virCPUDataCheckFeature cpu: Rework virCPUDataCheckFeature cpu: Introduce virCPUCheckFeature cpu: Document missing parameters for cpuCompare* cpu: Rework cpuCompare* APIs qemu: Update guest CPU def in live XML Move CMT feature filtering to QEMU driver docs/formatdomaincaps.html.in | 65 +++ docs/schemas/cputypes.rng | 135 ++++++ docs/schemas/domaincaps.rng | 60 +++ docs/schemas/domaincommon.rng | 129 +----- po/POTFILES.in | 1 + src/conf/cpu_conf.c | 64 ++- src/conf/cpu_conf.h | 21 + src/conf/domain_capabilities.c | 198 +++++++++ src/conf/domain_capabilities.h | 47 +++ src/cpu/cpu.c | 264 +++++++++--- src/cpu/cpu.h | 72 +++- src/cpu/cpu_arm.c | 79 ++-- src/cpu/cpu_ppc64.c | 48 ++- src/cpu/cpu_s390.c | 1 - src/cpu/cpu_x86.c | 463 +++++++++++++-------- src/driver-hypervisor.h | 2 +- src/libvirt-host.c | 3 +- src/libvirt_private.syms | 20 +- src/libxl/libxl_driver.c | 14 +- src/qemu/qemu_capabilities.c | 394 +++++++++++++----- src/qemu/qemu_capabilities.h | 24 +- src/qemu/qemu_capspriv.h | 13 +- src/qemu/qemu_command.c | 216 +++------- src/qemu/qemu_domain.c | 37 +- src/qemu/qemu_driver.c | 41 +- src/qemu/qemu_monitor.c | 12 +- src/qemu/qemu_monitor.h | 10 +- src/qemu/qemu_monitor_json.c | 24 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 95 ++++- src/test/test_driver.c | 12 +- src/vmware/vmware_conf.c | 6 +- tests/cputest.c | 24 +- .../cputestdata/x86-host+host-model-nofallback.xml | 2 +- tests/cputestdata/x86-host+host-model.xml | 2 +- .../x86-host+host-passthrough-features.xml | 4 + tests/cputestdata/x86-host+host-passthrough.xml | 19 +- tests/cputestdata/x86-host+min.xml | 27 +- tests/cputestdata/x86-host+pentium3.xml | 39 +- tests/cputestdata/x86-host-invtsc+host-model.xml | 2 +- .../cputestdata/x86-host-passthrough-features.xml | 4 + tests/domaincapsschemadata/basic.xml | 5 + tests/domaincapsschemadata/full.xml | 12 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 5 + tests/domaincapsschemadata/libxl-xenfv.xml | 5 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 5 + tests/domaincapsschemadata/libxl-xenpv.xml | 5 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 32 ++ .../qemu_2.6.0-gicv2-virt.aarch64.xml | 36 ++ .../qemu_2.6.0-gicv3-virt.aarch64.xml | 36 ++ tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 36 ++ tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 10 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 36 ++ tests/domaincapstest.c | 78 +++- tests/qemucapabilitiestest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemumonitorjsontest.c | 8 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml | 2 +- .../qemuxml2argv-cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 12 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 3 +- .../qemuxml2argv-cpu-exact2-nofallback.xml | 14 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 14 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model-cmt.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-minimum2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 6 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 20 +- .../qemuxml2argv-graphics-spice-timeout.xml | 24 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.xml | 2 +- tests/qemuxml2argvtest.c | 312 +++++++------- .../qemuxml2xmlout-graphics-spice-timeout.xml | 24 +- tests/testutilsqemu.c | 128 ++++-- tests/testutilsqemu.h | 11 +- tools/virsh-host.c | 10 +- 80 files changed, 2473 insertions(+), 1137 deletions(-) create mode 100644 docs/schemas/cputypes.rng create mode 100644 tests/cputestdata/x86-host+host-passthrough-features.xml create mode 100644 tests/cputestdata/x86-host-passthrough-features.xml -- 2.10.0

2 48

[libvirt] [libvirt-php][PATCH 0/2] Couple of example fixes
by Michal Privoznik 22 Sep '16

22 Sep '16

Pushed under "I'm the PHP master" rule. Michal Privoznik (2): examples: Sort domains examples: Die early if getting a screenshot fails examples/index.php | 2 +- examples/libvirt.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.8.4

2 3

[libvirt] [PATCH] qemu: fix libvirtd crash in migration after vm shutdown
by weifuqiang 22 Sep '16

22 Sep '16

[PATCH] qemu: fix libvirtd crash in migration after vm shutdown If we shutdown a guest, then migrate it without the arg XML, libvirtd will get crashed. The reason is that: 1 during shutdown callback, qemuProcessStop() , it points vm->def to vm->newDef 2 during migration, it frees persistentDef, which points to vm->newDef when the arg XML is NULL. However, because vm->newDef is now vm->def, what we IN FACT freed is vm->def. 3 it will refer to vm->def after step2, thus invalid read/write causes libvirtd crash We needn't to free persistentDef if persist_xml is NULL, because no extra def was alloced if persistent_xml is NULL. --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6a683f7..3636c93 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4915,7 +4915,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, VIR_WARN("Unable to encode migration cookie"); } - if (persistDef != vm->newDef) + if (persist_xml && persistDef) virDomainDefFree(persistDef); qemuMigrationCookieFree(mig); -- 1.9.5.msysgit.1

3 3

[libvirt] [PATCH 0/7] IVSHMEM round two, this time with cookies
by Martin Kletzander 22 Sep '16

22 Sep '16

Actually just migration cookie flag. Also this version dropped the role and model to make everything more sunshine-n-unicorns. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1347049 Martin Kletzander (7): conf: Fix virDomainShmemDefFind qemu: Add capabilities for ivshmem-{plain,doorbell} qemu: Save various defaults for shmem qemu: Add qemuDomainSupportsNonLegacyShmem qemu: Disable migration with legacy ivshmem qemu: Support newer ivshmem device variants qemu: Add support for hot/cold-(un)plug of shmem devices docs/formatdomain.html.in | 6 +- src/conf/domain_conf.c | 4 +- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 109 +++++++++- src/qemu/qemu_command.h | 10 + src/qemu/qemu_domain.c | 24 +++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 39 +++- src/qemu/qemu_hotplug.c | 231 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 27 ++- .../caps_2.6.0-gicv2.aarch64.xml | 2 + .../caps_2.6.0-gicv3.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemuhotplugtest.c | 21 ++ .../qemuhotplug-ivshmem-doorbell-detach.xml | 6 + .../qemuhotplug-ivshmem-doorbell.xml | 3 + .../qemuhotplug-ivshmem-plain-detach.xml | 5 + .../qemuhotplug-ivshmem-plain.xml | 1 + ...muhotplug-base-live+ivshmem-doorbell-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-doorbell.xml | 63 ++++++ .../qemuhotplug-base-live+ivshmem-plain-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-plain.xml | 57 +++++ .../qemuxml2argv-shmem-plain-doorbell.args | 46 ++++ .../qemuxml2argv-shmem-plain-doorbell.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 18 +- tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 10 +- 31 files changed, 685 insertions(+), 26 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml -- 2.10.0

2 12

[libvirt] [PATCH 0/7] Fix some typos.
by Nitesh Konkar 22 Sep '16

22 Sep '16

*** BLURB HERE *** Nitesh Konkar (7): domain_conf.c:fix a typo domain_conf.h:fix a typo domain_conf.c:fix a typo storage_conf.c:fix a typo interface_backend_udev.c:fix a typo esx_driver.c:fix a typo esx_driver.c:fix a typo src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 2 +- src/conf/storage_conf.c | 2 +- src/esx/esx_driver.c | 4 ++-- src/interface/interface_backend_udev.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH 0/4] fix some libvirtd cleanup leaks and crashes
by Nikolay Shirokovskiy 22 Sep '16

22 Sep '16

Crash situation of last 2 patches can easily simulated, just patch libvirt: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 30a2830..f6b71d6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4515,6 +4515,8 @@ processMonitorEOFEvent(virQEMUDriverPtr driver, unsigned int stopFlags = 0; virObjectEventPtr event = NULL; + sleep(3); + if (qemuProcessBeginStopJob(driver, vm, QEMU_JOB_DESTROY, true) < 0) return; then when it is up and running and there is also a qemu domain running: kill -9 $QEMU_DOMAIN && kill libvirtd If first 2 patches are not applied yet then make sure there is no admin server clients present. Nikolay Shirokovskiy (4): daemon: break cyclic deps between admin clients and daemon daemon: call free callbacks synchronously in event loop impl daemon: keep daemon until all hypervisors drivers are cleaned up qemu: first wait all workers finish on state cleanup daemon/libvirtd.c | 7 ++++- src/qemu/qemu_driver.c | 2 +- src/rpc/virnetdaemon.c | 1 + src/rpc/virnetsocket.c | 70 ++++++++++++++++++++++--------------------------- src/util/vireventpoll.c | 24 +++++++---------- 5 files changed, 50 insertions(+), 54 deletions(-) -- 1.8.3.1

2 6

Re: [libvirt] [RFC v2] libvirt vGPU QEMU integration
by Tian, Kevin 22 Sep '16

22 Sep '16

> From: Tian, Kevin > Sent: Thursday, September 22, 2016 10:33 AM > > > > > > Another example is class-specific attributes such > > > as 'resolution', etc. which you listed under 'display class'. All those > > > attributes should be moved to mdev directory. Only class ID is > > > required under each type. > > > > Can you elaborate on what you're proposing here? If we don't have > > attributes like 'resolution' under the type-id then we can't describe > > to the user the features of the mdev before we create it. I don't > > think anybody wants a 'create it and find out' type of interface. > > Thanks, > > > > I think such way would be racy. What about two clients creating mdev > devices simultaneously? How to guarantee their configuration of class > specific attributes not mutual-impacted since before creation any such > configuration would be global under that type? > > My feeling is that we'd better keep create simple - just write a UUID > to "type-id/create". Any class-specific attribute, if we really want to > support, should be able to be individually configured with required > resource allocated incrementally on top of basic resources allocated > at create stage. Then libvirt can set those attributes between create > and open a mdev device. If this direction is accepted, then naturally > such attributes should be put under mdev directory. Possibly we > don't need a class description under type-id. libvirt just checks directly > whether any known class represented in each mdev directory (vendor > driver will expose it on demand), and then operate attributes under > that class. > Have a better understanding of your concern now. User needs to know and set a list of attributes before requesting to create a new mdev device. From this angle all attributes should be enumerated per type-id. But as I explained above, writing multiple sysfs nodes to create a mdev device is racy. We either need a way to guarantee transactional operations on those nodes, or having type-id directory to only expose supported attributes while programming those attributes has to be through per-mdev directory after mdev device is created... Thanks Kevin

1 0

[libvirt] [PATCHv2] qemu: agent: Fix QEMU guest agent is not available due to an error
by Xiubo Li 22 Sep '16

22 Sep '16

These days, we experienced one qemu guest agent is not available error. Then the guest agent couldn't be used forever before rebooting the libvirtd daemon or reboot the qemu-guest-agent in the VM(you can also reboot the VM) to clear the priv->agentError. This is one bug for a long time in many verisons of libvirtd: https://bugzilla.redhat.com/show_bug.cgi?id=1090551 And there is one python script to reproduce this bug from the bugzilla: https://github.com/aspirer/study/blob/master/qemu-guest-agent/test2.py Just set the timeout to 0 at Line26, you can reproduce it very quickly: rsp = libvirt_qemu.qemuAgentCommand(dom, cmd, 1, 0) // 1 -> 0 The reason why this could happen is that: In case we received something like {"return": {}} for example, it is likely that somebody: 1) Started GA thread which sent one "guest-ping" command with seconds equals to VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0) makes this function return immediately without waiting, but after updating the events, it will sleep in virCondWait() or virCondWaitUntil(). 2) While in AgentIO thread the "guest-ping" command is sent successfully, with updating the events it will wait for reply. 3) Then the GA thread is woken up and the mon->msg is set to NULL and exit. 4) At last the AgentIO thread receives the reply of "guest-ping" command with the mon->msg == NULL. This case could be adapt to all the GA commands, including guest-sync, etc. This patch will check if this is the case and don't report an error but return silently. Signed-off-by: Xiubo Li <lixiubo(a)cmss.chinamobile.com> Signed-off-by: Zhuoyu Zhang <zhangzhuoyu(a)cmss.chinamobile.com> Signed-off-by: Wei Tang <tangwei(a)cmss.chinamobile.com> Signed-off-by: Yaowei Bai <baiyaowei(a)cmss.chinamobile.com> Signed-off-by: Qide Chen <chenqide(a)cmss.chinamobile.com> --- Changes in V2: - check value type instead of object type. src/qemu/qemu_agent.c | 37 ++++++++++++++++++++++++++++--------- src/util/virjson.h | 7 +++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index eeede6b..f5408cc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -308,7 +308,6 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, { virJSONValuePtr obj = NULL; int ret = -1; - unsigned long long id; VIR_DEBUG("Line [%s]", line); @@ -333,16 +332,36 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, obj = NULL; ret = 0; } else { - /* If we've received something like: - * {"return": 1234} - * it is likely that somebody started GA - * which is now processing our previous - * guest-sync commands. Check if this is - * the case and don't report an error but + virJSONValuePtr val; + + /* In case we received something like: + * {"return": {}} for example, + * it is likely that somebody: + * + * 1) Started GA thread which sent one "guest-ping" command + * with seconds equals to VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0) + * makes this function return immediately without waiting, but + * after updating the events, it will sleep in virCondWait() or + * virCondWaitUntil(). + * + * 2) While in AgentIO thread the "guest-ping" command is sent + * successfully, with updating the events it will wait for reply. + * + * 3) Then the GA thread is woken up and the mon->msg is set + * to NULL and exit. + * + * 4) At last the AgentIO thread receives the reply of "guest-ping" + * command with the mon->msg == NULL. + * + * This case could be adapt to all the GA commands, including + * guest-sync, etc. + * + * Check if this is the case and don't report an error but * return silently. */ - if (virJSONValueObjectGetNumberUlong(obj, "return", &id) == 0) { - VIR_DEBUG("Ignoring delayed reply to guest-sync: %llu", id); + val = virJSONValueObjectGet(obj, "return"); + if (val && virJSONValueTypeIsValid(val)) { + VIR_DEBUG("Ignoring delayed command reply"); ret = 0; goto cleanup; } diff --git a/src/util/virjson.h b/src/util/virjson.h index 66ed48a..cb1d973 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -80,6 +80,13 @@ struct _virJSONValue { } data; }; +static inline bool +virJSONValueTypeIsValid(virJSONValuePtr value) +{ + return ((value->type >= VIR_JSON_TYPE_OBJECT) && + (value->type <= VIR_JSON_TYPE_BOOLEAN)); +} + void virJSONValueFree(virJSONValuePtr value); int virJSONValueObjectCreate(virJSONValuePtr *obj, ...) -- 1.8.3.1

3 2

[libvirt] [PATCH] libxl: support VIR_MIGRATE_PERSIST_DEST migration flag
by Jim Fehlig 21 Sep '16

21 Sep '16

By default, virt-manager (and likely other libvirt-based apps) sets the VIR_MIGRATE_PERSIST_DEST flag when invoking the migrate API, which fails in a Xen setup since the libxl driver does not support the flag. Persisting a domain is a trivial task in the grand scheme of migration, so be nice to libvirt apps and add support for VIR_MIGRATE_PERSIST_DEST in the libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_migration.c | 23 +++++++++++++++++++++++ src/libxl/libxl_migration.h | 1 + 2 files changed, 24 insertions(+) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index f1da251..3b0dc74 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1021,6 +1021,29 @@ libxlDomainMigrationFinish(virConnectPtr dconn, event = NULL; } + if (flags & VIR_MIGRATE_PERSIST_DEST) { + unsigned int oldPersist = vm->persistent; + virDomainDefPtr vmdef; + + vm->persistent = 1; + if (!(vmdef = virDomainObjGetPersistentDef(cfg->caps, + driver->xmlopt, vm))) + goto cleanup; + + if (virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef) < 0) + goto cleanup; + + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + oldPersist ? + VIR_DOMAIN_EVENT_DEFINED_UPDATED : + VIR_DOMAIN_EVENT_DEFINED_ADDED); + if (event) { + libxlDomainEventQueue(driver, event); + event = NULL; + } + } + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto cleanup; diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index c02026d..8a074a0 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -29,6 +29,7 @@ # define LIBXL_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE | \ VIR_MIGRATE_PEER2PEER | \ + VIR_MIGRATE_PERSIST_DEST | \ VIR_MIGRATE_UNDEFINE_SOURCE | \ VIR_MIGRATE_PAUSED) -- 2.1.4

2 2

[libvirt] [PATCH] qemu_process: show shutoff reasons when debug log disabled
by Chen Hanxiao 21 Sep '16

21 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We have a few of senarios that libvirtd would invoke qemuProcessStop and leave a "shutting down" in /var/log/libvirt/qemu/$DOMAIN.log. The shutoff reason showing in debug log is also very important for us to know why VM shutting down in domain log, as we seldom enable debug log of libvirtd. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b10b053..73e9271 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5803,7 +5803,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainObjBroadcast(vm); if ((timestamp = virTimeStringNow()) != NULL) { - qemuDomainLogAppendMessage(driver, vm, "%s: shutting down\n", timestamp); + qemuDomainLogAppendMessage(driver, vm, "%s: shutting down, reason=%s\n", + timestamp, + virDomainShutoffReasonTypeToString(reason)); VIR_FREE(timestamp); } -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu_process: move graphics validation into separate function
by Pavel Hrdina 21 Sep '16

21 Sep '16

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_process.c | 56 +++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1f56883..b360f6b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4409,6 +4409,38 @@ qemuProcessStartWarnShmem(virDomainObjPtr vm) } } + +static int +qemuProcessStartValidateGraphics(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->ngraphics; i++) { + virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; + + switch (graphics->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (graphics->nListens > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("QEMU does not support multiple listens for " + "one graphics device.")); + return -1; + } + break; + + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + case VIR_DOMAIN_GRAPHICS_TYPE_RDP: + case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + break; + } + } + + return 0; +} + + static int qemuProcessStartValidateXML(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -4456,8 +4488,6 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, virCapsPtr caps, unsigned int flags) { - size_t i; - if (!(flags & VIR_QEMU_PROCESS_START_PRETEND)) { if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { VIR_DEBUG("Checking for KVM availability"); @@ -4484,27 +4514,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, qemuProcessStartWarnShmem(vm); - for (i = 0; i < vm->def->ngraphics; i++) { - virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; - - switch (graphics->type) { - case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: - if (graphics->nListens > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("QEMU does not support multiple listens for " - "one graphics device.")); - return -1; - } - break; - - case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; - } - } + qemuProcessStartValidateGraphics(vm); return 0; } -- 2.10.0

2 2

[libvirt] [PATCH 0/2] bhyve: add e1000 nic support
by Roman Bogorodskiy 21 Sep '16

21 Sep '16

Fabian Freyer (1): bhyve: Separate out checks from virBhyveProbeCaps Roman Bogorodskiy (1): bhyve: add e1000 nic support src/bhyve/bhyve_capabilities.c | 58 ++++++++++++++++++---- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 32 ++++++++++-- .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.args | 9 ++++ .../bhyvexml2argv-net-e1000.ldargs | 3 ++ .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml | 22 ++++++++ tests/bhyvexml2argvtest.c | 7 ++- 7 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml -- 2.9.2

2 4

[libvirt] [PATCH] libvirt-nodedev.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/libvirt-nodedev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index e4e9836..59f020b 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -595,7 +595,7 @@ virNodeDeviceDetachFlags(virNodeDevicePtr dev, * virNodeDeviceReAttach: * @dev: pointer to the node device * - * Re-attach a previously dettached node device to the node so that it + * Re-attach a previously detached node device to the node so that it * may be used by the node again. * * Depending on the hypervisor, this may involve operations such -- 2.1.0

2 1

[libvirt] [PATCH] libvirt-admin.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/libvirt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 03245b6..88eef54 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -344,7 +344,7 @@ virAdmConnectRef(virAdmConnectPtr conn) * @libVer: where to store the library version * * Provides version information. @libVer is the version of the library and will - * allways be set unless an error occurs in which case an error code and a + * always be set unless an error occurs in which case an error code and a * generic message will be returned. @libVer format is as follows: * major * 1,000,000 + minor * 1,000 + release. * -- 2.1.0

2 1

[libvirt] [PATCH] domain_conf.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea246b0..28b81d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25447,7 +25447,7 @@ virDomainDiskDefCheckDuplicateInfo(const virDomainDiskDef *a, } /* Duplicate WWN/serial isn't usually problematic for the OS and - * forbiding it would possibly inhibit using multipath configurations */ + * forbidding it would possibly inhibit using multipath configurations */ return 0; } -- 2.1.0

2 1

[libvirt] [PATCH] driver.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver.c b/src/driver.c index 1514a3b..67ac020 100644 --- a/src/driver.c +++ b/src/driver.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("driver"); #ifdef WITH_DRIVER_MODULES -/* XXX re-implment this for other OS, or use libtools helper lib ? */ +/* XXX re-implement this for other OS, or use libtools helper lib ? */ # include <dlfcn.h> # define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver" -- 2.1.0

2 1

[libvirt] [PATCH] domain_conf.c:fix the comment.
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ebddf5f..7daf2fd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14091,9 +14091,9 @@ void virDomainNetRemoveHostdev(virDomainDefPtr def, virDomainNetDefPtr net) { - /* hostdev net devices are normally also be in the hostdevs - * array, but might have already been removed by the time we - * get here. + /* hostdev net devices are normally in the hostdevs + * array, but might have already been removed by the + * time we get here. */ virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); size_t i; -- 2.1.0

2 1

[libvirt] [PATCH] domain_conf.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a70be31..ebddf5f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13936,7 +13936,7 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr def, virDomainDiskDefPtr disk) { int idx; - /* Tenatively plan to insert disk at the end. */ + /* Tentatively plan to insert disk at the end. */ int insertAt = -1; /* Then work backwards looking for disks on -- 2.1.0

2 1

[libvirt] [PATCH v4 0/2] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 21 Sep '16

21 Sep '16

v4: Address comments by peter on v3 Mostly betterments in naming variables and grouping patterns in Caps by 5 Thanks to Peter v3: Add patch 2/2 which address capability checks Changed 'glusterfs_debug_level' to 'gluster_debug_level' agreeing to Peter Made changes in libvirtd_qemu.aug Thanks to Peter & Daniel v2: Modify test cases and syntax check changes as suggested by Peter in v1. Rename qemu_gfapi_debuglevel to glusterfs_debug_level as per Daniel comments. Fix to make debug_level changes effects on URI along with JSON. TODO: * changes in libvirtd_qemu.aug Which I don't understand for now * comment on debug_level variable in storage source Not sure what is the right place * Capablities check v1: Initial post *** BLURB HERE *** Prasanna Kumar Kalever (2): qemu/gluster: add option for tuning debug logging level qemu_capabilities: Introduce gluster specific debug capability src/qemu/libvirtd_qemu.aug | 3 +++ src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 ++++++++++++++++++--- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 7 ++++--- .../qemuxml2argv-disk-drive-network-gluster.args | 12 ++++++------ tests/qemuxml2argvtest.c | 3 ++- 11 files changed, 65 insertions(+), 13 deletions(-) -- 2.7.4

3 6

[libvirt] [libvirt-php][PATCH] libvirt_domain_get_screenshot_api: More memleak fixes and checks
by Michal Privoznik 21 Sep '16

21 Sep '16

Firstly, we are not checking whether virStreamNew succeeds or not. Secondly, we are not freeing the stream in all exit paths. Then we are copying the same pattern which frees allocated memory over and over again. Oh, and also we should abort stream if we are exiting abnormally. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under "I'm a lonely libvirt-php maintainer" rule. src/libvirt-php.c | 64 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 3aed882..df2f32a 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -4758,49 +4758,38 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) RETURN_FALSE; #endif - GET_DOMAIN_FROM_ARGS("r|l",&zdomain, &screen); + GET_DOMAIN_FROM_ARGS("r|l", &zdomain, &screen); + + if (!(st = virStreamNew(domain->conn->conn, 0))) { + set_error("Cannot create new stream" TSRMLS_CC); + goto error; + } - st = virStreamNew(domain->conn->conn, 0); mime = virDomainScreenshot(domain->domain, st, screen, 0); if (!mime) { set_error_if_unset("Cannot get domain screenshot" TSRMLS_CC); - RETURN_FALSE; + goto error; } -#ifndef EXTWIN - if (mkstemp(file) == 0) { - free(mime); - RETURN_FALSE; - } -#endif - - if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { - if (errno != EEXIST || - (fd = open(file, O_WRONLY|O_TRUNC, 0666)) < 0) { - virStreamFree(st); - set_error_if_unset("Cannot get create file to save domain screenshot" TSRMLS_CC); - free(mime); - RETURN_FALSE; - } + if (!(fd = mkstemp(file))) { + virStreamAbort(st); + set_error_if_unset("Cannot get create file to save domain screenshot" TSRMLS_CC); + goto error; } if (virStreamRecvAll(st, streamSink, &fd) < 0) { - virStreamFree(st); set_error_if_unset("Cannot receive screenshot data" TSRMLS_CC); - free(mime); - RETURN_FALSE; + virStreamAbort(st); + goto error; } - close(fd); - if (virStreamFinish(st) < 0) { - virStreamFree(st); set_error_if_unset("Cannot close stream for domain" TSRMLS_CC); - free(mime); - RETURN_FALSE; + goto error; } virStreamFree(st); + st = NULL; array_init(return_value); if (bin) { @@ -4811,19 +4800,34 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) snprintf(fileNew, sizeof(fileNew), "%s.png", file); snprintf(tmp, sizeof(tmp), "%s %s %s > /dev/null 2> /dev/null", bin, file, fileNew); exitStatus = system(tmp); - unlink(file); if (WEXITSTATUS(exitStatus) != 0) - RETURN_FALSE; + goto error; + unlink(file); + close(fd); + fd = -1; VIRT_ADD_ASSOC_STRING(return_value, "file", fileNew); VIRT_ADD_ASSOC_STRING(return_value, "mime", "image/png"); - } - else { + } else { + unlink(file); + close(fd); + fd = -1; VIRT_ADD_ASSOC_STRING(return_value, "file", file); VIRT_ADD_ASSOC_STRING(return_value, "mime", mime); } free(mime); + return; + + error: + free(mime); + if (fd != -1) { + unlink(file); + close(fd); + } + if (st) + virStreamFree(st); + RETURN_FALSE; } /* -- 2.8.4

1 0

[libvirt] [PATCH 0/4] qemu: fix vcpupin/emulatorpin with --config on VMs with automatic NUMA pinning
by Peter Krempa 21 Sep '16

21 Sep '16

The automatic nodeset would creep into the persistent definition for live VMs with automatic pinning which is incorrect. https://bugzilla.redhat.com/show_bug.cgi?id=1365779 Peter Krempa (4): conf: Introduce virDomainObjGetOneDefState qemu: domain: Add macro to simplify access to vm private data qemu: driver: Don't return automatic NUMA vCPU pinning data for persistentDef qemu: driver: Don't return automatic NUMA emulator pinning data for persistentDef src/conf/domain_conf.c | 40 ++++++++++++++++++++++++++++++++++++---- src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_driver.c | 23 +++++++++++++---------- 5 files changed, 56 insertions(+), 14 deletions(-) -- 2.10.0

3 9

[libvirt] [PATCH v4 0/5] Remove caching of address sets
by Tomasz Flendrich 21 Sep '16

21 Sep '16

Link to the previous version: https://www.redhat.com/archives/libvir-list/2016-August/msg00721.html Changes in v4: * instead of failing, qemuDomainValidateDevicePCISlotsChipsets now simply displays a warning when a new address is being assigned during pci address set recalculation Tomasz Flendrich (5): Move validating chipset PCI slots to qemuDomainPCIAddressSetCreate Warn when assigning new pci addresses during recalculation Reduce number of parameters to qemuDomainPCIAddressSetCreate qemu_hotplug: generate pci address set on demand qemu: remove pciaddrs caching src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 215 +++++++++++++++++++++++------------------ src/qemu/qemu_domain_address.h | 6 ++ src/qemu/qemu_hotplug.c | 50 ++++++++-- 5 files changed, 168 insertions(+), 105 deletions(-) -- 1.9.1

2 6

[libvirt] [PATCH 0/2] Rework qemuhotplugtest
by Tomasz Flendrich 21 Sep '16

21 Sep '16

This series requires another one: https://www.redhat.com/archives/libvir-list/2016-July/msg01205.html Tomasz Flendrich (2): qemuhotplugtest: handle xml files more precisely qemuhotplugtest: change indentation tests/qemuhotplugtest.c | 254 +++++++++++---------- .../qemuhotplug-ccw-virtio-1-reverse.xml | 7 - ...ach.xml => qemuhotplug-qemu-agent-nosource.xml} | 1 - .../qemuhotplug-qemu-agent.xml | 1 + .../qemuhotplug-base+qemu-agent-detach.xml | 58 ----- .../qemuhotplug-base+qemu-agent.xml | 58 ----- ...plug-base-ccw-live+ccw-virtio+ccw-virtio-2.xml} | 0 ... => qemuhotplug-base-ccw-live+ccw-virtio-2.xml} | 0 ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 73 ------ ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 73 ------ ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 73 ------ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 63 ----- ....xml => qemuhotplug-base-config+qemu-agent.xml} | 0 .../qemuhotplug-base-live+qemu-agent-detach.xml | 58 ----- ...-base-with-scsi-controller-live+disk-scsi-2.xml | 51 ----- 15 files changed, 140 insertions(+), 630 deletions(-) delete mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-1-reverse.xml rename tests/qemuhotplugtestdevices/{qemuhotplug-qemu-agent-detach.xml => qemuhotplug-qemu-agent-nosource.xml} (66%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml rename tests/qemuhotplugtestdomains/{qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml => qemuhotplug-base-ccw-live+ccw-virtio+ccw-virtio-2.xml} (100%) rename tests/qemuhotplugtestdomains/{qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml => qemuhotplug-base-ccw-live+ccw-virtio-2.xml} (100%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml rename tests/qemuhotplugtestdomains/{qemuhotplug-base-config+qemu-agent+config.xml => qemuhotplug-base-config+qemu-agent.xml} (100%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml -- 2.7.4 (Apple Git-66)

2 3

[libvirt] [PATCH v3 0/6] Test persistent device attachment
by Tomasz Flendrich 21 Sep '16

21 Sep '16

Changes in v3: * fewer patches, because part of v2 was ACK'd * two old commits, 08/10 and 09/10, are now one commit * qemuDomainUpdateDeviceFlags is now also split, creating a new function qemuDomainUpdateDeviceLiveAndConfig(). This function is now used in qemuhotplugtest.c. * qemuDomainAttachDeviceLiveAndConfig, qemuDomainDetachDeviceLiveAndConfig and qemuDomainUpdateDeviceLiveAndConfig are now in a new file: qemu_driverpriv.h * variable "target" is renamed to "impact" and its type is changed * testQemuHotplugCheckResult() now takes "impact" as a parameter to determine whether to test the ->def or ->newDef * def->id is no longer set when handling a persistent domain * split DO_TEST_ATTACH (and other macros) to DO_TEST_ATTACH_LIVE and DO_TEST_ATTACH_CONFIG instead of taking a parameter * fixed indentation * "<source mode='bind'/>" is removed from one xml * a three year old testcase for updating a disk device was modified a little bit to make it finally execute and test something Link to v2: https://www.redhat.com/archives/libvir-list/2016-July/msg00595.html Tomasz Flendrich (6): Split qemuDomainUpdateDeviceFlags in two Make qemu attach/detach functions public Make qemuhotplugtest work with persistent domains qemuhotplug: Use a more generic function to update devices qemuhotplugtest: add testcase to update a disk device qemuhotplugtest: add a persistent attachment testcase src/qemu/qemu_driver.c | 117 +++--- src/qemu/qemu_driverpriv.h | 47 +++ tests/qemuhotplugtest.c | 433 ++++++++++++--------- .../qemuhotplug-disk-cdrom-nochange.xml | 2 +- .../qemuhotplug-qemu-agent.xml | 1 - .../qemuhotplug-base-config+qemu-agent+config.xml | 44 +++ .../qemuhotplug-base-config.xml | 40 ++ .../qemuhotplug-disk-cdrom.xml | 2 +- 8 files changed, 454 insertions(+), 232 deletions(-) create mode 100644 src/qemu/qemu_driverpriv.h create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config+qemu-agent+config.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config.xml -- 1.9.1

2 8

[libvirt] [PATCH] migration: Document we don't copy storage during offline migration
by Michal Privoznik 21 Sep '16

21 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1322717 During offline migration, no storage is copied. Nor disks, nor NVRAM file, nor anything. We use qemu for that and because domain is not running there's nobody to copy that for us. We should document this to avoid confusing users. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/migration.html.in | 5 +++-- src/libvirt-domain.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 8efdd7f..2768955 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -148,8 +148,9 @@ <code>virsh dumpxml</code> on source host followed by <code>virsh define</code> on destination host, as offline migration will run the pre-migration hook to update the domain XML on - destination host. Currently, copying non-shared storage is not - supported during offline migration. + destination host. Currently, copying non-shared storage or other file + based storages (e.g. UEFI variable storage) is not supported during + offline migration. </p> <h2><a name="uris">Migration URIs</a></h2> diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index fa82e49..9ba9f49 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3574,6 +3574,10 @@ virDomainMigrateUnmanaged(virDomainPtr domain, * not support this feature and will return an error if bandwidth * is not 0. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details @@ -3791,6 +3795,10 @@ virDomainMigrate(virDomainPtr domain, * not support this feature and will return an error if bandwidth * is not 0. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details @@ -3980,6 +3988,10 @@ virDomainMigrate2(virDomainPtr domain, * can use either VIR_MIGRATE_NON_SHARED_DISK or * VIR_MIGRATE_NON_SHARED_INC as they are mutually exclusive. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details -- 2.8.4

2 1

[libvirt] [PATCH] qemu: Ignore graphics cookie if port == 0
by Jiri Denemark 21 Sep '16

21 Sep '16

Old libvirt represents <graphics type='spice'> <listen type='none'/> </graphics> as <graphics type='spice' autoport='no'/> In this mode, QEMU doesn't listen for SPICE connection anywhere and clients have to use virDomainOpenGraphics* APIs to attach to the domain. That is, the client has to run on the same host where the domains runs and it's impossible to tell the client to reconnect to the destination QEMU during migration (unless there is some kind of proxy on the host). While current libvirt correctly ignores such graphics devices when creating graphics migration cookie, old libvirt just sends <graphics type='spice' port='0' listen='0.0.0.0' tlsPort='-1'/> in the cookie. After seeing this cookie, we happily would call client_migrate_info QMP command and wait for SPICE_MIGRATE_COMPLETED event, which is quite pointless since the doesn't know where to connecti anyway. We should just ignore such cookies. https://bugzilla.redhat.com/show_bug.cgi?id=1376083 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e734816..8a220d9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2903,6 +2903,15 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, goto cleanup; } + /* Older libvirt sends port == 0 for listen type='none' graphics. It's + * safe to ignore such requests since relocation to unknown port does + * not make sense in general. + */ + if (port <= 0 && tlsPort <= 0) { + ret = 0; + goto cleanup; + } + if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, -- 2.10.0

2 2

[libvirt] [PATCH] qemuDomainOpenGraphics: Start job early
by Jiri Denemark 21 Sep '16

21 Sep '16

Checking if a domain's definition or if it is active before we got a job is pointless since the domain might have changed in the meantime. Luckily libvirtd didn't crash when the API tried to talk to an inactive domain: debug : qemuDomainObjBeginJobInternal:2914 : Started job: modify (async=none vm=0x7f8f340140c0 name=ble) debug : qemuDomainObjEnterMonitorInternal:3137 : Entering monitor (mon=(nil) vm=0x7f8f340140c0 name=ble) warning : virObjectLock:319 : Object (nil) ((unknown)) is not a virObjectLockable instance debug : qemuMonitorOpenGraphics:3505 : protocol=spice fd=27 fdname=graphicsfd skipauth=1 error : qemuMonitorOpenGraphics:3508 : invalid argument: monitor must not be NULL debug : qemuDomainObjExitMonitorInternal:3160 : Exited monitor (mon=(nil) vm=0x7f8f340140c0 name=ble) debug : qemuDomainObjEndJob:3068 : Stopping job: modify (async=none vm=0x7f8f340140c0 name=ble) Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e29180d..4c45fc3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17118,10 +17118,13 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (virDomainOpenGraphicsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } priv = vm->privateData; @@ -17129,7 +17132,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (idx >= vm->def->ngraphics) { virReportError(VIR_ERR_INTERNAL_ERROR, _("No graphics backend with index %d"), idx); - goto cleanup; + goto endjob; } switch (vm->def->graphics[idx]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -17142,20 +17145,20 @@ qemuDomainOpenGraphics(virDomainPtr dom, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Can only open VNC or SPICE graphics backends, not %s"), virDomainGraphicsTypeToString(vm->def->graphics[idx]->type)); - goto cleanup; + goto endjob; } if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) - goto cleanup; + goto endjob; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; + + endjob: qemuDomainObjEndJob(driver, vm); cleanup: -- 2.10.0

2 2

[libvirt] [PATCH] stream.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- daemon/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/stream.c b/daemon/stream.c index bd0b5d2..533ecf7 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -444,7 +444,7 @@ int daemonAddClientStream(virNetServerClientPtr client, * * Removes a stream from the list of active streams for the client * - * Returns 0 if the stream was removd, -1 if it doesn't exist + * Returns 0 if the stream was removed, -1 if it doesn't exist */ int daemonRemoveClientStream(virNetServerClientPtr client, -- 2.1.0

2 1

[libvirt] [PATCH] config-post.h:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- config-post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-post.h b/config-post.h index dd69197..6eb63db 100644 --- a/config-post.h +++ b/config-post.h @@ -20,7 +20,7 @@ * Since virt-login-shell will be setuid, we must do everything * we can to avoid linking to other libraries. Many of them do * unsafe things in functions marked __atttribute__((constructor)). - * The only way avoid to avoid such deps is to re-compile the + * The only way to avoid such deps is to re-compile the * functions with the code in question disabled, and for that we * must override the main config.h rules. Hence this file :-( */ -- 2.1.0

2 1

[libvirt] [PATCH 0/5] enforce and simplify qga interactions
by Nikolay Shirokovskiy 21 Sep '16

21 Sep '16

First 2 patches fix bugs of libvirt - qga communication. They deal with the channel pecularities described in http://wiki.qemu.org/Features/QAPI/GuestAgent. First patch address https://bugzilla.redhat.com/show_bug.cgi?id=1090551 bug. Next 3 patches hide details of channel pecularities from client, so there is no more need to reissue commands for the reasons other then simple timeout. Nikolay Shirokovskiy (5): qemu: agent: ignore delayed reply when unsynced qemu: agent: ignore garbage while waiting for sync reply qemu: agent: skip outdated sync replies qemu: agent: reissue sync on garbage sync reply qemu: agent: give better error messages whe agent monitor is down src/qemu/qemu_agent.c | 91 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 37 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH v1 0/4] libxl: channels support
by Joao Martins 20 Sep '16

20 Sep '16

Hey, Channels have been on xen toolstack since Xen 4.5 and this small series adds support for it, including xenconfig conversion and appropriate tests. After this series it's possible to do this: (assuming correct configuration of qemu agent in the guest) $ cat domain.xml | grep -a1 channel | head -n 5 | tail -n 4 <channel type='unix'> <source mode='bind' path='/tmp/channel'/> <target type='xen' name='org.qemu.guest_agent.0'/> </channel> $ virsh create domain.xml $ echo '{"execute":"guest-network-get-interfaces"}' | socat stdio,ignoreeof unix-connect:/tmp/channel {"execute":"guest-network-get-interfaces"} {"return": [{"name": "lo", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "127.0.0.1", "prefix": 8}, {"ip-address-type": "ipv6", "ip-address": "::1", "prefix": 128}], "hardware-address": "00:00:00:00:00:00"}, {"name": "eth0", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "10.100.0.6", "prefix": 24}, {"ip-address-type": "ipv6", "ip-address": "fe80::216:3eff:fe40:88eb", "prefix": 64}], "hardware-address": "00:16:3e:40:88:eb"}, {"name": "sit0"}]} There is just one thing unclear: is source "path" meant to be auto-generated if it's not specified in the channel config? Additionally what does "state" signify for virtio case: is it that the guest agent is connected, or that the virtio serial is connected? Looking at the qemu driver on processSerialChangedEvent it sounds to me like it's about the serial state. I also have one other series that lets us share the qemu agent across both qemu and libxl drivers, with qemu-agent-command implemented. But it's still in an early stage. Any comments or feedback is appreciated :) Thanks, Joao Joao Martins (4): conf: add xen type for channels libxl: channels support xenconfig: channels conversion support xlconfigtest: add test for channel conversion docs/schemas/domaincommon.rng | 11 ++ src/conf/domain_conf.c | 18 +++- src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 81 ++++++++++++++ src/libxl/libxl_domain.c | 38 +++++++ src/qemu/qemu_command.c | 1 + src/xenconfig/xen_xl.c | 176 +++++++++++++++++++++++++++++++ tests/xlconfigdata/test-channel-pty.cfg | 13 +++ tests/xlconfigdata/test-channel-pty.xml | 33 ++++++ tests/xlconfigdata/test-channel-unix.cfg | 13 +++ tests/xlconfigdata/test-channel-unix.xml | 34 ++++++ tests/xlconfigtest.c | 4 + 12 files changed, 419 insertions(+), 4 deletions(-) create mode 100644 tests/xlconfigdata/test-channel-pty.cfg create mode 100644 tests/xlconfigdata/test-channel-pty.xml create mode 100644 tests/xlconfigdata/test-channel-unix.cfg create mode 100644 tests/xlconfigdata/test-channel-unix.xml -- 2.1.4

3 19

[libvirt] [PATCH v3 0/5] Add runnability info to query-cpu-definitions
by Eduardo Habkost 20 Sep '16

20 Sep '16

This series extends query-cpu-definitions to include an extra field: "unavailable-features". The new field can be used to find out reasons that prevent the CPU model from running in the current host. This will return information based on the current machine and accelerator only. In the future we may extend these mechanisms to allow querying other machines and other accelerators without restarting QEMU, but it will require some reorganization of QEMU's main code. Changes v2 -> v3: * Small documentation reword * Suggested-by: Markus Armbruster <armbru(a)redhat.com> * Create a x86_cpu_feature_name() function, to isolate the code that returns the property name Changes v1 -> v2: * Fixed documentation to say "(since 2.7)" * Removed @runnable field, improved documentation Example command output: { "return": [ { "unavailable-features": [], "static": false, "name": "host" }, { "unavailable-features": [], "static": false, "name": "qemu64" }, { "unavailable-features": [], "static": false, "name": "qemu32" }, { "unavailable-features": ["npt", "sse4a", "3dnow", "3dnowext", "fxsr-opt", "mmxext"], "static": false, "name": "phenom" }, { "unavailable-features": [], "static": false, "name": "pentium3" }, { "unavailable-features": [], "static": false, "name": "pentium2" }, { "unavailable-features": [], "static": false, "name": "pentium" }, { "unavailable-features": [], "static": false, "name": "n270" }, { "unavailable-features": [], "static": false, "name": "kvm64" }, { "unavailable-features": [], "static": false, "name": "kvm32" }, { "unavailable-features": [], "static": false, "name": "coreduo" }, { "unavailable-features": [], "static": false, "name": "core2duo" }, { "unavailable-features": ["3dnow", "3dnowext", "mmxext"], "static": false, "name": "athlon" }, { "unavailable-features": [], "static": false, "name": "Westmere" }, { "unavailable-features": ["xgetbv1", "xsavec", "3dnowprefetch", "smap", "adx", "rdseed", "mpx", "rtm", "hle"], "static": false, "name": "Skylake-Client" }, { "unavailable-features": [], "static": false, "name": "SandyBridge" }, { "unavailable-features": [], "static": false, "name": "Penryn" }, { "unavailable-features": ["tbm", "fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G5" }, { "unavailable-features": ["fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G4" }, { "unavailable-features": ["misalignsse", "sse4a"], "static": false, "name": "Opteron_G3" }, { "unavailable-features": [], "static": false, "name": "Opteron_G2" }, { "unavailable-features": [], "static": false, "name": "Opteron_G1" }, { "unavailable-features": [], "static": false, "name": "Nehalem" }, { "unavailable-features": [], "static": false, "name": "IvyBridge" }, { "unavailable-features": ["rtm", "hle"], "static": false, "name": "Haswell" }, { "unavailable-features": [], "static": false, "name": "Haswell-noTSX" }, { "unavailable-features": [], "static": false, "name": "Conroe" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed", "rtm", "hle"], "static": false, "name": "Broadwell" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed"], "static": false, "name": "Broadwell-noTSX" }, { "unavailable-features": [], "static": false, "name": "486" } ]} Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Eduardo Habkost (5): target-i386: List CPU models using subclass list target-i386: Move warning code outside x86_cpu_filter_features() target-i386: Define CPUID filtering functions before x86_cpu_list() qmp: Add runnability information to query-cpu-definitions target-i386: Return runnability information on query-cpu-definitions qapi-schema.json | 23 ++++- target-i386/cpu-qom.h | 4 + target-i386/cpu.c | 236 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 199 insertions(+), 64 deletions(-) -- 2.7.4

3 8

[libvirt] [PATCH v2] qemu-migration: Disallow migration of read only disk
by Corey S. McQuay 20 Sep '16

20 Sep '16

Currently Libvirt allows attempts to migrate read only disks. Qemu cannot handle this as read only disks cannot be written to on the destination system. The end result is a cryptic error message and a failed migration. This patch causes migration to fail earlier and provides a meaningful error message stating that migrating read only disks is not supported. Signed-off-by: Corey S. McQuay <csmcquay(a)linux.vnet.ibm.com> Reviewed-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e451ef6..011f349 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2157,6 +2157,13 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, if (!qemuMigrateDisk(disk, nmigrate_disks, migrate_disks)) continue; + if (disk->src->readonly) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Cannot migrate read-only disk %s"), + disk->dst); + goto cleanup; + } + if (!(diskAlias = qemuAliasFromDisk(disk)) || (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", hoststr, port, diskAlias) < 0)) -- 2.7.4

3 4