- Devel - libvirt List Archives

[libvirt] [PATCH libvirt 1/2] storage: add preallocation element
by Marc-André Lureau 10 May '12

10 May '12

Allow to specify preallocation mode for QCOW2 images. If not specified or not available, it's ignored. This change only modify the schema, doc, parsing and tests. --- docs/formatstorage.html.in | 6 ++++++ docs/schemas/storagevol.rng | 18 ++++++++++++++++++ src/conf/storage_conf.c | 26 ++++++++++++++++++++++++++ src/conf/storage_conf.h | 1 + src/util/storage_file.c | 4 ++++ src/util/storage_file.h | 10 ++++++++++ tests/storagevolxml2xmlin/vol-qcow2.xml | 1 + tests/storagevolxml2xmlout/vol-qcow2.xml | 1 + 8 files changed, 67 insertions(+) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index d0e4319..c4faadf 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -252,6 +252,12 @@ 1,152,921,504,606,846,976 bytes). <span class="since">Since 0.4.1, multi-character <code>unit</code> since 0.9.11</span></dd> + <dt><code>preallocation</code></dt> + <dd>An image with preallocated metadata is initially larger but + can improve performance when the image needs to grow. This is + supported by QCOW2 image format. + Attribe <code>mode</code> value can be 'off' or 'metadata'. + <span class="since">Since 0.9.13</span></dd> <dt><code>capacity</code></dt> <dd>Providing the logical capacity for the volume. This value is in bytes by default, but a <code>unit</code> attribute can be diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 8edb877..d9a148e 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -40,6 +40,7 @@ <ref name='scaledInteger'/> </element> </optional> + <ref name='preallocation'/> </define> <define name='permissions'> @@ -171,6 +172,23 @@ </optional> </define> + <define name='preallocationmode'> + <choice> + <value>off</value> + <value>metadata</value> + </choice> + </define> + + <define name='preallocation'> + <optional> + <element name='preallocation'> + <attribute name='mode'> + <ref name='preallocationmode'/> + </attribute> + </element> + </optional> + </define> + <define name='name'> <data type='string'> <param name="pattern">[a-zA-Z0-9_\+\-\.]+</param> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 0b34f28..95849ec 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -991,6 +991,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, char *allocation = NULL; char *capacity = NULL; char *unit = NULL; + char *preallocation = NULL; xmlNodePtr node; options = virStorageVolOptionsForPoolType(pool->type); @@ -1035,6 +1036,19 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, ret->allocation = ret->capacity; } + preallocation = virXPathString("string(./preallocation/@mode)", ctxt); + if (preallocation) { + if ((ret->preallocation = virStoragePreallocationModeTypeFromString(preallocation)) < 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown preallocation mode %s"), preallocation); + goto cleanup; + } + + VIR_FREE(preallocation); + } else { + ret->preallocation = VIR_STORAGE_PREALLOCATION_NONE; + } + ret->target.path = virXPathString("string(./target/path)", ctxt); if (options->formatFromString) { char *format = virXPathString("string(./target/format/@type)", ctxt); @@ -1244,6 +1258,18 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, virBufferAsprintf(&buf," <allocation unit='bytes'>%llu</allocation>\n", def->allocation); + if (def->preallocation != VIR_STORAGE_PREALLOCATION_NONE) { + const char *preallocation; + + preallocation = virStoragePreallocationModeTypeToString(def->preallocation); + if (!preallocation) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unexpected pool type")); + goto cleanup; + } + virBufferAsprintf(&buf," <preallocation mode='%s'/>\n", preallocation); + } + if (virStorageVolTargetDefFormat(options, &buf, &def->target, "target") < 0) goto cleanup; diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 9222c4a..c7c7af0 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -98,6 +98,7 @@ struct _virStorageVolDef { virStorageVolSource source; virStorageVolTarget target; virStorageVolTarget backingStore; + int preallocation; /* virStoragePreallocationMode enum */ }; typedef struct _virStorageVolDefList virStorageVolDefList; diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 530071e..8d78d36 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -47,6 +47,10 @@ VIR_ENUM_IMPL(virStorageFileFormat, "cloop", "cow", "dmg", "iso", "qcow", "qcow2", "qed", "vmdk", "vpc") +VIR_ENUM_IMPL(virStoragePreallocationMode, + VIR_STORAGE_PREALLOCATION_LAST, + "", "off", "metadata") + enum lv_endian { LV_LITTLE_ENDIAN = 1, /* 1234 */ LV_BIG_ENDIAN /* 4321 */ diff --git a/src/util/storage_file.h b/src/util/storage_file.h index 13d0e87..dfc8719 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -46,6 +46,16 @@ enum virStorageFileFormat { VIR_ENUM_DECL(virStorageFileFormat); +enum virStoragePreallocationMode { + VIR_STORAGE_PREALLOCATION_NONE, + VIR_STORAGE_PREALLOCATION_OFF, + VIR_STORAGE_PREALLOCATION_METADATA, + + VIR_STORAGE_PREALLOCATION_LAST +}; + +VIR_ENUM_DECL(virStoragePreallocationMode); + typedef struct _virStorageFileMetadata { char *backingStore; int backingStoreFormat; diff --git a/tests/storagevolxml2xmlin/vol-qcow2.xml b/tests/storagevolxml2xmlin/vol-qcow2.xml index b4924de..b4c6522 100644 --- a/tests/storagevolxml2xmlin/vol-qcow2.xml +++ b/tests/storagevolxml2xmlin/vol-qcow2.xml @@ -5,6 +5,7 @@ </source> <capacity unit="G">5</capacity> <allocation>294912</allocation> + <preallocation mode='metadata'/> <target> <path>/var/lib/libvirt/images/OtherDemo.img</path> <format type='qcow2'/> diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml2xmlout/vol-qcow2.xml index 4490931..311c52e 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2.xml @@ -5,6 +5,7 @@ </source> <capacity unit='bytes'>5368709120</capacity> <allocation unit='bytes'>294912</allocation> + <preallocation mode='metadata'/> <target> <path>/var/lib/libvirt/images/OtherDemo.img</path> <format type='qcow2'/> -- 1.7.10

