- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Report error if per-VM directory cannot be created
by Martin Kletzander 09 Sep '15

09 Sep '15

Commit f1f68ca33433 did not report an error if virFileMakePath() returned -1. Well, who would've guessed function with name starting with 'vir' sets an errno instead of reporting an error the libvirt way. Anyway, let's fix it, so the output changes from: $ virsh start arm error: Failed to start domain arm error: An error occurred, but the cause is unknown to: $ virsh start arm error: Failed to start domain arm error: Cannot create directory '/var/lib/libvirt/qemu/domain-arm': Not a directory Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1146886 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f7eb2b609437..d9a0942c4dfd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4734,8 +4734,10 @@ int qemuProcessStart(virConnectPtr conn, if (virAsprintf(&tmppath, "%s/domain-%s", cfg->libDir, vm->def->name) < 0) goto cleanup; - if (virFileMakePath(tmppath) < 0) + if (virFileMakePath(tmppath) < 0) { + virReportSystemError(errno, _("Cannot create directory '%s'"), tmppath); goto cleanup; + } if (virSecurityManagerDomainSetDirLabel(driver->securityManager, vm->def, tmppath) < 0) @@ -4747,8 +4749,10 @@ int qemuProcessStart(virConnectPtr conn, cfg->channelTargetDir, vm->def->name) < 0) goto cleanup; - if (virFileMakePath(tmppath) < 0) + if (virFileMakePath(tmppath) < 0) { + virReportSystemError(errno, _("Cannot create directory '%s'"), tmppath); goto cleanup; + } if (virSecurityManagerDomainSetDirLabel(driver->securityManager, vm->def, tmppath) < 0) -- 2.5.1

2 1

[libvirt] [PATCH] Distribute only generated virkeymaps.h
by Martin Kletzander 09 Sep '15

09 Sep '15

We are distributing virkeymaps.h and all the tools needed to rebuild that file. On top of that, we are generating that file into the $(srcdir) and that sometimes fails for me when trying to do make dist in VPATH on rawhide fedora. And we don't clean the file when maintainer-clean make target is requested. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 429137561c6f..c2784af299dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -173,15 +173,13 @@ UTIL_SOURCES = \ $(NULL) -EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ - $(srcdir)/util/virkeycode-mapgen.py - BUILT_SOURCES += util/virkeymaps.h +MAINTAINERCLEANFILES += util/virkeymaps.h util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.5.1

2 3

[libvirt] [PATCH] util: Add win32 version of virFileUnlink
by Martin Kletzander 08 Sep '15

08 Sep '15

Commit 35847860f65f Added the virFileUnlink function, but failed to add a version for mingw build, causing the following error: Cannot export virFileUnlink: symbol not defined Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virfile.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 408d2d912f13..75819d9c8bd7 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2637,6 +2637,20 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED, return -ENOSYS; } + +int +virFileUnlink(const char *path, + uid_t uid ATTRIBUTE_UNUSED, + gid_t gid ATTRIBUTE_UNUSED) +{ + if (unlink(path) < 0) { + virReportSystemError(errno, _("Unable to unlink path '%s'"), + path); + return -1; + } + + return 0; +} #endif /* WIN32 */ /** -- 2.5.1

3 3

[libvirt] [PATCH] docs: Remove last use of double semicolon in Makefile
by Martin Kletzander 08 Sep '15

08 Sep '15

Double semicolons have special meaning in makefiles, but they would have to be combined with other rules witch such separators in order to be used as intended. Since there are no other rules like that, let's clean it up. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index daf37b6b95de..bfae35e0ddba 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -204,7 +204,7 @@ todo: rm -f todo.html.in $(MAKE) todo.html -hvsupport.html:: $(srcdir)/hvsupport.html.in +hvsupport.html: $(srcdir)/hvsupport.html.in $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ $(top_srcdir)/src/libvirt_public.syms \ -- 2.5.1

2 1

[libvirt] [PATCH] conf: fix crash when parse a disordered numa settings
by Luyao Huang 08 Sep '15

08 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1260846 Introduced by 8fedbbdb, if we parse the disordered numa cell, will get segfault. This is because we allow parse the numa cell not in order and we alloc them before the parse loop, the cpumask maybe NULL when parse each numa cell. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/numa_conf.c | 10 +++++--- .../qemuxml2argv-cpu-numa-disordered.xml | 26 +++++++++++++++++++ .../qemuxml2xmlout-cpu-numa-disordered.xml | 29 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 5c123b9..b5963ac 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -759,11 +759,15 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, } VIR_FREE(tmp); - for (j = 0; j < i; j++) { + for (j = 0; j < n; j++) { + if (j == cur_cell || !def->mem_nodes[j].cpumask) + continue; + if (virBitmapOverlaps(def->mem_nodes[j].cpumask, - def->mem_nodes[i].cpumask)) { + def->mem_nodes[cur_cell].cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("NUMA cells %zu and %zu have overlapping vCPU ids"), i, j); + _("NUMA cells %u and %zu have overlapping vCPU ids"), + cur_cell, j); goto cleanup; } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml new file mode 100644 index 0000000..ad31607 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>328650</memory> + <currentMemory unit='KiB'>328650</currentMemory> + <vcpu placement='static'>16</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='2' cores='4' threads='2'/> + <numa> + <cell id='0' cpus='0-5' memory='109550' unit='KiB'/> + <cell id='2' cpus='6-10' memory='109550' unit='KiB'/> + <cell id='1' cpus='11-15' memory='109550' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml new file mode 100644 index 0000000..0a76f12 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>328650</memory> + <currentMemory unit='KiB'>328650</currentMemory> + <vcpu placement='static'>16</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='2' cores='4' threads='2'/> + <numa> + <cell id='0' cpus='0-5' memory='109550' unit='KiB'/> + <cell id='1' cpus='11-15' memory='109550' unit='KiB'/> + <cell id='2' cpus='6-10' memory='109550' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d41954e..5a20ebc 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -608,6 +608,7 @@ mymain(void) DO_TEST_DIFFERENT("cpu-numa1"); DO_TEST_DIFFERENT("cpu-numa2"); DO_TEST_DIFFERENT("cpu-numa-no-memory-element"); + DO_TEST_DIFFERENT("cpu-numa-disordered"); DO_TEST("cpu-numa-disjoint"); DO_TEST("cpu-numa-memshared"); -- 1.8.3.1

3 2

[libvirt] [PATCH] admin: Resolve leaked reference to private data
by Erik Skultety 08 Sep '15

08 Sep '15

Running valgrind on a very simplistic program consisting only from opening and closing admin connection (virAdmConnect{Open,Close}) shows a leak in remoteAdminPrivNew, because the last reference to privateData is not decremented, thus the object won't be disposed. This patch unrefs the privateData object once we closed the active connection to daemon, making further use of this connection useless. ==24577== at 0x4A089C7: calloc (in /usr/lib64/valgrind/vgpreload_***linux.so) ==24577== by 0x4E8835F: virAllocVar (viralloc.c:560) ==24577== by 0x4EDFA5C: virObjectNew (virobject.c:193) ==24577== by 0x4EDFBD4: virObjectLockableNew (virobject.c:219) ==24577== by 0x4C14DAF: remoteAdminPrivNew (libvirt-admin.c:152) ==24577== by 0x4C1537E: virAdmConnectOpen (libvirt-admin.c:308) ==24577== by 0x400BAD: main (listservers.c:39) ==24577== LEAK SUMMARY: ==24577== definitely lost: 80 bytes in 1 blocks ==24577== indirectly lost: 840 bytes in 6 blocks ==24577== possibly lost: 0 bytes in 0 blocks ==24577== still reachable: 12,179 bytes in 199 blocks ==24577== suppressed: 0 bytes in 0 blocks --- src/libvirt-admin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index b3fd0b3..5a4fc48 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -132,6 +132,7 @@ remoteAdminPrivFree(void *opaque) virAdmConnectPtr conn = opaque; remoteAdminConnectClose(conn); + virObjectUnref(conn->privateData); } static remoteAdminPrivPtr -- 2.4.3

2 2

[libvirt] [PATCH 0/3] vmx: Add handling for CDROM devices with SCSI passthru and other minor fixes
by Matthias Bolte 08 Sep '15

08 Sep '15

This patch series addresses this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1172544 It's mean as a replacement for this patch: https://www.redhat.com/archives/libvir-list/2015-August/msg00970.html Matthias Bolte (3): vmx: Some whitespace cleanup vmx: The virVMXParseDisk deviceType can be NULL, add some missing checks vmx: Add handling for CDROM devices with SCSI passthru src/vmx/vmx.c | 81 ++++++++++++++------- tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx | 6 ++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml | 24 +++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.vmx | 85 +++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml | 35 ++++++++++ tests/vmx2xmltest.c | 2 + tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.vmx | 14 ++++ tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.vmx | 25 +++++++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.xml | 35 ++++++++++ tests/xml2vmxtest.c | 2 + 11 files changed, 296 insertions(+), 27 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.xml create mode 100644 tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.xml -- 1.9.1

2 9

[libvirt] [PATCH] virsh: Teach attach-interface to --print-xml
by Michal Privoznik 07 Sep '15

07 Sep '15

We have the same argument to many other commands that produce an XML based on what user typed. But unfortunately attach-interface was missing it. Maybe nobody hasn't needed it yet. Well, I did just now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 20 ++++++++++++++++---- tools/virsh.pod | 4 ++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b029b65..516a51e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -862,6 +862,10 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_BOOL, .help = N_("affect current domain") }, + {.name = "print-xml", + .type = VSH_OT_BOOL, + .help = N_("print XML document rather than attach the interface") + }, {.name = NULL} }; @@ -938,9 +942,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; - if (persistent && virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; @@ -1051,6 +1052,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "</bandwidth>\n"); } + virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</interface>\n"); if (virBufferError(&buf)) { @@ -1060,6 +1062,15 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) xml = virBufferContentAndReset(&buf); + if (vshCommandOptBool(cmd, "print-xml")) { + vshPrint(ctl, "%s", xml); + functionReturn = true; + goto cleanup; + } + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + goto cleanup; + if (flags || current) ret = virDomainAttachDeviceFlags(dom, xml, flags); else @@ -1075,7 +1086,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) } cleanup: - virDomainFree(dom); + if (dom) + virDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 83c445d3..0212e7a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2507,6 +2507,7 @@ Likewise, I<--shareable> is an alias for I<--mode shareable>. [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--inbound average,peak,burst,floor>] [I<--outbound average,peak,burst>] +[I<--print-xml>] Attach a new network interface to the domain. I<type> can be I<network> to indicate connection via a libvirt virtual network, or @@ -2536,6 +2537,9 @@ kilobytes in a single burst at I<peak> speed as described in the Network XML documentation at L<http://libvirt.org/formatnetwork.html#elementQoS>. +If I<--print-xml> is specified, then the XML of the interface that would be +attached is printed instead. + If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. If I<--current> is specified, affect the current domain state. -- 2.4.6

2 1

[libvirt] [PATCH sandbox 0/4] Fix data retention with QEMU sandboxes
by Daniel P. Berrange 07 Sep '15

07 Sep '15

In testing the docker sandbox patches I found that with QEMU sandboxes, we would randomly loose data written to the block device. This meant that after untar'ing the image contents into the qcow2 the filesystem was left empty! Eventually I realized that there was no where we are calling sync() to flush data out to disk. We never noticed this before because the sandbox code mostly used 9p filesystems with QEMU which do not need this sync(). Daniel P. Berrange (4): push changing of user ID down into child process Sync and unmount filesystems during shutdown Fix passing of strace option to guest kernel Don't close immediately when getting EOF on RPC console bin/virt-sandbox.c | 23 ++- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 7 +- libvirt-sandbox/libvirt-sandbox-init-common.c | 226 +++++++++++++++++++--- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 3 +- 4 files changed, 225 insertions(+), 34 deletions(-) -- 2.4.3

2 8

[libvirt] [PATCHv3 0/2] Added waiting for DAD to finish for bridge address.
by Maxim Perevedentsev 07 Sep '15

07 Sep '15

This is a fix for commit db488c79173b240459c7754f38c3c6af9b432970 dnsmasq main process which is relied on when waiting for DAD to complete exits without actually waiting for DAD. This is dnsmasq daemon's task. It seems to be a race that DAD finished before dnsmasq main process exited. The above commit needs the execution to block until DAD finishes for bridge IPv6 address because then it closes dummy tap device. Thus we need to ensure this ourselves. So we periodically poll the kernel using netlink and check whether there are any IPv6 addresses assigned to bridge which have 'tentative' state. After DAD is finished, execution continues. I guess that is what dnsmasq was assumed to do. We use netlink to dump information about existing IPv6 addresses. Netlink's response is a multi-part message. Unfortunately, the current implementation of virNetlink treats such messages as faulty and throws an error. So the patch 2/2 adds multi-part nelink response support. Update v2: fixed syntax. Update v3: moved to virnetdev. Maxim Perevedentsev (2): network: added waiting for DAD to finish for bridge address. Add support for multi-part netlink messages. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 35 +++++++++- src/util/virnetdev.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 + src/util/virnetlink.c | 4 +- 5 files changed, 200 insertions(+), 2 deletions(-) -- Sincerely, Maxim Perevedentsev

