- Devel - libvirt List Archives

[libvirt] [PATCH v2] [TCK] nwfilter: probe for inverted ctdir
by Stefan Berger 17 May '13

17 May '13

Linux netfilter at some point inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We probe for this netfilter change via an IMCP message over loopback and 3 filtering rules applied to INPUT. If the sent byte arrives, the newer netfilter implementation has been detected and we convert the strings in the iptables output to now match that inversion implemented by libvirt. The downside of this is that probing of libvirt and this test tool are independent and this test tool will only work correctly for all cases if used with libvirt probing for 'ctdir inversion' as well. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- scripts/nwfilter/nwfilter2vmtest.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) Index: libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilter2vmtest.sh +++ libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh @@ -28,6 +28,10 @@ FLAG_LIBVIRT_TEST="$((1<<3))" FLAG_TAP_TEST="$((1<<4))" FLAG_FORCE_CLEAN="$((1<<5))" +# --ctdir original vs. --ctdir reply's meaning was inverted in +# netfilter at some point. We probe for it. +IPTABLES_CTRDIR_CORRECTED=0 + failctr=0 passctr=0 attachfailctr=0 @@ -100,6 +104,15 @@ mktmpdir() { return 0 } +probeIptablesCtdir() { + # below gawk works for "2\.6\.39.*"; any non-digit immediately + # after '39' will be ignored + rev=$(uname -r | gawk -F. '{print $1 * 1000000 + $2 * 1000 + $3 }') + # 2.6.39 had the correction + if [ $rev -ge 2006039 ]; then + IPTABLES_CTDIR_CORRECTED=1 + fi +} checkExpectedOutput() { xmlfile="$1" @@ -160,6 +173,14 @@ checkExpectedOutput() { break fi + if [ $IPTABLES_CTDIR_CORRECTED -ne 0 ]; then + #change --ctdir ORIGINAL to --ctdir REPLY + #and --ctdir REPLY to --ctdir ORIGINAL + sed -i "s/ctdir[ ]*ORIGINAL/ctdir _REPLY/" ${tmpfile} + sed -i "s/ctdir[ ]*REPLY/ctdir ORIGINAL/" ${tmpfile} + sed -i "s/ctdir _REPLY/ctdir REPLY/" ${tmpfile} + fi + diff -w ${tmpfile} ${tmpfile2} >/dev/null if [ $? -ne 0 ]; then @@ -551,6 +572,8 @@ main() { echo "This script will only run on Linux." fi exit 1; + else + probeIptablesCtdir fi if [ $(($flags & $FLAG_TAP_TEST)) -ne 0 ]; then

3 3

[libvirt] [PATCH 0/2] Fix storage schema issues
by Ján Tomko 17 May '13

17 May '13

Fix https://bugzilla.redhat.com/show_bug.cgi?id=893273 Ján Tomko (2): schema: require target path in storage pool xml schema: make source optional in volume XML docs/schemas/storagepool.rng | 8 +++--- docs/schemas/storagevol.rng | 4 ++- tests/Makefile.am | 2 ++ .../dir-missing-target-path-invalid.xml | 12 +++++++++ tests/storagepoolschematest | 2 +- tests/storagevolschemadata/qcow2-no-source.xml | 29 ++++++++++++++++++++++ tests/storagevolschematest | 2 +- 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 tests/storagepoolschemadata/dir-missing-target-path-invalid.xml create mode 100644 tests/storagevolschemadata/qcow2-no-source.xml -- 1.8.1.5

2 5

[libvirt] [PATCH] qemu: Change values of disk discard
by Osier Yang 17 May '13

17 May '13

QEMU might support more values for "-drive discard", so using Bi-state values (on/off) for it doesn't make sense. "on" maps to "unmap", "off" maps to "ignore": <...> @var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. Some machine types may not support discard requests. </...> --- docs/formatdomain.html.in | 4 ++-- docs/schemas/domaincommon.rng | 4 ++-- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a71c484..26a3d0d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1745,8 +1745,8 @@ The optional <code>discard</code> attribute controls whether to discard (also known as "trim" or "unmap") requests are ignored or passed to the filesystem. The value can be either - "on" (allow the discard request to be passed) or "off" (ingore - the discard request). + "unmap" (allow the discard request to be passed) or "ignore" + (gnore the discard request). <span class='since'>Since 1.0.6 (QEMU and KVM only)</span> </li> </ul> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 018ca0b..b53099b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1418,8 +1418,8 @@ <define name="discard"> <attribute name='discard'> <choice> - <value>on</value> - <value>off</value> + <value>unmap</value> + <value>ignore</value> </choice> </attribute> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b5e5d4d..e7a0381 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -745,8 +745,8 @@ VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST, "default", - "on", - "off") + "unmap", + "ignore") #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a10b2ab..e74da1c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -629,8 +629,8 @@ enum virDomainDeviceSGIO { enum virDomainDiskDiscard { VIR_DOMAIN_DISK_DISCARD_DEFAULT = 0, - VIR_DOMAIN_DISK_DISCARD_ON, - VIR_DOMAIN_DISK_DISCARD_OFF, + VIR_DOMAIN_DISK_DISCARD_UNMAP, + VIR_DOMAIN_DISK_DISCARD_IGNORE, VIR_DOMAIN_DISK_DISCARD_LAST }; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args index 02e2ddb..3c4687e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -1,8 +1,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ --drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=on \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=unmap \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=off \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=ignore \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml index a6a8135..f01312f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml @@ -17,13 +17,13 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' discard='on'/> + <driver name='qemu' type='qcow2' discard='unmap'/> <source file='/var/lib/libvirt/images/f14.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <disk type='file' device='cdrom'> - <driver name='qemu' type='raw' discard='off'/> + <driver name='qemu' type='raw' discard='ignore'/> <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> <target dev='hdc' bus='ide'/> <readonly/> -- 1.8.1.4

2 2

[libvirt] [PATCH v2 0/2] Add support for locking domain's memory pages
by Jiri Denemark 17 May '13

17 May '13

Jiri Denemark (2): Add support for locking domain's memory pages qemu: Implement support for locking domain's memory pages docs/formatdomain.html.in | 26 +++++++++++++--------- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 20 +++++++++-------- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml | 15 +++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 18 +++++++++++++++ .../qemuxml2argv-mlock-unsupported.args | 4 ++++ .../qemuxml2argv-mlock-unsupported.xml | 15 +++++++++++++ tests/qemuxml2argvtest.c | 5 +++++ 14 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml -- 1.8.2.1

3 5

[libvirt] Resend with corrected error handling
by dwalsh＠redhat.com 17 May '13

17 May '13

[PATCH] Change label of fusefs mounted at /proc/meminfo in lxc

4 6

[libvirt] [PATCH] qemu: Fix cgroup handling when setting VCPU BW
by Martin Kletzander 17 May '13

17 May '13

Commit 632f78c introduced a regression which causes schedinfo being unable to set some parameters. When migrating to priv->cgroup there was missing variable left out and due to passed NULL to underlying function, the setting failed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=963592 --- As 632f78c describes as v1.0.4-161-g632f78c, I'll push this into v1.0.5-maint as well once ACK'd. src/qemu/qemu_driver.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b1630f8..9e77fd6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8009,7 +8009,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; int i; - virCgroupPtr group = NULL; virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; unsigned long long value_ul; @@ -8087,7 +8086,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) { - if ((rc = qemuSetVcpusBWLive(vm, group, value_ul, 0))) + if ((rc = qemuSetVcpusBWLive(vm, priv->cgroup, value_ul, 0))) goto cleanup; vm->def->cputune.period = value_ul; @@ -8101,7 +8100,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) { - if ((rc = qemuSetVcpusBWLive(vm, group, 0, value_l))) + if ((rc = qemuSetVcpusBWLive(vm, priv->cgroup, 0, value_l))) goto cleanup; vm->def->cputune.quota = value_l; @@ -8115,7 +8114,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) { - if ((rc = qemuSetEmulatorBandwidthLive(vm, group, value_ul, 0))) + if ((rc = qemuSetEmulatorBandwidthLive(vm, priv->cgroup, + value_ul, 0))) goto cleanup; vm->def->cputune.emulator_period = value_ul; @@ -8129,7 +8129,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) { - if ((rc = qemuSetEmulatorBandwidthLive(vm, group, 0, value_l))) + if ((rc = qemuSetEmulatorBandwidthLive(vm, priv->cgroup, + 0, value_l))) goto cleanup; vm->def->cputune.emulator_quota = value_l; -- 1.8.2.1

2 2

[libvirt] [PATCH] Fix failure to detect missing cgroup partitions
by Daniel P. Berrange 17 May '13

17 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Change bbe97ae968eba60b71e0066d49f9fc909966d9d6 caused the QEMU driver to ignore ENOENT errors from cgroups, in order to cope with missing /proc/cgroups. This is not good though because many other things can cause ENOENT and should not be ignored. The callers expect to see ENXIO when cgroups are not present, so adjust the code to report that errno when /proc/cgroups is missing Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_cgroup.c | 3 +-- src/util/vircgroup.c | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index aaf94cf..9784f31 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -456,8 +456,7 @@ int qemuInitCgroup(virQEMUDriverPtr driver, if (rc != 0) { if (rc == -ENXIO || rc == -EPERM || - rc == -EACCES || - rc == -ENOENT) { /* No cgroups mounts == success */ + rc == -EACCES) { /* No cgroups mounts == success */ VIR_DEBUG("No cgroups present/configured/accessible, ignoring error"); goto done; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5780785..07ea2c3 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1110,8 +1110,13 @@ static int virCgroupPartitionNeedsEscaping(const char *path) path[0] == '.') return 1; - if (!(fp = fopen("/proc/cgroups", "r"))) + if (!(fp = fopen("/proc/cgroups", "r"))) { + /* The API contract is that we return ENXIO + * if cgroups are not available on a host */ + if (errno == ENOENT) + errno = ENXIO; return -errno; + } /* * Data looks like this: -- 1.8.2.1

2 1

[libvirt] [PATCH] qemu: Add support for locking domain's memory pages
by Jiri Denemark 17 May '13

17 May '13

--- docs/formatdomain.html.in | 26 +++++++++++++--------- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 20 +++++++++-------- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml | 15 +++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 18 +++++++++++++++ .../qemuxml2argv-mlock-unsupported.args | 4 ++++ .../qemuxml2argv-mlock-unsupported.xml | 15 +++++++++++++ tests/qemuxml2argvtest.c | 5 +++++ 14 files changed, 112 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5e89a92..da35d48 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -595,22 +595,28 @@ <memoryBacking> <hugepages/> <nosharepages/> + <locked/> </memoryBacking> ... </domain> </pre> + <p>The optional <code>memoryBacking</code> element may contain several + elements that influence how virtual memory pages are backed by host + pages.</p> + <dl> - <dt><code>memoryBacking</code></dt> - <dd>The optional <code>memoryBacking</code> element has two - optional elements. The element <code>hugepages</code> tells - the hypervisor that the guest should have its memory allocated - using hugepages instead of the normal native page size. And the - optional element <code>nosharepages</code> - (<span class="since">since 1.0.6</span>) tells the hypervisor - that share pages (memory merge, KSM) should be disabled on guest - startup. - </dd> + <dt><code>hugepages</code></dt> + <dd>This tells the hypervisor that the guest should have its memory + allocated using hugepages instead of the normal native page size.</dd> + <dt><code>nosharepages</code></dt> + <dd>Instructs hypervisor to disable shared pages (memory merge, KSM) for + this domain. <span class="since">Since 1.0.6</span></dd> + <dt><code>locked</code></dt> + <dd>When set and supported by the hypervisor, memory pages belonging + to the domain will be locked in host's memory and the host will not + be allowed to swap them out. + <span class="since">Since 1.0.6</span></dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 361794e..f3d3560 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -501,6 +501,11 @@ <empty/> </element> </optional> + <optional> + <element name="locked"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f0ca9d5..6d8e580 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10389,6 +10389,9 @@ virDomainDefParseXML(xmlDocPtr xml, if ((node = virXPathNode("./memoryBacking/nosharepages", ctxt))) def->mem.nosharepages = true; + if (virXPathBoolean("boolean(./memoryBacking/locked)", ctxt)) + def->mem.locked = true; + /* Extract blkio cgroup tunables */ if (virXPathUInt("string(./blkiotune/weight)", ctxt, &def->blkio.weight) < 0) @@ -15736,17 +15739,16 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->mem.swap_hard_limit) virBufferAddLit(buf, " </memtune>\n"); - if (def->mem.hugepage_backed || def->mem.nosharepages) + if (def->mem.hugepage_backed || def->mem.nosharepages || def->mem.locked) { virBufferAddLit(buf, " <memoryBacking>\n"); - - if (def->mem.hugepage_backed) - virBufferAddLit(buf, " <hugepages/>\n"); - - if (def->mem.nosharepages) - virBufferAddLit(buf, " <nosharepages/>\n"); - - if (def->mem.hugepage_backed || def->mem.nosharepages) + if (def->mem.hugepage_backed) + virBufferAddLit(buf, " <hugepages/>\n"); + if (def->mem.nosharepages) + virBufferAddLit(buf, " <nosharepages/>\n"); + if (def->mem.locked) + virBufferAddLit(buf, " <locked/>\n"); virBufferAddLit(buf, " </memoryBacking>\n"); + } virBufferAddLit(buf, " <vcpu"); virBufferAsprintf(buf, " placement='%s'", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c176a4c..16eb8b6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1861,6 +1861,7 @@ struct _virDomainDef { unsigned long long cur_balloon; /* in kibibytes */ bool hugepage_backed; bool nosharepages; + bool locked; int dump_core; /* enum virDomainMemDump */ unsigned long long hard_limit; /* in kibibytes */ unsigned long long soft_limit; /* in kibibytes */ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 488cbfe..82129a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -230,6 +230,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "mem-merge", "vnc-websocket", "drive-discard", + "mlock", ); struct _virQEMUCaps { @@ -2246,6 +2247,7 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, + { "realtime", "mlock", QEMU_CAPS_MLOCK }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 173ca77..117bf8a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -187,6 +187,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ + QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5b95c07..c268a3a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6541,6 +6541,17 @@ qemuBuildCommandLine(virConnectPtr conn, cfg->hugepagePath, NULL); } + if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MLOCK)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("memory locking not supported by QEMU binary")); + goto error; + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MLOCK)) { + virCommandAddArg(cmd, "-realtime"); + virCommandAddArgFormat(cmd, "mlock=%s", + def->mem.locked ? "on" : "off"); + } + virCommandAddArg(cmd, "-smp"); if (!(smp = qemuBuildSmpArgStr(def, qemuCaps))) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args new file mode 100644 index 0000000..2a5d94c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -realtime mlock=off \ +-smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml new file mode 100644 index 0000000..4125ca5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args new file mode 100644 index 0000000..bb6de13 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -realtime mlock=on \ +-smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml new file mode 100644 index 0000000..20a5eaa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml @@ -0,0 +1,18 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <memoryBacking> + <locked/> + </memoryBacking> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args new file mode 100644 index 0000000..54dd3b9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 \ +-smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml new file mode 100644 index 0000000..4125ca5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <emulator>/usr/bin/qemu</emulator> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c751440..d853308 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1007,6 +1007,11 @@ mymain(void) QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX); + DO_TEST("mlock-on", QEMU_CAPS_MLOCK); + DO_TEST_FAILURE("mlock-on", NONE); + DO_TEST("mlock-off", QEMU_CAPS_MLOCK); + DO_TEST("mlock-unsupported", NONE); + virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/2 v2] Fix the build failure
by Osier Yang 17 May '13

