- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/5] qemumonitorjsontest: Introduce some tests
by Michal Privoznik 10 Oct '13

10 Oct '13

v2 to some patches that weren't ACKed yet. Michal Privoznik (5): qemuMonitorTestFree: Join worker thread qemumonitorjsontest: Extend the test for yet another monitor commands qemumonitorjsontest: Test qemuMonitorJSONGetCPUInfo qemumonitorjsontest: Test qemuMonitorJSONGetVirtType qemumonitorjsontest: Test qemuMonitorJSONSendKey tests/qemumonitorjsontest.c | 253 +++++++++++++++++++++++++++++++++++++++++++ tests/qemumonitortestutils.c | 5 +- 2 files changed, 256 insertions(+), 2 deletions(-) -- 1.8.1.5

3 8

[libvirt] [PATCHv2 0/4] qemu: Allow users specify -incoming listen address
by Michal Privoznik 10 Oct '13

10 Oct '13

v2 for my previous attempt: https://www.redhat.com/archives/libvir-list/2013-October/msg00400.html diff to v1: -Check if listenAddress is a numeric IPv4 or IPv6 prior parsing it -enclose all IPv6 addresses in angle brackets 1/4 has been ACKed already Michal Privoznik (4): Migration: Introduce VIR_MIGRATE_PARAM_LISTEN_ADDRESS virsocket: Introduce virSocketAddrIsWildcard qemu: Implement support for VIR_MIGRATE_PARAM_LISTEN_ADDRESS qemu_conf: Introduce "migration_address" include/libvirt/libvirt.h.in | 10 ++++ src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 6 ++ src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_driver.c | 33 ++++++++--- src/qemu/qemu_migration.c | 113 +++++++++++++++++++++++++------------ src/qemu/qemu_migration.h | 13 +++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virsocketaddr.c | 71 +++++++++++++++++------ src/util/virsocketaddr.h | 2 + tests/sockettest.c | 29 ++++++++++ tools/virsh-domain.c | 11 ++++ tools/virsh.pod | 10 +++- 15 files changed, 241 insertions(+), 67 deletions(-) -- 1.8.1.5

3 9

[libvirt] [PATCH] AArch64: Porting of armv7l conditons to run qemu for aarch64.
by Pranavkumar Sawargaonkar 10 Oct '13

10 Oct '13