3 12

[libvirt] [PATCH] cpu: Introduce IvyBridge CPU model
by Jiri Denemark 07 Sep '15

07 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1254420 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_map.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index d2469ee..51aa899 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -869,6 +869,55 @@ <feature name='xsave'/> </model> + <model name='IvyBridge'> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='x2apic'/> + <feature name='xsave'/> + <feature name='xsaveopt'/> + </model> + <model name='Haswell-noTSX'> <vendor name='Intel'/> <feature name='aes'/> -- 2.5.1

2 2

[libvirt] [PATCH] .gitignore: Ignore the correct rename example binary
by Michal Privoznik 07 Sep '15

07 Sep '15

In e755186c5c305a9 we tried to introduce an example demonstrating new virDomainRename API. Unfortunately, in the .gitignore we had a different binary listed. It's 'rename' binary which we want git to ignore, not 'test'. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 19402f5..2d52a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -83,7 +83,7 @@ /examples/domtop/domtop /examples/hellolibvirt/hellolibvirt /examples/openauth/openauth -/examples/rename/test +/examples/rename/rename /gnulib/lib/* /gnulib/m4/* /gnulib/tests/* -- 2.4.6

1 0

[libvirt] [PATCH] examples: Add missing build data for 'rename'
by Martin Kletzander 07 Sep '15

07 Sep '15

Commit e755186c5c30 added the rename example, but forgot to build some essential files in there as well as add it to the spec file. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. Makefile.am | 2 +- libvirt.spec.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d338d5a220c1..6f217bc08595 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ tools/wireshark examples/dommigrate examples/polkit \ - examples/lxcconvert examples/domtop + examples/lxcconvert examples/domtop examples/rename ACLOCAL_AMFLAGS = -I m4 diff --git a/libvirt.spec.in b/libvirt.spec.in index 6f6b191ee61d..bb8bfc3c25c1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1546,7 +1546,7 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop +for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop rename do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -2330,6 +2330,7 @@ exit 0 %doc examples/dommigrate %doc examples/openauth %doc examples/xml +%doc examples/rename %doc examples/systemtap %changelog -- 2.5.1

1 0

[libvirt] [PATCH] qemu: Check address when attaching a virtio disk with an invalid address.
by rbian 06 Sep '15

06 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Attach-device can hotplug a virtio disk device with any address now. It need to validate the address before the attachment. This patch fix the problem. Signed-off-by: rbian <rbian(a)redhat.com> --- src/qemu/qemu_hotplug.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e71a204..be24993 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -331,6 +331,23 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; + } else { + if (STREQLEN(vm->def->os.machine, "s390-ccw", 8) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid CCW address")); + goto error; + } + } else { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid PCI address")); + goto error; + } + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.3

4 3

[libvirt] [PATCH libvirt master] interface type: add udp socket support
by Jonathan Toppins 05 Sep '15

05 Sep '15