17 May '13

As exposed by [1], qemuxml2argvtest fails because of it tries to access non-existing sysfs files when building qemu command for scsi-generic device. This creates "tests/sysfsroot", uses it as the fake sysfs root, any future sysfs test input files should be put into it. [1] https://www.redhat.com/archives/libvir-list/2013-May/msg00923.html v1 - v2: * Use callbacks instead of increasing the arguments Osier Yang (2): qemu: Add callback struct for qemuBuildCommandLine tests: Move fchostdata into sysfsroot src/qemu/qemu_command.c | 31 ++++++++++++++----- src/qemu/qemu_command.h | 16 ++++++++-- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_hotplug.c | 6 ++-- src/qemu/qemu_process.c | 3 +- src/util/virscsi.c | 35 ++++++++++++++++++---- src/util/virscsi.h | 3 +- tests/Makefile.am | 2 +- tests/fchostdata/fc_host/host4/fabric_name | 1 - tests/fchostdata/fc_host/host4/max_npiv_vports | 1 - tests/fchostdata/fc_host/host4/node_name | 1 - tests/fchostdata/fc_host/host4/npiv_vports_inuse | 1 - tests/fchostdata/fc_host/host4/port_name | 1 - tests/fchostdata/fc_host/host4/port_state | 1 - tests/fchostdata/fc_host/host4/vport_create | 0 tests/fchostdata/fc_host/host4/vport_delete | 0 tests/fchostdata/fc_host/host5/fabric_name | 1 - tests/fchostdata/fc_host/host5/max_npiv_vports | 1 - tests/fchostdata/fc_host/host5/node_name | 1 - tests/fchostdata/fc_host/host5/npiv_vports_inuse | 1 - tests/fchostdata/fc_host/host5/port_name | 1 - tests/fchostdata/fc_host/host5/port_state | 1 - tests/fchostdata/fc_host/host5/vport_create | 0 tests/fchostdata/fc_host/host5/vport_delete | 0 tests/fchosttest.c | 2 +- tests/qemuxml2argvtest.c | 18 ++++++++++- tests/qemuxmlnstest.c | 3 +- .../bus/scsi/devices/0:0:0:0/scsi_generic/sg0/dev | 1 + .../class/fchostdata/fc_host/host4/fabric_name | 1 + .../class/fchostdata/fc_host/host4/max_npiv_vports | 1 + .../class/fchostdata/fc_host/host4/node_name | 1 + .../fchostdata/fc_host/host4/npiv_vports_inuse | 1 + .../class/fchostdata/fc_host/host4/port_name | 1 + .../class/fchostdata/fc_host/host4/port_state | 1 + .../class/fchostdata/fc_host/host4/vport_create | 0 .../class/fchostdata/fc_host/host4/vport_delete | 0 .../class/fchostdata/fc_host/host5/fabric_name | 1 + .../class/fchostdata/fc_host/host5/max_npiv_vports | 1 + .../class/fchostdata/fc_host/host5/node_name | 1 + .../fchostdata/fc_host/host5/npiv_vports_inuse | 1 + .../class/fchostdata/fc_host/host5/port_name | 1 + .../class/fchostdata/fc_host/host5/port_state | 1 + .../class/fchostdata/fc_host/host5/vport_create | 0 .../class/fchostdata/fc_host/host5/vport_delete | 0 44 files changed, 110 insertions(+), 37 deletions(-) delete mode 100644 tests/fchostdata/fc_host/host4/fabric_name delete mode 100644 tests/fchostdata/fc_host/host4/max_npiv_vports delete mode 100644 tests/fchostdata/fc_host/host4/node_name delete mode 100644 tests/fchostdata/fc_host/host4/npiv_vports_inuse delete mode 100644 tests/fchostdata/fc_host/host4/port_name delete mode 100644 tests/fchostdata/fc_host/host4/port_state delete mode 100644 tests/fchostdata/fc_host/host4/vport_create delete mode 100644 tests/fchostdata/fc_host/host4/vport_delete delete mode 100644 tests/fchostdata/fc_host/host5/fabric_name delete mode 100644 tests/fchostdata/fc_host/host5/max_npiv_vports delete mode 100644 tests/fchostdata/fc_host/host5/node_name delete mode 100644 tests/fchostdata/fc_host/host5/npiv_vports_inuse delete mode 100644 tests/fchostdata/fc_host/host5/port_name delete mode 100644 tests/fchostdata/fc_host/host5/port_state delete mode 100644 tests/fchostdata/fc_host/host5/vport_create delete mode 100644 tests/fchostdata/fc_host/host5/vport_delete create mode 100644 tests/sysfsroot/bus/scsi/devices/0:0:0:0/scsi_generic/sg0/dev create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/fabric_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/max_npiv_vports create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/node_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/npiv_vports_inuse create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/port_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/port_state create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/vport_create create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host4/vport_delete create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/fabric_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/max_npiv_vports create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/node_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/npiv_vports_inuse create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/port_name create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/port_state create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/vport_create create mode 100644 tests/sysfsroot/class/fchostdata/fc_host/host5/vport_delete -- 1.8.1.4

4 11

[libvirt] [libvirt PATCH] conf: Fix the bug of disk->copy_on_read formating
by Osier Yang 16 May '13

16 May '13

