- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Fix virsh save-restore/migration with memory hotplug.
by Nitesh Konkar 26 Sep '16

26 Sep '16

Virsh restore/migration fails on a VM which has gone through a series of memory attach and detach where the sequence of detach is random(not in LIFO order). With memory hotplug, the dimms are looked up using the object-id and so, the restore/migration fails because the qemu command that gets generated has memdev and id values which wouldn't exist for the given slotid. This patch ensures that the source and destination would always have same memdev-objectid-slotid values. Steps to hit the issue: 1. Hot add two memory dimms twice. virsh attach-device VMName memHotplug.xml --live virsh attach-device VMName memHotplug.xml --live 2. cat memHotplug.xml <memory model='dimm' > <target> <size unit='MiB'>128</size> <node>0</node> </target> </memory> 3. Now hot unplug the first memory module attached. virsh detach-device VMName detach.xml --live 4. cat detach.xml <memory model='dimm'> <target> <size unit='MiB'>128</size> <node>0</node> </target> <alias name='dimm0'/> <address type='dimm' slot='0' base='0x100000000'/> </memory> 5.Save the VM and then restore. Restore fails.. virsh save VMName ./VMName.vmsav virsh restore ./VMName.vmsav Error: Unknown ramblock "memdimm1". 6. Example qemu log without current patch. dimm,node=0,memdev=memdimm0,id=dimm0,slot=1,addr=4429185024 -object memory-backend-ram,id=memdimm1,size=134217728 -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=2,addr=4563402752 -object memory-backend-ram,id=memdimm2,size=134217728 -device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=3,addr=4697620480 -object memory-backend-ram,id=memdimm3,size=134217728 -device pc-dimm,node=0,memdev=memdimm3,id=dimm3,slot=4,addr=4831838208 -object memory-backend-ram,id=memdimm4,size=134217728 -device pc-dimm,node=0,memdev=memdimm4,id=dimm4,slot=5,addr=4966055936 7. With the current patch we have kept the dimm name as dimmX where X=slot number.In such a case the memdev and id generated are always correct w.r.t the slotid and the virsh restore/ migrate succeeds. dimm,node=0,memdev=memdimm1,id=dimm1,slot=1,addr=4429185024 -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=memdimm3,size=134217728 -device pc-dimm,node=0,memdev=memdimm3,id=dimm3,slot=3,addr=4697620480 -object memory-backend-ram,id=memdimm4,size=134217728 -device pc-dimm,node=0,memdev=memdimm4,id=dimm4,slot=4,addr=4831838208 -object memory-backend-ram,id=memdimm5,size=134217728 -device pc-dimm,node=0,memdev=memdimm5,id=dimm5,slot=5,addr=4966055936 Nitesh Konkar (2): qemu_alias:Set dimm alias name to dimmX where X=slot number. tests/qemuxml2argvdata:Add a testcase src/qemu/qemu_alias.c | 51 +++++++++--- .../qemuxml2argv-memory-hotplug-dimm-alias.args | 35 ++++++++ .../qemuxml2argv-memory-hotplug-dimm-alias.xml | 94 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 4 files changed, 172 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml -- 1.9.3

2 3

[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