AArch64 qemu has similar behavior as armv7l, like use of mmio etc. This patch adds similar bypass checks what we have for armv7l to aarch64. E.g. we are enabling mmio transport for Nicdev. Making addDefaultUSB and addDefaultMemballoon to false etc. Signed-off-by: Anup Patel <anup.patel(a)linaro.org> Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar(a)linaro.org> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 8 +++++--- src/qemu/qemu_domain.c | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1eae4ba..74a1690 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2872,7 +2872,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) return false; - if (def->os.arch != VIR_ARCH_ARMV7L) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; /* This may not be true for all ARM machine types, but at least diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 22cc5f2..1c4de84 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -427,7 +427,8 @@ qemuDomainSupportsNicdev(virDomainDefPtr def, return false; /* non-virtio ARM nics require legacy -net nic */ - if (def->os.arch == VIR_ARCH_ARMV7L && + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) return false; @@ -1339,7 +1340,8 @@ static int qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { - if (def->os.arch == VIR_ARCH_ARMV7L && + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && STRPREFIX(def->os.machine, "vexpress-") && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( @@ -1870,7 +1872,7 @@ cleanup: static bool qemuDomainSupportsPCI(virDomainDefPtr def) { - if (def->os.arch != VIR_ARCH_ARMV7L) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; if (STREQ(def->os.machine, "versatilepb")) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 968e323..f4986d7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -727,7 +727,10 @@ qemuDomainDefPostParse(virDomainDefPtr def, addDefaultUSB = false; addDefaultMemballoon = false; break; - + case VIR_ARCH_AARCH64: + addDefaultUSB = false; + addDefaultMemballoon = false; + break; case VIR_ARCH_ALPHA: case VIR_ARCH_PPC: case VIR_ARCH_PPC64: -- 1.7.9.5

2 2

[libvirt] [PATCH] qemu: Init @pcidevs in qemuPrepareHostdevPCIDevices
by Michal Privoznik 10 Oct '13

10 Oct '13

At the beginning of the function qemuPrepareHostdevPCICheckSupport() is called. After that @pcidevs is initialized. However, if the very first command fails, we go to 'cleanup' label where virObjectUnref(pcidevs) is called. Obviously, it is called before @pcidevs was able to get initialized. Compiler warns about it: CC qemu/libvirt_driver_qemu_impl_la-qemu_hostdev.lo qemu/qemu_hostdev.c: In function 'qemuPrepareHostdevPCIDevices': qemu/qemu_hostdev.c:824:19: error: 'pcidevs' may be used uninitialized in this function [-Werror=maybe-uninitialized] virObjectUnref(pcidevs); ^ cc1: all warnings being treated as errors Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under buildbreaker and trivial rules. src/qemu/qemu_hostdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 81e0e88..43c03cc 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -633,7 +633,7 @@ qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, int nhostdevs, virQEMUCapsPtr qemuCaps) { - virPCIDeviceListPtr pcidevs; + virPCIDeviceListPtr pcidevs = NULL; int last_processed_hostdev_vf = -1; size_t i; int ret = -1; -- 1.8.1.5

1 0

[libvirt] [PATCHv4 0/3] Change preference of default PCI passthrough type to VFIO
by Peter Krempa 10 Oct '13

10 Oct '13

Peter Krempa (3): qemu: hostdev: Fix function spacing and header formatting qemu: hostdev: Add checks if PCI passthrough is availabe in the host qemu: Prefer VFIO for PCI device passthrough docs/formatdomain.html.in | 9 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_hostdev.c | 207 +++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_hostdev.h | 4 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 15 ++-- tests/qemuxml2argvtest.c | 11 +++ 8 files changed, 217 insertions(+), 35 deletions(-) -- 1.8.3.2

3 10

[libvirt] Can we make sc_copyright_check non-fatal?
by Cole Robinson 10 Oct '13

10 Oct '13

The copyright date syntax check is a source of frustration for me: - It fails on old maint branches. - It pokes into non git managed directories in $(srcdir). I like to keep directories like f18-maint.git, f19-maint.git etc. that are checkouts of the respective maint branches so I can parallelize when doing maint builds, and I like to keep them in my libvirt.git dir for organization, but running syntax-check in libvirt.git fails on the copyright check in $(srcdir)/f18-maint.git/.gnulib/... Is there any way to make it non-fatal? If it still spams with all the 'failures' I'm sure that's enough to encourage fixing the issues without blocking valid usage. Thanks, Cole

4 10

[libvirt] [PATCH 0/4] Add support for compression of managedsave and external snapshot memory images
by Peter Krempa 10 Oct '13

10 Oct '13

plus a few refactors. Peter Krempa (4): qemu: Fix coding style in qemuDomainSaveFlags() qemu: refactor qemuCompressProgramAvailable() qemu: managedsave: Add support for compressing managed save images qemu: snapshot: Add support for compressing external snapshot memory src/qemu/qemu.conf | 12 ++++++++ src/qemu/qemu_conf.c | 3 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_driver.c | 78 ++++++++++++++++++++++++++++++++++++-------------- 4 files changed, 74 insertions(+), 21 deletions(-) -- 1.8.3.2

3 13

[libvirt] [PATCH] qemu_migration: Check ABI stability against MIGRATABLE xml
by Michal Privoznik 10 Oct '13

10 Oct '13

https://bugzilla.redhat.com/show_bug.cgi?id=994364 If user provides domain XML in migration we check if it doesn't break ABI via virDomainDefCheckABIStability(). However, if the provided XML was generated via virDomainGetXMLDesc(..., VIR_DOMAIN_XML_MIGRATABLE) it is missing some devices, e.g. 'pci-root' controller. Hence, the ABI stability check fails even though it is stable. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..65a09b4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1970,6 +1970,8 @@ static char virCapsPtr caps = NULL; unsigned int cookieFlags = QEMU_MIGRATION_COOKIE_LOCKSTATE; bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR); + virDomainDefPtr migratableDef = NULL; + char *migratableDefStr = NULL; VIR_DEBUG("driver=%p, vm=%p, xmlin=%s, dname=%s," " cookieout=%p, cookieoutlen=%p, flags=%lx", @@ -2039,7 +2041,17 @@ static char VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if (!virDomainDefCheckABIStability(vm->def, def)) + migratableDefStr = qemuDomainDefFormatLive(driver, vm->def, false, true); + if (!migratableDefStr) + goto cleanup; + + if (!(migratableDef = virDomainDefParseString(migratableDefStr, caps, + driver->xmlopt, + QEMU_EXPECTED_VIRT_TYPES, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (!virDomainDefCheckABIStability(migratableDef, def)) goto cleanup; rv = qemuDomainDefFormatLive(driver, def, false, true); @@ -2051,6 +2063,8 @@ cleanup: qemuMigrationCookieFree(mig); virObjectUnref(caps); virDomainDefFree(def); + virDomainDefFree(migratableDef); + VIR_FREE(migratableDefStr); return rv; } @@ -2179,6 +2193,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, const char *listenAddr = NULL; char *migrateFrom = NULL; bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR); + virDomainDefPtr migratableDef = NULL; + char *migratableDefStr = NULL; if (virTimeMillisNow(&now) < 0) return -1; @@ -2213,18 +2229,16 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* Let migration hook filter domain XML */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - char *xml; int hookret; - if (!(xml = qemuDomainDefFormatXML(driver, *def, - VIR_DOMAIN_XML_SECURE | - VIR_DOMAIN_XML_MIGRATABLE))) + if (!(migratableDefStr = qemuDomainDefFormatXML(driver, *def, + VIR_DOMAIN_XML_SECURE | + VIR_DOMAIN_XML_MIGRATABLE))) goto cleanup; hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, (*def)->name, VIR_HOOK_QEMU_OP_MIGRATE, VIR_HOOK_SUBOP_BEGIN, - NULL, xml, &xmlout); - VIR_FREE(xml); + NULL, migratableDefStr, &xmlout); if (hookret < 0) { goto cleanup; @@ -2242,7 +2256,16 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (!newdef) goto cleanup; - if (!virDomainDefCheckABIStability(*def, newdef)) { + migratableDef = virDomainDefParseString(migratableDefStr, caps, + driver->xmlopt, + QEMU_EXPECTED_VIRT_TYPES, + VIR_DOMAIN_XML_INACTIVE); + if (!migratableDef) { + virDomainDefFree(newdef); + goto cleanup; + } + + if (!virDomainDefCheckABIStability(migratableDef, newdef)) { virDomainDefFree(newdef); goto cleanup; } @@ -2429,6 +2452,8 @@ cleanup: qemuDomainEventQueue(driver, event); qemuMigrationCookieFree(mig); virObjectUnref(caps); + virDomainDefFree(migratableDef); + VIR_FREE(migratableDefStr); return ret; stop: -- 1.8.1.5

2 2

[libvirt] [PATCH]docs: exit if failed to generate html
by Chen Hanxiao 10 Oct '13

10 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If xhtml1 dtd not install, some html will not be generated. If we 'make install', it will succeed and message "missing XHTML1 DTD" will be hide inside a large amount of logs. So exit when this occurs. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9de3406..82c3ed8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -223,7 +223,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --format --valid $< > $(srcdir)/$@ \ || { rm $(srcdir)/$@ && exit 1; }; \ - else echo "missing XHTML1 DTD" ; fi ; fi + else echo "missing XHTML1 DTD" ; exit 1; fi ; fi %.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ @@ -249,7 +249,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in > /dev/null ; then \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ - else echo "missing XHTML1 DTD" ; fi ; fi + else echo "missing XHTML1 DTD" ; exit 1; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ -- 1.8.2.1

2 2

[libvirt] [PATCHv3] LXC: Fix handling of RAM filesystem size units
by Ján Tomko 09 Oct '13

09 Oct '13

Since 76b644c when the support for RAM filesystems was introduced, libvirt accepted the following XML: <source usage='1024' unit='KiB'/> This was parsed correctly and internally stored in bytes, but it was formatted as (with an extra 's'): <source usage='1024' units='KiB'/> When read again, this was treated as if the units were missing, meaning libvirt was unable to parse its own XML correctly. The usage attribute was documented as being in KiB, but it was not scaled if the unit was missing. Transient domains still worked, because this was balanced by an extra 'k' in the mount options. This patch: Changes the parser to use 'units' instead of 'unit', as the latter was never documented (fixing persistent domains). Removes the extra 'k' from the tmpfs mount options, which is needed because now we parse our own XML correctly. Changes the default input unit to KiB to match documentation, fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1015689 --- v1: https://www.redhat.com/archives/libvir-list/2013-October/msg00361.html v2: keeps the output unit KiB changes the default input unit to KiB accepts 'units' as well as 'unit' in input XML v3: drop 'unit' completely as it was never documented docs/formatdomain.html.in | 6 +++-- docs/schemas/domaincommon.rng | 2 +- src/conf/domain_conf.c | 9 ++++--- src/lxc/lxc_container.c | 2 +- tests/domainschematest | 2 +- tests/lxcxml2xmldata/lxc-filesystem-ram.xml | 33 ++++++++++++++++++++++++++ tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml | 33 ++++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 8 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-filesystem-ram.xml create mode 100644 tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3689399..8f74487 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2213,7 +2213,8 @@ <dd> An in-memory filesystem, using memory from the host OS. The source element has a single attribute <code>usage</code> - which gives the memory usage limit in kibibytes. Only used + which gives the memory usage limit in KiB, unless units + are specified by the <code>units</code> attribute. Only used by LXC driver. (since 0.9.13)</dd> <dt><code>type='bind'</code></dt> @@ -2279,7 +2280,8 @@ <code>name</code> attribute must be used with <code>type='template'</code>, and the <code>dir</code> attribute must be used with <code>type='mount'</code>. The <code>usage</code> attribute - is used with <code>type='ram'</code> to set the memory limit in KB. + is used with <code>type='ram'</code> to set the memory limit in KiB, + unless units are specified by the <code>units</code> attribute. </dd> <dt><code>target</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5c5301d..10b017f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1732,7 +1732,7 @@ <ref name="unsignedLong"/> </attribute> <optional> - <attribute name='unit'> + <attribute name='units'> <ref name='unit'/> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d63845..e3737bc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5916,7 +5916,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *accessmode = NULL; char *wrpolicy = NULL; char *usage = NULL; - char *unit = NULL; + char *units = NULL; ctxt->node = node; @@ -5972,7 +5972,7 @@ virDomainFSDefParseXML(xmlNodePtr node, source = virXMLPropString(cur, "name"); else if (def->type == VIR_DOMAIN_FS_TYPE_RAM) { usage = virXMLPropString(cur, "usage"); - unit = virXMLPropString(cur, "unit"); + units = virXMLPropString(cur, "units"); } } else if (!target && xmlStrEqual(cur->name, BAD_CAST "target")) { @@ -6042,8 +6042,7 @@ virDomainFSDefParseXML(xmlNodePtr node, usage); goto error; } - if (unit && - virScaleInteger(&def->usage, unit, + if (virScaleInteger(&def->usage, units, 1024, ULLONG_MAX) < 0) goto error; } @@ -6065,7 +6064,7 @@ cleanup: VIR_FREE(accessmode); VIR_FREE(wrpolicy); VIR_FREE(usage); - VIR_FREE(unit); + VIR_FREE(units); VIR_FREE(format); return def; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b1f429c..7c722cc 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1428,7 +1428,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); if (virAsprintf(&data, - "size=%lldk%s", fs->usage, sec_mount_options) < 0) + "size=%lld%s", fs->usage, sec_mount_options) < 0) goto cleanup; if (virFileMakePath(fs->dst) < 0) { diff --git a/tests/domainschematest b/tests/domainschematest index 0e360ca..9ebf0b9 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -7,7 +7,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata " -DIRS="$DIRS lxcxml2xmldata" +DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" SCHEMA="domain.rng" check_schema "$DIRS" "$SCHEMA" diff --git a/tests/lxcxml2xmldata/lxc-filesystem-ram.xml b/tests/lxcxml2xmldata/lxc-filesystem-ram.xml new file mode 100644 index 0000000..002fde6 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-filesystem-ram.xml @@ -0,0 +1,33 @@ +<domain type='lxc'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='ram'> + <source usage='1048576'/> + <target dir='/mnt/mississippi'/> + </filesystem> + <filesystem type='ram'> + <source usage='1048576' units='bytes'/> + <target dir='/mnt/antananarivo'/> + </filesystem> + <filesystem type='ram'> + <source usage='1024' units='KiB'/> + <target dir='/mnt/ouagadougou'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml b/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml new file mode 100644 index 0000000..d2369a2 --- /dev/null +++ b/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml @@ -0,0 +1,33 @@ +<domain type='lxc'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1048576' units='KiB'/> + <target dir='/mnt/mississippi'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1024' units='KiB'/> + <target dir='/mnt/antananarivo'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1024' units='KiB'/> + <target dir='/mnt/ouagadougou'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 5846ab0..1692e4b 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -136,6 +136,7 @@ mymain(void) DO_TEST("systemd"); DO_TEST("hostdev"); DO_TEST("disk-formats"); + DO_TEST_DIFFERENT("filesystem-ram"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 1.8.1.5

2 2

[libvirt] [PATCH]cgroup: fix a comment typo in vircgroup.c
by Chen Hanxiao 09 Oct '13

09 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/shoule/should Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/vircgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e99caf5..91b8704 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2431,7 +2431,7 @@ virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares) int virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period) { - /* The cfs_period shoule be greater or equal than 1ms, and less or equal + /* The cfs_period should be greater or equal than 1ms, and less or equal * than 1s. */ if (cfs_period < 1000 || cfs_period > 1000000) { -- 1.8.2.1

2 1

[libvirt] [PATCH] storage_backend: Fix issue with allocation of 0 length volume
by John Ferlan 09 Oct '13

09 Oct '13

Commit id '532fef36' added a call to fallocate() and some error handling based on whether or not the function existed. This new call resulted in libvirt-cim/cimtest failures when attempting to create a volume with "0" (zero) allocation value. The failure is logged as: Oct 9 07:51:33 localhost libvirtd[8030]: cannot allocate 0 bytes in file '/var/lib/libvirt/images/cimtest-vol.img': Invalid argument This can also be seen with virsh vol-create-as: error: Failed to create vol test error: cannot allocate 0 bytes in file '/home/vm-images/test': Invalid argument error: Failed to create vol test error: cannot allocate 0 bytes in file '/home/vm-images/test': Invalid argument It turns out fallocate() will return EINVAL when the incoming 'len' (or allocation) value is 0 (or less). --- src/storage/storage_backend.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 662af32..d0580f9 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -332,19 +332,22 @@ createRawFile(int fd, virStorageVolDefPtr vol, /* Avoid issues with older kernel's <linux/fs.h> namespace pollution. */ #if HAVE_FALLOCATE - 0 /* Try to preallocate all requested disk space, but fall back to - * other methods if this fails with ENOSYS or EOPNOTSUPP. + * other methods if this fails with ENOSYS or EOPNOTSUPP. If allocation + * is 0 (or less than 0), then fallocate will fail with EINVAL. * NOTE: do not use posix_fallocate; posix_fallocate falls back * to writing zeroes block by block in case fallocate isn't * available, and since we're going to copy data from another * file it doesn't make sense to write the file twice. */ - if (fallocate(fd, 0, 0, vol->allocation) == 0) { - need_alloc = 0; - } else if (errno != ENOSYS && errno != EOPNOTSUPP) { - ret = -errno; - virReportSystemError(errno, - _("cannot allocate %llu bytes in file '%s'"), - vol->allocation, vol->target.path); - goto cleanup; + if (vol->allocation) { + if (fallocate(fd, 0, 0, vol->allocation) == 0) { + need_alloc = 0; + } else if (errno != ENOSYS && errno != EOPNOTSUPP) { + ret = -errno; + virReportSystemError(errno, + _("cannot allocate %llu bytes in file '%s'"), + vol->allocation, vol->target.path); + goto cleanup; + } } #endif -- 1.8.3.1

2 1

[libvirt] [PATCHv2] LXC: Fix handling of RAM filesystem size units
by Ján Tomko 09 Oct '13

09 Oct '13

Since 76b644c when the support for RAM filesystems was introduced, libvirt accepted the following XML: <source usage='1024' unit='KiB'/> This was parsed correctly and internally stored in bytes, but it was formatted as (with an extra 's'): <source usage='1024' units='KiB'/> When read again, this was treated as if the units were missing, meaning libvirt was unable to parse its own XML correctly. The usage attribute was documented as being in KiB, but it was not scaled if the unit was missing. Transient domains still worked, because this was balanced by an extra 'k' in the mount options. This patch: Outputs the units via the 'unit' attribute (fixing persistent domains), but accepts both 'unit' and 'units' (for compatibility with older libvirt and libvirt-sandbox). Removes the extra 'k' from the tmpfs mount options, which is needed because now we parse our own XML correctly. Changes the default unit to KiB to match documentation, fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1015689 --- v1: https://www.redhat.com/archives/libvir-list/2013-October/msg00361.html v2: keeps the output unit KiB changes the default input unit to KiB accepts 'units' as well as 'unit' in input XML docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 12 ++++++-- src/lxc/lxc_container.c | 2 +- tests/domainschematest | 2 +- tests/lxcxml2xmldata/lxc-filesystem-ram.xml | 41 ++++++++++++++++++++++++++ tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml | 41 ++++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 8 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-filesystem-ram.xml create mode 100644 tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3689399..dfd11bf 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2213,7 +2213,8 @@ <dd> An in-memory filesystem, using memory from the host OS. The source element has a single attribute <code>usage</code> - which gives the memory usage limit in kibibytes. Only used + which gives the memory usage limit in KiB, unless units + are specified by the <code>unit</code> attribute. Only used by LXC driver. (since 0.9.13)</dd> <dt><code>type='bind'</code></dt> @@ -2279,7 +2280,8 @@ <code>name</code> attribute must be used with <code>type='template'</code>, and the <code>dir</code> attribute must be used with <code>type='mount'</code>. The <code>usage</code> attribute - is used with <code>type='ram'</code> to set the memory limit in KB. + is used with <code>type='ram'</code> to set the memory limit KiB, unless + units are specified by the <code>unit</code> attribute. </dd> <dt><code>target</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5c5301d..582d4c3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1736,6 +1736,11 @@ <ref name='unit'/> </attribute> </optional> + <optional> + <attribute name='units'> + <ref name='unit'/> + </attribute> + </optional> <empty/> </element> </interleave> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d63845..0870047 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5917,6 +5917,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *wrpolicy = NULL; char *usage = NULL; char *unit = NULL; + char *units = NULL; ctxt->node = node; @@ -5973,6 +5974,7 @@ virDomainFSDefParseXML(xmlNodePtr node, else if (def->type == VIR_DOMAIN_FS_TYPE_RAM) { usage = virXMLPropString(cur, "usage"); unit = virXMLPropString(cur, "unit"); + units = virXMLPropString(cur, "units"); } } else if (!target && xmlStrEqual(cur->name, BAD_CAST "target")) { @@ -6042,8 +6044,11 @@ virDomainFSDefParseXML(xmlNodePtr node, usage); goto error; } - if (unit && - virScaleInteger(&def->usage, unit, + /* Older libvirt only parsed 'unit' here, despite + * printing it in the 'units' attribute. + * + * The default was bytes when 'unit' wasn't present */ + if (virScaleInteger(&def->usage, units ? units : unit, 1024, ULLONG_MAX) < 0) goto error; } @@ -6066,6 +6071,7 @@ cleanup: VIR_FREE(wrpolicy); VIR_FREE(usage); VIR_FREE(unit); + VIR_FREE(units); VIR_FREE(format); return def; @@ -14764,7 +14770,7 @@ virDomainFSDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_FS_TYPE_RAM: - virBufferAsprintf(buf, " <source usage='%lld' units='KiB'/>\n", + virBufferAsprintf(buf, " <source usage='%lld' unit='KiB'/>\n", def->usage / 1024); break; } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b1f429c..7c722cc 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1428,7 +1428,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); if (virAsprintf(&data, - "size=%lldk%s", fs->usage, sec_mount_options) < 0) + "size=%lld%s", fs->usage, sec_mount_options) < 0) goto cleanup; if (virFileMakePath(fs->dst) < 0) { diff --git a/tests/domainschematest b/tests/domainschematest index 0e360ca..9ebf0b9 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -7,7 +7,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata " -DIRS="$DIRS lxcxml2xmldata" +DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" SCHEMA="domain.rng" check_schema "$DIRS" "$SCHEMA" diff --git a/tests/lxcxml2xmldata/lxc-filesystem-ram.xml b/tests/lxcxml2xmldata/lxc-filesystem-ram.xml new file mode 100644 index 0000000..4b2abb5 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-filesystem-ram.xml @@ -0,0 +1,41 @@ +<domain type='lxc'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='ram'> + <source usage='1048576'/> + <target dir='/mnt/mississippi'/> + </filesystem> + <filesystem type='ram'> + <source usage='1048576' unit='bytes'/> + <target dir='/mnt/titicaca'/> + </filesystem> + <filesystem type='ram'> + <source usage='1024' unit='KiB'/> + <target dir='/mnt/orinoco'/> + </filesystem> + <filesystem type='ram'> + <source usage='1048576' units='bytes'/> + <target dir='/mnt/antananarivo'/> + </filesystem> + <filesystem type='ram'> + <source usage='1024' units='KiB'/> + <target dir='/mnt/ouagadougou'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml b/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml new file mode 100644 index 0000000..65d07dd --- /dev/null +++ b/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml @@ -0,0 +1,41 @@ +<domain type='lxc'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1048576' unit='KiB'/> + <target dir='/mnt/mississippi'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1024' unit='KiB'/> + <target dir='/mnt/titicaca'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1024' unit='KiB'/> + <target dir='/mnt/orinoco'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1024' unit='KiB'/> + <target dir='/mnt/antananarivo'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1024' unit='KiB'/> + <target dir='/mnt/ouagadougou'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 5846ab0..1692e4b 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -136,6 +136,7 @@ mymain(void) DO_TEST("systemd"); DO_TEST("hostdev"); DO_TEST("disk-formats"); + DO_TEST_DIFFERENT("filesystem-ram"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 1.8.1.5

3 4

[libvirt] [PATCH 0/3] qemu:Allow users specify -incoming listen address
by Michal Privoznik 09 Oct '13

09 Oct '13

However, if user provides a wrong address, the libvirtd dies horribly: Core was generated by `/home/zippy/tmp/libvirt.git/daemon/.libs/libvirtd --listen'. Program terminated with signal 11, Segmentation fault. #0 0x00007f5c3859a7fc in qemuProcessHandleMonitorEOF (mon=0x7f5c24001870, vm=0x7f5c24001fa0, opaque=0x7f5c300c8600) at qemu/qemu_process.c:300 300 if (priv->beingDestroyed) { (gdb) p priv $1 = (qemuDomainObjPrivatePtr) 0x0 (gdb) p vm $2 = (virDomainObjPtr) 0x7f5c24001fa0 This is supposed to be fixed by my patch: https://www.redhat.com/archives/libvir-list/2013-October/msg00347.html Michal Privoznik (3): Migration: Introduce VIR_MIGRATE_PARAM_LISTEN_ADDRESS qemu: Implement support for VIR_MIGRATE_PARAM_LISTEN_ADDRESS qemu_conf: Introduce "listen_address" include/libvirt/libvirt.h.in | 10 ++++ src/qemu/libvirtd_qemu.aug | 3 ++ src/qemu/qemu.conf | 6 +++ src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 33 +++++++++---- src/qemu/qemu_migration.c | 98 +++++++++++++++++++++++++++----------- src/qemu/qemu_migration.h | 13 +++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + tools/virsh-domain.c | 11 +++++ tools/virsh.pod | 10 +++- 11 files changed, 146 insertions(+), 43 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH] LXC: Fix the output units of ram filesystem size
by Ján Tomko 09 Oct '13

09 Oct '13

Commit 76b644c added support for adding RAM filesystems to LXC domains, with a syntax of: <source usage='10' unit='MiB'/> where default unit would be KiB per documentation, however the XML parser treated sizes without units as bytes. When formatting the XML, this was divided by 1024, but the KiB units were put inside the 'units' attribute, as opposed to the 'unit' attribute the parser looks for. The code generating the mount options assumed the size in the domain definition to be in KiB, despite it being parsed as B. This worked as long as exaclty one re-format of the XML happened (for domains that were just created). Change the XML output to bytes and fix the documentation. https://bugzilla.redhat.com/show_bug.cgi?id=1015689 --- docs/formatdomain.html.in | 5 ++-- src/conf/domain_conf.c | 4 ++-- src/lxc/lxc_container.c | 2 +- tests/lxcxml2xmldata/lxc-filesystem-ram.xml | 33 ++++++++++++++++++++++++++ tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml | 33 ++++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 6 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-filesystem-ram.xml create mode 100644 tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3689399..bfe0ae4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2213,7 +2213,8 @@ <dd> An in-memory filesystem, using memory from the host OS. The source element has a single attribute <code>usage</code> - which gives the memory usage limit in kibibytes. Only used + which gives the memory usage limit in bytes, unless units + are specified by the attribute <code>unit</code>. Only used by LXC driver. (since 0.9.13)</dd> <dt><code>type='bind'</code></dt> @@ -2279,7 +2280,7 @@ <code>name</code> attribute must be used with <code>type='template'</code>, and the <code>dir</code> attribute must be used with <code>type='mount'</code>. The <code>usage</code> attribute - is used with <code>type='ram'</code> to set the memory limit in KB. + is used with <code>type='ram'</code> to set the memory limit in bytes. </dd> <dt><code>target</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0d63845..2c67966 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14764,8 +14764,8 @@ virDomainFSDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_FS_TYPE_RAM: - virBufferAsprintf(buf, " <source usage='%lld' units='KiB'/>\n", - def->usage / 1024); + virBufferAsprintf(buf, " <source usage='%lld' unit='B'/>\n", + def->usage); break; } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b1f429c..7c722cc 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1428,7 +1428,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); if (virAsprintf(&data, - "size=%lldk%s", fs->usage, sec_mount_options) < 0) + "size=%lld%s", fs->usage, sec_mount_options) < 0) goto cleanup; if (virFileMakePath(fs->dst) < 0) { diff --git a/tests/lxcxml2xmldata/lxc-filesystem-ram.xml b/tests/lxcxml2xmldata/lxc-filesystem-ram.xml new file mode 100644 index 0000000..404429b --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-filesystem-ram.xml @@ -0,0 +1,33 @@ +<domain type='lxc'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='ram'> + <source usage='1048576'/> + <target dir='/mnt/mississippi'/> + </filesystem> + <filesystem type='ram'> + <source usage='1048576' unit='b'/> + <target dir='/mnt/titicaca'/> + </filesystem> + <filesystem type='ram'> + <source usage='1024' unit='KiB'/> + <target dir='/mnt/orinoco'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml b/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml new file mode 100644 index 0000000..431b8cb --- /dev/null +++ b/tests/lxcxml2xmloutdata/lxc-filesystem-ram.xml @@ -0,0 +1,33 @@ +<domain type='lxc'> + <name>demo</name> + <uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid> + <memory unit='KiB'>500000</memory> + <currentMemory unit='KiB'>500000</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/bin/sh</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1048576' unit='B'/> + <target dir='/mnt/mississippi'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1048576' unit='B'/> + <target dir='/mnt/titicaca'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='1048576' unit='B'/> + <target dir='/mnt/orinoco'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 5846ab0..1692e4b 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -136,6 +136,7 @@ mymain(void) DO_TEST("systemd"); DO_TEST("hostdev"); DO_TEST("disk-formats"); + DO_TEST_DIFFERENT("filesystem-ram"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 1.8.1.5

3 3

[libvirt] [PATCH] storage: Use bool instead of int
by Ján Tomko 09 Oct '13

09 Oct '13

Commit 532fef3 added two-state 'need_alloc' and exposed 'want_sparse' which also only has two states. Change their type from int to bool. --- src/storage/storage_backend.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 662af32..4eec0f3 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -129,7 +129,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, int fd, unsigned long long *total, - int want_sparse) + bool want_sparse) { int inputfd = -1; int amtread = -1; @@ -270,7 +270,7 @@ virStorageBackendCreateBlockFrom(virConnectPtr conn ATTRIBUTE_UNUSED, if (inputvol) { int res = virStorageBackendCopyToFD(vol, inputvol, - fd, &remain, 0); + fd, &remain, false); if (res < 0) goto cleanup; } @@ -315,7 +315,7 @@ static int createRawFile(int fd, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol) { - int need_alloc = 1; + bool need_alloc = true; int ret = 0; unsigned long long remain; @@ -338,7 +338,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, * available, and since we're going to copy data from another * file it doesn't make sense to write the file twice. */ if (fallocate(fd, 0, 0, vol->allocation) == 0) { - need_alloc = 0; + need_alloc = false; } else if (errno != ENOSYS && errno != EOPNOTSUPP) { ret = -errno; virReportSystemError(errno, @@ -354,8 +354,8 @@ createRawFile(int fd, virStorageVolDefPtr vol, /* allow zero blocks to be skipped if we've requested sparse * allocation (allocation < capacity) or we have already * been able to allocate the required space. */ - int want_sparse = (need_alloc == 0) || - (vol->allocation < inputvol->capacity); + bool want_sparse = !need_alloc || + (vol->allocation < inputvol->capacity); ret = virStorageBackendCopyToFD(vol, inputvol, fd, &remain, want_sparse); if (ret < 0) { -- 1.8.1.5

2 2

[libvirt] [PATCH 0/2] change the minimum blkio weight according to kernel version
by Chen Hanxiao 09 Oct '13

09 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Since 2.6.39, kernel changed the minimum weight of device blkio. We need to follow them according to different kernel version. Chen Hanxiao (2): [libvirt][PATCH]cgroup: introduce kernel version check function for cgroup [libvirt][PATCH]blkio: change the minimum weight according to kernel version src/util/vircgroup.c | 76 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 65 insertions(+), 11 deletions(-) -- 1.8.2.1

2 6

[libvirt] [PATCH] tests: Add qemu test for multiple timers
by Cole Robinson 08 Oct '13

08 Oct '13

The following XML is the recommended default clock configuration for qemu: <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> <timer name='hpet' present='no'/> </clock> However we weren't testing any of those timer elements. --- .../qemuxml2argv-clock-hpet-off.args | 5 ++++ .../qemuxml2argv-clock-hpet-off.xml | 30 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args new file mode 100644 index 0000000..5d11d91 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-rtc base=utc,driftfix=slew -no-kvm-pit-reinjection -no-hpet -no-acpi -boot c \ +-usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml new file mode 100644 index 0000000..3aed49f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <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'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 58165fd..286f1a3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -421,6 +421,8 @@ mymain(void) DO_TEST("clock-variable", QEMU_CAPS_RTC); */ DO_TEST("clock-france", QEMU_CAPS_RTC); + DO_TEST("clock-hpet-off", QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, + QEMU_CAPS_NO_KVM_PIT); DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM); DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_CPU_HOST); DO_TEST("kvmclock", QEMU_CAPS_KVM); -- 1.8.3.1

2 1

[libvirt] [PATCH] Ignore thin pool LVM devices
by Dusty Mabe 08 Oct '13

08 Oct '13

For BZ 924672 the problem stems from the fact that thin pool logical volume devices show up in /sbin/lvs output just like normal logical volumes do. Since the thin pool devices show up libvirt assumes they are just normal logical volumes and assumes there will be a corresponding /dev/vgname/lvname device that has been created. This is not the case and you will receive the following error when starting the storage pool: error: cannot stat file '/dev/vgvirt/thinpool': No such file or directory This patch modifies virStorageBackendLogicalMakeVol() to ignore thin pool backing devices. --- src/storage/storage_backend_logical.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index a1a37a1..74d26bd 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -85,6 +85,10 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (attrs[4] != 'a') return 0; + /* BZ 924672 - Skip thin pools(t) and thin pool data(T) */ + if (attrs[0] == 't' || attrs[0] == 'T') + return 0; + /* See if we're only looking for a specific volume */ if (data != NULL) { vol = data; -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu_migration: Avoid crashing if domain dies too quickly
by Michal Privoznik 08 Oct '13

08 Oct '13

I've noticed a SIGSEGV-ing libvirtd on the destination when the qemu died too quickly = in Prepare phase. What is happening here is: 1) [Thread 3493] We are in qemuMigrationPrepareAny() and calling qemuProcessStart() which subsequently calls qemuProcessWaitForMonitor() and qemuConnectMonitor(). So far so good. The qemuMonitorOpen() succeeds, however switching monitor to QMP mode fails as qemu died meanwhile. That is qemuMonitorSetCapabilities() returns -1. 2013-10-08 15:54:10.629+0000: 3493: debug : qemuMonitorSetCapabilities:1356 : mon=0x14a53da0 2013-10-08 15:54:10.630+0000: 3493: debug : qemuMonitorJSONCommandWithFd:262 : Send command '{"execute":"qmp_capabilities","id":"libvirt-1"}' for write with FD -1 2013-10-08 15:54:10.630+0000: 3493: debug : virEventPollUpdateHandle:147 : EVENT_POLL_UPDATE_HANDLE: watch=17 events=13 ... 2013-10-08 15:54:10.631+0000: 3493: debug : qemuMonitorSend:956 : QEMU_MONITOR_SEND_MSG: mon=0x14a53da0 msg={"execute":"qmp_capabilities","id":"libvirt-1"} fd=-1 2013-10-08 15:54:10.631+0000: 3262: debug : virEventPollRunOnce:641 : Poll got 1 event(s) 2) [Thread 3262] The event loop is trying to do the talking to monitor. However, qemu is dead already, remember? 2013-10-08 15:54:13.436+0000: 3262: error : qemuMonitorIORead:551 : Unable to read from monitor: Connection reset by peer 2013-10-08 15:54:13.516+0000: 3262: debug : virFileClose:90 : Closed fd 25 ... 2013-10-08 15:54:13.533+0000: 3493: debug : qemuMonitorSend:968 : Send command resulted in error internal error: early end of file from monitor: possible problem: 3) [Thread 3493] qemuProcessStart() failed. No big deal. Go to the 'endjob' label and subsequently to the 'cleanup'. Since the domain is not persistent and ret is -1, the qemuDomainRemoveInactive() is called. This has an (unpleasant) effect of virObjectUnref()-in the @vm object. Unpleasant because the event loop which is about to trigger EOF callback still holds a pointer to the @vm (not the reference). See the valgrind output below. 4) [Thread 3262] So the even loop starts triggering EOF: 2013-10-08 15:54:13.542+0000: 3262: debug : qemuMonitorIO:729 : Triggering EOF callback 2013-10-08 15:54:13.543+0000: 3262: debug : qemuProcessHandleMonitorEOF:294 : Received EOF on 0x14549110 'migt10' And the monitor is cleaned up. This results in calling qemuProcessHandleMonitorEOF with the @vm pointer passed. The pointer is kept in qemuMonitor struct. ==3262== Thread 1: ==3262== Invalid read of size 4 ==3262== at 0x77ECCAA: pthread_mutex_lock (in /lib64/libpthread-2.15.so) ==3262== by 0x52FAA06: virMutexLock (virthreadpthread.c:85) ==3262== by 0x52E3891: virObjectLock (virobject.c:320) ==3262== by 0x11626743: qemuProcessHandleMonitorEOF (qemu_process.c:296) ==3262== by 0x11642593: qemuMonitorIO (qemu_monitor.c:730) ==3262== by 0x52BD526: virEventPollDispatchHandles (vireventpoll.c:501) ==3262== by 0x52BDD49: virEventPollRunOnce (vireventpoll.c:648) ==3262== by 0x52BBC68: virEventRunDefaultImpl (virevent.c:274) ==3262== by 0x542D3D9: virNetServerRun (virnetserver.c:1112) ==3262== by 0x11F368: main (libvirtd.c:1513) ==3262== Address 0x14549128 is 24 bytes inside a block of size 136 free'd ==3262== at 0x4C2AF5C: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==3262== by 0x529B1FF: virFree (viralloc.c:580) ==3262== by 0x52E3703: virObjectUnref (virobject.c:270) ==3262== by 0x531557E: virDomainObjListRemove (domain_conf.c:2355) ==3262== by 0x1160E899: qemuDomainRemoveInactive (qemu_domain.c:2061) ==3262== by 0x1163A0C6: qemuMigrationPrepareAny (qemu_migration.c:2450) ==3262== by 0x1163A923: qemuMigrationPrepareDirect (qemu_migration.c:2626) ==3262== by 0x11682D71: qemuDomainMigratePrepare3Params (qemu_driver.c:10309) ==3262== by 0x53B0976: virDomainMigratePrepare3Params (libvirt.c:7266) ==3262== by 0x1502D3: remoteDispatchDomainMigratePrepare3Params (remote.c:4797) ==3262== by 0x12DECA: remoteDispatchDomainMigratePrepare3ParamsHelper (remote_dispatch.h:5741) ==3262== by 0x54322EB: virNetServerProgramDispatchCall (virnetserverprogram.c:435) The mon->vm is set in qemuMonitorOpenInternal() which is the correct place to increase @vm ref counter. The correct place to decrease the ref counter is then qemuMonitorDispose(). However, in order to avoid cyclic calling of dispose functions, we must use hack, and set priv->mon to NULL. The qemuDomainObjPrivateFree won't call us again then. This describes the last two chunks of the commit. The others are there for handling virObjectRef() and virObjectUnref() correctly. So far it doesn't work well with NULL virClassPtr :) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Yet another one of those patches, where chasing it down took a half of a day and description what went wrong is longer than a few lines of fix. src/qemu/qemu_capabilities.c | 14 ++++++++++---- src/qemu/qemu_monitor.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7c39c1c..17095b4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2587,7 +2587,8 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, char *monpath = NULL; char *pidfile = NULL; pid_t pid = 0; - virDomainObj vm; + virDomainObjPtr vm = NULL; + virDomainXMLOptionPtr xmlopt = NULL; /* the ".sock" sufix is important to avoid a possible clash with a qemu * domain called "capabilities" @@ -2650,10 +2651,13 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, goto cleanup; } - memset(&vm, 0, sizeof(vm)); - vm.pid = pid; + if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) || + !(vm = virDomainObjNew(xmlopt))) + goto cleanup; + + vm->pid = pid; - if (!(mon = qemuMonitorOpen(&vm, &config, true, &callbacks, NULL))) { + if (!(mon = qemuMonitorOpen(vm, &config, true, &callbacks, NULL))) { ret = 0; goto cleanup; } @@ -2673,6 +2677,8 @@ cleanup: virCommandFree(cmd); VIR_FREE(monarg); VIR_FREE(monpath); + virObjectUnref(vm); + virObjectUnref(xmlopt); if (pid != 0) { char ebuf[1024]; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a601ee0..2cf68da 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -251,10 +251,21 @@ static char * qemuMonitorEscapeNonPrintable(const char *text) static void qemuMonitorDispose(void *obj) { qemuMonitorPtr mon = obj; + qemuDomainObjPrivatePtr priv = mon->vm->privateData; VIR_DEBUG("mon=%p", mon); if (mon->cb && mon->cb->destroy) (mon->cb->destroy)(mon, mon->vm, mon->callbackOpaque); + /* HACK: priv->mon is still non-NULL. If we are the last to hold the + * reference to mon->vm, the qemuDomainObjPrivateFree() will call + * qemuMonitorClose() and hence us again. IOW, dispose callback which calls + * dispose callback which calls dispose callback ... + * Moreover, not all domains have privateData - for instance a dummy domain + * object created in virQEMUCapsInitQMP(). */ + if (priv) + priv->mon = NULL; + virObjectUnref(mon->vm); + virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); virJSONValueFree(mon->options); @@ -781,6 +792,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, } mon->fd = fd; mon->hasSendFD = hasSendFD; + virObjectRef(vm); mon->vm = vm; mon->json = json; if (json) -- 1.8.1.5

2 1

Re: [libvirt] [virt-tools-list] [PATCH] build: fix linker error on FreeBSD
by Eric Blake 08 Oct '13

08 Oct '13

On 10/08/2013 10:21 AM, Giuseppe Scrivano wrote: > Commit 2d74822a9eb4856c7f5216bb92bcb76630660f72 renamed > "freebsdNodeGetCPUCount" to "appleFreebsdNodeGetCPUCount", leaving one > call to "freebsdNodeGetCPUCount". Fix this other case. ACK, although it looks like you intended this to go to libvir-list (now cc'd) > > Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> > --- > src/nodeinfo.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/nodeinfo.c b/src/nodeinfo.c > index 320d8f8..702ad7c 100644 > --- a/src/nodeinfo.c > +++ b/src/nodeinfo.c > @@ -1056,8 +1056,8 @@ nodeGetCPUCount(void) > > VIR_FREE(cpupath); > return ncpu; > -#elif defined(__FreeBSD__) > - return freebsdNodeGetCPUCount(); > +#elif defined(__FreeBSD__) || defined(__APPLE__) > + return appleFreebsdNodeGetCPUCount (); > #else > virReportError(VIR_ERR_NO_SUPPORT, "%s", > _("host cpu counting not implemented on this platform")); > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 3

[libvirt] [PATCH] Fix typo breaking cgroups for NBD backed filesystems
by Daniel P. Berrange 08 Oct '13

08 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A typo in the setup of NBD backed filesystems meant the /dev/nbdN device would not be added to the cgroups device ACL. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index e7e7acc..6cb36ff 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -423,7 +423,7 @@ static int virLXCControllerSetupNBDDeviceFS(virDomainFSDefPtr fs) * We now change it into a block device type, so that * the rest of container setup 'just works' */ - fs->type = VIR_DOMAIN_DISK_TYPE_BLOCK; + fs->type = VIR_DOMAIN_FS_TYPE_BLOCK; VIR_FREE(fs->src); fs->src = dev; -- 1.8.3.1

2 1

[libvirt] [PATCH] Initialize threading & error layer in LXC controller
by Daniel P. Berrange 08 Oct '13

08 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> In Fedora 20, libvirt_lxc crashes immediately at startup with a trace #0 0x00007f0cddb653ec in free () from /lib64/libc.so.6 #1 0x00007f0ce0e16f4a in virFree (ptrptr=ptrptr@entry=0x7f0ce1830058) at util/viralloc.c:580 #2 0x00007f0ce0e2764b in virResetError (err=0x7f0ce1830030) at util/virerror.c:354 #3 0x00007f0ce0e27a5a in virResetLastError () at util/virerror.c:387 #4 0x00007f0ce0e28858 in virEventRegisterDefaultImpl () at util/virevent.c:233 #5 0x00007f0ce0db47c6 in main (argc=11, argv=0x7fff4596c328) at lxc/lxc_controller.c:2352 Normally virInitialize calls virErrorInitialize and virThreadInitialize, but we don't link to libvirt.so in libvirt_lxc, and nor did we ever call the error or thread initializers. I have absolutely no idea how this has ever worked, let alone what caused it to stop working in Fedora 20. In addition not all code paths from virLogSetFromEnv will ensure virLogInitialize is called correctly, which is another possible crash scenario. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 4 +++- src/util/virlog.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ed73ab0..92fb2bb 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2250,7 +2250,9 @@ int main(int argc, char *argv[]) if (setlocale(LC_ALL, "") == NULL || bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL) { + textdomain(PACKAGE) == NULL || + virThreadInitialize() < 0 || + virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); } diff --git a/src/util/virlog.c b/src/util/virlog.c index 047a131..a54e209 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -547,6 +547,9 @@ virLogDefineFilter(const char *match, virCheckFlags(VIR_LOG_STACK_TRACE, -1); + if (virLogInitialize() < 0) + return -1; + if ((match == NULL) || (priority < VIR_LOG_DEBUG) || (priority > VIR_LOG_ERROR)) return -1; @@ -662,6 +665,9 @@ virLogDefineOutput(virLogOutputFunc f, virCheckFlags(0, -1); + if (virLogInitialize() < 0) + return -1; + if (f == NULL) return -1; -- 1.8.3.1

2 1

[libvirt] [PATCHv3 0/3] Change preference of default PCI passthrough type to VFIO
by Peter Krempa 08 Oct '13

08 Oct '13

Version 3 incorporates fixes for issues I found while testing this series a bit better than the previous one. The main objective of this series is to add checks if VFIO is enabled on a host and if it's the case use it as a default PCI passthrough type instead of the legacy KVM passthrough type. Peter Krempa (3): qemu: hostdev: Refactor PCI passhrough handling qemu: hostdev: Add checks if PCI passthrough is availabe in the host qemu: Prefer VFIO for PCI device passthrough docs/formatdomain.html.in | 9 ++- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 28 ++++++--- src/qemu/qemu_hostdev.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hostdev.h | 5 ++ src/qemu/qemu_hotplug.c | 29 ++++++---- src/qemu/qemu_process.c | 18 ++++-- tests/qemuxml2argvtest.c | 11 ++++ 8 files changed, 214 insertions(+), 31 deletions(-) -- 1.8.3.2

3 12

[libvirt] [PATCHv4 0/4] Introduce APIs to extract DHCP leases info
by Nehal J Wani 08 Oct '13

08 Oct '13

This API returns the leases information stored in the DHCP leases file of dnsmasq for a given virtual network. It contacts the bridge network driver, which parses the leases file. It supports two methods: 1. Return info for all network interfaces connected to a given virtual network 2. Return information for a particular network interface in a given virtual network by providing its MAC Address v4 * Added support for DHCPv6, updated lease file parsing method v3 * Mostly small nits, change in MACRO names, use of virSocketAddrGetIpPrefix to retrieve IP prefix from @dom XML. Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00832.html v2 * Since DHCPv6 is supposed to be suported in future, virNetworkGetDHCPLeasesForMAC changed, prefix and virIPAddrType added in virNetworkDHCPLeases struct. Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00732.html v1 * Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00620.html * The need for these APIs were result of a RFC was proposed on the list. Refer: http://www.redhat.com/archives/libvir-list/2013-July/msg01603.html Nehal J Wani (4): net-dhcp-leases: Implement the remote protocol net-dhcp-leases: Implement the remote protocol net-dhcp-leases: Private implementation inside network driver net-dhcp-leases: Add virsh support daemon/remote.c | 157 ++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 36 +++++++ python/generator.py | 3 + src/driver.h | 13 +++ src/libvirt.c | 177 +++++++++++++++++++++++++++++++ src/libvirt_public.syms | 3 + src/network/bridge_driver.c | 240 +++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 169 +++++++++++++++++++++++++++++- src/remote/remote_protocol.x | 59 ++++++++++- src/remote_protocol-structs | 47 +++++++++ src/rpc/gendispatch.pl | 1 + tools/virsh-network.c | 150 +++++++++++++++++++++++++++ tools/virsh.pod | 6 ++ 13 files changed, 1057 insertions(+), 4 deletions(-) -- 1.7.11.7

4 32