The reason for it's not exposed for such long time is that there is no xml2xml test for it. This fixes the bug and adds test. --- src/conf/domain_conf.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml | 15 ++++++++++----- tests/qemuxml2xmltest.c | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 862b997..be22429 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13640,7 +13640,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *iomode = virDomainDiskIoTypeToString(def->iomode); const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); - const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); + const char *copy_on_read = virDomainDiskCopyOnReadTypeToString(def->copy_on_read); const char *sgio = virDomainDiskSGIOTypeToString(def->sgio); char uuidstr[VIR_UUID_STRING_BUFLEN]; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index 0834cf2..076095e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -1,6 +1,8 @@ <domain type='qemu'> <name>test</name> + <uuid>468404ad-d49c-40f2-9e14-02294f9c1be3</uuid> <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64' machine='pc-0.13'>hvm</type> @@ -20,27 +22,30 @@ <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> - <disk type='file' device='cdrom'> + <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> + <controller type='usb' index='0'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> <interface type='user'> <mac address='52:54:00:e5:48:58'/> <model type='virtio'/> <driver name='vhost' txmode='iothread'/> </interface> - <controller type='usb' index='0'/> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </controller> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> + <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 492ac60..d24cec9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -289,6 +289,8 @@ mymain(void) DO_TEST("hostdev-scsi-virtio-scsi"); DO_TEST("hostdev-scsi-readonly"); + DO_TEST("disk-copy_on_read"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.4

2 4

[libvirt] [PATCH] datatypes: fix virGetStoragePool's comment
by Ján Tomko 16 May '13

16 May '13

--- Pushed under the trivial rule. src/datatypes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datatypes.c b/src/datatypes.c index 884eb3e..940d968 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -421,7 +421,7 @@ virInterfaceDispose(void *obj) * and register it in the table. In any case a corresponding call to * virObjectUnref() is needed to not leak data. * - * Returns a pointer to the network, or NULL in case of failure + * Returns a pointer to the storage pool, or NULL in case of failure */ virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, -- 1.8.1.5

1 0

[libvirt] [PATCH] daemon: fix leak after listing all volumes
by Ján Tomko 16 May '13

16 May '13

CVE-2013-1962 remoteDispatchStoragePoolListAllVolumes wasn't freeing the pool. The pool also held a reference to the connection, preventing it from getting freed and closing the netcf interface driver, which held two sockets open. --- daemon/remote.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/remote.c b/daemon/remote.c index 1d21478..af89e60 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4202,6 +4202,8 @@ cleanup: virStorageVolFree(vols[i]); VIR_FREE(vols); } + if (pool) + virStoragePoolFree(pool); return rv; } -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu: Fix crash in migration of graphics-less guests.
by Viktor Mihajlovski 16 May '13

16 May '13

Commit 7f15ebc7a2b599ab10dbc15bca6f823591213e67 introduced a bug happening when guests without a <graphics> element are migrated. The initialization of listenAddress happens unconditionally from the cookie even if the cookie->graphics pointer was NULL. Moved the initialization to where it is safe. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e38d99b..e10127d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1723,7 +1723,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; - char *listenAddress = cookie->graphics->listen; + char *listenAddress; if (!cookie) return 0; @@ -1737,6 +1737,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; + listenAddress = cookie->graphics->listen; if (!listenAddress || STREQ(listenAddress, "0.0.0.0") || STREQ(listenAddress, "::")) -- 1.7.9.5

2 1

[libvirt] [PATCH] build: Fix check-driverimpls in VPATH
by Jiri Denemark 16 May '13

16 May '13

DRIVER_SOURCE_FILES mixes files with absolute path (inherited from REMOTE_DRIVER_GENERATED) with file paths that are relative to srcdir but check-driverimpls.pl needs full paths. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6c626ac..9a17f59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -468,7 +468,8 @@ DRIVER_SOURCE_FILES = \ check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ - $(DRIVER_SOURCE_FILES) + $(filter /%,$(DRIVER_SOURCE_FILES)) \ + $(addprefix $(srcdir)/,$(filter-out /%,$(DRIVER_SOURCE_FILES))) EXTRA_DIST += check-driverimpls.pl -- 1.8.2.1

2 2

[libvirt] [PATCH 0/8] Add qcow2 extensions support
by Ján Tomko 16 May '13

16 May '13

Since QEMU 1.1 qcow2 supports a features bitfield, allowing to implement additional features without breaking compatibility with older QEMU versions. The version header on-disk is bumped to 3, however the format name is still 'qcow2', not 'qcow3' (which is what I used in v2). v2: https://www.redhat.com/archives/libvir-list/2013-February/msg00212.html qcow2 vs. qcow3 discussion: https://www.redhat.com/archives/libvir-list/2013-March/msg00094.html Ján Tomko (8): storage: rework qemu-img command line generation tests: don't overwrite error in storage xml-to-argv test util: add support for qcow2v3 image detection conf: add features to volume target XML storage: add support for creating qcow2 images with extensions conf: split out snapshot disk XML formatting Add qcow2 features support to snapshots qemu: add qcow2 extension support to inactive external snapshots docs/formatsnapshot.html.in | 5 + docs/formatstorage.html.in | 19 +++ docs/schemas/Makefile.am | 1 + docs/schemas/domainsnapshot.rng | 7 + docs/schemas/storagefilefeatures.rng | 24 ++++ docs/schemas/storagevol.rng | 7 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/snapshot_conf.c | 127 ++++++++++++++---- src/conf/snapshot_conf.h | 2 + src/conf/storage_conf.c | 76 ++++++++++- src/conf/storage_conf.h | 6 +- src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 72 +++++++--- src/storage/storage_backend.c | 143 +++++++++++++------- src/storage/storage_backend_fs.c | 10 ++ src/util/virstoragefile.c | 164 ++++++++++++++++++----- src/util/virstoragefile.h | 12 ++ tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 5 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 4 + tests/storagevolxml2argvdata/qcow2-1.1.argv | 1 + tests/storagevolxml2argvdata/qcow2-lazy.argv | 1 + tests/storagevolxml2argvdata/vol-qcow2-1.1.xml | 32 +++++ tests/storagevolxml2argvdata/vol-qcow2-lazy.xml | 35 +++++ tests/storagevolxml2argvtest.c | 6 +- tests/storagevolxml2xmlin/vol-qcow2-1.1.xml | 32 +++++ tests/storagevolxml2xmlin/vol-qcow2-lazy.xml | 35 +++++ tests/storagevolxml2xmlout/vol-qcow2-1.1.xml | 33 +++++ tests/storagevolxml2xmlout/vol-qcow2-lazy.xml | 35 +++++ tests/storagevolxml2xmltest.c | 2 + 30 files changed, 769 insertions(+), 132 deletions(-) create mode 100644 docs/schemas/storagefilefeatures.rng create mode 100644 tests/storagevolxml2argvdata/qcow2-1.1.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-lazy.argv create mode 100644 tests/storagevolxml2argvdata/vol-qcow2-1.1.xml create mode 100644 tests/storagevolxml2argvdata/vol-qcow2-lazy.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-1.1.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2-lazy.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-1.1.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2-lazy.xml -- 1.8.1.5

1 8

[libvirt] [PATCH] util: Fix build without devmapper
by Jiri Denemark 16 May '13

16 May '13

stdlib.h header file needed for getenv was only transitively included through libdevmapper.h. --- Pushed as a trivial build-breaker. src/util/virutil.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virutil.c b/src/util/virutil.c index ab3c82f..7f4ecd6 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -26,6 +26,7 @@ #include <config.h> +#include <stdlib.h> #include <dirent.h> #include <stdio.h> #include <stdarg.h> -- 1.8.2.1

1 0

[libvirt] [PATCH 0/3] Fix the build failure
by Osier Yang 16 May '13

16 May '13

As exposed by [1], qemuxml2argvtest fails because of it tries to access non-existing sysfs files when building qemu command for scsi-generic device. This creates "tests/sysfsroot", uses it as the fake sysfs root, any future sysfs test input files should be put into it. [1] https://www.redhat.com/archives/libvir-list/2013-May/msg00923.html Osier Yang (3): qemu: Allow to specify the sysfs root for qemuBuildCommandLine tests: Feed the fake sysfs root to qemuBuildCommandLine tests: Move fchostdata into sysfsroot src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_command.c | 12 +++-- src/qemu/qemu_command.h | 6 ++- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_hostdev.c | 9 ++-- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 3 +- src/security/security_dac.c | 6 ++- src/security/security_selinux.c | 6 ++- src/util/virscsi.c | 51 ++++++++++++++++++---- src/util/virscsi.h | 6 ++- tests/Makefile.am | 2 +- tests/fchostdata/fc_host/host4/fabric_name | 1 - tests/fchostdata/fc_host/host4/max_npiv_vports | 1 - tests/fchostdata/fc_host/host4/node_name | 1 - tests/fchostdata/fc_host/host4/npiv_vports_inuse | 1 - tests/fchostdata/fc_host/host4/port_name | 1 - tests/fchostdata/fc_host/host4/port_state | 1 - tests/fchostdata/fc_host/host4/vport_create | 0 tests/fchostdata/fc_host/host4/vport_delete | 0 tests/fchostdata/fc_host/host5/fabric_name | 1 - tests/fchostdata/fc_host/host5/max_npiv_vports | 1 - tests/fchostdata/fc_host/host5/node_name | 1 - tests/fchostdata/fc_host/host5/npiv_vports_inuse | 1 - tests/fchostdata/fc_host/host5/port_name | 1 - tests/fchostdata/fc_host/host5/port_state | 1 - tests/fchostdata/fc_host/host5/vport_create | 0 tests/fchostdata/fc_host/host5/vport_delete | 0 tests/fchosttest.c | 2 +- tests/qemuxml2argvtest.c | 5 ++- tests/qemuxmlnstest.c | 3 +- .../bus/scsi/devices/0:0:0:0/scsi_generic/sg0/dev | 1 + tests/sysfsroot/class/fc_host/host4/fabric_name | 1 + .../sysfsroot/class/fc_host/host4/max_npiv_vports | 1 + tests/sysfsroot/class/fc_host/host4/node_name | 1 + .../class/fc_host/host4/npiv_vports_inuse | 1 + tests/sysfsroot/class/fc_host/host4/port_name | 1 + tests/sysfsroot/class/fc_host/host4/port_state | 1 + tests/sysfsroot/class/fc_host/host4/vport_create | 0 tests/sysfsroot/class/fc_host/host4/vport_delete | 0 tests/sysfsroot/class/fc_host/host5/fabric_name | 1 + .../sysfsroot/class/fc_host/host5/max_npiv_vports | 1 + tests/sysfsroot/class/fc_host/host5/node_name | 1 + .../class/fc_host/host5/npiv_vports_inuse | 1 + tests/sysfsroot/class/fc_host/host5/port_name | 1 + tests/sysfsroot/class/fc_host/host5/port_state | 1 + tests/sysfsroot/class/fc_host/host5/vport_create | 0 tests/sysfsroot/class/fc_host/host5/vport_delete | 0 48 files changed, 101 insertions(+), 45 deletions(-) delete mode 100644 tests/fchostdata/fc_host/host4/fabric_name delete mode 100644 tests/fchostdata/fc_host/host4/max_npiv_vports delete mode 100644 tests/fchostdata/fc_host/host4/node_name delete mode 100644 tests/fchostdata/fc_host/host4/npiv_vports_inuse delete mode 100644 tests/fchostdata/fc_host/host4/port_name delete mode 100644 tests/fchostdata/fc_host/host4/port_state delete mode 100644 tests/fchostdata/fc_host/host4/vport_create delete mode 100644 tests/fchostdata/fc_host/host4/vport_delete delete mode 100644 tests/fchostdata/fc_host/host5/fabric_name delete mode 100644 tests/fchostdata/fc_host/host5/max_npiv_vports delete mode 100644 tests/fchostdata/fc_host/host5/node_name delete mode 100644 tests/fchostdata/fc_host/host5/npiv_vports_inuse delete mode 100644 tests/fchostdata/fc_host/host5/port_name delete mode 100644 tests/fchostdata/fc_host/host5/port_state delete mode 100644 tests/fchostdata/fc_host/host5/vport_create delete mode 100644 tests/fchostdata/fc_host/host5/vport_delete create mode 100644 tests/sysfsroot/bus/scsi/devices/0:0:0:0/scsi_generic/sg0/dev create mode 100644 tests/sysfsroot/class/fc_host/host4/fabric_name create mode 100644 tests/sysfsroot/class/fc_host/host4/max_npiv_vports create mode 100644 tests/sysfsroot/class/fc_host/host4/node_name create mode 100644 tests/sysfsroot/class/fc_host/host4/npiv_vports_inuse create mode 100644 tests/sysfsroot/class/fc_host/host4/port_name create mode 100644 tests/sysfsroot/class/fc_host/host4/port_state create mode 100644 tests/sysfsroot/class/fc_host/host4/vport_create create mode 100644 tests/sysfsroot/class/fc_host/host4/vport_delete create mode 100644 tests/sysfsroot/class/fc_host/host5/fabric_name create mode 100644 tests/sysfsroot/class/fc_host/host5/max_npiv_vports create mode 100644 tests/sysfsroot/class/fc_host/host5/node_name create mode 100644 tests/sysfsroot/class/fc_host/host5/npiv_vports_inuse create mode 100644 tests/sysfsroot/class/fc_host/host5/port_name create mode 100644 tests/sysfsroot/class/fc_host/host5/port_state create mode 100644 tests/sysfsroot/class/fc_host/host5/vport_create create mode 100644 tests/sysfsroot/class/fc_host/host5/vport_delete -- 1.8.1.4

4 13

[libvirt] [PATCH] Move VirtualBox driver into libvirtd
by Daniel P. Berrange 16 May '13

16 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Change the build process & driver initialization so that the VirtualBox driver is built into libvirtd, instead of libvirt.so This change avoids the VirtualBox GPLv2-only license causing compatibility problems with libvirt.so which is under the GPLv2-or-later license. NB this change prevents use of the VirtualBox driver on the Windows platform, until such time as libvirtd can be made to work there. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.c | 9 +++++++++ docs/drvvbox.html.in | 12 ++++++++++++ src/Makefile.am | 24 +++++++++++++++++++----- src/libvirt.c | 7 ------- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 1ac8e30..abb46ca 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -73,6 +73,9 @@ # ifdef WITH_UML # include "uml/uml_driver.h" # endif +#ifdef WITH_VBOX +# include "vbox/vbox_driver.h" +#endif # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif @@ -400,6 +403,9 @@ static void daemonInitialize(void) # ifdef WITH_UML virDriverLoadModule("uml"); # endif +# ifdef WITH_UML + virDriverLoadModule("vbox"); +# endif #else # ifdef WITH_NETWORK networkRegister(); @@ -434,6 +440,9 @@ static void daemonInitialize(void) # ifdef WITH_UML umlRegister(); # endif +# ifdef WITH_VBOX + vboxRegister(); +# endif #endif } diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in index d59da57..e2a213c 100644 --- a/docs/drvvbox.html.in +++ b/docs/drvvbox.html.in @@ -31,6 +31,18 @@ vbox+tcp://user@example.com/session (remote access, SASl/Kerberos) vbox+ssh://user@example.com/session (remote access, SSH tunnelled) </pre> + <p> + <strong>NOTE: as of libvirt 1.0.6, the VirtualBox driver will always + run inside the libvirtd daemon, instead of being built-in to the + libvirt.so library directly. This change was required due to the + fact that VirtualBox code is GPLv2-only licensed, which is not + compatible with the libvirt.so license of GPLv2-or-later. The + daemon will be auto-started when the first connection to VirtualBox + is requested. This change also means it is no longer possible to + use the VirtualBox on the Windows platform, which lacks support + for the libvirtd daemon.</strong> + </p> + <h2><a name="xmlconfig">Example domain XML config</a></h2> <pre> diff --git a/src/Makefile.am b/src/Makefile.am index 6c626ac..8f26181 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -957,12 +957,26 @@ libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES) endif if WITH_VBOX +noinst_LTLIBRARIES += libvirt_driver_vbox_impl.la +libvirt_driver_vbox_la_SOURCES = +libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_vbox.la +libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version +else noinst_LTLIBRARIES += libvirt_driver_vbox.la -libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la -libvirt_driver_vbox_la_CFLAGS = \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_vbox_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) -libvirt_driver_vbox_la_SOURCES = $(VBOX_DRIVER_SOURCES) +# GPLv2-only license requries that it be linked into +# libvirtd and *not* libvirt.so +#libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la +endif + +libvirt_driver_vbox_impl_la_CFLAGS = \ + -I$(top_srcdir)/src/conf \ + $(AM_CFLAGS) +libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) +libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES) endif if WITH_XENAPI diff --git a/src/libvirt.c b/src/libvirt.c index 2b3515e..d0ec10a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -81,9 +81,6 @@ #ifdef WITH_PHYP # include "phyp/phyp_driver.h" #endif -#ifdef WITH_VBOX -# include "vbox/vbox_driver.h" -#endif #ifdef WITH_ESX # include "esx/esx_driver.h" #endif @@ -465,10 +462,6 @@ virGlobalInit(void) if (phypRegister() == -1) goto error; #endif -#ifdef WITH_VBOX - if (vboxRegister() == -1) - goto error; -#endif #ifdef WITH_ESX if (esxRegister() == -1) goto error; -- 1.8.2.1

4 3

[libvirt] [PATCH v2 00/12] Multiple TX queue support
by Michal Privoznik 16 May '13

16 May '13

Just a rebased version of [1]. Kernel and subsequently QEMU learned multiple transmit queues a while ago. The feature has a nice advantage, it allows a single guest to transmit multiple flows of network data using multiple CPUs simultaneously which increase traffic bandwidth. A lot. The documentation how to use this is available at [2] or [3]. 1: https://www.redhat.com/archives/libvir-list/2013-April/msg01548.html 2: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/tree/Docume… 3: http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-options.hx;hb=HEAD#l1363 Michal Privoznik (12): Introduce /domain/devices/interface/driver/@queues attribute qemu: Move interface cmd line construction into a separate function qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Adapt command line generation to multiqueue net util: Learn virNetDevTapCreate multiqueue network qemu: Allow multiple vhost-net openings qemu: Rework qemuNetworkIfaceConnect qemu: Adapt qemuDomainAttachNetDevice to multiqueue net qemu: Change qemuOpenVhostNet return value qemu: Adapt qemuBuildInterfaceCommandLine to to multiqueue net qemu: Enable multiqueue network docs/formatdomain.html.in | 11 +- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_command.c | 453 +++++++++++++-------- src/qemu/qemu_command.h | 13 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_hotplug.c | 99 +++-- src/qemu/qemu_monitor.c | 78 ++-- src/qemu/qemu_monitor.h | 8 +- src/uml/uml_conf.c | 5 +- src/util/virnetdevtap.c | 115 +++--- src/util/virnetdevtap.h | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 +- .../qemuxml2argv-net-virtio-device.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 51 +++ tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 19 files changed, 586 insertions(+), 306 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhost_queues.xml -- 1.8.2.1

3 24

[libvirt] [PATCH]write separate module for hostdev passthrough
by Chunyan Liu 16 May '13

16 May '13

This patch sets include two patches: 1/2 is the implementation of the hostdev passthrough common library. To meet two purposes: a. move qemu hostdev APIs to common library so that it could be used by all hypervisor drivers. b. maintain a global hostdev in-use state. 2/2 is the implementation of pci passthrough to libxl driver. There should be more patches to change qemu driver and lxc driver codes to switch to common library APIs, but I think it's better to have you review the common library first. After common library APIs confirmed, then modify qemu/lxc driver codes in a time. The implementation to libxl driver (2/2) is an example of using common library. Please review, thanks! Chunyan Liu (2): add pci passthrough common library add pci passthrough impl to libxl po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt.c | 5 + src/libvirt_private.syms | 15 + src/libxl/libxl_conf.c | 44 ++ src/libxl/libxl_driver.c | 21 +- src/util/virhostdevmanager.c | 1218 ++++++++++++++++++++++++++++++++++++++++++ src/util/virhostdevmanager.h | 91 ++++ src/util/virpci.c | 17 +- src/util/virpci.h | 7 +- src/util/virusb.c | 19 +- src/util/virusb.h | 4 +- 12 files changed, 1426 insertions(+), 17 deletions(-) create mode 100644 src/util/virhostdevmanager.c create mode 100644 src/util/virhostdevmanager.h

1 2

[libvirt] [PATCH] Expand documentation for LXC driver
by Daniel P. Berrange 16 May '13

16 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update the LXC driver documentation to describe the way containers are setup by default. Also describe the common virsh commands for managing containers and a little about the security. Placeholders for docs about configuring containers still to be filled in. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/drvlxc.html.in | 401 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 366 insertions(+), 35 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index beff214..a745956 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -3,49 +3,100 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <body> <h1>LXC container driver</h1> + + <ul id="toc"></ul> + <p> -The libvirt LXC driver manages "Linux Containers". Containers are sets of processes -with private namespaces which can (but don't always) look like separate machines, but -do not have their own OS. Here are two example configurations. The first is a very -light-weight "application container" which does not have its own root image. +The libvirt LXC driver manages "Linux Containers". At their simplest, containers +can just be thought of as a collection of processes, separated from the main +host processes via a set of resource namespaces and constrained via control +groups resource tunables. The libvirt LXC driver has no dependancy on the LXC +userspace tools hosted on sourceforge.net. It directly utilizers the relevant +kernel features to build the container environment. This allows for sharing +of many libvirt technologies across both the QEMU/KVM and LXC drivers. In +particular sVirt for mandatory access control, auditing of operations, +integration with control groups and many other features. </p> - <h2><a name="project">Project Links</a></h2> +<h2><a name="cgroups">Control groups Requirements</a></h2> - <ul> - <li> - The <a href="http://lxc.sourceforge.net/">LXC</a> Linux - container system - </li> - </ul> +<p> +In order to control the resource usage of processes inside containers, the +libvirt LXC driver requires that certain cgroups controllers are mounted on +the host OS. The minimum required controllers are 'cpuacct', 'memory' and +'devices', while recommended extra controllers are 'cpu', 'freezer' and +'blkio'. Libvirt will not mount the cgroups filesystem itself, leaving +this upto the init system to take care of. Systemd will do the right thing +in this repect, while for other init systems the <code>cgconfig</code> +init service will be required. For further information, consult the general +libvirt <a href="cgroups.html">cgroups documentation</a>. +</p> -<h2>Cgroups Requirements</h2> +<h2><a name="namespaces">Namespace requirements</a></h2> <p> -The libvirt LXC driver requires that certain cgroups controllers are -mounted on the host OS. The minimum required controllers are 'cpuacct', -'memory' and 'devices', while recommended extra controllers are -'cpu', 'freezer' and 'blkio'. The /etc/cgconfig.conf & cgconfig -init service used to mount cgroups at host boot time. To manually -mount them use: +In order to separate processes inside a container from those in the +primary "host" OS environment, the libvirt LXC driver requires that +certain kernel namespaces are compiled in. Libvirt currently requires +the 'mount', 'ipc', 'pid', and 'uts' namespaces to be available. If +separate network interfaces are desired, then the 'net' namespace is +requird. In the near future, the 'user' namespace will optionally be +supported. </p> -<pre> - # mount -t cgroup cgroup /dev/cgroup -o cpuacct,memory,devices,cpu,freezer,blkio -</pre> +<p> +<strong>NOTE: In the absence of support for the 'user' namespace, +processes inside containers cannot be securely isolated from host +process without the use of a mandatory access control technology +such as SELinux or AppArmor.</strong> +</p> + +<h2><a name="init">Default container setup</a></h2> + +<h3><a name="cliargs">Command line arguments</a></h3> <p> -NB, the blkio controller in some kernels will not allow creation of nested -sub-directories which will prevent correct operation of the libvirt LXC -driver. On such kernels, it may be necessary to unmount the blkio controller. +When the container "init" process is started, it will typically +not be given any command line arguments (eg the equivalent of +the bootloader args visible in <code>/proc/cmdline</code>). If +any arguments are desired, then must be explicitly set in the +container XML configuration via one or more <code>initarg</code> +elements. For example, to run <code>systemd --unit emergency.service</code> +would use the following XML </p> +<pre> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/systemd</init> + <initarg>--unit</initarg> + <initarg>emergency.service</initarg> + </os> +</pre> -<h2>Environment setup for the container init</h2> +<h3><a name="envvars">Environment variables</a></h3> <p> When the container "init" process is started, it will be given several useful -environment variables. +environment variables. The following standard environment variables are mandated +by <a href="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">systemd container interface</a> +to be provided by all container technologies on Linux. +</p> + +<dl> +<dt>container</dt> +<dd>The fixed string <code>libvirt-lxc</code> to identify libvirt as the creator</dd> +<dt>container_uuid</dt> +<dd>The UUID assigned to the container by libvirt</dd> +<dt>PATH</dt> +<dd>The fixed string <code>/bin:/usr/bin</code></dd> +<dt>TERM</dt> +<dd>The fixed string <code>linux</code></dd> +</dl> + +<p> +In addition to the standard variables, the following libvirt specific +environment variables are also provided </p> <dl> @@ -54,9 +105,152 @@ environment variables. <dt>LIBVIRT_LXC_UUID</dt> <dd>The UUID assigned to the container by libvirt</dd> <dt>LIBVIRT_LXC_CMDLINE</dt> -<dd>The unparsed command line arguments specified in the container configuration</dd> +<dd>The unparsed command line arguments specified in the container configuration. +Use of this is discouraged, in favour of passing arguments directly to the +container init process via the <code>initarg</code> config element.</dd> </dl> +<h3><a name="fsmounts">Filesystem mounts</a></h3> + +<p> +In the absence of any explicit configuration, the container will +inherit the host OS filesystem mounts. A number of mount points will +be made read only, or re-mounted with new instances to provide +container specific data. The following special mounts are setup +by libvirt +</p> + +<ul> +<li><code>/dev</code> a new "tmpfs" pre-populated with authorized device nodes</li> +<li><code>/dev/pts</code> a new private "devpts" instance for console devices</li> +<li><code>/sys</code> the host "sysfs" instance remounted read-only</li> +<li><code>/proc</code> a new instance of the "proc" filesystem</li> +<li><code>/proc/sys</code> the host "/proc/sys" bind-mounted read-only</li> +<li><code>/sys/fs/selinux</code> the host "selinux" instance remounted read-only</li> +<li><code>/sys/fs/cgroup/NNNN</code> the host cgroups controllers bind-mounted to +only expose the sub-tree associated with the container</li> +<li><code>/proc/meminfo</code> a FUSE backed file reflecting memory limits of the container</li> +</ul> + + +<h3><a name="devnodes">Device nodes</a></h3> + +<p> +The container init process will be started with <code>CAP_MKNOD</code> +capability removed & blocked from re-acquiring it. As such it will +not be able to create any device nodes in <code>/dev</code> or anywhere +else in its filesystems. Libvirt itself will take care of pre-populating +the <code>/dev</code> filesystem with any devices that the container +is authorized to use. The current devices that will be made available +to all containers are +</p> + +<ul> +<li><code>/dev/zero</code></li> +<li><code>/dev/null</code></li> +<li><code>/dev/full</code></li> +<li><code>/dev/random</code></li> +<li><code>/dev/urandom</code></li> +<li><code>/dev/stdin</code> symlinked to <code>/proc/self/fd/0</code></li> +<li><code>/dev/stdout</code> symlinked to <code>/proc/self/fd/1</code></li> +<li><code>/dev/stderr</code> symlinked to <code>/proc/self/fd/2</code></li> +<li><code>/dev/fd</code> symlinked to <code>/proc/self/fd</code></li> +<li><code>/dev/ptmx</code> symlinked to <code>/dev/pts/ptmx</code></li> +<li><code>/dev/console</code> symlinked to <code>/dev/pts/0</code></li> +</ul> + +<p> +In addition, for every console defined in the guest configuration, +a symlink will be created from <code>/dev/ttyN</code> symlinked to +the corresponding <code>/dev/pts/M</code> psuedo TTY device. The +first console will be <code>/dev/tty1</code>, with further consoles +numbered incrementally from there. +</p> + +<p> +Further block or character devices will be made available to containers +depending on their configuration. +</p> + + + +<h2>Container security</h2> + +<h3>sVirt SELinux</h3> + +<p> +In the absence of the "user" namespace being used, containers cannot +be considered secure against exploits of the host OS. The sVirt SELinux +driver provides a way to secure containers even when the "user" namespace +is not used. The cost is that writing a policy to allow execution of +arbitrary OS is not practical. The SELinux sVirt policy is typically +tailored to work with an simpler application confinement use case, +as provided by the "libvirt-sandbox" project. +</p> + +<h3>Auditing</h3> + +<p> +The LXC driver is integrated with libvirt's auditing subsystem, which +causes audit messages to be logged whenever there is an operation +performed against a container which has impact on host resources. +So for example, start/stop, device hotplug will all log audit messages +providing details about what action occurred & any resources +associated with it. There are the following 3 types of audit messages +</p> + +<ul> +<li><code>VIRT_MACHINE_ID</code> - details of the SELinux process and +image security labels assigned to the container.</li> +<li><code>VIRT_CONTROL</code> - details of an action / operation +performed against a container. There are the following types of +operation + <ul> + <li><code>op=start</code> - a container has been started. Provides + the machine name, uuid and PID of the <code>libvirt_lxc</code> + controller process</li> + <li><code>op=init</code> - the init PID of the container has been + started. Provides the machine name, uuid and PID of the + <code>libvirt_lxc</code> controller process and PID of the + init process (in the host PID namespace)</li> + <li><code>op=stop</code> - a container has been stopped. Provides + the machine name, uuid</li> + </ul> +</li> +<li><code>VIRT_RESOURCE</code> - details of a host resource +associated with a container action.</li> +</ul> + +<h3>Device access</h3> + +<p> +All containers are launched with the CAP_MKNOD capability cleared +and removed from the bounding set. Libvirt will ensure that the +/dev filesystem is pre-populated with all devices that a container +is allowed to use. In addition, the cgroup "device" controller is +configured to block read/write/mknod from all devices except those +that a container is authorized to use. +</p> + +<h2><a name="exconfig">Example configurations</a></h2> <h3>Example config version 1</h3> <p></p> @@ -121,21 +315,158 @@ debootstrap, whatever) under /opt/vm-1-root: </domain> </pre> + +<h2><a name="usage">Container usage / management</a></h2> + +<p> +As with any libvirt virtualization driver, LXC containers can be +managed via a wide variety of libvirt based tools. At the lowest +level the <code>virsh</code> command can be used to perform many +tasks, by passing the <code>-c lxc:///</code> argument. As an +alternative to repeating the URI with every command, the <code>LIBVIRT_DEFAULT_URI</code> +environment variable can be set to <code>lxc:///</code>. The +examples that follow outline some common operations with virsh +and LXC. For further details about usage of virsh consult its +manual page. +</p> + +<h3><a name="usageSave">Defining (saving) container configuration></a></h3> + <p> -In both cases, you can define and start a container using:</p> +The <code>virsh define</code> command takes an XML configuration +document and loads it into libvirt, saving the configuration on disk +</p> + +<pre> +# virsh -c lxc:/// define myguest.xml +</pre> + +<h3><a name="usageView">Viewing container configuration</a></h3> + +<p> +The <code>virsh dumpxml</code> command can be used to view the +current XML configuration of a container. By default the XML +output reflects the current state of the container. If the +container is running, it is possible to explicitly request the +persistent configuration, instead of the current live configuration +using the <code>--inactive</code> flag +</p> + +<pre> +# virsh -c lxc:/// dumpxml myguest +</pre> + +<h3><a name="usageStart">Starting containers</a></h3> + +<p> +The <code>virsh start</code> command can be used to start a +container from a previously defined persistent configuration +</p> + +<pre> +# virsh -c lxc:/// start myguest +</pre> + +<p> +It is also possible to start so called "transient" containers, +which do not require a persistent configuration to be saved +by libvirt, using the <code>virsh create</code> command. +</p> + <pre> -virsh --connect lxc:/// define v1.xml -virsh --connect lxc:/// start vm1 +# virsh -c lxc:/// create myguest.xml </pre> -and then get a console using: + + +<h3><a name="usageStop">Stopping containers</a></h3> + +<p> +The <code>virsh shutdown</code> command can be used +to request a graceful shutdown of the container. By default +this command will first attempt to send a message to the +init process via the <code>/dev/initctl</code> device node. +If no such device node exists, then it will send SIGTERM +to PID 1 inside the container. +</p> + <pre> -virsh --connect lxc:/// console vm1 +# virsh -c lxc:/// shutdown myguest </pre> -<p>Now doing 'ps -ef' will only show processes in the container, for -instance. You can undefine it using + +<p> +If the container does not respond to the graceful shutdown +request, it can be forceably stopped using the <code>virsh destroy</code> </p> + <pre> -virsh --connect lxc:/// undefine vm1 +# virsh -c lxc:/// destroy myguest </pre> + + +<h3><a name="usageReboot">Rebooting a container</a></h3> + +<p> +The <code>virsh reboot</code> command can be used +to request a graceful shutdown of the container. By default +this command will first attempt to send a message to the +init process via the <code>/dev/initctl</code> device node. +If no such device node exists, then it will send SIGHUP +to PID 1 inside the container. +</p> + +<pre> +# virsh -c lxc:/// reboot myguest +</pre> + +<h3><a name="usageDelete">Undefining (deleting) a container configuration</a></h3> + +<p> +The <code>virsh undefine</code> command can be used to delete the +persistent configuration of a container. If the guest is currently +running, this will turn it into a "transient" guest. +</p> + +<pre> +# virsh -c lxc:/// undefine myguest +</pre> + +<h3><a name="usageConnect">Connecting to a container console</a></h3> + +<p> +The <code>virsh console</code> command can be used to connect +to the text console associated with a container. If the container +has been configured with multiple console devices, then the +<code>--devname</code> argument can be used to choose the +console to connect to +</p> + +<pre> +# virsh -c lxc:/// console myguest +</pre> + +<h3><a name="usageEnter">Running commands in a container</a></h3> + +<p> +The <code>virsh lxc-enter-namespace</code> command can be used +to enter the namespaces & security context of a container +and then execute an arbitrary command. +</p> + +<pre> +# virsh -c lxc:/// lxc-enter-namespace myguest -- /bin/ls -al /dev +</pre> + +<h3><a name="usageTop">Monitoring container utilization</a></h3> + +<p> +The <code>virt-top</code> command can be used to monitor the +activity & resource utilization of all containers on a +host +</p> + +<pre> +# virt-top -c lxc:/// +</pre> + </body> </html> -- 1.8.1.4

2 1

[libvirt] [PATCH 0/2] VIR_STRDUP ease of use
by Eric Blake 16 May '13

16 May '13

As pointed out during my (ongoing) review of Michal's series, I think that letting VIR_STRDUP take a NULL source can make it easier to use; I also think that documenting the guarantee that it evaluates arguments exactly once is worth enforcing. Hmm, I guess that means I should write a 3/2 patch that enhances the testsuite to intentionally do a side effect and show that it happens exactly once. Eric Blake (2): alloc: make VIR_APPEND_ELEMENT safer string: make VIR_STRDUP easier to use HACKING | 19 ++++++++++++------- docs/hacking.html.in | 16 ++++++++++++---- src/util/viralloc.c | 9 ++++++--- src/util/viralloc.h | 36 +++++++++++++++++++++++++++--------- src/util/virstring.c | 12 ++++++++---- src/util/virstring.h | 22 ++++++++++++++++------ 6 files changed, 81 insertions(+), 33 deletions(-) -- 1.8.1.4

3 7

[libvirt] [PATCH v3] virsh: lookup interface by name or mac other than one by one
by Guannan Ren 16 May '13

16 May '13

Change virMacAddrParse() to accept NULL addr for mac address testing purpose. --- src/util/virmacaddr.c | 3 ++- tools/virsh-interface.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index c4ca0a8..8e41844 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -166,7 +166,8 @@ virMacAddrParse(const char* str, virMacAddrPtr addr) (0xFF < result)) break; - addr->addr[i] = (unsigned char) result; + if (addr) + addr->addr[i] = (unsigned char) result; if ((i == 5) && (*end_ptr == '\0')) return 0; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index f75c572..74b4ed7 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -35,6 +35,7 @@ #include "virbuffer.h" #include "viralloc.h" #include "virfile.h" +#include "virmacaddr.h" #include "virutil.h" #include "virxml.h" #include "virstring.h" @@ -46,6 +47,7 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, { virInterfacePtr iface = NULL; const char *n = NULL; + bool is_mac = false; virCheckFlags(VSH_BYNAME | VSH_BYMAC, NULL); if (!optname) @@ -62,14 +64,17 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, if (name) *name = n; + if (virMacAddrParse(n, NULL) == 0) + is_mac = true; + /* try it by NAME */ - if (flags & VSH_BYNAME) { + if (!is_mac && (flags & VSH_BYNAME)) { vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface NAME\n", cmd->def->name, optname); iface = virInterfaceLookupByName(ctl->conn, n); - } + /* try it by MAC */ - if (!iface && (flags & VSH_BYMAC)) { + } else if (is_mac && (flags & VSH_BYMAC)) { vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface MAC\n", cmd->def->name, optname); iface = virInterfaceLookupByMACString(ctl->conn, n); -- 1.8.1.4