Adds a new interface type using UDP sockets, this seems only applicable to QEMU but have edited tree-wide to support the new interface type. The interface type required the addition of a "destaddr" (destination address), this then maps into the following xml and qemu call. <interface type='udp'> <mac address='52:54:00:5c:67:56'/> <source address='127.0.0.1' port='11112'/> <model type='virtio'/> <dest address="127.0.0.1' port='22222'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> ... QEMU call: -netdev socket,udp=127.0.0.1:22222,localaddr=127.0.0.1:11112 Notice the xml "source" entry becomes the "localaddr" for the qemu call. reference: http://lists.gnu.org/archive/html/qemu-devel/2011-11/msg00629.html Signed-off-by: Jonathan Toppins <jtoppins(a)cumulusnetworks.com> --- docs/formatdomain.html.in | 17 ++++++++++++ src/conf/domain_conf.c | 56 +++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 3 +++ src/conf/netdev_bandwidth_conf.h | 1 + src/libxl/libxl_conf.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_process.c | 1 + src/qemu/qemu_command.c | 12 +++++++++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_interface.c | 2 ++ src/uml/uml_conf.c | 5 ++++ src/xenconfig/xen_sxpr.c | 1 + tools/virsh-domain.c | 1 + 13 files changed, 99 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c0a265a..95f7f5d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4165,6 +4165,23 @@ </devices> ...</pre> + <h5><a name="elementsNICSUDP">UDP unicast tunnel</a></h5> + + <p> + A UDP unicast architecture provides a virtual network which enables + connections between Qemu instances using Qemu's UDP infrastructure.</p> + +<pre> + ... + <devices> + <interface type='udp'> + <mac address='52:54:00:22:c9:42'/> + <source address='127.0.0.1' port='11115'/> + <dest address='127.0.0.1' port='11116'/> + </interface> + </devices> + ...</pre> + <h5><a name="elementsNICSModel">Setting the NIC model</a></h5> <pre> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e4114f8..11961ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -385,7 +385,8 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "bridge", "internal", "direct", - "hostdev") + "hostdev", + "udp") VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, "default", @@ -1629,7 +1630,9 @@ void virDomainNetDefFree(virDomainNetDefPtr def) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: VIR_FREE(def->data.socket.address); + VIR_FREE(def->data.socket.destaddr); break; case VIR_DOMAIN_NET_TYPE_NETWORK: @@ -8398,6 +8401,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *script = NULL; char *address = NULL; char *port = NULL; + char *destaddr = NULL; + char *destport = NULL; char *model = NULL; char *backend = NULL; char *txmode = NULL; @@ -8510,10 +8515,15 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } else if (!address && (def->type == VIR_DOMAIN_NET_TYPE_SERVER || def->type == VIR_DOMAIN_NET_TYPE_CLIENT || - def->type == VIR_DOMAIN_NET_TYPE_MCAST) && + def->type == VIR_DOMAIN_NET_TYPE_MCAST || + def->type == VIR_DOMAIN_NET_TYPE_UDP) && xmlStrEqual(cur->name, BAD_CAST "source")) { address = virXMLPropString(cur, "address"); port = virXMLPropString(cur, "port"); + } else if (!destaddr && def->type == VIR_DOMAIN_NET_TYPE_UDP && + xmlStrEqual(cur->name, BAD_CAST "dest")) { + destaddr = virXMLPropString(cur, "address"); + destport = virXMLPropString(cur, "port"); } else if (xmlStrEqual(cur->name, BAD_CAST "ip")) { virDomainNetIpDefPtr ip = NULL; @@ -8751,6 +8761,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: if (port == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No <source> 'port' attribute " @@ -8766,7 +8777,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (address == NULL) { if (def->type == VIR_DOMAIN_NET_TYPE_CLIENT || - def->type == VIR_DOMAIN_NET_TYPE_MCAST) { + def->type == VIR_DOMAIN_NET_TYPE_MCAST || + def->type == VIR_DOMAIN_NET_TYPE_UDP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No <source> 'address' attribute " "specified with socket interface")); @@ -8776,6 +8788,32 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->data.socket.address = address; address = NULL; } + + if (def->type != VIR_DOMAIN_NET_TYPE_UDP) + break; + + if (destport == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No <dest> 'port' attribute " + "specified with socket interface")); + goto error; + } + if (virStrToLong_i(destport, NULL, 10, &def->data.socket.destport) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot parse <dest> 'port' attribute " + "with socket interface")); + goto error; + } + + if (destport == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No <dest> 'address' attribute " + "specified with socket interface")); + goto error; + } else { + def->data.socket.destaddr = destaddr; + address = NULL; + } break; case VIR_DOMAIN_NET_TYPE_INTERNAL: @@ -19732,6 +19770,7 @@ virDomainNetDefFormat(virBufferPtr buf, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: if (def->data.socket.address) { virBufferAsprintf(buf, "<source address='%s' port='%d'/>\n", def->data.socket.address, def->data.socket.port); @@ -19739,6 +19778,17 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, "<source port='%d'/>\n", def->data.socket.port); } + + if (def->type != VIR_DOMAIN_NET_TYPE_UDP) + break; + + if (def->data.socket.destaddr) { + virBufferAsprintf(buf, "<dest address='%s' port='%d'/>\n", + def->data.socket.destaddr, def->data.socket.destport); + } else { + virBufferAsprintf(buf, "<dest port='%d'/>\n", + def->data.socket.destport); + } break; case VIR_DOMAIN_NET_TYPE_INTERNAL: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 698a4d2..e96fece 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -889,6 +889,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_INTERNAL, VIR_DOMAIN_NET_TYPE_DIRECT, VIR_DOMAIN_NET_TYPE_HOSTDEV, + VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_LAST } virDomainNetType; @@ -991,6 +992,8 @@ struct _virDomainNetDef { struct { char *address; int port; + char *destaddr; + int destport; } socket; /* any of NET_CLIENT or NET_SERVER or NET_MCAST */ struct { char *name; diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index 6cbf4ae..cdeac09 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -53,6 +53,7 @@ static inline bool virNetDevSupportBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index e845759..a76ad5a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1177,6 +1177,7 @@ libxlMakeNic(virDomainDefPtr def, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 110a556..03d6311 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -382,6 +382,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index e99b039..04fbb0a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -429,6 +429,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_LAST: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eb00f0f..2dac923 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5354,6 +5354,17 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, type_sep = ','; break; + case VIR_DOMAIN_NET_TYPE_UDP: + virBufferAsprintf(&buf, "socket%cudp=%s:%d%clocaladdr=%s:%d", + type_sep, + net->data.socket.destaddr, + net->data.socket.destport, + type_sep, + net->data.socket.address, + net->data.socket.port); + type_sep = ','; + break; + case VIR_DOMAIN_NET_TYPE_USER: default: virBufferAddLit(&buf, "user"); @@ -8416,6 +8427,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1ea397f..e6c20e9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2394,6 +2394,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: if (STRNEQ_NULLABLE(olddev->data.socket.address, newdev->data.socket.address) || olddev->data.socket.port != newdev->data.socket.port) { diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 01226ac..4d55e4d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -100,6 +100,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: @@ -187,6 +188,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 90deb2a..afc0375 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -195,6 +195,11 @@ umlBuildCommandLineNet(virConnectPtr conn, _("TCP client networking type not supported")); goto error; + case VIR_DOMAIN_NET_TYPE_UDP: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("UDP networking type not supported")); + goto error; + case VIR_DOMAIN_NET_TYPE_MCAST: /* ethNNN=tuntap,macaddr,ipaddr,port */ virBufferAddLit(&buf, "mcast"); diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 05e938a..1d43ec1 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1962,6 +1962,7 @@ xenFormatSxprNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4988ba2..fc23ee1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -993,6 +993,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: -- 1.9.1

6 20

[libvirt] [PATCH 0/5] Resolve some Coverity related errors
by John Ferlan 05 Sep '15

05 Sep '15

Patches 1, 3, & 4 show up periodically in my Coverity runs, but not always. Usually only when some sort of self inflicted build error only gets a partial build followed by a complete analysis phase. Patch 2 is related to a Coverity error seen in private integration testing as well. Although it could be deemed Coverity noise - it's just easier to adjust our code to use the right type than try to generate a reproducer or figure out exactly what the error is. Patch 5 is based on some investigation I started in July to remove some sa_asserts. I could split into two patches if really desired, but it was just easier to keep as one. John Ferlan (5): qemu: Check virGetLastError return value for migration finish failure lxc: Avoid Coverity SIZEOF_MISMATCH virfile: Avoid Coverity IDENTICAL_BRANCHES error util: Avoid Coverity FORWARD_NULL conf: Remove need for a couple of sa_asserts src/conf/domain_conf.c | 9 +++++---- src/libvirt-domain.c | 3 ++- src/lxc/lxc_container.c | 4 ++-- src/qemu/qemu_migration.c | 3 ++- src/util/virdbus.c | 4 ++++ src/util/virfile.c | 3 +-- 6 files changed, 16 insertions(+), 10 deletions(-) -- 2.1.0

2 11

[libvirt] [PATCH sandbox] Require libvirt-glib >= 0.2.2 for LXC fsdriver format fix
by Daniel P. Berrange 05 Sep '15

05 Sep '15

Versions of libvirt-glib < 0.2.2 are buggy when configuring the <filesystem> format/driver attributes, causing the disk to be setup as a plain volume instead of nbd. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 69b5870..9677b24 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ GIO_UNIX_REQUIRED=2.28.0 GOBJECT_REQUIRED=2.32.0 LIBVIRT_REQUIRED=1.0.2 LIBVIRT_GCONFIG_REQUIRED=0.2.1 -LIBVIRT_GLIB_REQUIRED=0.1.7 +LIBVIRT_GLIB_REQUIRED=0.2.2 LIBVIRT_GOBJECT_REQUIRED=0.1.7 GOBJECT_INTROSPECTION_REQUIRED=0.10.8 LZMA_REQUIRED=5.0.0 -- 2.4.3

2 1

[libvirt] [PATCH v2] examples: Add example polkit ACL rules
by Jiri Denemark 04 Sep '15

04 Sep '15

Creating ACL rules is not exactly easy and existing examples are pretty simple. This patch adds a somewhat complex example which defines several roles. Admins can do everything, operators can do basic operations on any domain and several groups of users who act as operators but only on a limited set of domains. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Makefile.am | 2 +- configure.ac | 1 + examples/polkit/Makefile.am | 17 ++++++ examples/polkit/libvirt-acl.rules | 115 ++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 3 + 5 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 examples/polkit/Makefile.am create mode 100644 examples/polkit/libvirt-acl.rules diff --git a/Makefile.am b/Makefile.am index 91b943b..d338d5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ tests po examples/object-events examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ - tools/wireshark examples/dommigrate \ + tools/wireshark examples/dommigrate examples/polkit \ examples/lxcconvert examples/domtop ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 8471a46..136c2e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2809,6 +2809,7 @@ AC_CONFIG_FILES([\ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile \ examples/lxcconvert/Makefile \ + examples/polkit/Makefile \ tools/wireshark/Makefile \ tools/wireshark/src/Makefile]) AC_OUTPUT diff --git a/examples/polkit/Makefile.am b/examples/polkit/Makefile.am new file mode 100644 index 0000000..4d213e8 --- /dev/null +++ b/examples/polkit/Makefile.am @@ -0,0 +1,17 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +EXTRA_DIST = libvirt-acl.rules diff --git a/examples/polkit/libvirt-acl.rules b/examples/polkit/libvirt-acl.rules new file mode 100644 index 0000000..5c26593 --- /dev/null +++ b/examples/polkit/libvirt-acl.rules @@ -0,0 +1,115 @@ +function Role(name) { + this.name = name; + + this.users = []; + this.groups = []; + + this.check = function(subject, api, domain) { + var validUser = false + + if (this.users.indexOf(subject.user) >= 0) { + validUser = true; + } else { + for (var i = 0; i < subject.groups.length; i++) { + if (this.groups.indexOf(subject.groups[i]) >= 0) { + validUser = true; + break; + } + } + } + + if (validUser && + (this.name == "admin" || + !domain || + (this.domains && domain.match(this.domains)))) { + var msg = "Access granted: " + + "user = " + subject.user + + ", groups = [" + subject.groups + "]" + + ", role = " + this.name + + ", api = " + api; + if (domain) + msg += ", domain = " + domain; + polkit.log(msg); + return true + } + + return false; + }; +} + + +/* Basic operations and monitoring on a limited set of domains. */ +var userA = new Role("userA"); +userA.domains = /^a/; +userA.users = ["userA1", "userA2", "userA3", "multiUser"]; +userA.groups = ["groupA1", "groupA2"]; + +var userB = new Role("userB"); +userB.domains = /^b/; +userB.users = ["userB1", "userB2", "userB3", "multiUser"]; +userB.groups = ["groupB1", "groupB2", "multiGroup"]; + +var userC = new Role("userC"); +userC.domains = /^c/; +userC.users = ["userC1", "userC2", "userC3"]; +userC.groups = ["groupC1", "groupC2", "multiGroup"]; + +/* Same as users but on any domain. */ +var operator = new Role("operator"); +operator.domains = /.*/; +operator.users = ["powerUser1", "powerUser2"]; +operator.groups = ["powerGroup1", "powerGroup2", "powerGroup3"]; + +var users = [operator, userA, userB, userC]; + +/* Full access. */ +var admin = new Role("admin"); +admin.users = ["adminUser1"]; +admin.groups = ["adminGroup1"]; + + +restrictedActions = [ + "domain.core-dump", + "domain.fs-freeze", + "domain.fs-trim", + "domain.getattr", + "domain.hibernate", + "domain.init-control", + "domain.inject-nmi", + "domain.open-device", + "domain.open-graphics", + "domain.pm-control", + "domain.read", + "domain.reset", + "domain.save", + "domain.screenshot", + "domain.send-input", + "domain.send-signal", + "domain.set-password", + "domain.set-time", + "domain.snapshot", + "domain.start", + "domain.stop", + "domain.suspend" +]; + +polkit.addRule(function(action, subject) { + if (action.id.indexOf("org.libvirt.api.") != 0) + return polkit.Result.NOT_HANDLED; + + var api = action.id.replace("org.libvirt.api.", ""); + var domain = action.lookup("domain_name"); + + if (admin.check(subject, api, domain)) + return polkit.Result.YES; + + if (restrictedActions.indexOf(api) < 0) + return polkit.Result.NOT_HANDLED; + + for (var i = 0; i < users.length; i++) { + if (users[i].check(subject, api, domain)) + return polkit.Result.YES; + } + + return polkit.Result.NO; +}); diff --git a/libvirt.spec.in b/libvirt.spec.in index 78a4cc3..6f6b191 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2039,6 +2039,9 @@ exit 0 %endif # ! %{with_driver_modules} %if %{with_network} + +%doc examples/polkit/*.rules + %files daemon-config-network %defattr(-, root, root) %dir %{_datadir}/libvirt/networks/ -- 2.5.1

2 3

[libvirt] [PATCH 0/4] Several virsh initialization adjustments
by Erik Skultety 04 Sep '15

04 Sep '15

When looking at commit 4fdd873f, I've come to notice, that after my changes to virsh (834c5720), vshInit always calls vshReadlineInit and that is because client mode defaults to interactive which might be changed after command line arguments are parsed. So this series addresses this minor issue and provides some small tweaks and adjustments. Erik Skultety (4): virsh: Do not make interactive mode default vsh: adjust vshInit signature and remove redundant error label vsh: Introduce vshInitReload vsh: Make vshInitDebug static tools/virsh.c | 12 +++++++----- tools/vsh.c | 32 ++++++++++++++++++++++---------- tools/vsh.h | 4 ++-- 3 files changed, 31 insertions(+), 17 deletions(-) -- 2.4.3

2 8

[libvirt] [PATCH 0/2] Change name of the domain upon successful rename
by Martin Kletzander 04 Sep '15

04 Sep '15

Try running the example added in 1/2 before and after applying 2/2. Martin Kletzander (2): Add example that renames domain there and back Change name of the domain upon successful rename .gitignore | 1 + configure.ac | 1 + examples/rename/Makefile.am | 24 +++++++++++++++ examples/rename/rename.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 41 +++++++++++++++++++++++++ src/remote/remote_protocol.x | 2 +- 6 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 examples/rename/Makefile.am create mode 100644 examples/rename/rename.c -- 2.5.1

2 4

[libvirt] [PATCH v2 0/2] Need to perform address checks for ccw/s390
by John Ferlan 04 Sep '15

04 Sep '15

Assumptions were made that if someone provided an address type ccw or s390 that it would occur only if using an enabled emulator. Turns out that premise isn't necessarily true and it leads to libvirtd crashing for hotplugs and qemu start errors for config paths. These patches will make the checks prior to crashes or qemu process starts in order to avoid the situation. v1: http://www.redhat.com/archives/libvir-list/2015-August/msg01043.html Changes since v1... ... Implement a function to handle the s390-ccw check using STRPREFIX instead of a mix of STRPREFIX and STREQLEN ... Create qemuCheckCCWS390AddressSupport to handle checking address type if defined on entry to disk, controller, and rng device additions whether through hotplug or config options. NB: It doesn't seem network devices are afflicted, although perhaps I read the code wrong. It seems for a network device there is/was none of the set the default address if undefined code added. John Ferlan (2): qemu: Introduce qemuDomainMachineIsS390CCW qemu: Need to check for machine.os when using ADDRESS_TYPE_CCW src/qemu/qemu_command.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 5 +++++ src/qemu/qemu_domain.c | 6 ++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_hotplug.c | 24 +++++++++++++++------ 5 files changed, 83 insertions(+), 8 deletions(-) -- 2.1.0

2 3

[libvirt] [sandbox PATCH v3 00/22] *** Virt-sandbox-image ***
by Eren Yagdiran 04 Sep '15

04 Sep '15

V3 Changes: * License syntax fixed * Source abstract method get_env fixed * Discarding byte code generation now resides into a new commit * Template_dir and storage_dir refactored and runtime resolver is added for checking permissions * -f,--format parameter is refactored. Default is qcow2. * Ssl warning is now using stderr * get_disk method in Source now adds another layer with a randomized name Daniel P Berrange (1): Add virt-sandbox-image Eren Yagdiran (21): Fix virt-sandbox-image Image: Add Hooking Mechanism Image: virt-sandbox-image default dir constants Image: Discard caching bytecode Image: Add check_writable and runtime resolver Image: Add download function Image: Refactor create function Image: Add delete function Image: Add get_command function to Source Image: Add run args Image: Add check_connect function Image: Add get_disk function to Source Image: Add run function Image: Add network support Image: Add Volume Support Image: man file for virt-sandbox-image Add configuration object for environment variables Add environment parameter to virt-sandbox Common-init: Exporting custom environment variables Add testcase for custom environment variables Image: Add custom environment support .gitignore | 1 + bin/Makefile.am | 21 +- bin/virt-sandbox-image.in | 3 + bin/virt-sandbox-image.pod | 172 +++++++++++ bin/virt-sandbox.c | 14 + configure.ac | 2 + libvirt-sandbox/Makefile.am | 2 + libvirt-sandbox/libvirt-sandbox-config-all.h | 1 + libvirt-sandbox/libvirt-sandbox-config-env.c | 199 ++++++++++++ libvirt-sandbox/libvirt-sandbox-config-env.h | 78 +++++ libvirt-sandbox/libvirt-sandbox-config.c | 187 +++++++++++- libvirt-sandbox/libvirt-sandbox-config.h | 12 + libvirt-sandbox/libvirt-sandbox-init-common.c | 30 ++ libvirt-sandbox/libvirt-sandbox.h | 1 + libvirt-sandbox/libvirt-sandbox.sym | 6 + libvirt-sandbox/tests/test-config.c | 10 + po/POTFILES.in | 1 + virt-sandbox-image/Makefile.am | 14 + virt-sandbox-image/sources/DockerSource.py | 421 ++++++++++++++++++++++++++ virt-sandbox-image/sources/Source.py | 55 ++++ virt-sandbox-image/sources/__init__.py | 26 ++ virt-sandbox-image/virt-sandbox-image.py | 299 ++++++++++++++++++ 22 files changed, 1550 insertions(+), 5 deletions(-) create mode 100644 bin/virt-sandbox-image.in create mode 100644 bin/virt-sandbox-image.pod create mode 100644 libvirt-sandbox/libvirt-sandbox-config-env.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-env.h create mode 100644 virt-sandbox-image/Makefile.am create mode 100644 virt-sandbox-image/sources/DockerSource.py create mode 100644 virt-sandbox-image/sources/Source.py create mode 100644 virt-sandbox-image/sources/__init__.py create mode 100755 virt-sandbox-image/virt-sandbox-image.py -- 2.1.0

3 28

[libvirt] [PATCH v4 0/6] vz: add migration support
by Nikolay Shirokovskiy 04 Sep '15

04 Sep '15

NOTE that minimal command to migrate vz domain is like next: virsh -c vz:///system migrate 200 vz+ssh://shiny0/system --p2p --live --compressed --persistent --undefinesource ==Difference from v1: 1. Patch is quite different. First patchset implements migration thru managed migration scheme. This one goes thru p2p scheme. I belive this is a better approach. Vz migration is done via vz sdk and first patchset uses 5 phased migration only to get a token from destination on prepare phase which is kind a misuse. This patch just adds vz specific function to driver interface to archive the same goal. 2. Offline migration is supported as there is no more dependency on current flow of managed migration scheme. ==Difference from v2: 1. Implement thru direct migration instead of p2p. p2p is just managed 5-staged migration when managing is done on daemon side. Vz migration stages are all hidden in vz sdk and thus it would be more consistent to use direct scheme. 2. Use existing driver function for prepare migration phase to pass session uuid from destination to source instead of new one. As vz migration is direct one we will not use prepare phase function in a straight forward manner anyway. ==Difference from v3: Return back to p2p implementation. Difference from p2p implementation in v2 is that prepare phase driver function is used to pass session_uuid from destination to source instead of new ad-hoc driver function. src/vz/vz_driver.c | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 86 +++++++++++-- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.h | 4 +- 4 files changed, 423 insertions(+), 15 deletions(-)

3 16

[libvirt] [PATCH V2] libxl: don't overwrite error from virNetSocketNewConnectTCP()
by Jim Fehlig 04 Sep '15

04 Sep '15

Remove redundant error reporting in libxlDomainMigrationPerform(). virNetSocketNewConnectTCP() is perfectly capable of reporting sensible errors. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: Actually try to compile the code and find saved_errno is no longer used - remove it. src/libxl/libxl_migration.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 9609e06..0d23e5f 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -472,7 +472,6 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, virURIPtr uri = NULL; virNetSocketPtr sock; int sockfd = -1; - int saved_errno = EINVAL; int ret = -1; /* parse dst host:port from uri */ @@ -487,12 +486,8 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, /* socket connect to dst host:port */ if (virNetSocketNewConnectTCP(hostname, portstr, AF_UNSPEC, - &sock) < 0) { - virReportSystemError(saved_errno, - _("unable to connect to '%s:%s'"), - hostname, portstr); + &sock) < 0) goto cleanup; - } if (virNetSocketSetBlocking(sock, true) < 0) { virObjectUnref(sock); -- 2.5.0

3 3

[libvirt] [RFC PATCH 0/3] Implement mockup capabilities cache in QEMU tests
by Pavel Fedin 04 Sep '15

04 Sep '15

Since commit e8d55172544c1fafe31a9e09346bdebca4f0d6f9 qemu driver checks emulator capabilities during domain XML post-parse. However, test suite does not initialize it, therefore a condition to skip all checks if there is no cache supplied was added. This is actually a hack, whose sole purpose is to make existing test suite working. Additionally, it prevents from writing new tests for this particular functionality. This series attempts to solve this problem by implementing proper cache mockup in test suite. The main idea is to create a cache in standard way and put there a pre-defined capabilities set (which tests already have). The main problem here is to know emulator binary name, which is contained in the source XML. However, we have to create our cache before reading the XML. The simplest way to resolve this is to assume particular binary name from test name. Currently tests which assume cross-architecture binary are all prefixed with the architecture name (with one exception of "keywrap" tests which all assume /usr/bin/qemu-system-s390x and do not have "s390-" prefix in their name). This scheme works fine, unless we use "native" emulator binary. Here we have a mess. Most newer tests use /usr/bin/qemu, however there is a large number of tests which use /usr/libexec/qemu-kvm or /usr/bin/kvm (i guess these are leftovers from the epoch when qemu-kvm was a separate fork of qemu). This is currently not handled in any way, and these tests may report errors due to missing binaries (because virQEMUCapsCacheLookup() attempts to populate the cache automatically by querying the binary if not already known). There are several possible ways to resolve this: a) Add all possible names as aliases for /usr/bin/qemu b) Forbid to use oldstyle names at all in these tests c) Declare some prefix like "kvm-" for those tests who want to use /usr/libexec/qemu-kvm. Again, this would ban /usr/bin/kvm and /usr/bin/qemu-kvm (if not using aliases like in (b) d) Hardcode (optional) emulator name per test. IMHO a bad idea because number of tests is huge. e) Do some preparsing of the XML and extract binary name from it. Again, i disliked it for not being simple enough. I also thought about an alternate implementation which would patch postParseCallback and insert own function there which builds a cache. At this point binary name is already known from the XML. However, such a design looks like an ugly hack by itself, so i stopped going in this direction. Comments and opinions are welcome. Pavel Fedin (3): Implement virQEMUCapsCache mockup Use mockup cache Removed unneeded check src/qemu/qemu_capabilities.c | 10 +--------- src/qemu/qemu_capspriv.h | 36 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.c | 5 +---- tests/qemuagenttest.c | 9 ++++++++- tests/qemuargv2xmltest.c | 5 +++++ tests/qemuhotplugtest.c | 23 ++++++++++++++-------- tests/qemuxml2argvtest.c | 5 +++++ tests/qemuxml2xmltest.c | 6 ++++++ tests/qemuxmlnstest.c | 5 +++++ tests/testutilsqemu.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 3 +++ 11 files changed, 130 insertions(+), 22 deletions(-) create mode 100644 src/qemu/qemu_capspriv.h mode change 100644 => 100755 tests/qemuagenttest.c mode change 100644 => 100755 tests/qemuhotplugtest.c mode change 100644 => 100755 tests/qemuxml2xmltest.c mode change 100644 => 100755 tests/testutilsqemu.c -- 2.1.4