2 10

[libvirt] [PATCH 1/1] Assign spapr-vio bus address to ibmvscsi controller
by Li Zhang 10 May '12

10 May '12

ibmvscsi is based on spapr-vio bus address type. It can't work on PCI bus. Now, it is still on pci bus. This patch is to assign spapr-vio address type to ibmvscsi controller. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 117542f..3100f41 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2566,6 +2566,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBufferAddLit(&buf, "lsi"); break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: + def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; virBufferAddLit(&buf, "spapr-vscsi"); break; default: -- 1.7.9.5

2 2

[libvirt] [PATCH] build: Fix the typo in configure.ac
by Osier Yang 10 May '12

10 May '12

s/nuamd/numad/, -- Pushed under trivial rule. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 93cc3e8..f7e15f9 100644 --- a/configure.ac +++ b/configure.ac @@ -1525,7 +1525,7 @@ if test "$with_numad" != "no" ; then if test -z "$NUMAD" || test $fail = 1; then with_numad="no" else - with_nuamd="yes" + with_numad="yes" fi else test -z "$NUMAD" && -- 1.7.7.3

1 0

[libvirt] [PATCHv2] conf: Fix memory leaks in virStoragePoolDefParseSource
by Alex Jia 10 May '12

10 May '12

Detected by valgrind. Leaks are introduced in commit 122fa379. src/conf/storage_conf.c: fix memory leaks. How to reproduce? $ make && make -C tests check TESTS=storagepoolxml2xmltest $ cd tests && valgrind -v --leak-check=full ./storagepoolxml2xmltest actual result: ==28571== LEAK SUMMARY: ==28571== definitely lost: 40 bytes in 5 blocks ==28571== indirectly lost: 0 bytes in 0 blocks ==28571== possibly lost: 0 bytes in 0 blocks ==28571== still reachable: 1,054 bytes in 21 blocks ==28571== suppressed: 0 bytes in 0 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/storage_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 0b34f28..188af6d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -465,6 +465,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, } } + VIR_FREE(nodeset); source->initiator.iqn = virXPathString("string(./initiator/iqn/@name)", ctxt); nsource = virXPathNodeSet("./device", ctxt, &nodeset); -- 1.7.1

2 2

[libvirt] [PATCH] qemu: fix build when !HAVE_NUMACTL
by Eric Blake 10 May '12

10 May '12

Commit 97010eb1f forgot to change the other side of an #ifdef. * src/qemu/qemu_process.c (qemuProcessInitNumaMemoryPolicy): Add argument. --- Pushing under the build-breaker rule. src/qemu/qemu_process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e34cc6d..b7c53ea 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1751,7 +1751,8 @@ cleanup: } #else static int -qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) +qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm, + const char *nodemask ATTRIBUTE_UNUSED) { if (vm->def->numatune.memory.nodemask) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.7.6