3 4

[libvirt] [PATCH v4] nwfilter: check for inverted ctdir
by Stefan Berger 16 May '13

16 May '13

Linux netfilter at some point (Linux 2.6.39) inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We check for the kernel version and assume that all Linux kernels with version 2.6.39 have the newer inverted logic. Any distro backporting the Linux kernel patch that inverts the --ctdir logic (Linux commit 96120d86f) must also backport this patch for Linux and adapt the kernel version being tested for. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- v2->v3: - using uname now to check for Linux kernel version number v1->v2: - using virSocketAddrParseIPv4 --- src/nwfilter/nwfilter_ebiptables_driver.c | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -27,6 +27,7 @@ #include <string.h> #include <sys/stat.h> #include <fcntl.h> +#include <sys/utsname.h> #include "internal.h" @@ -85,6 +86,17 @@ static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; +/* + * --ctdir original vs. --ctdir reply's meaning was inverted in netfilter + * at some point (Linux 2.6.39) + */ +enum ctdirStatus { + CTDIR_STATUS_UNKNOWN = 0, + CTDIR_STATUS_CORRECTED = 1, + CTDIR_STATUS_OLD = 2, +}; +static enum ctdirStatus iptables_ctdir_corrected; + #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) #define PRINT_CHAIN(buf, prefix, ifname, suffix) \ @@ -1262,6 +1274,17 @@ iptablesEnforceDirection(int directionIn virNWFilterRuleDefPtr rule, virBufferPtr buf) { + switch (iptables_ctdir_corrected) { + case CTDIR_STATUS_UNKNOWN: + /* could not be determined or s.th. is seriously wrong */ + return; + case CTDIR_STATUS_CORRECTED: + directionIn = !directionIn; + break; + case CTDIR_STATUS_OLD: + break; + } + if (rule->tt != VIR_NWFILTER_RULE_DIRECTION_INOUT) virBufferAsprintf(buf, " -m conntrack --ctdir %s", (directionIn) ? "Original" @@ -4304,6 +4327,32 @@ ebiptablesDriverTestCLITools(void) return ret; } +static void +ebiptablesDriverProbeCtdir(void) +{ + struct utsname utsname; + unsigned long thisversion; + + iptables_ctdir_corrected = CTDIR_STATUS_UNKNOWN; + + if (uname(&utsname) < 0) { + VIR_ERROR(_("Call to utsname failed: %d"), errno); + return; + } + + /* following Linux lxr, the logic was inverted in 2.6.39 */ + if (virParseVersionString(utsname.release, &thisversion, true) < 0) { + VIR_ERROR(_("Could not determine kernel version from string %s"), + utsname.release); + return; + } + + if (thisversion >= 2 * 1000000 + 6 * 1000 + 39) + iptables_ctdir_corrected = CTDIR_STATUS_CORRECTED; + else + iptables_ctdir_corrected = CTDIR_STATUS_OLD; +} + static int ebiptablesDriverInit(bool privileged) { @@ -4341,6 +4390,9 @@ ebiptablesDriverInit(bool privileged) return -ENOTSUP; } + if (iptables_cmd_path) + ebiptablesDriverProbeCtdir(); + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; return 0;