3 8

[libvirt] [PATCH] libxl: report correct errno from virNetSocketNewConnectTCP on migration
by Ian Campbell 04 Sep '15

04 Sep '15

saved_errno is never written to in this function after it is initialised and it is only used to log the failure from virNetSocketNewConnectTCP masking the real errno from that function. Drop saved_errno and use errno itself. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- src/libxl/libxl_migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 39e4a65..e291d71 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -480,7 +480,6 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, virURIPtr uri = NULL; virNetSocketPtr sock; int sockfd = -1; - int saved_errno = EINVAL; int ret = -1; /* parse dst host:port from uri */ @@ -496,7 +495,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, if (virNetSocketNewConnectTCP(hostname, portstr, AF_UNSPEC, &sock) < 0) { - virReportSystemError(saved_errno, + virReportSystemError(errno, _("unable to connect to '%s:%s'"), hostname, portstr); goto cleanup; -- 2.1.4

3 5

[libvirt] [sandbox] Add ext4 module to QEMU initrd
by Cédric Bosdonnat 04 Sep '15

04 Sep '15

Some distros don't have ext4 built in their kernel, but as a module. Make sure the ext4 module is loaded or we will fail loading root host-images on those distros. --- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 43372b5..3d3267a 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -184,6 +184,13 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, /* For dhclient to work */ gvir_sandbox_config_initrd_add_module(initrd, "af_packet.ko"); + /* In case ext4 is built as a module, include it and its deps + * for the root mount */ + gvir_sandbox_config_initrd_add_module(initrd, "mbcache.ko"); + gvir_sandbox_config_initrd_add_module(initrd, "jbd2.ko"); + gvir_sandbox_config_initrd_add_module(initrd, "crc16.ko"); + gvir_sandbox_config_initrd_add_module(initrd, "ext4.ko"); + if (!gvir_sandbox_builder_initrd_construct(builder, initrd, targetfile, error)) goto cleanup; -- 2.1.4

2 1

[libvirt] Release of libvirt-1.2.19
by Daniel Veillard 04 Sep '15

04 Sep '15

It's out ! Tagged in git, signed tarball and rpms are available from the usual place: ftp://libvirt.org/libvirt/ I also pushed the python bindings out at: ftp://libvirt.org/libvirt/python This is still a relatively small release at around 200 commits, but with user noticeable features rolled in, as long with the usual set of bug fixes and improvements: Features: - Big improvements on ppc64 support (Andrea Bolognani) - New virDomainRename API (Tomas Meszaros) - Support for QEMU new pci emulations (Laine Stump) Documentation: - Rename page about vz driver (Sergey Bronnikov) - docs: Rename 'parallels' to 'vz' (Sergey Bronnikov) - virDomainRename: Extend API documentation (Tomas Meszaros) - virt-aa-helper: document --probing and --dry-run (Guido Günther) - docs: Drop unused rule for internals/%.html.tmp target (Guido Günther) - api: Adjust comment for virDomainAddIOThread (John Ferlan) - fix typo in comments (Cao jin) - virDomainCoreDumpWithFormat: Mention enum for @dumpformat (Michal Privoznik) Portability: - lxc: ensure setns() syscall is defined (Daniel P. Berrange) - selinux: fix compile errors (Guido Günther) - util: fix build without cgroup (Roman Bogorodskiy) - build: fix mingw build (Eric Blake) - protocol: Don't use rename as a variable name (Martin Kletzander) - Remove static keyword from vshReadline when readline does not exist (Moshe Levi) - Detect location of qemu-bridge-helper (Guido Günther) - Check if qemu-bridge-helper exists and is executable (Guido Günther) - nodeinfo: Fix build failure when KVM headers are not available (Andrea Bolognani) Bug Fixes: - apparmor: Adjust path to domain monitor socket (Guido Günther) - util: fallback to ioctl(SIOCBRDELBR) if netlink RTM_DELLINK fails (Laine Stump) - util: fallback to ioctl(SIOCBRADDBR) if netlink RTM_NEWLINK fails (Laine Stump) - Revert "LXC: show used memory as 0 when domain is not active" (Jim Fehlig) - libxl: acquire a job when receiving a migrating domain (Jim Fehlig) - libxl: don't attempt to resume domain when suspend fails (Jim Fehlig) - libxl: fix ref counting of libxlMigrationDstArgs (Jim Fehlig) - libvirt_lxc: Claim success for --help (Michal Privoznik) - util: Allow virProcessSetNamespaces() to have sparse FD list (Michal Privoznik) - virt-aa-helper: Improve valid_path (Michal Privoznik) - lxc: Resolve Coverity RESOURCE_LEAK (John Ferlan) - qemu: Emit correct audit message for memory hot unplug (Luyao Huang) - qemu: Emit correct audit message for memory hot plug (Luyao Huang) - hostdev: skip ACS check when using VFIO for device assignment (Laine Stump) - qemu: Label correct per-VM path when starting (Martin Kletzander) - qemu: Update blkio.weight value after successful set (Luyao Huang) - Eliminate incorrect and unnecessary check for changed IP address (Vasiliy Tolstov) - storage: only run safezero if allocation is > 0 (Guido Günther) - virt-aa-helper: allow access to /usr/share/ovmf/ (intrigeri) - qemu: Fix access to auto-generated socket paths (Martin Kletzander) - cpu: Move check for NULL CPU model inside the driver (Andrea Bolognani) - qemu: Sync BlkioDevice values when setting them in cgroups (Martin Kletzander) - lxc: Sync BlkioDevice values when setting them in cgroups (Martin Kletzander) - qemuDomainRename: Don't leave a domain locked uppon fail (Michal Privoznik) - qemu: Add check for invalid iothread_id in qemuDomainChgIOThread (John Ferlan) - virsh: Reset global error after successfull domain lookup (Luyao Huang) - libvirt-domain: forbid use virDomainRename in readonly connection (Luyao Huang) - virsh: fix always return false in domrename (Luyao Huang) - qemu: Resolve Coverity UNINIT (John Ferlan) - qemu: Fix segfault when parsing private domain data (Martin Kletzander) - conf: Check for hostdev conflicts when assign default disk address (John Ferlan) - conf: Add SCSI hostdev check for disk drive address already in use (John Ferlan) - Revert "qemu: Allow to plug virtio-net-pci into PCIe slot" (Laine Stump) - domain: Fix crash if trying to live update disk <serial> (Cole Robinson) - util: don't overwrite stack when getting ethtool gfeatures (Laine Stump) - cpu: Fix segfault in the ppc64 driver (Andrea Bolognani) - conf: Don't try formating non-existing addresses (Martin Kletzander) - qemu: fail on attempts to use <filterref> for non-tap network connections (Laine Stump) - network: validate network NAT range (Laine Stump) - qemu: Enable ioeventfd usage for virtio-scsi controllers (Martin Kletzander) - virNetDevBandwidthParseRate: Reject negative values (Michal Privoznik) - network: verify proper address family in updates to <host> and <range> (Laine Stump) - virDomainDefParseXML: Check for malicious cpu ids in <numa/> (Michal Privoznik) - qemu: Fix reporting of physical capacity for block devices (Peter Krempa) - qemu: Build correct command line for PCI NICs on ARM (Pavel Fedin) - qemu: Forbid image pre-creation for non-shared storage migration (Peter Krempa) - conf: Resolve Coverity FORWARD_NULL (John Ferlan) - virsh: fix domfsinfo output in quiet mode (Luyao Huang) - Avoid starting a PowerPC VM with floppy disk (Kothapally Madhu Pavan) - Caps: Disable floppy disk for PowerPC VM (Kothapally Madhu Pavan) - qemu: fix some api cannot work when disable cpuset in conf (Luyao Huang) Improvements: - src: Check for symbols ordering in ADMIN_SYM_FILES (Michal Privoznik) - src: Cleanup libvirt_admin.syms (Michal Privoznik) - src: Check libvirt_admin.syms for exported symbols (Michal Privoznik) - lxc_container: Turn lxcAttachNS into calling virProcessSetNamespaces (Michal Privoznik) - utils: Remove the logging of errors from virNetDevSendEthtoolIoctl (Moshe Levi) - Start daemon only after filesystems are mounted (Martin Kletzander) - virt-aa-helper: add NVRAM store file for read/write (Peter Kieser) - Fix link to page for Virtuozzo driver (Sergey Bronnikov) - lxc: Inherit namespace feature (ik.nitk) - qemu: add a check for nodeset in qemuDomainSetNumaParamsLive (Luyao Huang) - virt-aa-helper: Simplify restriction logic (Guido Günther) - tests: Use qemuProcessPrepareMonitorChr in qemuxmlnstest (Martin Kletzander) - security_dac: Add SetDirLabel support (Martin Kletzander) - security_selinux: Add SetDirLabel support (Martin Kletzander) - security_stack: Add SetDirLabel support (Martin Kletzander) - security: Add virSecurityDomainSetDirLabel (Martin Kletzander) - security_dac: Label non-listening sockets (Martin Kletzander) - security_selinux: Use proper structure to access socket data (Martin Kletzander) - locking: Remove redundant 'srv' element from virLockDaemon (Erik Skultety) - tests: Add some compatibility-related cases to the CPU tests (Andrea Bolognani) - cpu: Better support for ppc64 compatibility modes (Andrea Bolognani) - cpu: Don't update host-model guest CPUs on ppc64 (Andrea Bolognani) - Add generated libvirt_admin.syms into .gitignore (Martin Kletzander) - conf: Check for attach disk usage of iothread=0 (John Ferlan) - libvirt-admin: Generate symbols file (Guido Günther) - daemon: Use $(NULL) for libvird_admin's flags (Guido Günther) - virconf: correct code formatting (Cao jin) - virConfWalk: fix the inconsistent name (Cao jin) - qemu: Report better error message when renaming to existing domain name (Martin Kletzander) - util: Add getters for cgroup block device I/O throttling (Martin Kletzander) - util: Add virCgroupGetBlockDevString (Martin Kletzander) - util: Add virStringGetFirstWithPrefix (Martin Kletzander) - api: Remove check on iothread_id arg in virDomainPinIOThread (John Ferlan) - qemuDomainAddCgroupForThread: Don't overwrite the error (Luyao Huang) - virconf: fix the inconsistent name (Cao jin) - qemuDomainRename: Explicitly check if domain is renaming to itself (Michal Privoznik) - virHashAddEntry: Report error on duplicate key (Michal Privoznik) - virHashAddOrUpdateEntry: Turn @new_name into void * (Michal Privoznik) - tools: Introduce new client generic module vsh (Erik Skultety) - qemu: Implement virDomainRename (Tomas Meszaros) - Introduce new VIR_DOMAIN_EVENT_DEFINED_RENAMED event (Tomas Meszaros) - domain_conf: Introducde virDomainObjListRenameAddNew() & virDomainObjListRenameRemove() (Tomas Meszaros) - virsh: Implement "domrename" command (Tomas Meszaros) - Introduce virDomainRename API (Tomas Meszaros) - conf: Remove 'vmdef' from virDomainHostdevDefParseXML (John Ferlan) - qemu: Use numad information when getting pin information (Martin Kletzander) - qemu: Keep numad hint after daemon restart (Martin Kletzander) - conf: Pass private data to Parse function of XML options (Martin Kletzander) - conf: Create locals for virDomainDiskDefAssignAddress (John Ferlan) - Drive hot-unplug: reliable parsing of HMP results (Frank Schreuder) - cmdAttachInterface: Fully implement @floor support (Michal Privoznik) - networkBandwidthGenericChecks: Drop useless check (Michal Privoznik) - networkBandwidthUpdate: Don't blindly dereference pointers (Michal Privoznik) - virsh: Refactor parseRateStr to avoid false-positive uninitialized variable (Peter Krempa) - qemu: fix qemuDomainSupportsPCI() for ARM machines of "virt" machinetype (Laine Stump) - virNetSocketCheckProtocols: handle EAI_NONAME as IPv6 unavailable (Guido Günther) - qemu: Implement VIR_DOMAIN_BANDWIDTH_IN_FLOOR (Michal Privoznik) - virsh: Implement VIR_DOMAIN_BANDWIDTH_IN_FLOOR (Michal Privoznik) - Introduce VIR_DOMAIN_BANDWIDTH_IN_FLOOR (Michal Privoznik) - virsh: Rework parseRateStr (Michal Privoznik) - qemuDomainSetInterfaceParameters: Use new functions to update bandwidth (Michal Privoznik) - bridge_driver: Introduce networkBandwidthUpdate (Michal Privoznik) - bridge_driver: Introduce networkBandwidthChangeAllowed (Michal Privoznik) - virNetDevBandwidthUpdateRate: turn class_id into integer (Michal Privoznik) - virNetDevParseMcast: Avoid magic constant (Michal Privoznik) - tests: Add a bunch of cpu test case for ppc64 (Andrea Bolognani) - tests: Re-enable ppc64 cpu tests (Andrea Bolognani) - cpu: Forbid model fallback in the ppc64 driver (Andrea Bolognani) - cpu: Implement backwards compatibility in the ppc64 driver (Andrea Bolognani) - cpu: Add POWER8NVL information to CPU map XML (Andrea Bolognani) - cpu: Parse and use PVR masks in the ppc64 driver (Andrea Bolognani) - cpu: Simplify ppc64 part of CPU map XML (Andrea Bolognani) - cpu: Support multiple PVRs in the ppc64 driver (Andrea Bolognani) - cpu: Align ppc64 CPU data with x86 (Andrea Bolognani) - tests: Temporarily disable ppc64 cpu tests (Andrea Bolognani) - cpu: Use ppc64Compute() to implement ppc64DriverCompare() (Andrea Bolognani) - cpu: CPU model names have to match on ppc64 (Andrea Bolognani) - cpu: Never skip CPU model name check in ppc64 driver (Andrea Bolognani) - tests: Improve result handling in cpuTestGuestData() (Andrea Bolognani) - cpu: Reorder functions in the ppc64 driver (Andrea Bolognani) - cpu: Simplify ppc64ModelFromCPU() (Andrea Bolognani) - cpu: Simplify NULL handling in ppc64 driver (Andrea Bolognani) - cpu: Mark driver functions in ppc64 driver (Andrea Bolognani) - admin: Drop 'internal.h' include from libvirt-admin.h (Erik Skultety) - conf: Add ioeventfd option for controllers (Martin Kletzander) - qemuMonitorOpenInternal: remove redundant code (Cao jin) - rpc: Remove keepalive_required option (Martin Kletzander) - qemu: support new pci controller model "pcie-switch-downstream-port" (Laine Stump) - conf: new pcie-controller model "pcie-switch-downstream-port" (Laine Stump) - qemu: add capabilities bit for device xio3130-downstream (Laine Stump) - qemu: support new pci controller model "pcie-switch-upstream-port" (Laine Stump) - conf: new pci controller model "pcie-switch-upstream-port" (Laine Stump) - qemu: add capabilities bit for device x3130-upstream (Laine Stump) - qemu: support new pci controller model "pcie-root-port" (Laine Stump) - conf: new pci controller model "pcie-root-port" (Laine Stump) - qemu: add capabilities bit for device ioh3420 (Laine Stump) - qemu: implement <target chassisNr='n'/> subelement/attribute of <controller> (Laine Stump) - conf: add new <target> subelement with chassisNr attribute to <controller> (Laine Stump) - qemu: implement <model> subelement to <controller> (Laine Stump) - conf: add new <model> subelement with name attribute to <controller> (Laine Stump) - conf: more useful error message when pci function is out of range (Laine Stump) - numa_conf: Introduce virDomainNumaGetMaxCPUID (Michal Privoznik) - Allow vfio hotplug of a device to the domain which owns the iommu (Shivaprasad G Bhat) - qemuDomainDefPostParse: Adjust indent (Michal Privoznik) - bootstrap: Don't require python-config (Michal Privoznik) - qemu: Allow to plug virtio-net-pci into PCIe slot (Pavel Fedin) - qemu: Add PCI-Express root to ARM virt machine (Pavel Fedin) - qemu: Introduce QEMU_CAPS_OBJECT_GPEX (Pavel Fedin) - cpu: Indentation changes in the ppc64 driver (Andrea Bolognani) - cpu: Rename {powerpc,ppc} => ppc64 (internal symbols) (Andrea Bolognani) - cpu: Rename {powerpc,ppc} => ppc64 (exported symbols) (Andrea Bolognani) - cpu: Rename {powerpc,ppc} => ppc64 (filesystem) (Andrea Bolognani) - tests: extend workaround for gnutls private key loading failure (Daniel P. Berrange) - conf: Allow error reporting in virDomainDiskSourceIsBlockType (John Ferlan) - docs: Add Fibre Channel NPIV supported option for volume lun config (John Ferlan) - conf: Change when virDomainDiskDefAssignAddress is called (John Ferlan) - conf: Remove unused param from virDomainHostdevDefParseXML (John Ferlan) - conf: Change when virDomainHostdevAssignAddress is called (John Ferlan) - conf: Try controller add when searching hostdev bus for unit (John Ferlan) - conf: Add check for host address type while checking in use (John Ferlan) - conf: Add xmlopt to virDomainDeviceDefPostParseInternal (John Ferlan) - conf: Move hostdev and disk address validations (John Ferlan) - conf: Add 'bus' and 'target' to SCSI address conflict checks (John Ferlan) - conf: Remove extraneous check in virDomainHostdevAssignAddress (John Ferlan) - qemu: Remove double unlock for domains (Martin Kletzander) - tests: Add subcores3 nodeinfo test (Andrea Bolognani) - tests: Add subcores2 nodeinfo test (Andrea Bolognani) - tests: Add subcores1 nodeinfo test (Andrea Bolognani) - tests: Prepare for subcore tests (Shivaprasad G Bhat) - nodeinfo: Fix output on PPC64 KVM hosts (Shivaprasad G Bhat) - rpc: Fix slow volume download (virsh vol-download) (Ossi Herrala) - There is no virDomainFindBy{ID, Name, UUID} anymore (Cao jin) - Post-release version bump to 1.2.19 (Martin Kletzander) - Fix a trailing space in spec file (Daniel Veillard) Cleanups: - Revert "lxc: ensure setns() syscall is defined" (Michal Privoznik) - test: Replace tabs with spaces in virnetdaemondata json files (Erik Skultety) - tests: Remove unused file (Andrea Bolognani) - cpu: Remove ISA information from CPU map XML (Andrea Bolognani) So thanks everybody for your contributions to this release, be it bug reports, patches, new code, dcumentation, etc ... Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH v2] domain-conf: escape string for socket attribute
by Pavel Hrdina 03 Sep '15

03 Sep '15

Commit d091518b tried to escape all strings in produced XML, but missed this one. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 69225f4..f95190f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21118,9 +21118,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf, switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (def->data.vnc.socket) { - if (def->data.vnc.socket) - virBufferAsprintf(buf, " socket='%s'", - def->data.vnc.socket); + virBufferEscapeString(buf, " socket='%s'", def->data.vnc.socket); } else { if (def->data.vnc.port && (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) -- 2.5.1

2 1

[libvirt] [PATCH] domain-conf: escape string for socket attribute
by Pavel Hrdina 03 Sep '15

03 Sep '15

Commit d091518b tried to escape all strings in produced XML, but missed this one. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c5e9653..56f9460 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21060,8 +21060,8 @@ virDomainGraphicsDefFormat(virBufferPtr buf, case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (def->data.vnc.socket) { if (def->data.vnc.socket) - virBufferAsprintf(buf, " socket='%s'", - def->data.vnc.socket); + virBufferEscapeString(buf, " socket='%s'", + def->data.vnc.socket); } else { if (def->data.vnc.port && (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) -- 2.5.0

2 2

[libvirt] [PATCH] remoteClientCloseFunc: Don't mangle connection object refcount
by Michal Privoznik 03 Sep '15

03 Sep '15

Well, in 8ad126e6 we tried to fix a memory corruption problem. However, the fix was not as good as it could be. I mean, the commit has one line more than it should. I've noticed this output just recently: # ./run valgrind --leak-check=full --show-reachable=yes ./tools/virsh domblklist gentoo ==17019== Memcheck, a memory error detector ==17019== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al. ==17019== Using Valgrind-3.10.1 and LibVEX; rerun with -h for copyright info ==17019== Command: /home/zippy/work/libvirt/libvirt.git/tools/.libs/virsh domblklist gentoo ==17019== Target Source ------------------------------------------------ fda /var/lib/libvirt/images/fd.img vda /var/lib/libvirt/images/gentoo.qcow2 hdc /home/zippy/tmp/install-amd64-minimal-20150402.iso ==17019== Thread 2: ==17019== Invalid read of size 4 ==17019== at 0x4EFF5B4: virObjectUnref (virobject.c:258) ==17019== by 0x5038CFF: remoteClientCloseFunc (remote_driver.c:552) ==17019== by 0x5069D57: virNetClientCloseLocked (virnetclient.c:685) ==17019== by 0x506C848: virNetClientIncomingEvent (virnetclient.c:1852) ==17019== by 0x5082136: virNetSocketEventHandle (virnetsocket.c:1913) ==17019== by 0x4ECD64E: virEventPollDispatchHandles (vireventpoll.c:509) ==17019== by 0x4ECDE02: virEventPollRunOnce (vireventpoll.c:658) ==17019== by 0x4ECBF00: virEventRunDefaultImpl (virevent.c:308) ==17019== by 0x130386: vshEventLoop (vsh.c:1864) ==17019== by 0x4F1EB07: virThreadHelper (virthread.c:206) ==17019== by 0xA8462D3: start_thread (in /lib64/libpthread-2.20.so) ==17019== by 0xAB441FC: clone (in /lib64/libc-2.20.so) ==17019== Address 0x139023f4 is 4 bytes inside a block of size 240 free'd ==17019== at 0x4C2B1F0: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==17019== by 0x4EA8949: virFree (viralloc.c:582) ==17019== by 0x4EFF6D0: virObjectUnref (virobject.c:273) ==17019== by 0x4FE74D6: virConnectClose (libvirt.c:1390) ==17019== by 0x13342A: virshDeinit (virsh.c:406) ==17019== by 0x134A37: main (virsh.c:950) The problem is, when registering remoteClientCloseFunc(), it's conn->closeCallback which is ref'd. But in the function itself it's conn->closeCallback->conn what is unref'd. This is causing imbalance in reference counting. Moreover, there's no need for the remote driver to increase/decrease conn refcount since it's not used anywhere. It's just merely passed to client registered callback. And for that purpose it's correctly ref'd in virConnectRegisterCloseCallback() and then unref'd in virConnectUnregisterCloseCallback(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Not only this is nice because it fixes a bug by removing some lines, it maybe needs to be backported all the way down to v1.0.5 main branches. src/remote/remote_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ec26ebe..aca00c0 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -546,10 +546,6 @@ remoteClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, cbdata->freeCallback = NULL; } virObjectUnlock(cbdata); - - /* free the connection reference that comes along with the callback - * registration */ - virObjectUnref(cbdata->conn); } /* helper macro to ease extraction of arguments from the URI */ -- 2.4.6

2 1

[libvirt] [PATCH] vshInit: Don't leak @histsize_env
by Michal Privoznik 03 Sep '15

03 Sep '15

Caller is responsible for freeing the result of virStringJoin() when no longer needed: ==10701== 1 bytes in 1 blocks are definitely lost in loss record 1 of 806 ==10701== at 0x4C29F80: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==10701== by 0xAADB679: strdup (in /lib64/libc-2.20.so) ==10701== by 0x4F18655: virStrdup (virstring.c:726) ==10701== by 0x4F175AF: virStringJoin (virstring.c:165) ==10701== by 0x131D4D: vshReadlineInit (vsh.c:2572) ==10701== by 0x1322DF: vshInit (vsh.c:2736) ==10701== by 0x1347C1: main (virsh.c:907) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 1a5b6e8..54c4614 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2552,8 +2552,8 @@ vshReadlineInit(vshControl *ctl) char *name_capitalized = NULL; int max_history = 500; int ret = -1; + char *histsize_env = NULL; const char *histsize_str = NULL; - const char *histsize_env = NULL; const char *strings[] = { name_capitalized, "HISTSIZE", @@ -2613,6 +2613,7 @@ vshReadlineInit(vshControl *ctl) cleanup: VIR_FREE(userdir); VIR_FREE(name_capitalized); + VIR_FREE(histsize_env); return ret; } -- 2.4.6

2 1

[libvirt] [PATCHv2 0/2] macvtap: don't use netlink to save/set mac for macvtap+passthrough+802.1Qbh
by Laine Stump 03 Sep '15

03 Sep '15

These two patches are the v2 of a single patch that I sent last week: https://www.redhat.com/archives/libvir-list/2015-August/msg00889.html At the time I sent that patch, I had no hardware to test it on, but was operating on a misunderstood assumption - someone in the know had told me that libvirt didn't need to save/restore the MAC address of VFs for 802.1Qbh macvtap passthrough, and I extrapolated from there that we didn't need to *set* the MAC address of the VF either. This makes sense, since that is what happens for 802.1Qbh *device* passthrough, but based on my own tests the 802.1Qbh "associate" fails unless libvirt sets the VF's MAC address prior to associate. So this patch takes a different approach from V1 - instead of completely skipping the save/set/restore of MAC address for VFs that are using 802.1Qbh, it still does it, but uses the "old" method of ioctl(SIOCGIFHWADDR) and ioctl(SIOCSIFHWADDR). I *did* have the proper hardware to test this time, and it works (both for a Cisco VMFEX card using 802.1Qbh and for an Intel 82576 card with straight macvtap passthrough). Laine Stump (2): util: make virNetDev(Replace|Restore)MacAddress public functions util: don't use netlink to save/set mac for macvtap+passthrough+802.1Qbh src/libvirt_private.syms | 2 + src/util/virnetdev.c | 172 ++++++++++++++++++++++---------------------- src/util/virnetdev.h | 10 +++ src/util/virnetdevmacvlan.c | 26 +++++-- 4 files changed, 121 insertions(+), 89 deletions(-) -- 2.1.0

2 3

[libvirt] [PATCH] virsh: Enhance the detailed output of domblklist for networked source
by Lin Ma 03 Sep '15

03 Sep '15

Format & Output more detailed information about networked source e.g: The output without the patch: $ virsh domblklist $DOMAIN --details Type Device Target Source ------------------------------------------------ network disk vda test-pool/image network disk vdb iqn.2015-08.org.example:sn01/0 network disk vdc /image.raw network disk vdd - network disk vde - network disk vdf image1 network disk vdg test-volume/image.raw The output with the patch: $ virsh domblklist $DOMAIN --details Type Device Target Source ------------------------------------------------ network disk vda rbd://monitor1.example.org:6321/test-pool/image network disk vdb iscsi://192.168.124.200:3260/iqn.2015-08.org.example:sn01/0 network disk vdc http://192.168.124.200:80/image.raw network disk vdd nbd+unix:///var/run/nbdsock network disk vde nbd://192.168.124.200:12345 network disk vdf sheepdog://192.168.124.200:6000/image1 network disk vdg gluster://192.168.124.200/test-volume/image.raw Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 60 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 340a8e2..9188b42 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -518,6 +518,12 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ndisks; i++) { char *type = NULL; char *device = NULL; + char *protocol = NULL; + char *transport = NULL; + char *host_name = NULL; + char *host_port = NULL; + char *socket = NULL; + char *name = NULL; char *target; char *source; @@ -541,11 +547,55 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) VIR_FREE(device); goto cleanup; } - source = virXPathString("string(./source/@file" - "|./source/@dev" - "|./source/@dir" - "|./source/@name" - "|./source/@volume)", ctxt); + if (type && STREQ(type, "network")) { + protocol = virXPathString("string(./source/@protocol)", ctxt); + name = virXPathString("string(./source/@name)", ctxt); + transport = virXPathString("string(./source/host/@transport)", ctxt); + socket = virXPathString("string(./source/host/@socket)", ctxt); + host_name = virXPathString("string(./source/host/@name)", ctxt); + host_port = virXPathString("string(./source/host/@port)", ctxt); + if (VIR_STRDUP(source, protocol) < 0) + goto cleanup; + VIR_FREE(protocol); + if(transport) { + if(virAsprintf(&source, "%s+%s", source, transport) < 0) + goto cleanup; + VIR_FREE(transport); + } + if(virAsprintf(&source, "%s://", source) < 0) + goto cleanup; + if(host_name) { + if(virAsprintf(&source, "%s%s", source, host_name) < 0) + goto cleanup; + VIR_FREE(host_name); + if(host_port) { + if(virAsprintf(&source, "%s:%s", source, host_port) < 0) + goto cleanup; + VIR_FREE(host_port); + } + } + if(name) { + if(!STRPREFIX(name, "/")) + if(virAsprintf(&source, "%s/", source) < 0) + goto cleanup; + if(virAsprintf(&source, "%s%s", source, name) < 0) + goto cleanup; + VIR_FREE(name); + } else if(socket) { + if(!STRPREFIX(socket, "/")) + if(virAsprintf(&source, "%s/", source) < 0) + goto cleanup; + if(virAsprintf(&source, "%s%s", source, socket) < 0) + goto cleanup; + VIR_FREE(socket); + } + } else { + source = virXPathString("string(./source/@file" + "|./source/@dev" + "|./source/@dir" + "|./source/@name" + "|./source/@volume)", ctxt); + } if (details) { vshPrint(ctl, "%-10s %-10s %-10s %s\n", type, device, target, source ? source : "-"); -- 2.1.4

3 3

[libvirt] [PATCH v2 0/9] admin API: Introduce server listing API
by Erik Skultety 03 Sep '15

03 Sep '15

v2: - tab replacing patch now also includes files Martin added in his keepalive series (trivial, ready to be pushed) - admin_server now marked as renamed instead of deleted and formated with -M - introduction of virAdmServe structure split to a separate patch - resolved server naming issues from review (added fallback data) - refactored lock_daemon a little not to store duplicate reference to a server, since we now have daemon structure - tweaked virnetdaemontest and included new data for it virt-admin still missing in this series, because first we need to handle proper connecting to daemons, i.e. discuss the URI format and then we can add individual commands, so I postponed it in this series and will look at the connect routine first. Erik Skultety (9): test: Replace tabs with spaces in virnetdaemondata json files test: s/{in,out}put-data-admin-nomdns/{in,out}put-data-admin-nomdns-nonames locking: Remove redundant 'srv' element from virLockDaemon rpc: Introduce new elements 'id' and 'name' to virnetserver structure virnetdaemon: Add post exec restart support for multiple servers admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API admin: Usage example of the new server listing API (not to be pushed) .gitignore | 1 + Makefile.am | 2 +- configure.ac | 1 + daemon/Makefile.am | 6 +- daemon/admin.c | 174 +++++++++++++++ daemon/admin.h | 36 ++++ daemon/admin_server.c | 103 +++------ daemon/admin_server.h | 23 +- daemon/libvirtd.c | 10 +- examples/admin/Makefile.am | 25 +++ examples/admin/listservers.c | 65 ++++++ include/libvirt/libvirt-admin.h | 12 ++ po/POTFILES.in | 2 +- src/admin/admin_protocol.x | 27 ++- src/admin_protocol-structs | 16 ++ src/datatypes.c | 35 +++ src/datatypes.h | 36 ++++ src/libvirt-admin.c | 171 +++++++++++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 4 + src/libvirt_remote.syms | 3 +- src/locking/lock_daemon.c | 42 ++-- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetdaemon.c | 111 +++++++--- src/rpc/virnetdaemon.h | 30 ++- src/rpc/virnetserver.c | 46 +++- src/rpc/virnetserver.h | 5 + .../input-data-admin-nomdns-names.json | 128 +++++++++++ .../input-data-admin-nomdns-nonames.json | 126 +++++++++++ .../virnetdaemondata/input-data-admin-nomdns.json | 126 ----------- .../input-data-no-keepalive-required.json | 240 ++++++++++----------- .../output-data-admin-nomdns-names.json | 128 +++++++++++ ....json => output-data-admin-nomdns-nonames.json} | 2 + .../virnetdaemondata/output-data-anon-clients.json | 1 + .../output-data-initial-nomdns.json | 1 + tests/virnetdaemondata/output-data-initial.json | 1 + .../output-data-no-keepalive-required.json | 240 ++++++++++----------- tests/virnetdaemontest.c | 52 ++--- 38 files changed, 1492 insertions(+), 546 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 examples/admin/Makefile.am create mode 100644 examples/admin/listservers.c create mode 100644 tests/virnetdaemondata/input-data-admin-nomdns-names.json create mode 100644 tests/virnetdaemondata/input-data-admin-nomdns-nonames.json delete mode 100644 tests/virnetdaemondata/input-data-admin-nomdns.json create mode 100644 tests/virnetdaemondata/output-data-admin-nomdns-names.json rename tests/virnetdaemondata/{output-data-admin-nomdns.json => output-data-admin-nomdns-nonames.json} (98%) -- 2.4.3

3 23

[libvirt] [PATCH v2 0/2] qemu: Default to virtio-net where available
by Andrea Bolognani 03 Sep '15

03 Sep '15

This new version of the patch addresses Martin's comments by using capabilities to detect whether virtio-net can be used, and if that is the case, does so on all architectures. Plus, the commit messages are slightly less terse this time around :) Cheers. Andrea Bolognani (2): qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_NET capability qemu: Default to virtio-net where available src/qemu/qemu_capabilities.c | 7 ++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 19 ++++++++++++++----- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemuhelptest.c | 18 ++++++++++++------ 11 files changed, 40 insertions(+), 12 deletions(-) -- 2.4.3

4 11

[libvirt] [PATCH 0/4] Resolve a few NFS root-squash related issues
by John Ferlan 03 Sep '15

03 Sep '15

The following series of patches resolve a few issues found within and because of an NFS root-squash environment. Patch 1: No real change - mostly to get data on which path was failing Patch 2: Create a virFileUnlink() API which will essentially follow the code that virFileCreateAs[Forked] and virDirCreate[NoFork] have taken with respect to running the 'unlink' in a fork'd process under the uid/gid used to create the volume. Patch 3: Commit id '7c2d65dde2' used the default mode to create a file when "vol->target.perms->mode" was set rather than checking it against -1 in virStorageBackendCreateRaw when calling virFileOpenAs. The logic was change to follow other changes which check "->mode == -1", then use default, else use "->mode" value. Patch 4: Commit id '155ca616' added a check and call to a storage driver 'refreshVol' API. Unfortunately if it failed, proper cleanup wasn't done leaving 'voldef' set and already in the pool list. The cleanup path would then delete the memory eventually leading to a crash or corruption for an ensuing refresh or list pool. For an NFS root squash environment with incorrect XML to create the file (either wrong uid/gid or mode value), the refreshVol would fail since it tried to run as root. On such a failure, it was possible that the volume remained in the NFS pool when it should have been deleted (unless root could delete the file). The last 3 patches are very much so related and intertwined. Fortunately it's a very limited environment. John Ferlan (4): virfile: Add error for root squash change mode failure virfile: Introduce virFileUnlink storage: Correct the 'mode' check storage: Handle failure from refreshVol src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 8 +-- src/storage/storage_backend_fs.c | 3 +- src/storage/storage_driver.c | 6 ++- src/util/virfile.c | 113 ++++++++++++++++++++++++++++++++++++++- src/util/virfile.h | 1 + 6 files changed, 126 insertions(+), 6 deletions(-) -- 2.1.0

3 8

[libvirt] [PATCH] lxc: fuse mount for /proc/cpuinfo
by Cédric Bosdonnat 03 Sep '15

03 Sep '15

We already have a fuse mount to reflect the cgroup memory restrictions in the container. This commit adds the same for the number of available CPUs. Only the CPUs listed by virProcessGetAffinity are shown in the container's cpuinfo. --- src/lxc/lxc_container.c | 42 ++++++++++++------- src/lxc/lxc_fuse.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a433552..7ae13a8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1055,24 +1055,38 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, const char *stateDir) { int ret; - char *meminfo_path = NULL; + char *src_path = NULL; + char *dst_path = NULL; + const char *paths[] = {"meminfo", "cpuinfo"}; + size_t i; - VIR_DEBUG("Mount /proc/meminfo stateDir=%s", stateDir); + for (i = 0; i < 2; i++) { + VIR_DEBUG("Mount /proc/%s stateDir=%s", paths[i], stateDir); + + if ((ret = virAsprintf(&src_path, + "/.oldroot/%s/%s.fuse/%s", + stateDir, + def->name, + paths[i])) < 0) + return ret; + + if ((ret = virAsprintf(&dst_path, + "/proc/%s", + paths[i])) < 0) { + VIR_FREE(src_path); + return ret; + } - if ((ret = virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name)) < 0) - return ret; + if ((ret = mount(src_path, dst_path, + NULL, MS_BIND, NULL)) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s"), + src_path, dst_path); + } - if ((ret = mount(meminfo_path, "/proc/meminfo", - NULL, MS_BIND, NULL)) < 0) { - virReportSystemError(errno, - _("Failed to mount %s on /proc/meminfo"), - meminfo_path); + VIR_FREE(src_path); + VIR_FREE(dst_path); } - - VIR_FREE(meminfo_path); return ret; } #else diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..9c88147 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -42,6 +42,61 @@ #if WITH_FUSE static const char *fuse_meminfo_path = "/meminfo"; +static const char *fuse_cpuinfo_path = "/cpuinfo"; + +static virBufferPtr lxcProcComputeCpuinfo() { + FILE *fd = NULL; + char *line = NULL; + size_t n; + bool writeProc = false; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + virBufferPtr new_cpuinfo = &buffer; + pid_t pid; + virBitmapPtr cpuAffinity = NULL; + + fd = fopen("/proc/cpuinfo", "r"); + if (fd == NULL) { + virReportSystemError(errno, _("%s"), "Cannot open /proc/cpuinfo"); + goto error; + } + + pid = getpid(); + if (!(cpuAffinity = virProcessGetAffinity(pid))) + goto error; + + while (getline(&line, &n, fd) > 0) { + if (STRPREFIX(line, "processor\t:")) { + unsigned long cpuid = 0; + char *suffix = NULL; + if (virStrToLong_ul(line + 12, &suffix, 10, &cpuid) < 0) { + goto error; + } + + if (virBitmapGetBit(cpuAffinity, cpuid, &writeProc) < 0) { + goto error; + } + } + + if (writeProc) { + virBufferAdd(new_cpuinfo, line, -1); + + if (virBufferCheckError(new_cpuinfo) < 0) { + goto error; + } + } + } + + cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fd); + virBitmapFree(cpuAffinity); + return new_cpuinfo; + + error: + virBufferFreeAndReset(new_cpuinfo); + new_cpuinfo = NULL; + goto cleanup; +} static int lxcProcGetattr(const char *path, struct stat *stbuf) { @@ -50,6 +105,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) struct stat sb; struct fuse_context *context = fuse_get_context(); virDomainDefPtr def = (virDomainDefPtr)context->private_data; + virBufferPtr cpuinfo = NULL; memset(stbuf, 0, sizeof(struct stat)); if (virAsprintf(&mempath, "/proc/%s", path) < 0) @@ -76,12 +132,36 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) stbuf->st_atime = sb.st_atime; stbuf->st_ctime = sb.st_ctime; stbuf->st_mtime = sb.st_mtime; + } else if (STREQ(path, fuse_cpuinfo_path)) { + if (!(cpuinfo = lxcProcComputeCpuinfo())) { + res = -EIO; + goto cleanup; + } + + if (stat(mempath, &sb) < 0) { + res = -errno; + goto cleanup; + } + + stbuf->st_uid = def->idmap.uidmap ? def->idmap.uidmap[0].target : 0; + stbuf->st_gid = def->idmap.gidmap ? def->idmap.gidmap[0].target : 0; + stbuf->st_mode = sb.st_mode; + stbuf->st_nlink = 1; + stbuf->st_blksize = sb.st_blksize; + stbuf->st_size = virBufferUse(cpuinfo); + stbuf->st_blocks = stbuf->st_size / 512; + if (stbuf->st_size % 512 != 0) + stbuf->st_blocks++; + stbuf->st_atime = sb.st_atime; + stbuf->st_ctime = sb.st_ctime; + stbuf->st_mtime = sb.st_mtime; } else { res = -ENOENT; } cleanup: VIR_FREE(mempath); + virBufferFreeAndReset(cpuinfo); return res; } @@ -96,6 +176,7 @@ static int lxcProcReaddir(const char *path, void *buf, filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); filler(buf, fuse_meminfo_path + 1, NULL, 0); + filler(buf, fuse_cpuinfo_path + 1, NULL, 0); return 0; } @@ -103,7 +184,8 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (!STREQ(path, fuse_meminfo_path) && + !STREQ(path, fuse_cpuinfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) @@ -234,6 +316,28 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, return res; } +static int lxcProcReadCpuinfo(char *buf, size_t size, off_t offset) +{ + virBufferPtr new_cpuinfo = lxcProcComputeCpuinfo(); + int new_size = -1; + int copied = -1; + + if (!new_cpuinfo) + goto error; + + copied = size; + new_size = virBufferUse(new_cpuinfo); + + if ((new_size - offset) < size) + copied = new_size - offset; + + memcpy(buf, virBufferCurrentContent(new_cpuinfo) + offset, copied); + + error: + virBufferFreeAndReset(new_cpuinfo); + return copied; +} + static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, char *buf ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED, @@ -254,6 +358,9 @@ static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, if (STREQ(path, fuse_meminfo_path)) { if ((res = lxcProcReadMeminfo(hostpath, def, buf, size, offset)) < 0) res = lxcProcHostRead(hostpath, buf, size, offset); + } else if (STREQ(path, fuse_cpuinfo_path)) { + if ((res = lxcProcReadCpuinfo(buf, size, offset)) < 0) + res = lxcProcHostRead(hostpath, buf, size, offset); } VIR_FREE(hostpath); -- 2.1.4

2 1

[libvirt] [PATCH] qemu: Need to check for machine.os when using ADDRESS_TYPE_CCW
by John Ferlan 02 Sep '15

02 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1258361 When attaching a disk or rng when providing an address type ccw, we need to ensure the machine.os is valid for the target guest. Checks are made when the address type is not provided, but if provided the os.machine check is bypassed. For an inactive guest, an addition followed by a start would cause the startup to fail after qemu_command builds the command line and attempts to start the guest. For an active guest, libvirtd would crash. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: For 'rng' in qemu_command - rather than change each of the if..else if.. conditions to have the {}, I just made the check up front. Also while I could separate these into disk and rng - since it's the same fix for the same problem it just seem "proper" to include both in same patch src/qemu/qemu_command.c | 15 +++++++++++++++ src/qemu/qemu_hotplug.c | 21 ++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abc57d7..ecdec2c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4296,6 +4296,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, case VIR_DOMAIN_DISK_BUS_VIRTIO: if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + if (!STREQLEN(def->os.machine, "s390-ccw", 8)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for disk target " + "'%s' using machine type '%s'"), + disk->dst, def->os.machine); + goto error; + } virBufferAddLit(&opt, "virtio-blk-ccw"); if (disk->iothread) virBufferAsprintf(&opt, ",iothread=iothread%u", disk->iothread); @@ -6874,6 +6881,14 @@ qemuBuildRNGDevStr(virDomainDefPtr def, goto error; } + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && + !STREQLEN(def->os.machine, "s390-ccw", 8)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for rng device " + "using machine type '%s'"), + def->os.machine); + goto error; + } if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) virBufferAsprintf(&buf, "virtio-rng-ccw,rng=obj%s,id=%s", dev->info.alias, dev->info.alias); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e71a204..154539c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -319,6 +319,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, int ret = -1; const char* type = virDomainDiskBusTypeToString(disk->bus); qemuDomainObjPrivatePtr priv = vm->privateData; + bool is_s390_ccw = STREQLEN(vm->def->os.machine, "s390-ccw", 8); char *devstr = NULL; char *drivestr = NULL; bool releaseaddr = false; @@ -326,8 +327,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, const char *src = virDomainDiskGetSource(disk); if (!disk->info.type) { - if (STREQLEN(vm->def->os.machine, "s390-ccw", 8) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) + if (is_s390_ccw && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; @@ -346,6 +346,13 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + if (!is_s390_ccw) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for disk target " + "'%s' using machine type '%s'"), + disk->dst, vm->def->os.machine); + return -1; + } if (virDomainCCWAddressAssign(&disk->info, priv->ccwaddrs, !disk->info.addr.ccw.assigned) < 0) goto error; @@ -1642,6 +1649,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, virDomainRNGDefPtr rng) { qemuDomainObjPrivatePtr priv = vm->privateData; + bool is_s390_ccw = STRPREFIX(vm->def->os.machine, "s390-ccw"); char *devstr = NULL; char *charAlias = NULL; char *objAlias = NULL; @@ -1657,7 +1665,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, return -1; if (rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (STRPREFIX(vm->def->os.machine, "s390-ccw") && + if (is_s390_ccw && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { rng->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { @@ -1670,6 +1678,13 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, if (virDomainPCIAddressEnsureAddr(priv->pciaddrs, &rng->info) < 0) return -1; } else if (rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + if (!is_s390_ccw) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for rng device " + "using machine type '%s'"), + vm->def->os.machine); + return -1; + } if (virDomainCCWAddressAssign(&rng->info, priv->ccwaddrs, !rng->info.addr.ccw.assigned) < 0) return -1; -- 2.1.0

3 2

[libvirt] [PATCH] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat 02 Sep '15

02 Sep '15

Tunnelled migration can hang if the destination qemu exits despite all the ABI checks. This happens whenever the destination qemu exits before the complete transfer. The savevm state checks at runtime can fail at destination qemu and error out. The source qemu cant notice it as the EPIPE is not propogated to qemu. The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would never get to 100% transfer completion. The qemuMigrationWaitForCompletion() never breaks out as well since the ssh connection to destination is healthy, and the source qemu also thinks the migration is ongoing as the Fd to which it transfers, is never closed or broken. So, the migration will hang forever. Even Ctrl-C on the virsh migrate wouldn't be honoured. Close the source side FD when there is an error in the stream. That way, the source qemu updates itself and qemuMigrationWaitForCompletion() notices the failure. Close the FD for all kinds of errors to be sure. The error message is not copied for EPIPE so that the destination error is copied instead later. Note: Reproducible with repeated migrations between Power hosts running in different subcores-per-core modes. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ff89ab5..4f9aced 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4029,7 +4029,11 @@ static void qemuMigrationIOFunc(void *arg) } error: - virCopyLastError(&data->err); + /* Let the source qemu know that the transfer can't continue anymore. + * Don't copy the error for EPIPE as destination has the actual error */ + VIR_FORCE_CLOSE(data->sock); + if (!virLastErrorIsSystemErrno(EPIPE)) + virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); }

1 0

[libvirt] [PATCH v3 0/5] vz: add migration support
by nshirokovskiy＠virtuozzo.com 02 Sep '15

02 Sep '15

NOTE that minimal command to migrate vz domain is like next: virsh -c vz:///system migrate --direct 200 shiny0 --migrateuri vz+ssh://shiny0/system --live --persistent --compressed ==Difference from v1: 1. Patch is quite different. First patchset implements migration thru managed migration scheme. This one goes thru p2p scheme. I belive this is a better approach. Vz migration is done via vz sdk and first patchset uses 5 phased migration only to get a token from destination on prepare phase which is kind a misuse. This patch just adds vz specific function to driver interface to archive the same goal. 2. Offline migration is supported as there is no more dependency on current flow of managed migration scheme. ==Difference from v2: 1. Implement thru direct migration instead of p2p. p2p is just managed 5-staged migration when managing is done on daemon side. Vz migration stages are all hidden in vz sdk and thus it would be more consistent to use direct scheme. 2. Use existing driver function for prepare migration phase to pass session uuid from destination to source instead of new one. As vz migration is direct one we will not use prepare phase function in a straight forward manner anyway. src/libvirt-domain.c | 3 +- src/vz/vz_driver.c | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 86 ++++++++++++--- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.h | 4 +- 5 files changed, 398 insertions(+), 16 deletions(-)

4 25

[libvirt] libvirtlight problem with Xen
by Eric 02 Sep '15

02 Sep '15

I'm trying to use virt-manager with Xen. My Dom0 is Debian 8. When I create a DomU (Ubuntu Trusty) as a PV guest, the boot fails with an error saying that libvirtlight failed to connect. The opinion from the virt-manager list group is that the problem is libvirt, not virt-manager. I've googled around, and have seen old posts about this, but these seem to claim that the problem has resolved. Solution? Thanks Eric

2 1

[libvirt] [PATCH] virVMXParseDisk: Recognize scsi-passthru
by Michal Privoznik 01 Sep '15

01 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1172544 So, imagine you have this config: scsi0:1.present = "TRUE" scsi0:1.deviceType = "scsi-passthru" scsi0:1.fileName = "/vmfs/devices/cdrom/mpx.vmhba32:C0:T0:L0" scsi0:1.allowGuestConnectionControl = "FALSE" So far, libvirt does not recognize this pattern and fails. What if we produce the following XML to it? <disk type='block' device='disk'> <source dev='/vmfs/devices/cdrom/mpx.vmhba32:C0:T0:L0'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/vmx/vmx.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 36e2891..6d83d81 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2187,6 +2187,17 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con * function to parse a CDROM device may handle it. */ goto ignore; + } else if (STREQ_NULLABLE(deviceType, "scsi-passthru")) { + char *tmp; + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); + if (!(tmp = ctx->parseFileName(fileName, ctx->opaque))) + goto cleanup; + if (virDomainDiskSetSource(*def, tmp) < 0) { + VIR_FREE(tmp); + goto cleanup; + } + VIR_FREE(tmp); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " -- 2.4.6

2 2

[libvirt] Missing CPU vendor in capabilities in 1.2.18+
by Guido Günther 01 Sep '15

01 Sep '15

Hi, We have a report in Debian[1] where after a update from 1.2.16 to 1.2.18 VMs on a Intel i5 CPU fail to start due to libvirt not being able to match the CPU vendor: # virsh start sid error: Failed to start domain sid error: unsupported configuration: guest and host CPU are not compatible: host CPU vendor does not match required CPU vendor Intel The root cause seems to be that the <vendor> element is missing from the hosts capabilities. While I have: $ virsh capabilities | xpath -q -e //host/cpu/vendor <vendor>Intel</vendor> on my Intel box the reporters machine with a Core i5 the <vendor> element is just empty. Any idea what could have triggered this? This is still broken in 1.2.19-rc1. The bug has more details and logs attached. Any pointers would be welcome since I don't have access to such a machine atm to step through src/cpu/cpu_x86.c. Cheers, -- Guido [1] http://bugs.debian.org/797513

1 0

[libvirt] [PATCH] qemu: Default to virtio network devices on ppc64
by Andrea Bolognani 01 Sep '15

01 Sep '15

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1254044 --- src/qemu/qemu_domain.c | 3 ++- .../qemuxml2argvdata/qemuxml2argv-pseries-net-default.args | 6 ++++++ .../qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml | 14 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0a9ed6b..4c5b3ec 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1195,7 +1195,8 @@ qemuDomainDefPostParse(virDomainDefPtr def, static const char * qemuDomainDefaultNetModel(const virDomainDef *def) { - if (ARCH_IS_S390(def->os.arch)) + if (ARCH_IS_S390(def->os.arch) || + ARCH_IS_PPC64(def->os.arch)) return "virtio"; if (def->os.arch == VIR_ARCH_ARMV7L || diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args new file mode 100644 index 0000000..50adffa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:55:2b:d9,bus=pci,addr=0x1 \ +-net user,vlan=0,name=hostnet0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml new file mode 100644 index 0000000..7bf8139 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml @@ -0,0 +1,14 @@ +<domain type='qemu'> + <name>pseries-net-default</name> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <interface type='user'> + <mac address='52:54:00:55:2b:d9'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c2482e6..f20a94b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1397,6 +1397,7 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION); + DO_TEST("pseries-net-default", QEMU_CAPS_DEVICE); DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST_ERROR("pseries-vio-address-clash", QEMU_CAPS_DRIVE, -- 2.4.3

2 1

[libvirt] [PATCH 0/3] Couple of src/Makefile.am fixes
by Michal Privoznik 01 Sep '15

01 Sep '15

I've noticed that 'make distcheck' is failing. While investigating that issue I've came up with some other checks too. Preferably, I'd like to get these into the current release (the fix 2/3 at least). Michal Privoznik (3): src: Check libvirt_admin.syms for exported symbols src: Cleanup libvirt_admin.syms src: Check for symbols ordering in ADMIN_SYM_FILES src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.4.6

3 5

[libvirt] [PATCH] migration: remove direct migration dependency on version1 of driver
by Nikolay Shirokovskiy 31 Aug '15

31 Aug '15

From: Nikolay Shirokovskiy <Nikolay Shirokovskiy nshirokovskiy(a)virtuozzo.com> Direct migration should work if *perform3 is present but *perform is not. This is situation when driver migration is implemented after new version of driver function is introduced. We should not be forced to support old version too as its parameter space is subspace of newer one. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt-domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 6ab50ba..c89775b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3427,7 +3427,8 @@ virDomainMigrateDirect(virDomainPtr domain, NULLSTR(xmlin), flags, NULLSTR(dname), NULLSTR(dconnuri), NULLSTR(miguri), bandwidth); - if (!domain->conn->driver->domainMigratePerform) { + if (!domain->conn->driver->domainMigratePerform && + !domain->conn->driver->domainMigratePerform3) { virReportUnsupportedError(); return -1; } -- 1.7.1

3 6

[libvirt] Entering freeze for libvirt-1.2.19
by Daniel Veillard 31 Aug '15

31 Aug '15

So I have tagged rc1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ The release works just fine in my limited testing, but others should try it out to check portability and more advanced functionalities. I will likely push rc2 at the end of the week-end and the final release on Tuesday or Wednesday, assuming no big issue is raised in the meantime. thanks for giving it a try. I also note that we have some CI test failing, not for core libvirt but perl bindings, virt-manager, ... it would be good to investigate before we push the release: https://ci.centos.org/view/libvirt-project/ thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 5

[libvirt] [libvirt-test-api][PATCH] Add new test case for allocPages API
by Luyao Huang 31 Aug '15

31 Aug '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/test_connection.conf | 4 ++ repos/virconn/connection_allocPages.py | 88 ++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 repos/virconn/connection_allocPages.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index 336b1ad..600ec32 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -77,3 +77,7 @@ virconn:connection_getMemoryParameters virconn:connection_getMemoryStats conn qemu:///system + +virconn:connection_allocPages + conn + qemu:///system diff --git a/repos/virconn/connection_allocPages.py b/repos/virconn/connection_allocPages.py new file mode 100644 index 0000000..9ddd474 --- /dev/null +++ b/repos/virconn/connection_allocPages.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = () +optional_params = {'conn': ''} + +HOST_HUGEPAGE = '/sys/devices/system/node/node%d/hugepages/hugepages-%dkB/nr_hugepages' + +def get_host_pagesize(conn): + ret = [] + tree = lxml.etree.fromstring(conn.getCapabilities()) + + set = tree.xpath("/capabilities/host/cpu/pages") + for n in set: + ret.append(int(n.attrib['size'])) + + return ret + +def get_host_pagecount(pagesize): + try: + return int(open(HOST_HUGEPAGE % (0, pagesize)).read()) + except IOError: + return -1 + +def connection_allocPages(params): + """ + test API for allocPages in class virConnect + """ + logger = params['logger'] + fail=0 + + try: + conn=libvirt.open(params['conn']) + logger.info("get connection to libvirtd") + list1 = get_host_pagesize(conn) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + for i in list1: + logger.info("test hugepage size %d" % i) + + if get_host_pagecount(i) == -1: + logger.info("Skip system page size %d" % i) + continue + + """ test flag VIR_NODE_ALLOC_PAGES_SET """ + try: + cur_count = get_host_pagecount(i) + conn.allocPages({i : cur_count + 1}, 0, 1, libvirt.VIR_NODE_ALLOC_PAGES_SET) + if get_host_pagecount(i) != cur_count + 1: + logger.info("libvirt set a wrong page count to %dKiB hugepage" % i) + fail = 1 + except libvirtError, e: + if "Allocated only" in e.message: + tmp_count = int(e.message.replace(" ", "")[-1:]) + + if tmp_count != get_host_pagecount(i): + logger.info("libvirt output %dKiB hugepage count is not right" % i) + fail = 1 + else: + logger.error("API error message: %s" % e.message) + return 1 + + """ test flag VIR_NODE_ALLOC_PAGES_ADD """ + try: + cur_count = get_host_pagecount(i) + conn.allocPages({i : 1}, 0, 1, libvirt.VIR_NODE_ALLOC_PAGES_ADD) + if get_host_pagecount(i) != cur_count + 1: + logger.info("libvirt set a wrong page count to %dKiB hugepage" % i) + fail = 1 + except libvirtError, e: + if "Allocated only" in e.message: + tmp_count = int(e.message.replace(" ", "")[-1:]) + + if tmp_count != get_host_pagecount(i): + logger.info("libvirt output %dKiB hugepage count is not right" % i) + fail = 1 + else: + logger.error("API error message: %s" % e.message) + return 1 + + return fail -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH 1/3] Introduce new test case for add/del IOthread
by Luyao Huang 31 Aug '15

31 Aug '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/linux_domain.conf | 6 +++ repos/domain/add_del_iothread.py | 82 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 repos/domain/add_del_iothread.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index fd32aad..8a7efe9 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -281,6 +281,12 @@ domain:set_memory_period conn qemu:///system +domain:add_del_iothread + guestname + $defaultname + conn + qemu:///system + domain:destroy guestname $defaultname diff --git a/repos/domain/add_del_iothread.py b/repos/domain/add_del_iothread.py new file mode 100644 index 0000000..2d874f9 --- /dev/null +++ b/repos/domain/add_del_iothread.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = ('guestname',) +optional_params = {'conn': 'qemu:///system'} + +def find_iothreadid_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//iothreadids/iothread") + for n in set: + ids = n.attrib['id'] + if int(ids) == iothreadid: + return True + + return False + +def add_del_iothread(params): + """ + test API for addIOThread and delIOThread in class virDomain + """ + + logger = params['logger'] + fail=0 + + try: + conn = libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + guest = params['guestname'] + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + """ test effect guest running XML """ + if vm.isActive() == 1: + logger.info("guest is running test with running guest") + + for i in range(300, 1000): + if not find_iothreadid_fromxml(vm, 1, i): + logger.info("add iothread %d to running guest" % i) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if find_iothreadid_fromxml(vm, 1, i): + vm.delIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if find_iothreadid_fromxml(vm, 1, i): + logger.info("FAIL: still can find iothread id in XML") + fail=1 + + break + else: + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + break + + """ test effect guest config""" + logger.info("test with guest inactive XML") + for i in range(300, 1000): + if not find_iothreadid_fromxml(vm, 0, i): + logger.info("add iothread %d to guest config" % i) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if find_iothreadid_fromxml(vm, 0, i): + vm.delIOThread(i, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if find_iothreadid_fromxml(vm, 0, i): + logger.info("FAIL: still can find iothread id in XML") + fail=1 + + break + else: + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + break + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1

2 3