1 0

[libvirt] [PATCH] Report error when parsing character device target type
by Jim Fehlig 09 May '12

09 May '12

No useful error was being reported when an invalid character device target type is specified in the domainXML. E.g. ... <console type="pty"> <source path="/dev/pts/2"/> <target type="kvm" port="0"/> </console> ... resulted in error: Failed to define domain from x.xml error: An error occurred, but the cause is unknown With this small patch, the error is more helpful error: Failed to define domain from x.xml error: XML error: unknown target type 'kvm' specified for character device --- src/conf/domain_conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 976e42b..54ac1db 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4895,6 +4895,9 @@ virDomainChrDefParseTargetXML(virCapsPtr caps, if ((def->targetType = virDomainChrTargetTypeFromString(caps, vmdef, def->deviceType, targetType)) < 0) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("unknown target type '%s' specified for character device"), + targetType); goto error; } -- 1.7.8.3

2 2

[libvirt] FYI: Getting rid of gettextize cruft
by Richard W.M. Jones 09 May '12

09 May '12

In libguestfs, we recently got rid of gettextize (or rather, we got rid of the po/Makefile* cruft that gettextize produces). We replaced it with a very simple 100 line Makefile.am which does the same thing, without the many bugs and problems caused by gettextize and autopoint: Final po/Makefile.am: https://github.com/libguestfs/libguestfs/blob/75514ab57a06e534f26698fe1725c… Patches to remove gettextize cruft: https://github.com/libguestfs/libguestfs/commit/6aa95e87c1f259589ff9c781270… https://github.com/libguestfs/libguestfs/commit/75514ab57a06e534f26698fe172… Is this something that libvirt would be interested in? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 2

[libvirt] [PATCHv2 0/2] a new flag VIR_DOMAIN_CPU_STATS_VCPU
by Hu Tao 09 May '12

09 May '12

From: root <root(a)KERNEL-128.(none)> This series adds a new flag VIR_DOMAIN_CPU_STATS_VCPU to virDomainGetCPUStats, which is for getting statistics of physical cpu time consumed by virtual cpus. Changes: v2: - added detailed documentation - added some error checks and fix some memleaks - the two patches rearranged slightly Hu Tao (2): Add a new flag VIR_DOMAIN_CPU_STATS_VCPU to virDomainGetCPUStats Adds support to VIR_DOMAIN_CPU_STATS_VCPU in qemu_driver. include/libvirt/libvirt.h.in | 8 ++ src/libvirt.c | 9 ++- src/qemu/qemu_driver.c | 186 ++++++++++++++++++++++++++++++++++++++---- src/util/cgroup.c | 4 +- tools/virsh.c | 16 +++- 5 files changed, 199 insertions(+), 24 deletions(-)

3 9

[libvirt] Entering freeze for libvirt-0.9.12
by Daniel Veillard 09 May '12

09 May '12

A bit late compared to my estimate from last week, I have just tagged the git tree and made an rc1 snapshot for testing: ftp://libvirt.org/libvirt/libvirt-0.9.12-rc1.tar.gz and currently pushing along the large set of rpms. We still have a number of pending patches as pointed out by http://libvirt.org/pending.html I think the patches from Wen for "cpu bandwidth for hypervisor threads" are a new feature which should wait for after 0.9.12, maybe we should do the same with the remaining patches from Stephan for multiple IP learning the dhcpsnooping code, but there are others pending. The rc1 seems to compile and work okay for me using the set of rpms (notice the change in the set !), please raise potential portability and stability issues, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] conf: Fix memory leaks in virStoragePoolDefParseSource
by Alex Jia 09 May '12

09 May '12

Detected by valgrind. Leaks are introduced in commit 122fa379. src/conf/storage_conf.c: fix memory leaks. How to reproduce? $ make && make -C tests check TESTS=storagepoolxml2xmltest $ cd tests && valgrind -v --leak-check=full ./storagepoolxml2xmltest actual result: ==28571== LEAK SUMMARY: ==28571== definitely lost: 40 bytes in 5 blocks ==28571== indirectly lost: 0 bytes in 0 blocks ==28571== possibly lost: 0 bytes in 0 blocks ==28571== still reachable: 1,054 bytes in 21 blocks ==28571== suppressed: 0 bytes in 0 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/storage_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 0b34f28..668e679 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -462,6 +462,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; } } + VIR_FREE(nodeset); } } -- 1.7.1

3 6