3 2

[libvirt] [PATCH] FreeBSD: disable buggy -fstack-protector-all
by Roman Bogorodskiy 16 May '13

16 May '13

FreeBSD ships an old gcc 4.2.1 which generates bogus code, e.g. getsockopt() call returns struct xucred with bogus values, which doesn't even allow to connect to libvirtd: error: Failed to find group record for gid '1284660778': No error: 0 So roll back to just -fstack-protector on FreeBSD. --- m4/virt-compile-warnings.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index dc0e7d7..ce4e244 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -191,7 +191,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl -fstack-protector stuff passes gl_WARN_ADD with gcc dnl on Mingw32, but fails when actually used case $host in - *-*-linux*|*-*-freebsd*) + *-*-linux*) dnl Fedora only uses -fstack-protector, but doesn't seem to dnl be great overhead in adding -fstack-protector-all instead dnl gl_WARN_ADD([-fstack-protector]) @@ -205,6 +205,13 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl off the following clang specific warning gl_WARN_ADD([-Wno-unused-command-line-argument]) ;; + *-*-freebsd*) + dnl FreeBSD ships old gcc 4.2.1 which doesn't handle + dnl -fstack-protector-all well + gl_WARN_ADD([-fstack-protector]) + + gl_WARN_ADD([-Wno-unused-command-line-argument]) + ;; esac gl_WARN_ADD([-fexceptions]) gl_WARN_ADD([-fasynchronous-unwind-tables]) -- 1.8.0

3 2

[libvirt] [PATCH v2 0/4] Extra validation for the <sysinfo> section
by John Ferlan 16 May '13

16 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=890494 The <sysinfo> section needs an extra uuid validation check. The current check compares the numerical sysinfo/system_uuid with the domain uuid; however, it's possible that someone added extra hyphens into the sysinfo uuid which results in the inability to start the domain (at least qemu). Rather than fail due to improper format, adjust/save to the expected format. The bug report indicates the 'date' field should at least be syntax checked based on what's desribed in the SMBIOS spec. From the spec: "String number of the BIOS release date. The date string, if supplied, is in either mm/dd/yy or mm/dd/yyyy format. If the year portion of the string is two digits, the year is assumed to be 19yy. NOTE: The mm/dd/yyyy format is required for SMBIOS version 2.3 and later" v2 -> v1 differences: - Moved Sysinfo field validation checks from virDomainDefParseXML() into virSysinfoParseXML() - As long as the virUUIDParse() value matches the domain's UUID field save the 'correct' format in the system_uuid field - that is don't error out just because of extraneous space or dash in provided UUID. - Added tests for date field and uuid comparison parsing errors. NOTE: 01 and 02 are unchanged John Ferlan (4): docs: Fix syntax in sysinfo description docs: Update description of SMBIOS fields Validate the bios_date format for <sysinfo> Adjust improperly formatted <sysinfo> uuid docs/formatdomain.html.in | 51 +++++++++++--- src/conf/domain_conf.c | 78 ++++++++++++++++------ .../qemuxml2argvdata/qemuxml2argv-smbios-date.xml | 23 +++++++ .../qemuxml2argv-smbios-uuid-match.xml | 23 +++++++ tests/qemuxml2argvtest.c | 2 + 5 files changed, 148 insertions(+), 29 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smbios-uuid-match.xml -- 1.8.1.4

2 11

[libvirt] [PATCH] Don't mount selinux fs in LXC if selinux is disabled
by Daniel P. Berrange 16 May '13

16 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Before trying to mount the selinux filesystem in a container use is_selinux_enabled() to check if the machine actually has selinux support (eg not booted with selinux=0) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1a80376..a1b6aff 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -52,6 +52,10 @@ # include <blkid/blkid.h> #endif +#if WITH_SELINUX +# include <selinux/selinux.h> +#endif + #include "virerror.h" #include "virlog.h" #include "lxc_container.h" @@ -698,6 +702,12 @@ static int lxcContainerMountBasicFS(char *sec_mount_options) (access(srcpath, R_OK) < 0)) continue; +#if WITH_SELINUX + if (STREQ(mnts[i].src, SELINUX_MOUNT) && + !is_selinux_enabled()) + continue; +#endif + if (virFileMakePath(mnts[i].dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), -- 1.8.2.1

2 1

[libvirt] This patch tells SELinux a name to associate with the MCS Label.
by dwalsh＠redhat.com 15 May '13

15 May '13

[PATCH 1/1] libvirt patch to write a mcs translation file to

2 2

[libvirt] [libvirt PATCH] qemu: Support discard for disk
by Osier Yang 15 May '13

15 May '13

QEMU introduced "discard" option for drive since commit a9384aff53, <...> @var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. Some machine types may not support discard requests. </...> This patch exposes the support in libvirt. QEMU supported "discard" for "-drive" since v1.5.0-rc0: % git tag --contains a9384aff53 contains v1.5.0-rc0 v1.5.0-rc1 So this only detects the capability bit using virQEMUCapsProbeQMPCommandLine. --- This is on top of https://www.redhat.com/archives/libvir-list/2013-May/msg00979.html --- docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 +++++++ src/conf/domain_conf.c | 18 +++++++++++ src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 +++++++ .../qemuxml2argv-disk-drive-discard.args | 8 +++++ .../qemuxml2argv-disk-drive-discard.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 2 ++ 12 files changed, 112 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9ade507..a73d72e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1681,6 +1681,14 @@ network. By default copy-on-read is off. <span class='since'>Since 0.9.10 (QEMU and KVM only)</span> </li> + <li> + The optional <code>discard</code> attribute controls whether + to discard (also known as "trim" or "unmap") requests are + ignored or passed to the filesystem. The value can be either + "on" (allow the discard request to be passed) or "off" (ingore + the discard request). + <span class='since'>Since 1.0.6 (QEMU and KVM only)</span> + </li> </ul> </dd> <dt><code>boot</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8004428..2083e95 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1304,6 +1304,9 @@ <optional> <ref name="copy_on_read"/> </optional> + <optional> + <ref name="discard"/> + </optional> <empty/> </element> </define> @@ -1399,6 +1402,14 @@ <value>off</value> </choice> </attribute> + </define> + <define name="discard"> + <attribute name='discard'> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> </define> <define name="controller"> <element name="controller"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 862b997..f632c02 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -743,6 +743,10 @@ VIR_ENUM_IMPL(virDomainTPMModel, VIR_DOMAIN_TPM_MODEL_LAST, VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST, "passthrough") +VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST, + "default", + "on", + "off") #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE @@ -4534,6 +4538,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, char *wwn = NULL; char *vendor = NULL; char *product = NULL; + char *discard = NULL; int expected_secret_usage = -1; int auth_secret_usage = -1; @@ -4761,6 +4766,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); copy_on_read = virXMLPropString(cur, "copy_on_read"); + discard = virXMLPropString(cur, "discard"); } else if (!mirror && xmlStrEqual(cur->name, BAD_CAST "mirror") && !(flags & VIR_DOMAIN_XML_INACTIVE)) { char *ready; @@ -5207,6 +5213,14 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, def->copy_on_read = cor; } + if (discard) { + if ((def->discard = virDomainDiskDiscardTypeFromString(discard)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk discard mode '%s'"), discard); + goto error; + } + } + if (devaddr) { if (virDomainParseLegacyDeviceAddress(devaddr, &def->info.addr.pci) < 0) { @@ -5326,6 +5340,7 @@ cleanup: VIR_FREE(ioeventfd); VIR_FREE(event_idx); VIR_FREE(copy_on_read); + VIR_FREE(discard); VIR_FREE(devaddr); VIR_FREE(serial); virStorageEncryptionFree(encryption); @@ -13642,6 +13657,7 @@ virDomainDiskDefFormat(virBufferPtr buf, const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); const char *copy_on_read = virDomainVirtioEventIdxTypeToString(def->copy_on_read); const char *sgio = virDomainDiskSGIOTypeToString(def->sgio); + const char *discard = virDomainDiskDiscardTypeToString(def->discard); char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -13718,6 +13734,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " event_idx='%s'", event_idx); if (def->copy_on_read) virBufferAsprintf(buf, " copy_on_read='%s'", copy_on_read); + if (def->discard) + virBufferAsprintf(buf, " discard='%s'", discard); virBufferAddLit(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a9d3410..67ea91e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -625,6 +625,14 @@ enum virDomainDiskSGIO { VIR_DOMAIN_DISK_SGIO_LAST }; +enum virDomainDiskDiscard { + VIR_DOMAIN_DISK_DISCARD_DEFAULT = 0, + VIR_DOMAIN_DISK_DISCARD_ON, + VIR_DOMAIN_DISK_DISCARD_OFF, + + VIR_DOMAIN_DISK_DISCARD_LAST +}; + typedef struct _virDomainBlockIoTuneInfo virDomainBlockIoTuneInfo; struct _virDomainBlockIoTuneInfo { unsigned long long total_bytes_sec; @@ -707,6 +715,7 @@ struct _virDomainDiskDef { bool rawio_specified; int rawio; /* no = 0, yes = 1 */ int sgio; /* enum virDomainDiskSGIO */ + int discard; /* enum virDomainDiskDiscard */ size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; @@ -2462,6 +2471,7 @@ VIR_ENUM_DECL(virDomainDiskIo) VIR_ENUM_DECL(virDomainDiskSecretType) VIR_ENUM_DECL(virDomainDiskSGIO) VIR_ENUM_DECL(virDomainDiskTray) +VIR_ENUM_DECL(virDomainDiskDiscard) VIR_ENUM_DECL(virDomainIoEventFd) VIR_ENUM_DECL(virDomainVirtioEventIdx) VIR_ENUM_DECL(virDomainDiskCopyOnRead) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cdd0b41..cc734da 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -142,6 +142,7 @@ virDomainDiskDefFree; virDomainDiskDefGenSecurityLabelDef; virDomainDiskDefGetSecurityLabelDef; virDomainDiskDeviceTypeToString; +virDomainDiskDiscardTypeToString; virDomainDiskErrorPolicyTypeFromString; virDomainDiskErrorPolicyTypeToString; virDomainDiskFindByBusAndDst; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c711e92..e6cb091 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -228,6 +228,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "scsi-generic.bootindex", /* 145 */ "mem-merge", + "drive-discard", ); struct _virQEMUCaps { @@ -2243,6 +2244,7 @@ struct virQEMUCapsCommandLineProps { static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, + { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 477e526..e30a550 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -185,6 +185,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ + QEMU_CAPS_DRIVE_DISCARD = 147, /* -drive discard=off(ignore)|on(unmap) */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eddc263..053f553 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3267,6 +3267,17 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } } + if (disk->discard) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) { + virBufferAsprintf(&opt, ",discard=%s", + virDomainDiskDiscardTypeToString(disk->discard)); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("discard is not supported by this QEMU binary")); + goto error; + } + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON)) { const char *wpolicy = NULL, *rpolicy = NULL; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args new file mode 100644 index 0000000..02e2ddb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=on \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=off \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml new file mode 100644 index 0000000..a6a8135 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>test</name> + <uuid>92d7a226-cfae-425b-a6d3-00bbf9ec5c9e</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.13'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' discard='on'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw' discard='off'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 98ceb83..46dd7de 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -579,6 +579,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); + DO_TEST("disk-drive-discard", + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_DISCARD, + QEMU_CAPS_DEVICE); DO_TEST("disk-snapshot", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("event_idx", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 492ac60..ffb0e87 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -259,6 +259,8 @@ mymain(void) DO_TEST("disk-scsi-disk-vpd"); DO_TEST("disk-source-pool"); + DO_TEST("disk-drive-discard"); + DO_TEST("virtio-rng-random"); DO_TEST("virtio-rng-egd"); -- 1.8.1.4

4 8

[libvirt] This patch is needed for openshift domains to run ps command
by dwalsh＠redhat.com 15 May '13

15 May '13

I thought I sent this patch before, but I can not find a record of it, and do not see it in upstream. [PATCH] Change label of fusefs mounted at /proc/meminfo in lxc

2 2

[libvirt] [PATCH 0/4] Misc cleanups & fixes to LXC driver
by Daniel P. Berrange 15 May '13

15 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series starts with a few cleanup patches removing code that is no longer required. The final patch fixes an important bug preventing LXC startup on certain distros which unwisely chose to make /var/run an absolute symlink instead of a relative symlink Daniel P. Berrange (4): Remove obsolete pivotRoot flag in LXC driver Stop passing around old root directory prefix Remove obsolete skipRoot flag in LXC driver Fix LXC startup when /var/run is an absolute symlink src/lxc/lxc_container.c | 139 ++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 74 deletions(-) -- 1.8.2.1

3 8

[libvirt] [PATCH 0/4] Fix issues with guest lifecycle event action settings
by John Ferlan 15 May '13

15 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=916052 Domain lifecycle events "on_reboot" and "on_poweroff" translate into QEMU command options "no-reboot" and "no-shutdown" at startup time. The existing code only checked the "on_reboot" setting to determine whether to add the "no-reboot" option even though "on_poweroff" could have been set to allow reboot. Changed the logic to only use "no-reboot" if each of the lifecycle event actions was "destroy". I considered adding "preserve" as well; however, a future preserve action might be able to cull something from a qemu process that doesn't just exit immediately. NB, previously it was possible to have both QEMU command options on the command line, which while not tagged as an error could be considered "odd". During the shutdown or reboot domain operations, the calls to qemuAgentShutdown and qemuDomainSetFakeReboot did not consider the possibility that the event action for shutdown was reboot or the event action for reboot was destroy. This patch fixes that. NB, I wasn't sure how I could "convey" that to the user though. The virsh reboot will still issue the message "Domain is being rebooted" even though it could be destroyed. Like was virsh shutdown will still issue the message "Domain is being shutdown" even though it is being rebooted. The usage of VIR_INFO was an attempt to do that even though one would have to have the correct debug level set. Adjusted the documentation in order to describe the possible actions based on the event lifecycle action settings of the domain. John Ferlan (4): Adjust usage of qemu -no-reboot and -no-shutdown options Adjust comments to describe on_poweroff and on_reboot action Handle the domain event 'on_reboot' and 'on_poweroff' settings docs: Update formatdomain for lifecycle events docs/formatdomain.html.in | 30 ++++++++++++++++++++++-------- src/libvirt.c | 15 +++++++++++---- src/qemu/qemu_command.c | 17 +++++++++++++---- src/qemu/qemu_driver.c | 26 ++++++++++++++++++++++---- 4 files changed, 68 insertions(+), 20 deletions(-) -- 1.8.1.4

3 10

[libvirt] [PATCH v2] interface: report generic error message of lookup failure
by Guannan Ren 15 May '13

15 May '13

"couldn't find interface named" "couldn't find interface with MAC address" use generic message as follows "couldn't find interface with" --- src/interface/interface_backend_netcf.c | 16 ++++++++-------- src/interface/interface_backend_udev.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index cbba4fd..c6f3f42 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -104,12 +104,12 @@ static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfac int errcode = ncf_error(ncf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface with '%s': %s%s%s"), ifinfo->name, errmsg, details ? " - " : "", details ? details : ""); } else { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), + _("couldn't find interface with '%s'"), ifinfo->name); } } @@ -334,7 +334,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface with '%s': %s%s%s"), names[i], errmsg, details ? " - " : "", details ? details : ""); goto cleanup; @@ -342,7 +342,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, /* Ignore the NETCF_NOERROR, as the interface is very likely * deleted by other management apps (e.g. virt-manager). */ - VIR_WARN("couldn't find interface named '%s', might be " + VIR_WARN("couldn't find interface with '%s', might be " "deleted by other process", names[i]); continue; } @@ -421,12 +421,12 @@ static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface with '%s': %s%s%s"), name, errmsg, details ? " - " : "", details ? details : ""); } else { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), name); + _("couldn't find interface with '%s'"), name); } goto cleanup; } @@ -454,14 +454,14 @@ static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface with MAC address '%s': %s%s%s"), + _("couldn't find interface with '%s': %s%s%s"), macstr, errmsg, details ? " - " : "", details ? details : ""); goto cleanup; } if (niface == 0) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface with MAC address '%s'"), + _("couldn't find interface with '%s'"), macstr); goto cleanup; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1fd7d46..e61be52 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -420,7 +420,7 @@ udevInterfaceLookupByName(virConnectPtr conn, const char *name) dev = udev_device_new_from_subsystem_sysname(udev, "net", name); if (!dev) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), + _("couldn't find interface with '%s'"), name); goto cleanup; } @@ -467,7 +467,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) /* Check that we got something back */ if (!dev_entry) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface with MAC address '%s'"), + _("couldn't find interface with '%s'"), macstr); goto cleanup; } @@ -940,7 +940,7 @@ udevGetIfaceDef(struct udev *udev, const char *name) dev = udev_device_new_from_subsystem_sysname(udev, "net", name); if (!dev) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), name); + _("couldn't find interface with '%s'"), name); goto error; } @@ -1068,7 +1068,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) ifinfo->name); if (!dev) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), + _("couldn't find interface with '%s'"), ifinfo->name); status = -1; goto cleanup; -- 1.8.1.4

2 2

[libvirt] Build failed in Jenkins: libvirt-check #1003
by Guido Günther 15 May '13

15 May '13

Hi, I don't have time to look into these test failurs in detail atm: but it seems that one of these commits broke qemuxml2argvtest: qemu: New cap flags for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi host device rng: Interleave hostdev elements for more detail see below. Cheers, -- Guido See <http://honk.sigxcpu.org:8001/job/libvirt-check/997/> ------------------------------------------ [...truncated 798 lines...] .. 2 OK PASS: viratomictest TEST: utiltest ... 3 OK PASS: utiltest TEST: shunloadtest . 1 OK PASS: shunloadtest TEST: virtimetest ............... 15 OK PASS: virtimetest TEST: viruritest .................. 18 OK PASS: viruritest TEST: virkeyfiletest . 1 OK PASS: virkeyfiletest TEST: virauthconfigtest ...... 6 OK PASS: virauthconfigtest TEST: virbitmaptest ........ 8 OK PASS: virbitmaptest TEST: vircgrouptest ........ 8 OK PASS: vircgrouptest TEST: virendiantest .. 2 OK PASS: virendiantest TEST: viridentitytest .. 2 OK PASS: viridentitytest TEST: virkeycodetest .. 2 OK PASS: virkeycodetest TEST: virlockspacetest ....... 7 OK PASS: virlockspacetest TEST: virstringtest .............. 14 OK PASS: virstringtest TEST: virportallocatortest .. 2 OK PASS: virportallocatortest TEST: sysinfotest . 1 OK PASS: sysinfotest TEST: virstoragetest ........................................ 40 ............. 53 OK PASS: virstoragetest TEST: fdstreamtest .... 4 OK PASS: fdstreamtest TEST: fchosttest ..... 5 OK PASS: fchosttest TEST: virnettlscontexttest ........................................ 40 ........ 48 OK PASS: virnettlscontexttest TEST: securityselinuxtest SKIP: securityselinuxtest TEST: securityselinuxlabeltest SKIP: securityselinuxlabeltest TEST: virdrivermoduletest .......... 10 OK PASS: virdrivermoduletest TEST: xml2sexprtest ........................................ 40 ............. 53 OK PASS: xml2sexprtest TEST: sexpr2xmltest ........................................ 40 ........... 51 OK PASS: sexpr2xmltest TEST: xmconfigtest ........................................ 40 .......................... 66 OK PASS: xmconfigtest TEST: xencapstest .......... 10 OK PASS: xencapstest TEST: statstest SKIP: statstest TEST: reconnect SKIP: reconnect TEST: qemuxml2argvtest ........................................ 40 ........................................ 80 ........................................ 120 ........................................ 160 ........................................ 200 ........................................ 240 ........................................ 280 .........!!!! 293 FAIL FAIL: qemuxml2argvtest TEST: qemuxml2xmltest ........................................ 40 ........................................ 80 ........................................ 120 ................... 139 OK PASS: qemuxml2xmltest TEST: qemuxmlnstest ....... 7 OK PASS: qemuxmlnstest TEST: qemuargv2xmltest ........................................ 40 ........................................ 80 ... 83 OK PASS: qemuargv2xmltest TEST: qemuhelptest ................. 17 OK PASS: qemuhelptest TEST: domainsnapshotxml2xmltest ........ 8 OK PASS: domainsnapshotxml2xmltest TEST: qemumonitortest .. 2 OK PASS: qemumonitortest TEST: qemumonitorjsontest ...... 6 OK PASS: qemumonitorjsontest TEST: lxcxml2xmltest ... 3 OK PASS: lxcxml2xmltest TEST: openvzutilstest .. 2 OK PASS: openvzutilstest TEST: vmx2xmltest ........................................ 40 .......... 50 OK PASS: vmx2xmltest TEST: xml2vmxtest ........................................ 40 ..... 45 OK PASS: xml2vmxtest TEST: jsontest .... 4 OK PASS: jsontest TEST: networkxml2xmltest .................. 18 OK PASS: networkxml2xmltest TEST: networkxml2conftest ............ 12 OK PASS: networkxml2conftest TEST: nwfilterxml2xmltest ........................................ 40 . 41 OK PASS: nwfilterxml2xmltest TEST: storagevolxml2argvtest ........... 11 OK PASS: storagevolxml2argvtest TEST: storagevolxml2xmltest ....... 7 OK PASS: storagevolxml2xmltest TEST: storagepoolxml2xmltest ............... 15 OK PASS: storagepoolxml2xmltest TEST: nodedevxml2xmltest ............. 13 OK PASS: nodedevxml2xmltest TEST: interfacexml2xmltest ................... 19 OK PASS: interfacexml2xmltest TEST: cputest ........................................ 40 .......................... 66 OK PASS: cputest TEST: eventtest ............... 15 OK PASS: eventtest TEST: libvirtdconftest ....................................... 39 OK PASS: libvirtdconftest TEST: capabilityschematest .............. 14 OK PASS: capabilityschematest TEST: interfaceschematest .................. 18 OK PASS: interfaceschematest TEST: networkschematest ........................................ 40 . 41 OK PASS: networkschematest TEST: storagepoolschematest ................................ 32 OK PASS: storagepoolschematest TEST: storagevolschematest .............. 14 OK PASS: storagevolschematest TEST: domainschematest ........................................ 40 ........................................ 80 ........................................ 120 ........................................ 160 ........................................ 200 ........................................ 240 ........................................ 280 ........................................ 320 ........................................ 360 ........................................ 400 ........................................ 440 .............................. 470 OK PASS: domainschematest TEST: nodedevschematest ............... 15 OK PASS: nodedevschematest TEST: nwfilterschematest ........................................ 40 . 41 OK PASS: nwfilterschematest TEST: domainsnapshotschematest ............... 15 OK PASS: domainsnapshotschematest TEST: test_conf.sh .. 2 OK PASS: test_conf.sh PASS: cpuset PASS: define-dev-segfault PASS: int-overflow PASS: libvirtd-fail PASS: libvirtd-pool PASS: read-bufsiz PASS: read-non-seekable PASS: start PASS: vcpupin TEST: virsh-all ........................................ 40 ........................................ 80 ........................................ 120 ........................................ 160 ...................................... 198 OK PASS: virsh-all PASS: virsh-optparse PASS: virsh-schedinfo PASS: virsh-synopsis PASS: virsh-undefine ======================================= 1 of 82 tests failed (4 tests were not run) Please report to libvir-list(a)redhat.com ======================================= make[2]: *** [check-TESTS] Error 1 make[2]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/tests'> make[1]: *** [check-am] Error 2 make[1]: Leaving directory `<http://honk.sigxcpu.org:8001/job/libvirt-check/ws/tests'> make: *** [check-recursive] Error 1 Build step 'Execute shell' marked build as failure

3 7

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 1.0.5
by Daniel P. Berrange 15 May '13

15 May '13

I am pleased to announce that release 1.0.5 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.0.5.tar.gz Changed in this release: - Add all new APIs and constants in libvirt 1.0.4 and 1.0.5 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] Update to COPYING.LIB to latest LGPLv2.1 copy
by Christophe Fergeau 15 May '13

15 May '13

The text version of LGPLv2.1 available at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt is slightly different from COPYING.LIB: - several paragraphs were rewrapped - the FSF address has changed, so the license has been changed to indicate the newer address I've checked that there are no changes in the license text apart from the updated address, which is what I want to fix with this commit. --- COPYING.LIB | 82 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/COPYING.LIB b/COPYING.LIB index 89d4489..4362b49 100644 --- a/COPYING.LIB +++ b/COPYING.LIB @@ -1,9 +1,8 @@ - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. +strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that @@ -57,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. -^L + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. @@ -113,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. -^L + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -138,8 +136,8 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. +interface definition files, plus the scripts used to control compilation +and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of @@ -218,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. -^L + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -269,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. -^L + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -305,10 +303,10 @@ of these things: the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above @@ -331,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. -^L + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -372,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. -^L + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any @@ -407,11 +404,11 @@ be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. @@ -425,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. -^L + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -459,21 +456,19 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS -^L + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright (C) <year> <name of author> @@ -490,17 +485,16 @@ notice is found. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. + library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice -- 1.8.1.4

3 7

[libvirt] [PATCH v3 0/2] VNC WebSocket support
by Martin Kletzander 15 May '13

15 May '13

I'm re-sending this series even after previous ACK, because I've found out there was missing virPortAllocatorRelease call when disposing of domain. There were also many cleanups in the meantime and both John and Eric found out some nits in the previous series. I also *somehow* lost the tests (not even git-reflog found them) and had to re-create them again. Martin Kletzander (2): Add VNC WebSocket support qemu: Add VNC WebSocket support docs/formatdomain.html.in | 5 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 16 ++++++ src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 6 +++ src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 60 +++++++++++++++++++++- src/qemu/qemu_command.h | 3 ++ src/qemu/qemu_conf.c | 32 ++++++++++++ src/qemu/qemu_conf.h | 6 +++ src/qemu/qemu_driver.c | 5 ++ src/qemu/qemu_process.c | 44 ++++++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 2 + tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-graphics-vnc-websocket.args | 4 ++ .../qemuxml2argv-graphics-vnc-websocket.xml | 28 ++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 20 files changed, 216 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml -- 1.8.2.1

3 6

[libvirt] [PATCH 0/6] Ensure clean compile with clang
by Daniel P. Berrange 15 May '13

15 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> There are various problems building libvirt with clang, which mostly revolve around compiler warning handling. This series fixes all the problems I see with clang 3.2 on a Fedora 19 x86_64 host. Daniel P. Berrange (6): Ensure consistent enablement of gcc 'diagnostic' pragma Workaround issue with clang and inline functions with static vars Ignore cast alignment warnings in inotify code for Xen. Correctly detect warning flags with clang Only pass -export-dynamic to linker, not compiler Don't duplicate compiler warning flags when linking configure.ac | 4 ++-- daemon/Makefile.am | 1 - m4/virt-compile-warnings.m4 | 29 +++++++++++++++++++++++++---- src/Makefile.am | 11 +++-------- src/internal.h | 2 +- src/xen/xen_inotify.c | 3 +++ tests/vircgroupmock.c | 7 ++++++- tools/Makefile.am | 4 +--- 8 files changed, 41 insertions(+), 20 deletions(-) -- 1.8.2.1

5 18

[libvirt] [PATCH] tests: Add fchostdata in EXTRA_DIST
by Osier Yang 15 May '13

15 May '13

Pushed under build-breaker rule. --- tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f53e208..2822d39 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -86,7 +86,8 @@ EXTRA_DIST = \ xmconfigdata \ xml2sexprdata \ xml2vmxdata \ - .valgrind.supp + .valgrind.supp \ + fchostdata test_helpers = commandhelper ssh test_conf test_programs = virshtest sockettest \ -- 1.8.1.4

2 2

[libvirt] [libvirt PATCH 0/2] qemu: disable memory merge at guest startup
by Osier Yang 15 May '13

15 May '13

*** BLURB HERE *** Eric Blake (1): qemu: detect -machine mem-merge capability Osier Yang (1): qemu: New XML to disable memory merge at guest startup docs/formatdomain.html.in | 13 +++++--- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 20 ++++++++---- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 37 ++++++++++++++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 +++++++++++++ tests/qemuargv2xmltest.c | 2 ++ .../qemuxml2argv-nosharepages.args | 4 +++ .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 31 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 12 files changed, 128 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml -- 1.8.1.4

2 6

[libvirt] [libvirt-tck PATCH v2 1/3] add three APIs testing for block
by Zhe Peng 15 May '13

15 May '13

new script for block APIs dom->block_resize dom->get_block_info dom->block_peek --- scripts/domain/121-block-info.t | 137 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/121-block-info.t diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t new file mode 100644 index 0000000..17ebb2e --- /dev/null +++ b/scripts/domain/121-block-info.t @@ -0,0 +1,137 @@ +# -*- perl -*- +# +# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013 Zhe Peng <zpeng(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/121-block-info.t + +=head1 DESCRIPTION + +The test case validates that all following APIs work well include +dom->block_resize +dom->get_block_info +dom->block_peek + +=cut + +use strict; +use warnings; + +use Test::More tests => 29; + +use Sys::Virt::TCK; +use Test::Exception; +use File::stat; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + +# test is_alive +my $live = $conn->is_alive(); +ok($live > 0, "Connection is alive"); + +my $xml = $tck->generic_pool("dir")->as_xml; + +diag "Defining transient storage pool"; +my $pool; +ok_pool(sub { $pool = $conn->define_storage_pool($xml) }, "define transient storage pool"); +lives_ok(sub { $pool->build(0) }, "built storage pool"); +lives_ok(sub { $pool->create }, "started storage pool"); + +my $volallocxml = $tck->generic_volume("tck", "raw", 1024*1024*50)->allocation(1024*1024*50)->as_xml; +my ($vol, $path, $st); +ok_volume { $vol = $pool->create_volume($volallocxml) } "create fully allocated raw volume"; + +my $volallocxml2 = $tck->generic_volume("tck2", "raw", 1024*1024*50)->allocation(1024*1024)->as_xml; +my ($vol2, $path2, $st2); +ok_volume { $vol2 = $pool->create_volume($volallocxml2) } "create not fully allocated raw volume"; + +my $volallocxml3 = $tck->generic_volume("tck3", "qcow2", 1024*1024*50)->allocation(1024*1024)->as_xml; +my ($vol3, $path3, $st3); +ok_volume { $vol3 = $pool->create_volume($volallocxml3) } "create qcow2 volume"; + +$path = xpath($vol, "string(/volume/target/path)"); +$st = stat($path); +ok($st, "path $path exists"); +is($st->size, 1024*1024*50, "size is 50M"); + +$path2 = xpath($vol2, "string(/volume/target/path)"); +$st2 = stat($path2); +ok($st2, "path $path2 exists"); + +$path3 = xpath($vol3, "string(/volume/target/path)"); +$st3 = stat($path3); +ok($st3, "path $path3 exists"); + +diag "Generic guest with pervious created vol"; +my $disktype = "raw"; +my $dst = "vda"; +my $dst2 = "vdb"; +my $dst3 = "vdc"; +my $guest = $tck->generic_domain("tck"); +$guest->rmdisk(); + +$guest->disk(format => { name => "qemu", type => $disktype }, type => "file", src => $path, dst => $dst); +$guest->disk(format => { name => "qemu", type => $disktype }, type => "file", src=> $path2, dst => $dst2); +$guest->disk(format => { name => "qemu", type => "qcow2" }, type => "file", src=> $path3, dst => $dst3); +$guest->interface(type => "network", source => "default", model => "virtio", mac => "52:54:00:22:22:22"); + +$xml = $guest->as_xml; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "Create domain"); +$xml = $dom->get_xml_description(); + +is($dom->get_block_info($dst2,0)->{capacity}, 1024*1024*50, "Get disk capacity info"); +is($dom->get_block_info($dst2,0)->{allocation}, 1024*1024, "Get disk allocation info"); +is($dom->get_block_info($dst2,0)->{physical}, 1024*1024, "Get disk physical info"); + + +is($dom->get_block_info($dst,0)->{capacity}, 1024*1024*50, "Get disk capacity info"); +is($dom->get_block_info($dst,0)->{allocation}, 1024*1024*50, "Get disk allocation info"); +is($dom->get_block_info($dst,0)->{physical}, 1024*1024*50, "Get disk physical info"); + +diag "Test block_resize"; +lives_ok(sub {$dom->block_resize($dst, 512*50)}, "resize to 512*50 KB"); +$st = stat($path); +is($st->size, 512*1024*50, "size is 25M"); + +is($dom->get_block_info($dst,0)->{capacity}, 1024*512*50, "Get disk capacity info"); +is($dom->get_block_info($dst,0)->{allocation}, 1024*512*50, "Get disk allocation info"); +is($dom->get_block_info($dst,0)->{physical}, 1024*512*50, "Get disk physical info"); + +lives_ok(sub {$dom->block_resize($dst, 1024*50)}, "resize to 1024*50 KB"); +$st = stat($path); +is($st->size, 1024*1024*50, "size is 50M"); + +diag "Test block_peek"; +my $date = "test"; +system("echo $date > $path"); +is($dom->block_peek($path,0,4,0), $date, "Get date from raw image"); + +#qcow2 file start with hexadecimal:0x51 0x46 0x49 (ASCII: "QFI") +is($dom->block_peek($path3,0,3,0), "QFI", "Get date from qcow2 image"); + +lives_ok(sub { $vol->delete(0) }, "deleted volume"); + +diag "Destroy domain"; +$dom->destroy; + +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + -- 1.7.7.6

3 8

[libvirt] [PATCH] spec: fix outdated comment
by Eric Blake 15 May '13

15 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=963016 points out that we don't use initscripts by default on Fedora any more. * libvirt.spec.in (Requires): Better explanation of gettext. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f4ec6eb..ad9cea2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1022,7 +1022,7 @@ Requires: ncurses # So remote clients can access libvirt over SSH tunnel # (client invokes 'nc' against the UNIX socket on the server) Requires: nc -# Needed by libvirt-guests init script. +# Needed by /usr/libexec/libvirt-guests.sh script. Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils -- 1.8.1.4

1 0

[libvirt] latency between LIFECYCLE event and notification generation
by nishant burte 15 May '13

15 May '13

Hi, I want to know following about LIFECYCLE events of libvirt. 1. about the the latency of these events happening and notification generation. e.g. suppose a VM goes down. How much time it takes to realize that the particular VM has gone down(going to say, DEFINED state) and then notification is generated? 2. Second question is, can someone please explain what are the sequence of steps happen between a VM going down and the notification is generated? Could you please answer both the queries? Thanks Nishant

3 5

[libvirt] [PATCH v3] nwfilter: check for inverted ctdir
by Stefan Berger 15 May '13

15 May '13

Linux netfilter at some point (Linux 2.6.39) inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We check for the kernel version and assume that all Linux kernels with version 2.6.39 have the newer inverted logic. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- v2->v3: - using uname now to check for Linux kernel version number v1->v2: - using virSocketAddrParseIPv4 --- src/nwfilter/nwfilter_ebiptables_driver.c | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -27,6 +27,7 @@ #include <string.h> #include <sys/stat.h> #include <fcntl.h> +#include <sys/utsname.h> #include "internal.h" @@ -85,6 +86,17 @@ static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; +/* + * --ctdir original vs. --ctdir reply's meaning was inverted in netfilter + * at some point (Linux 2.6.39) + */ +enum ctdirStatus { + CTDIR_STATUS_UNKNOWN = 0, + CTDIR_STATUS_CORRECTED = 1, + CTDIR_STATUS_OLD = 2, +}; +static enum ctdirStatus iptables_ctdir_corrected; + #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) #define PRINT_CHAIN(buf, prefix, ifname, suffix) \ @@ -1262,6 +1274,17 @@ iptablesEnforceDirection(int directionIn virNWFilterRuleDefPtr rule, virBufferPtr buf) { + switch (iptables_ctdir_corrected) { + case CTDIR_STATUS_UNKNOWN: + /* could not be determined or s.th. is seriously wrong */ + return; + case CTDIR_STATUS_CORRECTED: + directionIn = !directionIn; + break; + case CTDIR_STATUS_OLD: + break; + } + if (rule->tt != VIR_NWFILTER_RULE_DIRECTION_INOUT) virBufferAsprintf(buf, " -m conntrack --ctdir %s", (directionIn) ? "Original" @@ -4304,6 +4327,34 @@ ebiptablesDriverTestCLITools(void) return ret; } +static void +ebiptablesDriverProbeCtdir(void) +{ + struct utsname utsname; + unsigned int major, minor, micro; + + iptables_ctdir_corrected = CTDIR_STATUS_UNKNOWN; + + if (uname(&utsname) < 0) { + VIR_ERROR(_("Call to utsname failed: %d"), errno); + return; + } + + /* following Linux lxr, the logic was inverted in 2.6.39 */ + if (sscanf(utsname.release, "%u.%u.%u", &major, &minor, &micro) != 3) { + VIR_ERROR(_("Could not detect kernel version from string %s"), + utsname.release); + return; + } + + if (major >= 3 || + (major == 2 && minor == 6 && micro >= 39)) + iptables_ctdir_corrected = CTDIR_STATUS_CORRECTED; + else + iptables_ctdir_corrected = CTDIR_STATUS_OLD; + +} + static int ebiptablesDriverInit(bool privileged) { @@ -4341,6 +4392,9 @@ ebiptablesDriverInit(bool privileged) return -ENOTSUP; } + if (iptables_cmd_path) + ebiptablesDriverProbeCtdir(); + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; return 0;

3 3

[libvirt] [PATCH 0/7] util: Fixes for NPIV related helpers
by Osier Yang 15 May '13

15 May '13

Osier Yang (7): util: Fix regression of wwn reading util: Fix regression introduced by commit 4360a098441 util: Don't miss the slash in constructed path util: Change virIsCapable* to return bool util: Update the comment for virGetFCHostNameByWWN util: Honor the passed sysfs_prefix tests: Add tests for fc_host src/node_device/node_device_linux_sysfs.c | 4 +- src/util/virutil.c | 47 +++--- src/util/virutil.h | 4 +- tests/Makefile.am | 5 + tests/fchostdata/fc_host/host4/fabric_name | 1 + tests/fchostdata/fc_host/host4/max_npiv_vports | 1 + tests/fchostdata/fc_host/host4/node_name | 1 + tests/fchostdata/fc_host/host4/npiv_vports_inuse | 1 + tests/fchostdata/fc_host/host4/port_name | 1 + tests/fchostdata/fc_host/host4/port_state | 1 + tests/fchostdata/fc_host/host4/vport_create | 0 tests/fchostdata/fc_host/host4/vport_delete | 0 tests/fchostdata/fc_host/host5/fabric_name | 1 + tests/fchostdata/fc_host/host5/max_npiv_vports | 1 + tests/fchostdata/fc_host/host5/node_name | 1 + tests/fchostdata/fc_host/host5/npiv_vports_inuse | 1 + tests/fchostdata/fc_host/host5/port_name | 1 + tests/fchostdata/fc_host/host5/port_state | 1 + tests/fchostdata/fc_host/host5/vport_create | 0 tests/fchostdata/fc_host/host5/vport_delete | 0 tests/fchosttest.c | 175 +++++++++++++++++++++++ 21 files changed, 220 insertions(+), 27 deletions(-) create mode 100644 tests/fchostdata/fc_host/host4/fabric_name create mode 100644 tests/fchostdata/fc_host/host4/max_npiv_vports create mode 100644 tests/fchostdata/fc_host/host4/node_name create mode 100644 tests/fchostdata/fc_host/host4/npiv_vports_inuse create mode 100644 tests/fchostdata/fc_host/host4/port_name create mode 100644 tests/fchostdata/fc_host/host4/port_state create mode 100644 tests/fchostdata/fc_host/host4/vport_create create mode 100644 tests/fchostdata/fc_host/host4/vport_delete create mode 100644 tests/fchostdata/fc_host/host5/fabric_name create mode 100644 tests/fchostdata/fc_host/host5/max_npiv_vports create mode 100644 tests/fchostdata/fc_host/host5/node_name create mode 100644 tests/fchostdata/fc_host/host5/npiv_vports_inuse create mode 100644 tests/fchostdata/fc_host/host5/port_name create mode 100644 tests/fchostdata/fc_host/host5/port_state create mode 100644 tests/fchostdata/fc_host/host5/vport_create create mode 100644 tests/fchostdata/fc_host/host5/vport_delete create mode 100644 tests/fchosttest.c -- 1.8.1.4

5 27

[libvirt] [PATCH] Forbid use of ':' in RBD pool names
by Daniel P. Berrange 15 May '13

15 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The QEMU command line syntax for RBD disks is file=rbd:pool/image:opt1=val1:opt2=val2... There is no way to escape the ':' if it appears in the pool or image name. Thus it must be explicitly forbidden if it occurs in the libvirt XML. People are known to be abusing the lack of escaping in current libvirt to pass arbitrary args to QEMU. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 6 ++++ ...qemuxml2argv-disk-drive-network-rbd-invalid.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 3 files changed, 48 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-invalid.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eddc263..c0cb250 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2383,6 +2383,12 @@ qemuBuildRBDString(virConnectPtr conn, char *secret = NULL; size_t secret_size; + if (strchr(disk->src, ':')) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("':' not allowed in RBD source volume name")); + return -1; + } + virBufferEscape(opt, ',', ",", "rbd:%s", disk->src); if (disk->auth.username) { virBufferEscape(opt, '\\', ":", ":id=%s", disk->auth.username); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-invalid.xml new file mode 100644 index 0000000..e8d3280 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-invalid.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='rbd' name='poolname/imagename:rbd_cache=1:rbd_cache_size=67108864:rbd_cache_max_dirty=0'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 98ceb83..579c016 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -160,6 +160,9 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) { if (flags & FLAG_EXPECT_FAILURE) { ret = 0; + if (virTestGetDebug() > 1) + fprintf(stderr, "Got expected error: %s\n", + virGetLastErrorMessage()); virResetLastError(); } goto out; @@ -528,6 +531,8 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-network-rbd-ipv6", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); + DO_TEST_FAILURE("disk-drive-network-rbd-invalid", + QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT); DO_TEST("disk-drive-no-boot", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX); DO_TEST("disk-usb", NONE); -- 1.8.2.1

3 3

[libvirt] [PATCHv2] storage: Ensure 'qemu-img resize' size arg is a 512 multiple
by Christophe Fergeau 15 May '13

15 May '13

qemu-img resize will fail with "The new size must be a multiple of 512" if libvirt doesn't round it first. This fixes rhbz#951495 Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- Changes since v1: - move rounding code to a new VIR_ROUND_UP() macro - add a note in virStorageVolResize API doc that the requested capacity may be rounded up src/internal.h | 3 +++ src/libvirt.c | 3 ++- src/storage/storage_backend_fs.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/internal.h b/src/internal.h index d819aa3..28540f4 100644 --- a/src/internal.h +++ b/src/internal.h @@ -339,6 +339,9 @@ /* divide value by size, rounding up */ # define VIR_DIV_UP(value, size) (((value) + (size) - 1) / (size)) +/* round up value to the closest multiple of size */ +# define VIR_ROUND_UP(value, size) (VIR_DIV_UP(value, size) * (size)) + # if WITH_DTRACE_PROBES # ifndef LIBVIRT_PROBES_H diff --git a/src/libvirt.c b/src/libvirt.c index 2b3515e..f2360f8 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -14124,7 +14124,8 @@ error: * Changes the capacity of the storage volume @vol to @capacity. The * operation will fail if the new capacity requires allocation that would * exceed the remaining free space in the parent pool. The contents of - * the new capacity will appear as all zero bytes. + * the new capacity will appear as all zero bytes. The capacity value will + * be rounded to the granularity supported by the hypervisor. * * Normally, the operation will attempt to affect capacity with a minimum * impact on allocation (that is, the default operation favors a sparse diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9b83e57..1379f17 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1219,6 +1219,10 @@ virStorageBackendFilesystemResizeQemuImg(const char *path, return -1; } + /* Round capacity as qemu-img resize errors out on sizes which are not + * a multiple of 512 */ + capacity = VIR_ROUND_UP(capacity, 512); + cmd = virCommandNew(img_tool); virCommandAddArgList(cmd, "resize", path, NULL); virCommandAddArgFormat(cmd, "%llu", capacity); -- 1.8.2.1

2 1

[libvirt] [PATCH] virsh: Pretty the output of qemu-agent-command
by Osier Yang 15 May '13

15 May '13

This adds a new option "--pretty" for qemu-agent-command, to pretty-format the returned JSON string. --- tools/virsh-domain.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 546b182..bb94ac1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7605,6 +7605,10 @@ static const vshCmdOptDef opts_qemu_agent_command[] = { .type = VSH_OT_BOOL, .help = N_("execute command without timeout") }, + {.name = "pretty", + .type = VSH_OT_BOOL, + .help = N_("pretty-print the output") + }, {.name = "cmd", .type = VSH_OT_ARGV, .flags = VSH_OFLAG_REQ, @@ -7626,6 +7630,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) const vshCmdOpt *opt = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; bool pad = false; + virJSONValuePtr pretty = NULL; dom = vshCommandOptDomain(ctl, cmd, NULL); if (dom == NULL) @@ -7670,6 +7675,17 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) } result = virDomainQemuAgentCommand(dom, guest_agent_cmd, timeout, flags); + if (vshCommandOptBool(cmd, "pretty")) { + char *tmp; + pretty = virJSONValueFromString(result); + if (pretty && (tmp = virJSONValueToString(pretty, true))) { + VIR_FREE(result); + result = tmp; + } else { + vshResetLibvirtError(); + } + } + vshPrint(ctl, "%s\n", result); ret = true; -- 1.8.1.4

2 2

[libvirt] [libvirt PATCH] virsh: Use vshPrint instead of printf
by Osier Yang 15 May '13

15 May '13

--- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 86786ee..546b182 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7670,7 +7670,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) } result = virDomainQemuAgentCommand(dom, guest_agent_cmd, timeout, flags); - if (result) printf("%s\n", result); + vshPrint(ctl, "%s\n", result); ret = true; -- 1.8.1.4

2 2

[libvirt] [PATCH] Fix invalid argument reference in virnetdev.h
by Martin Kletzander 15 May '13

15 May '13

Commit ccff335f added ATTRIBUTE_NONNULL for an attribute which is not a pointer and made files including virnetdev.h not compilable, so fix that. --- Pushed under the build-breaker rule. src/util/virnetdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 0b394ad..bc0777c 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -48,7 +48,7 @@ int virNetDevAddRoute(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_RETURN_CHECK; int virNetDevClearIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) -- 1.8.2.1

1 0