- Devel - libvirt List Archives

[libvirt] [PATCH] Disable static libraries by default
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Every source file is currently built twice by libtool, once for the shared library and once for the static library. Static libs are not commonly packaged by distros and slow down compilation time by as more than 50% compared to a shared-only build time. Time for 'make -j 4': shared only: 2 mins 9 secs shared + static: 3 mins 26 secs Time for non-parallel make shared only: 3 mins 32 secs shared + static: 5 mins 41 secs Those few people who really want them, can pass --enable-static to configure Disabling them by default requires use of LT_INIT, but for compat with RHEL5 we can't rely on that. So we conditionally use LT_INIT, but fallback to AM_PROG_LIBTOOL if not present. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 09e4ad9..0df9e5c 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,11 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +m4_ifndef([LT_INIT], [ + AM_PROG_LIBTOOL +], [ + LT_INIT([shared disable-static]) +]) AM_PROG_CC_C_O AM_PROG_LD -- 1.8.1.4

2 3

[libvirt] [PATCH libvirt-glib] Disable static libraries by default
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Every source file is currently built twice by libtool, once for the shared library and once for the static library. Static libs are not commonly packaged by distros and slow down compilation time by as more than 50% compared to a shared-only build time. Time for non-parallel make shared only: 52 secs shared + static: 1 min 26 secs Those few people who really want them, can pass --enable-static to configure Disabling them by default requires use of LT_INIT. We don't need to support older libtool, so drop use of AM_PROG_LIBTOOL entirely --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 96dbf5a..7b5a092 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,7 @@ AC_SUBST([LIBVIRT_GLIB_VERSION_NUMBER]) AC_PROG_CC AM_PROG_CC_C_O -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL +LT_INIT([shared disable-static win32-dll]) dnl AC_CONFIG_LIBOBJ_DIR([src]) -- 1.8.1.4

2 1

[libvirt] [libvirt-glib] build: Replace obsolete macro in configure.ac
by Christophe Fergeau 02 Apr '13

02 Apr '13

From: Stefano Facchini <stefano.facchini(a)gmail.com> Fix the build for newer automake --- AUTHORS | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6cec5d7..db05f64 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,5 +17,6 @@ Patches have been received from: Timo Juhani Lindfors <timo.lindfors(a)iki.fi> Alexander Larsson <alexl(a)redhat.com> Claudio Bley <cbley(a)av-test.de> + Stefano Facchini <stefano.facchini(a)gmail.com> ... send patches to get your name added ... diff --git a/configure.ac b/configure.ac index 96dbf5a..2bf9c1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT(libvirt-glib, 0.1.7) AC_CONFIG_SRCDIR(libvirt-glib/libvirt-glib-main.c) AC_CONFIG_AUX_DIR([build-aux]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) -- 1.8.1.4

2 3

[libvirt] [PATCH] virsh: Call virDomainFree in cmdDomFSTrim
by Michal Privoznik 02 Apr '13

02 Apr '13

The virsh domfstrim command was not freeing allocated domain, leaving leaked references behind. --- tools/virsh-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5ddcedc..5fbfeee 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10058,6 +10058,8 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: + if (dom) + virDomainFree(dom); return ret; } -- 1.8.1.5

5 6

[libvirt] [libvirt-glib] config: Fix 2 leaks in domain memory setters
by Christophe Fergeau 02 Apr '13

02 Apr '13

--- libvirt-gconfig/libvirt-gconfig-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index be572ab..7ef0be8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -414,6 +414,7 @@ void gvir_config_domain_set_memory(GVirConfigDomain *domain, guint64 memory) gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), "unit", "KiB", NULL); + g_object_unref(G_OBJECT(node)); g_object_notify(G_OBJECT(domain), "memory"); } @@ -439,6 +440,7 @@ void gvir_config_domain_set_current_memory(GVirConfigDomain *domain, gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), "unit", "KiB", NULL); + g_object_unref(G_OBJECT(node)); g_object_notify(G_OBJECT(domain), "current-memory"); } -- 1.8.1.4

2 1

[libvirt] [libvirt-glib 1/4] gconfig: Add GVirConfigStoragePool getters
by Christophe Fergeau 02 Apr '13

02 Apr '13

--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 143 +++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-storage-pool.h | 8 ++ libvirt-gconfig/libvirt-gconfig.sym | 12 +++ 3 files changed, 163 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index 4ad9fc1..b06c24c 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -74,6 +74,25 @@ GVirConfigStoragePool *gvir_config_storage_pool_new_from_xml(const gchar *xml, return GVIR_CONFIG_STORAGE_POOL(object); } +/** + * gvir_config_storage_pool_get_pool_type: + * @pool: a #GVirConfigStoragePool + * + * Gets the type of the pool. + * + * Returns: #Gname of @pool. + */ +GVirConfigStoragePoolType gvir_config_storage_pool_get_pool_type(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), + GVIR_CONFIG_STORAGE_POOL_TYPE_DIR); + + return gvir_config_object_get_attribute_genum(GVIR_CONFIG_OBJECT(pool), + NULL, "type", + GVIR_CONFIG_TYPE_STORAGE_POOL_TYPE, + GVIR_CONFIG_STORAGE_POOL_TYPE_DIR); +} + void gvir_config_storage_pool_set_pool_type(GVirConfigStoragePool *pool, GVirConfigStoragePoolType type) { @@ -87,6 +106,22 @@ void gvir_config_storage_pool_set_pool_type(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_name: + * @pool: a #GVirConfigStoragePool + * + * Gets the name of the pool. + * + * Returns: name of @pool. + */ +const char *gvir_config_storage_pool_get_name(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(pool), + "name"); +} + +/** * gvir_config_storage_pool_set_name: * @name: (allow-none): */ @@ -100,6 +135,22 @@ void gvir_config_storage_pool_set_name(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_uuid: + * @pool: a #GVirConfigStoragePool + * + * Gets the unique identifier for @pool. + * + * Returns: unique identifier for @pool. + */ +const char *gvir_config_storage_pool_get_uuid(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(pool), + "uuid"); +} + +/** * gvir_config_storage_pool_set_uuid: * @uuid: (allow-none): */ @@ -112,6 +163,22 @@ void gvir_config_storage_pool_set_uuid(GVirConfigStoragePool *pool, "uuid", uuid); } +/** + * gvir_config_storage_pool_get_capacity: + * @pool: a #GVirConfigStoragePool + * + * Gets the total storage capacity for the pool. + * + * Returns: total storage capacity in bytes. + */ +guint64 gvir_config_storage_pool_get_capacity(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), 0); + + return gvir_config_object_get_node_content_uint64(GVIR_CONFIG_OBJECT(pool), + "capacity"); +} + void gvir_config_storage_pool_set_capacity(GVirConfigStoragePool *pool, guint64 capacity) { @@ -121,6 +188,22 @@ void gvir_config_storage_pool_set_capacity(GVirConfigStoragePool *pool, "capacity", capacity); } +/** + * gvir_config_storage_pool_get_allocation: + * @pool: a #GVirConfigStoragePool + * + * Gets the total storage allocation for the pool. + * + * Returns: total storage allocation in bytes. + */ +guint64 gvir_config_storage_pool_get_allocation(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), 0); + + return gvir_config_object_get_node_content_uint64(GVIR_CONFIG_OBJECT(pool), + "allocation"); +} + void gvir_config_storage_pool_set_allocation(GVirConfigStoragePool *pool, guint64 allocation) { @@ -130,6 +213,22 @@ void gvir_config_storage_pool_set_allocation(GVirConfigStoragePool *pool, "allocation", allocation); } +/** + * gvir_config_storage_pool_get_available: + * @pool: a #GVirConfigStoragePool + * + * Gets the free space available for allocating new volumes in the pool. + * + * Returns: free space available in bytes. + */ +guint64 gvir_config_storage_pool_get_available(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), 0); + + return gvir_config_object_get_node_content_uint64(GVIR_CONFIG_OBJECT(pool), + "available"); +} + void gvir_config_storage_pool_set_available(GVirConfigStoragePool *pool, guint64 available) { @@ -140,6 +239,28 @@ void gvir_config_storage_pool_set_available(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_source: + * @pool: a #GVirConfigStoragePool + * + * Gets the source for @pool + * + * Returns: (transfer full): a new #GVirConfigStoragePoolSource instance. + */ +GVirConfigStoragePoolSource *gvir_config_storage_pool_get_source(GVirConfigStoragePool *pool) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(pool), + "source", + GVIR_CONFIG_TYPE_STORAGE_POOL_SOURCE); + + return GVIR_CONFIG_STORAGE_POOL_SOURCE(object); +} + +/** * gvir_config_storage_pool_set_source: * @source: (allow-none): */ @@ -156,6 +277,28 @@ void gvir_config_storage_pool_set_source(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_target: + * @pool: a #GVirConfigStoragePool + * + * Gets the target for @pool + * + * Returns: (transfer full): a new #GVirConfigStoragePoolTarget instance. + */ +GVirConfigStoragePoolTarget *gvir_config_storage_pool_get_target(GVirConfigStoragePool *pool) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(pool), + "target", + GVIR_CONFIG_TYPE_STORAGE_POOL_TARGET); + + return GVIR_CONFIG_STORAGE_POOL_TARGET(object); +} + +/** * gvir_config_storage_pool_set_target: * @target: (allow-none): */ diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.h b/libvirt-gconfig/libvirt-gconfig-storage-pool.h index 9005482..ac4141e 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.h @@ -76,20 +76,28 @@ GVirConfigStoragePool *gvir_config_storage_pool_new(void); GVirConfigStoragePool *gvir_config_storage_pool_new_from_xml(const gchar *xml, GError **error); +guint64 gvir_config_storage_pool_get_allocation(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_allocation(GVirConfigStoragePool *pool, guint64 allocation); +guint64 gvir_config_storage_pool_get_available(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_available(GVirConfigStoragePool *pool, guint64 available); +guint64 gvir_config_storage_pool_get_capacity(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_capacity(GVirConfigStoragePool *pool, guint64 capacity); +const char *gvir_config_storage_pool_get_name(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_name(GVirConfigStoragePool *pool, const char *name); +GVirConfigStoragePoolType gvir_config_storage_pool_get_pool_type(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_pool_type(GVirConfigStoragePool *pool, GVirConfigStoragePoolType type); +GVirConfigStoragePoolSource *gvir_config_storage_pool_get_source(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_source(GVirConfigStoragePool *pool, GVirConfigStoragePoolSource *source); +GVirConfigStoragePoolTarget *gvir_config_storage_pool_get_target(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_target(GVirConfigStoragePool *pool, GVirConfigStoragePoolTarget *target); +const char *gvir_config_storage_pool_get_uuid(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_uuid(GVirConfigStoragePool *pool, const char *uuid); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index a1b2cc1..93b2e33 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -512,4 +512,16 @@ LIBVIRT_GCONFIG_0.1.6 { gvir_config_domain_graphics_spice_image_compression_get_type; } LIBVIRT_GCONFIG_0.1.5; +LIBVIRT_GCONFIG_0.1.7 { + global: + gvir_config_storage_pool_get_allocation; + gvir_config_storage_pool_get_available; + gvir_config_storage_pool_get_capacity; + gvir_config_storage_pool_get_name; + gvir_config_storage_pool_get_pool_type; + gvir_config_storage_pool_get_source; + gvir_config_storage_pool_get_target; + gvir_config_storage_pool_get_uuid; +} LIBVIRT_GCONFIG_0.1.6; + # .... define new API here using predicted next version number .... -- 1.8.1.4

2 7

[libvirt] [libvirt-glib] gconfig: Add calls to [gs]et_virt_type to domain tests
by Christophe Fergeau 02 Apr '13

02 Apr '13

Setting GVirConfigDomain::virt_type is required for a working domain configuration, using it in the test programs will be helpful if people are using this as a base when starting to use libvirt-gconfig --- examples/config-demo.py | 1 + libvirt-gconfig/tests/test-domain-create.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/examples/config-demo.py b/examples/config-demo.py index 508bbc5..268c439 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -3,6 +3,7 @@ from gi.repository import LibvirtGConfig; domain = LibvirtGConfig.Domain.new() +domain.set_virt_type(LibvirtGConfig.DomainVirtType.KVM) domain.set_name("foo") domain.set_memory(1024*1024) # 1 GB domain.set_vcpus(2) diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 20fedc5..e30f643 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -111,6 +111,9 @@ int main(int argc, char **argv) domain = gvir_config_domain_new(); g_assert(domain != NULL); + + gvir_config_domain_set_virt_type(domain, GVIR_CONFIG_DOMAIN_VIRT_KVM); + g_assert(gvir_config_domain_get_virt_type(domain) == GVIR_CONFIG_DOMAIN_VIRT_KVM); gvir_config_domain_set_name(domain, "foo"); g_str_const_check(gvir_config_domain_get_name(domain), "foo"); -- 1.8.1.4

2 1

[libvirt] [PATCH 1/2] manual: Add info about migrateuri in virsh manual
by Martin Kletzander 02 Apr '13

02 Apr '13

The virsh(1) man page wasn't saying anything about the 'migrateuri' parameter other than it can be usually omitted. A patched version of docs/migrate.html.in is taken in this patch to fix that up in the man page. --- docs/migration.html.in | 4 ++-- tools/virsh.pod | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 2416275..aecef41 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -192,12 +192,12 @@ should specify the hypervisor specific URI, using an IP address associated with the network to be used.</li> <li>The firewall restricts what ports are available. When libvirt - generates a migration URI will pick a port number using hypervisor + generates a migration URI it will pick a port number using hypervisor specific rules. Some hypervisors only require a single port to be open in the firewalls, while others require a whole range of port numbers. In the latter case the management application may wish to choose a specific port number outside the default range in order - to comply with local firewall policies</li> + to comply with local firewall policies.</li> </ol> <h2><a name="config">Configuration file handling</a></h2> diff --git a/tools/virsh.pod b/tools/virsh.pod index e7e82e3..11447fe 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1080,7 +1080,7 @@ such as GFS2 or GPFS. If you are sure the migration is safe or you just do not care, use I<--unsafe> to force the migration. The I<desturi> is the connection URI of the destination host, and -I<migrateuri> is the migration URI, which usually can be omitted. +I<migrateuri> is the migration URI, which usually can be omitted (see below). I<dname> is used for renaming the domain to new name during migration, which also usually can be omitted. Likewise, I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on @@ -1108,6 +1108,32 @@ seen from the source machine. =back +When I<migrateuri> is not specified, libvirt will automatically determine the +hypervisor specific URI, by looking up the target host's configured hostname. +There are a few scenarios where specifying I<migrateuri> may help: + +=over 4 + +=item * The configured hostname is incorrect, or DNS is broken. If a host has a +hostname which will not resolve to match one of its public IP addresses, then +libvirt will generate an incorrect URI. In this case I<migrateuri> should be +explicitly specified, using an IP address, or a correct hostname. + +=item * The host has multiple network interaces. If a host has multiple network +interfaces, it might be desirable for the migration data stream to be sent over +a specific interface for either security or performance reasons. In this case +I<migrateuri> should be explicitly specified, using an IP address associated +with the network to be used. + +=item * The firewall restricts what ports are available. When libvirt generates +a migration URI, it will pick a port number using hypervisor specific rules. +Some hypervisors only require a single port to be open in the firewalls, while +others require a whole range of port numbers. In the latter case I<migrateuri> +might be specified to choose a specific port number outside the default range in +order to comply with local firewall policies. + +=back + =item B<migrate-setmaxdowntime> I<domain> I<downtime> Set maximum tolerable downtime for a domain which is being live-migrated to -- 1.8.1.5

2 4

[libvirt] [PATCHv2 0/4] Add domain modification impact flags to hot-management commands
by Peter Krempa 02 Apr '13

02 Apr '13

A respin of the series that changes some virsh commands to handle flags more sanely. This version fixes comments by Martin, Laine and Eric. This series omits already acked patches. Peter Krempa (4): virsh: Fix semantics of --config for "update-device" command virsh-domain: Add --live, --config, --current logic to cmdDetachInterface virsh-domain: Add --live, --config, --current logic to cmdDetachDevice virsh-domain: Add --live, --config, --current logic to cmdDetachDisk tools/virsh-domain.c | 182 +++++++++++++++++++++++++++++++++++++-------------- tools/virsh.pod | 81 +++++++++++++++++------ 2 files changed, 194 insertions(+), 69 deletions(-) -- 1.8.1.5

3 10

[libvirt] [PATCH 0/3] Refactor formatting of MAC addresses and domif-getlink virsh command
by Peter Krempa 02 Apr '13

02 Apr '13

This series refactors libvirt XML code generator to create uniform mac addresses with lowercase hex characters and refactors the domif-getlink command to avoid a bug and too complex code. Peter Krempa (3): util: Change virMacAddrFormat to lowercase hex characters conf: Use virMacAddrFormat while generating domain XML files virsh-domain-monitor: Refactor cmdDomIfGetLink src/conf/domain_conf.c | 7 +- src/util/virmacaddr.c | 2 +- tests/networkxml2xmlout/bandwidth-network.xml | 2 +- .../networkxml2xmlout/dhcp6host-routed-network.xml | 2 +- tests/networkxml2xmlout/empty-allow-ipv6.xml | 2 +- tests/networkxml2xmlout/isolated-network.xml | 2 +- tests/networkxml2xmlout/routed-network.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 4 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.vmx | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx | 4 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 2 +- tools/virsh-domain-monitor.c | 100 ++++++++------------- 21 files changed, 62 insertions(+), 87 deletions(-) -- 1.8.1.5

3 11

[libvirt] Entering freeze for libvirt-1.0.4
by Daniel Veillard 02 Apr '13

02 Apr '13

Based on the discussions from last week, we are entering freeze now, I tagged v1.0.4-rc1 in git and pushed libvirt-1.0.4-rc1.tar.gz as well as rpms for F17 at the usual place: ftp://libvirt.org/libvirt/ This looks functional for my limited testing, but give it a try. Hopefully since 1.0.3 wasn't too long ago we should be mostly okay :) And of course a release on April Fool sounds like a good target ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 7

[libvirt] [PATCHv2] conf: Enforce ranges on cputune variables
by Peter Krempa 02 Apr '13

02 Apr '13

The limits are documented at http://libvirt.org/formatdomain.html#elementsCPUTuning . Enforce them when going through XML parsing in addition to being enforced by the API. --- Notes: Version 2: - split out from the conf callback series and applied separately to the parser code src/conf/domain_conf.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3fca7f..371d80c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9677,6 +9677,14 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.period > 0 && + (def->cputune.period < 1000 || def->cputune.period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune period must be in range " + "[1000, 1000000]")); + goto error; + } + if (virXPathLongLong("string(./cputune/quota[1])", ctxt, &def->cputune.quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9684,6 +9692,15 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.quota > 0 && + (def->cputune.quota < 1000 || + def->cputune.quota > 18446744073709551)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune quota must be in range " + "[1000, 18446744073709551]")); + goto error; + } + if (virXPathULongLong("string(./cputune/emulator_period[1])", ctxt, &def->cputune.emulator_period) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9691,6 +9708,15 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.emulator_period > 0 && + (def->cputune.emulator_period < 1000 || + def->cputune.emulator_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_period must be in range " + "[1000, 1000000]")); + goto error; + } + if (virXPathLongLong("string(./cputune/emulator_quota[1])", ctxt, &def->cputune.emulator_quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9698,6 +9724,15 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.emulator_quota > 0 && + (def->cputune.emulator_quota < 1000 || + def->cputune.emulator_quota > 18446744073709551)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_quota must be in range " + "[1000, 18446744073709551]")); + goto error; + } + if ((n = virXPathNodeSet("./cputune/vcpupin", ctxt, &nodes)) < 0) goto error; -- 1.8.1.5

2 2

[libvirt] [PATCH v3] test: Return Libvirt logo as domain screenshot
by Michal Privoznik 02 Apr '13

02 Apr '13

This is just a bare Easter Egg. Whenever a user runs virDomainScreenshot over a domain in test driver, he'll get the Libvirt PNG logo in return. --- docs/Makefile.am | 1 + libvirt.spec.in | 1 + src/test/test_driver.c | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 7583772..b5d7575 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -287,6 +287,7 @@ install-data-local: for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done + $(INSTALL_DATA) $(srcdir)/../docs/libvirtLogo.png $(DESTDIR)$(pkgdatadir) uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done diff --git a/libvirt.spec.in b/libvirt.spec.in index 2da0558..34b3f9c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1941,6 +1941,7 @@ fi %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/cpu_map.xml +%{_datadir}/libvirt/libvirtLogo.png %if %{with_systemd} %{_unitdir}/libvirt-guests.service diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c5fffb9..4dbd775 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -39,11 +39,13 @@ #include "virutil.h" #include "viruuid.h" #include "capabilities.h" +#include "configmake.h" #include "viralloc.h" #include "network_conf.h" #include "interface_conf.h" #include "domain_conf.h" #include "domain_event.h" +#include "fdstream.h" #include "storage_conf.h" #include "node_device_conf.h" #include "virxml.h" @@ -5773,6 +5775,27 @@ cleanup: return ret; } +static char * +testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, + virStreamPtr st, + unsigned int screen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *ret = NULL; + + virCheckFlags(0, NULL); + + if (!(ret = strdup("image/png"))) { + virReportOOMError(); + return NULL; + } + + if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY < 0)) + VIR_FREE(ret); + + return ret; +} + static virDriver testDriver = { .no = VIR_DRV_TEST, @@ -5843,6 +5866,7 @@ static virDriver testDriver = { .domainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ .isAlive = testIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ + .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ }; static virNetworkDriver testNetworkDriver = { -- 1.8.1.5

3 3

[libvirt] [PATCH] smartcard: spell ccid-card-emulated qemu property correctly
by Eric Blake 02 Apr '13

02 Apr '13

Reported by Anthony Messina in https://bugzilla.redhat.com/show_bug.cgi?id=904692 Present since introduction of smartcard support in commit f5fd9baa * src/qemu/qemu_command.c (qemuBuildCommandLine): Match qemu spelling. --- No one has spotted my bug, latent since Feb 2011, until now. I guess smartcard use is not very common... src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c278f..59a6061 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6843,7 +6843,7 @@ qemuBuildCommandLine(virConnectPtr conn, } else { database = VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE; } - virBufferAsprintf(&opt, ",database=%s", database); + virBufferAsprintf(&opt, ",db=%s", database); break; case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: -- 1.8.1.4

2 2

[libvirt] [PATCH v5] qemu: Allow migration over IPv6
by Ján Tomko 02 Apr '13

02 Apr '13

Allow migration over IPv6 by listening on [::] instead of 0.0.0.0 when QEMU supports it (QEMU_CAPS_IPV6_MIGRATION) and there is at least one v6 address configured on the system. Use virURIParse in qemuMigrationPrepareDirect to allow parsing IPv6 addresses, which would cause an 'incorrect :port' error message before. Move setting of migrateFrom from qemuMigrationPrepare{Direct,Tunnel} after domain XML parsing, since we need the QEMU binary path from it to get its capabilities. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=846013 --- diff to v4: Always listen on IPv6 if it's available. Don't add a migration flag. v4: https://www.redhat.com/archives/libvir-list/2013-March/msg01213.html discussion: https://www.redhat.com/archives/libvir-list/2013-March/msg00515.html src/qemu/qemu_capabilities.c | 6 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 104 +++++++++++++++++++++++++++++++++---------- tests/qemuhelptest.c | 9 ++-- 4 files changed, 93 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3840b41..1e1da4d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -213,6 +213,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-ccw", "dtb", "megasas", + + "ipv6-migration", /* 135 */ ); struct _virQEMUCaps { @@ -1181,6 +1183,9 @@ virQEMUCapsComputeCmdFlags(const char *help, if (version >= 11000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_HOST); + if (version >= 1001000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); + if (version >= 1002000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); return 0; @@ -2317,6 +2322,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7101f67..2ccc7c2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,6 +174,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ QEMU_CAPS_DTB = 133, /* -dtb file */ QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ + QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 537b834..867c7f1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -22,6 +22,8 @@ #include <config.h> +#include <netdb.h> +#include <sys/socket.h> #include <sys/time.h> #ifdef WITH_GNUTLS # include <gnutls/gnutls.h> @@ -1104,12 +1106,12 @@ error: */ static int qemuMigrationStartNBDServer(virQEMUDriverPtr driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + const char *listenAddr) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; unsigned short port = 0; - const char *listenAddr = "0.0.0.0"; char *diskAlias = NULL; size_t i; @@ -1980,8 +1982,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, int *cookieoutlen, const char *dname, const char *dom_xml, - const char *migrateFrom, virStreamPtr st, + unsigned int port, unsigned long flags) { virDomainDefPtr def = NULL; @@ -1997,6 +1999,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, char *xmlout = NULL; unsigned int cookieFlags; virCapsPtr caps = NULL; + const char *listenAddr = NULL; + char *migrateFrom = NULL; if (virTimeMillisNow(&now) < 0) return -1; @@ -2084,6 +2088,45 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, } } + if (tunnel) { + /* QEMU will be started with -incoming stdio + * (which qemu_command might convert to exec:cat or fd:n) + */ + if (!(migrateFrom = strdup("stdio"))) { + virReportOOMError(); + goto cleanup; + } + } else { + virQEMUCapsPtr qemuCaps = NULL; + struct addrinfo *info = NULL; + struct addrinfo hints = { .ai_flags = AI_ADDRCONFIG, + .ai_socktype = SOCK_STREAM }; + + if (!(qemuCaps = virQEMUCapsCacheLookupCopy(driver->qemuCapsCache, + def->emulator))) + goto cleanup; + + /* Listen on :: instead of 0.0.0.0 if QEMU understands it + * and there is at least one IPv6 address configured + */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION) && + getaddrinfo("::", NULL, &hints, &info) == 0) { + freeaddrinfo(info); + listenAddr = "[::]"; + } else { + listenAddr = "0.0.0.0"; + } + virObjectUnref(qemuCaps); + + /* QEMU will be started with -incoming [::]:port + * or -incoming 0.0.0.0:port + */ + if (virAsprintf(&migrateFrom, "tcp:%s:%d", listenAddr, port) < 0) { + virReportOOMError(); + goto cleanup; + } + } + if (!(vm = virDomainObjListAdd(driver->domains, driver->xmlconf, def, @@ -2172,7 +2215,7 @@ done: if (flags & VIR_MIGRATE_TUNNELLED) VIR_DEBUG("NBD in tunnelled migration is currently not supported"); else { - if (qemuMigrationStartNBDServer(driver, vm) < 0) { + if (qemuMigrationStartNBDServer(driver, vm, listenAddr) < 0) { /* error already reported */ goto endjob; } @@ -2213,6 +2256,7 @@ done: ret = 0; cleanup: + VIR_FREE(migrateFrom); VIR_FREE(origname); VIR_FREE(xmlout); virDomainDefFree(def); @@ -2270,12 +2314,9 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, st, NULLSTR(dname), dom_xml, flags); - /* QEMU will be started with -incoming stdio (which qemu_command might - * convert to exec:cat or fd:n) - */ ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - "stdio", st, flags); + st, 0, flags); return ret; } @@ -2296,9 +2337,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, static int port = 0; int this_port; char *hostname = NULL; - char migrateFrom [64]; const char *p; + char *uri_str = NULL; int ret = -1; + virURIPtr uri; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2347,16 +2389,39 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * URI when passing it to the qemu monitor, so bad * characters in hostname part don't matter. */ - if (!STRPREFIX(uri_in, "tcp:")) { + if (!(p = STRSKIP(uri_in, "tcp:"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("only tcp URIs are supported for KVM/QEMU" " migrations")); goto cleanup; } - /* Get the port number. */ - p = strrchr(uri_in, ':'); - if (p == strchr(uri_in, ':')) { + /* Convert uri_in to well-formed URI with // after tcp: */ + if (!(STRPREFIX(uri_in, "tcp://"))) { + if (virAsprintf(&uri_str, "tcp://%s", p) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + uri = virURIParse(uri_str ? uri_str : uri_in); + VIR_FREE(uri_str); + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("missing host in migration" + " URI: %s"), uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { /* Generate a port */ this_port = QEMUD_MIGRATION_FIRST_PORT + port++; if (port == QEMUD_MIGRATION_NUM_PORTS) @@ -2369,25 +2434,16 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, } } else { - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber(&p); - if (this_port == -1 || p-uri_in != strlen(uri_in)) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("URI ended with incorrect ':port'")); - goto cleanup; - } + this_port = uri->port; } } if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); - /* QEMU will be started with -incoming tcp:0.0.0.0:port */ - snprintf(migrateFrom, sizeof(migrateFrom), "tcp:0.0.0.0:%d", this_port); - ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - migrateFrom, NULL, flags); + NULL, this_port, flags); cleanup: VIR_FREE(hostname); if (ret != 0) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a28109a..05bb8a6 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -812,7 +812,8 @@ mymain(void) QEMU_CAPS_DEVICE_VMWARE_SVGA, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB); + QEMU_CAPS_DTB, + QEMU_CAPS_IPV6_MIGRATION); DO_TEST("qemu-1.2.0", 1002000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -913,7 +914,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DTB, - QEMU_CAPS_SCSI_MEGASAS); + QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_IPV6_MIGRATION); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -1019,7 +1021,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DTB, - QEMU_CAPS_SCSI_MEGASAS); + QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_IPV6_MIGRATION); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu: Support multiple queue virtio-scsi
by Osier Yang 02 Apr '13

02 Apr '13

This introduce a new attribute "num_queues" (same with the good name QEMU uses) for virtio-scsi controller. An example of the XML: <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> The corresponding QEMU command line: -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ --- docs/formatdomain.html.in | 9 +++++--- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 13 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 8 +++++++ .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index cf382e8..262f1ac 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2092,10 +2092,13 @@ controller. A "scsi" controller has an optional attribute <code>model</code>, which is one of "auto", "buslogic", "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or - "vmpvscsi". A "usb" controller has an optional attribute + "vmpvscsi". The attribute <code>num_queues</code> + (<span class="since">1.0.5 (QEMU and KVM only)</span>) is to specify + the number of queues for the controller, it should match the number + of vCPUs. A "usb" controller has an optional attribute <code>model</code>, which is one of "piix3-uhci", "piix4-uhci", "ehci", - "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", - "vt82c686b-uhci", "pci-ohci" or "nec-xhci". Additionally, + "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", + "pci-ohci" or "nec-xhci". Additionally, <span class="since">since 0.10.0</span>, if the USB bus needs to be explicitly disabled for the guest, <code>model='none'</code> may be used. The PowerPC64 "spapr-vio" addresses do not have an associated controller. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8d7e6db..089be6c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1407,6 +1407,11 @@ </attribute> </optional> <optional> + <attribute name="num_queues"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> <ref name="usbmaster"/> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3fca7f..e9d6b8b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4825,6 +4825,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *type = NULL; char *idx = NULL; char *model = NULL; + char *num_queues = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -4860,6 +4861,14 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->model = -1; } + if ((num_queues = virXMLPropString(node, "num_queues"))) { + if (virStrToLong_ui(num_queues, NULL, 10, &def->num_queues) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'num_queues' value '%s'"), num_queues); + goto error; + } + } + if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; @@ -4937,6 +4946,7 @@ cleanup: VIR_FREE(type); VIR_FREE(idx); VIR_FREE(model); + VIR_FREE(num_queues); return def; @@ -13037,6 +13047,9 @@ virDomainControllerDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " model='%s'", model); } + if (def->num_queues) + virBufferAsprintf(buf, " num_queues='%u'", def->num_queues); + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: if (def->opts.vioserial.ports != -1) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index edddf25..8e79961 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -728,6 +728,7 @@ struct _virDomainControllerDef { int type; int idx; int model; /* -1 == undef */ + unsigned int num_queues; union { virDomainVirtioSerialOpts vioserial; } opts; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c278f..bc7beff 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3530,6 +3530,14 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBuffer buf = VIR_BUFFER_INITIALIZER; int model; + if (def->num_queues && + !(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'num_queues' is only supported by virtio-scsi controller")); + return NULL; + } + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: model = def->model; @@ -3613,6 +3621,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, goto error; } + if (def->num_queues) + virBufferAsprintf(&buf, ",num_queues=%u", def->num_queues); + if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps) < 0) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args new file mode 100644 index 0000000..8d46799 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml new file mode 100644 index 0000000..dfa9cf1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml @@ -0,0 +1,26 @@ +<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'>8</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'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 38787ac..055d935 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -550,6 +550,9 @@ mymain(void) DO_TEST("disk-scsi-virtio-scsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-virtio-scsi-num_queues", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ba9aa96..e5056f1 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -179,6 +179,7 @@ mymain(void) DO_TEST("disk-scsi-device"); DO_TEST("disk-scsi-vscsi"); DO_TEST("disk-scsi-virtio-scsi"); + DO_TEST("disk-virtio-scsi-num_queues"); DO_TEST("disk-scsi-megasas"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); DO_TEST_FULL("disk-mirror", true, WHEN_INACTIVE); -- 1.8.1.4

3 4

[libvirt] Release of libvirt-1.0.4
by Daniel Veillard 02 Apr '13

02 Apr '13

As planned I tagged the release in git and pushed the new version to the usual place as tarball and rpms: ftp://libvirt.org/libvirt/ I hesited a bit in pushing the patchset from Peter fixing the memory corruption bug, but since it seems hard to reproduce and the amount of change was a bit too large to push just before a release, I prefered delaying it until after 1.0.4 . This release is a bit smaller than usual at around 200 patches but that's not surprizing considering the shrter timeframe since 1.0.3. This includes an homogenous set of features, improvements and bug fixes, plus updates for localization of ukrainian (100%), japanese (100%), French (12%) and Gujarati (78%) Features: - qemu: support passthrough for iscsi disks (Paolo Bonzini) - various S390 improvements (Viktor Mihajlovski) - various LXC bugs fixes and improvements (Daniel P. Berrange, Gao feng) - Add API for thread cancellation (Daniel P. Berrange) Documentation: - Fix truncated sentence in RDP 'multiUser' attribute (Christophe Fergeau) - Remove the redundant parentheses in migrate help (Yanbing Du) - virsh: Fix docs for "virsh setmaxmem" (Peter Krempa) - util: fix virAllocVar's comment (Ján Tomko) - clarify virsh net commands (Gene Czarcinski) - storage: Fix grammar (Philipp Hahn) - Fix /pool/storage/name documentation (Christophe Fergeau) - Fix /pool/storage/directory@path documentation (Christophe Fergeau) - Fix snapshot-create-as syntax in help output (Martin Kletzander) - Update to COPYING.LIB to latest LGPLv2.1 copy (Christophe Fergeau) - Fix a copy & paste error for virsh dump help (Yanbing Du) - Clarify semantics of sparse storage volumes (Jiri Denemark) Portability: - virutil: Fix compilation on non-linux platforms (Michal Privoznik) - Fix linkage of virt-aa-helper with numa library (Daniel P. Berrange) - Don't fail if SELinux is diabled (Guido Günther) - Fix --without-libvirtd builds (Doug Goldstein) - lxc: include sys/stat.h (Guido Günther) - Ensure GET_VLAN_VID_CMD is always defined (Daniel P. Berrange) - Don't import loop.h unless HAVE_DECL_LO_FLAGS_AUTOCLEAR is defined (Daniel P. Berrange) Bug Fixes: - virsh: don't call virSecretFree on NULL (Ján Tomko) - storage: Avoid double virCommandFree in virStorageBackendLogicalDeletePool (Martin Kletzander) - nodedev: invert virIsCapableFCHost return value (Ján Tomko) - security_manager.c: Append seclabel iff generated (Michal Privoznik) - security: Don't add seclabel of type none if there's already a seclabel (Michal Privoznik) - security_manager: Don't manipulate domain XML in virDomainDefGetSecurityLabelDef (Michal Privoznik) - conf: fix memory leak of class_id bitmap (Guannan Ren) - uml:release config object when uml driver shutdown (Guannan Ren) - qemu:release qemu config object when qemu driver shutdown (Guannan Ren) - net: use newer iptables syntax (Stefan Seyfried) - remote: Don't call NULL closeFreeCallback (Viktor Mihajlovski) - rpc: Fix client crash when server drops connection (Jiri Denemark) - conf: fix a failure when detaching a usb device (Guannan Ren) - qemu: Don't set address type too early during virtio disk hotplug (Guido Günther) - virsh: error out on non-numeric timeout values (Ján Tomko) - qemu: Set migration FD blocking (Michal Privoznik) - util: Fix bug of managing vport (Osier Yang) - nodedev: Fix the improper logic when enumerating SRIOV VF (Osier Yang) - lxc: Prevent shutting down the host (Martin Kletzander) - Ensure root filesystem is mounted if a file/block mount. (Daniel P. Berrange) - Fix thread safety in LXC callback handling (Daniel P. Berrange) - Remove bogus filtering from virDomainGetRootFilesystem (Daniel P. Berrange) - Fix parsing of bond interface XML (Jim Fehlig) - virsh: don't print --(null) in vol-name and vol-pool (Ján Tomko) - Fix free of uninitialized value in LXC numad setup (Daniel P. Berrange) - Correct invalid RNG schemas (Martin Kletzander) - python: Fix emulatorpin API bindings (Peter Krempa) - qemu: Un-mark volume as mirrored/copied if blockjob copy fails (Peter Krempa) - Fix initialization of virIdentityPtr thread locals (Daniel P. Berrange) - qemu: Add the new disk src into shared disk table when updating disk (Osier Yang) - python: fix bindings that don't raise an exception (Guannan Ren) - Fix typos s/HAVE_SELINUX/WITH_SELINUX/ (Daniel P. Berrange) - fix TLS error with virNetServerClientCreateIdentity (Olivia Yin) - storage: fix unlikely memory leak in rbd backend (Laine Stump) - Do not prematurely close loop devices in LXC controller (Daniel P. Berrange) - qemu: Fix startupPolicy regression (Jiri Denemark) - qemu: do not support non-network disks without -drive (Paolo Bonzini) - Fix size probing for VDI images (Ján Tomko) - Fix memory leak on OOM in virSecuritySELinuxMCSFind (Daniel P. Berrange) - Avoid closing uninitialized FDs when LXC startup fails (Daniel P. Berrange) - Prevent streams from becoming libvirtd controlling TTY (Daniel P. Berrange) - util: escapes special characters in VIR_LOG_REGEX (Guannan Ren) - Daemonize fuse thread in libvirt_lxc (Daniel P. Berrange) - Fix missing error dispatch in virDomainLxcEnterNamespace (Daniel P. Berrange) - Fix query of LXC security label (Daniel P. Berrange) - qemu_driver: Try KVM_CAP_MAX_VCPUS only if defined (Michal Privoznik) - Add missing break in LXC loop device setup (Daniel P. Berrange) - qemu: Avoid NULL dereference in qemuSharedDiskEntryFree (Jiri Denemark) - qemu: Fix retrieval of maximum number of vCPUs on KVM hosts (Peter Krempa) - virsh: fix snapshot-create with no xmlfile (Ján Tomko) - lxc: Init activeUsbHostdevs (Guido Günther) - bandwidth: Require network QoS if interface uses 'floor' (Michal Privoznik) - qemuDomainBlockStatsFlags: Guard disk lookup with a domain job (Michal Privoznik) - Fix crash parsing RNG device specification (Daniel P. Berrange) - Resolve valgrind error (John Ferlan) - storage: Cleanup logical volume creation code (Jiri Denemark) - qemu: update domain live xml for virsh memtune with --live flag (Guannan Ren) - util: fix a integer boundary error (Guannan Ren) Improvements: - util: Fix the conflict type for virIsCapableFCHost (Osier Yang) - libvirt_private.syms: Correctly export seclabel APIs (Michal Privoznik) - log: Separate thread ID from timestemp in ring buffer (Jiri Denemark) - virsh: Correct DESCRIPTION for virsh help blockcopy (Yanbing Du) - Fix virConnectOpen.*() name requirements (Martin Kletzander) - virsh: Let the compiler check usage of all fields in vshCmdOptType enum (Peter Krempa) - python: set default value to optional arguments (Guannan Ren) - libvirt-guests: newline between output sentences (Eric Blake) - nodedev: Abstract nodeDeviceVportCreateDelete as util function (Osier Yang) - nodedev: Dump max vports and vports in use for HBA's XML (Osier Yang) - nodedev: Refactor the helpers (Osier Yang) - nodedev: Use access instead of stat (Osier Yang) - util: Add one helper virReadFCHost to read the value of fc_host entry (Osier Yang) - nodedev: Introduce two new flags for listAll API (Osier Yang) - nodedev: Remove the unused enum (Osier Yang) - Mount temporary devpts on /var/lib/libvirt/lxc/$NAME.devpts (Daniel P. Berrange) - Move FUSE mount to /var/lib/libvirt/lxc/$NAME.fuse (Daniel P. Berrange) - viralloc: Export virAllocTest* (Michal Privoznik) - qemu: add support for LSI MegaRAID SAS1078 (aka megasas) SCSI controller (Paolo Bonzini) - qemu: pass iscsi authorization credentials (Paolo Bonzini) - domain: parse XML for iscsi authorization credentials (Paolo Bonzini) - secret: add iscsi to possible usage types (Paolo Bonzini) - domain: make port optional for network disks (Paolo Bonzini) - qemu: add support for libiscsi (Paolo Bonzini) - make: regenerate bindings when <classname>.py changes (Guannan Ren) - python: treat flags as default argument with value 0 (Guannan Ren) - virsh-snapshot: Simplify cleanup path in cmdSnapshotEdit (Peter Krempa) - virsh-snapshot: Use the mutually exclusive params macro in cmdSnapshotEdit (Peter Krempa) - virsh-snapshot: Refactor cmdSnapshotCurrent (Peter Krempa) - virsh-domain: Fix flag name in error message to match the check (Peter Krempa) - virsh-host: Refactor cmdFreecell (Peter Krempa) - virsh-snapshot: Refactor virsh snapshot-list (Peter Krempa) - virsh: Introduce macros to reject mutually exclusive arguments (Peter Krempa) - qemu: s/VIR_ERR_NO_SUPPORT/VIR_ERR_OPERATION_UNSUPPORTED (Michal Privoznik) - domain: add support for iscsi network disks (Paolo Bonzini) - cgroup: export virCgroupRemoveRecursively (Gao feng) - doc/schema: disk storage volume formats (Philipp Hahn) - doc/schema: Support iqn for storage pools (Philipp Hahn) - doc/schema: add ocfs2 for disk vol (Philipp Hahn) - LXC: add cpuset cgroup support for lxc (Gao feng) - NUMA: cleanup for numa related codes (Gao feng) - LXC: allow uses advisory nodeset from querying numad (Gao feng) - rename qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice (Gao feng) - selinux: deal with dtb file (Olivia Yin) - qemu: add dtb option support (Olivia Yin) - conf: support <dtb> tag in XML domain file (Olivia Yin) - rename tests/conftest.c (Gene Czarcinski) - Setup LXC cgroups in two phases (Daniel P. Berrange) - Set the current client identity during API call dispatch (Daniel P. Berrange) - Add ability to get a virIdentity from a virNetServerClientPtr (Daniel P. Berrange) - Add API to get the system identity (Daniel P. Berrange) - Add APIs for associating a virIdentityPtr with the current thread (Daniel P. Berrange) - Define internal APIs for managing identities (Daniel P. Berrange) - Add APIs to get at more client security data (Daniel P. Berrange) - qemu: support URI syntax for NBD (Paolo Bonzini) - qemu: support NBD with Unix sockets (Paolo Bonzini) - qemu: support named nbd exports (Paolo Bonzini) - qemu: rewrite NBD command-line builder and parser (Paolo Bonzini) - qemu: test NBD command-line builder and parser (Paolo Bonzini) - util: portably check for unchanged uid (Eric Blake) - Make vshDebug work when parsing parameters (Martin Kletzander) - Remove contiguous CPU indexes assumption (Li Zhang) - audit: Audit resources used by VirtIO RNG (Peter Krempa) - S390: Testcases for virtio-scsi and virtio-rng (Viktor Mihajlovski) - S390: Enable virtio-scsi and virtio-rng (Viktor Mihajlovski) - qemu: Rename virtio-scsi capability (Viktor Mihajlovski) - util: fix clear_emulator_capabilities=0 (Laine Stump) - Fix deps for generating RPC dispatch code (Daniel P. Berrange) - Fix generation of systemtap probes for RPC protocols (Daniel P. Berrange) - Re-add DTrace probes on 'dispose' functions (Daniel P. Berrange) - Fix parsing of SELinux ranges without a category (Daniel P. Berrange) - Separate MCS range parsing from MCS range checking (Daniel P. Berrange) - virtio-rng: Add rate limiting options for virtio-RNG (Peter Krempa) - S390: Testcases for virtio-ccw machines (Viktor Mihajlovski) - S390: Add hotplug support for s390 virtio devices (J.B. Joret) - S390: QEMU driver support for CCW addresses (Viktor Mihajlovski) - S390: domain_conf support for CCW (Viktor Mihajlovski) - S390: Documentation for CCW address type (Viktor Mihajlovski) - Use separate symbol file for GNUTLS symbols (Daniel P. Berrange) - Apply security label when entering LXC namespaces (Daniel P. Berrange) - virCaps: conf: start splitting out irrelevat data (Peter Krempa) - Remove hack using existance of an 'identity' string to disable auth (Daniel P. Berrange) - Convert HAVE_SELINUX to WITH_SELINUX (Guido Günther) - capabilities: add NUMA memory information (Dusty Mabe) - apparmor: use AppArmorSetFDLabel for both imageFD and tapFD (Guannan Ren) - Include pid namespace inode in LXC audit messages (Daniel P. Berrange) - Add support for disks backed by plain files in LXC (Daniel P. Berrange) - Refactor loop device setup code in LXC (Daniel P. Berrange) - Convert QEMU driver to use virLogProbablyLogMessage (Daniel P. Berrange) - Improve LXC startup error reporting (Daniel P. Berrange) - Add method for checking if a string is (probably) a log message (Daniel P. Berrange) - Use VIR_MASS_CLOSE in LXC container startup (Daniel P. Berrange) - Fix conditional build of virNetDevSetupControlFull (Daniel P. Berrange) - Rename 'daemon' param to 'binary' in virNetClientNewUNIX (Daniel P. Berrange) - Rename 'clone' to 'clonevol' to avoid name clash with clone() syscall (Daniel P. Berrange) - viralloc: use consistent naming (Eric Blake) - rng: allow default device in RNG grammar (Eric Blake) - build: avoid shadowing a function name (Eric Blake) - conf: Report errors on cputune parameter parsing (Peter Krempa) - conf: Make virDomainDeviceInfoIterate usable without os type (Peter Krempa) - virsh-snapshot: Add ability to print only snapshot names (Peter Krempa) Cleanups: - python:remove semicolon in python code (Guannan Ren) - Clean redundant code about VCPU string checking (Li Zhang) - Cleanup useless flags specifications (Martin Kletzander) - nodeinfo: don't define nodeGetCellMemory if it isn't ever used (Hu Tao) - virsh-domain: Remove unused vshCompleteXMLFromDomain (Peter Krempa) - sheepdog: Adjust logic to break while loop to avoid Coverity error (John Ferlan) - libxl_driver: Resolve Coverity errors (John Ferlan) - libxl_conf: Resolve Coverity issue with call to regcomp() (John Ferlan) - conf: whitespace cleanups and refactors with no semantic impact (Peter Krempa) thanks everybody for your contributions for this release ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 10

[libvirt] [PATCH] virsh: Add a helper to parse cpulist
by Osier Yang 02 Apr '13

02 Apr '13

vcpupin and emulatorpin use same code to parse the cpulist, this abstracts the same code as a helper. Along with various code style fixes, and error improvement (only error "Physical CPU %d doesn't exist" if the specified CPU exceed the range, no "cpulist: Invalid format", see the following for an example of the error prior to this patch). % virsh vcpupin 4 0 0-8 error: Physical CPU 4 doesn't exist. error: cpulist: Invalid format. --- tools/virsh-domain.c | 278 ++++++++++++++++++++------------------------------- 1 file changed, 106 insertions(+), 172 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d1e6f9d..0fe2a51 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5460,6 +5460,97 @@ vshPrintPinInfo(unsigned char *cpumaps, size_t cpumaplen, return true; } +static unsigned char * +virParseCPUList(vshControl *ctl, const char *cpulist, + int maxcpu, size_t cpumaplen) +{ + unsigned char *cpumap = NULL; + const char *cur; + bool unuse = false; + int i, cpu, lastcpu; + + cpumap = vshCalloc(ctl, cpumaplen, sizeof(*cpumap)); + + /* Parse cpulist */ + cur = cpulist; + if (*cur == 'r') { + for (cpu = 0; cpu < maxcpu; cpu++) + VIR_USE_CPU(cpumap, cpu); + return cpumap; + } else if (*cur == 0) { + goto error; + } + + while (*cur != 0) { + /* The char '^' denotes exclusive */ + if (*cur == '^') { + cur++; + unuse = true; + } + + /* Parse physical CPU number */ + if (!c_isdigit(*cur)) + goto error; + + if ((cpu = virParseNumber(&cur)) < 0) + goto error; + + if (cpu >= maxcpu) { + vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); + goto cleanup; + } + + virSkipSpaces(&cur); + + if (*cur == ',' || *cur == 0) { + if (unuse) + VIR_UNUSE_CPU(cpumap, cpu); + else + VIR_USE_CPU(cpumap, cpu); + } else if (*cur == '-') { + /* The char '-' denotes range */ + if (unuse) + goto error; + cur++; + virSkipSpaces(&cur); + + /* Parse the end of range */ + lastcpu = virParseNumber(&cur); + + if (lastcpu < cpu) + goto error; + + if (lastcpu >= maxcpu) { + vshError(ctl, _("Physical CPU %d doesn't exist."), maxcpu); + goto cleanup; + } + + for (i = cpu; i <= lastcpu; i++) + VIR_USE_CPU(cpumap, i); + + virSkipSpaces(&cur); + } + + if (*cur == ',') { + cur++; + virSkipSpaces(&cur); + unuse = false; + } else if (*cur == 0) { + break; + } else { + goto error; + } + } + + return cpumap; + +error: + vshError(ctl, "%s", _("cpulist: Invalid format.")); +cleanup: + VIR_FREE(cpumap); + return NULL; +} + static bool cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) { @@ -5467,13 +5558,11 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; int vcpu = -1; const char *cpulist = NULL; - bool ret = true; + bool ret = false; unsigned char *cpumap = NULL; unsigned char *cpumaps = NULL; size_t cpumaplen; - int i, cpu, lastcpu, maxcpu, ncpus; - bool unuse = false; - const char *cur; + int i, maxcpu, ncpus; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); @@ -5545,7 +5634,6 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s %s\n", _("VCPU:"), _("CPU Affinity")); vshPrint(ctl, "----------------------------------\n"); for (i = 0; i < ncpus; i++) { - if (vcpu != -1 && i != vcpu) continue; @@ -5556,105 +5644,28 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) break; } - } else { - ret = false; } VIR_FREE(cpumaps); goto cleanup; } /* Pin mode: pinning specified vcpu to specified physical cpus*/ - - cpumap = vshCalloc(ctl, cpumaplen, sizeof(*cpumap)); - /* Parse cpulist */ - cur = cpulist; - if (*cur == 0) { - goto parse_error; - } else if (*cur == 'r') { - for (cpu = 0; cpu < maxcpu; cpu++) - VIR_USE_CPU(cpumap, cpu); - cur = ""; - } - - while (*cur != 0) { - - /* the char '^' denotes exclusive */ - if (*cur == '^') { - cur++; - unuse = true; - } - - /* parse physical CPU number */ - if (!c_isdigit(*cur)) - goto parse_error; - cpu = virParseNumber(&cur); - if (cpu < 0) { - goto parse_error; - } - if (cpu >= maxcpu) { - vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); - goto parse_error; - } - virSkipSpaces(&cur); - - if (*cur == ',' || *cur == 0) { - if (unuse) { - VIR_UNUSE_CPU(cpumap, cpu); - } else { - VIR_USE_CPU(cpumap, cpu); - } - } else if (*cur == '-') { - /* the char '-' denotes range */ - if (unuse) { - goto parse_error; - } - cur++; - virSkipSpaces(&cur); - /* parse the end of range */ - lastcpu = virParseNumber(&cur); - if (lastcpu < cpu) { - goto parse_error; - } - if (lastcpu >= maxcpu) { - vshError(ctl, _("Physical CPU %d doesn't exist."), maxcpu); - goto parse_error; - } - for (i = cpu; i <= lastcpu; i++) { - VIR_USE_CPU(cpumap, i); - } - virSkipSpaces(&cur); - } - - if (*cur == ',') { - cur++; - virSkipSpaces(&cur); - unuse = false; - } else if (*cur == 0) { - break; - } else { - goto parse_error; - } - } + if (!(cpumap = virParseCPUList(ctl, cpulist, maxcpu, cpumaplen))) + goto cleanup; if (flags == -1) { - if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) { - ret = false; - } + if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) + goto cleanup; } else { - if (virDomainPinVcpuFlags(dom, vcpu, cpumap, cpumaplen, flags) != 0) { - ret = false; - } + if (virDomainPinVcpuFlags(dom, vcpu, cpumap, cpumaplen, flags) != 0) + goto cleanup; } + ret = true; cleanup: VIR_FREE(cpumap); virDomainFree(dom); return ret; - -parse_error: - vshError(ctl, "%s", _("cpulist: Invalid format.")); - ret = false; - goto cleanup; } /* @@ -5701,13 +5712,11 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; const char *cpulist = NULL; - bool ret = true; + bool ret = false; unsigned char *cpumap = NULL; unsigned char *cpumaps = NULL; size_t cpumaplen; - int i, cpu, lastcpu, maxcpu; - bool unuse = false; - const char *cur; + int maxcpu; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); @@ -5761,101 +5770,26 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, " *: "); ret = vshPrintPinInfo(cpumaps, cpumaplen, maxcpu, 0); vshPrint(ctl, "\n"); - } else { - ret = false; } VIR_FREE(cpumaps); goto cleanup; } /* Pin mode: pinning emulator threads to specified physical cpus*/ - - cpumap = vshCalloc(ctl, cpumaplen, sizeof(*cpumap)); - /* Parse cpulist */ - cur = cpulist; - if (*cur == 0) { - goto parse_error; - } else if (*cur == 'r') { - for (cpu = 0; cpu < maxcpu; cpu++) - VIR_USE_CPU(cpumap, cpu); - cur = ""; - } - - while (*cur != 0) { - - /* the char '^' denotes exclusive */ - if (*cur == '^') { - cur++; - unuse = true; - } - - /* parse physical CPU number */ - if (!c_isdigit(*cur)) - goto parse_error; - cpu = virParseNumber(&cur); - if (cpu < 0) { - goto parse_error; - } - if (cpu >= maxcpu) { - vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); - goto parse_error; - } - virSkipSpaces(&cur); - - if (*cur == ',' || *cur == 0) { - if (unuse) { - VIR_UNUSE_CPU(cpumap, cpu); - } else { - VIR_USE_CPU(cpumap, cpu); - } - } else if (*cur == '-') { - /* the char '-' denotes range */ - if (unuse) { - goto parse_error; - } - cur++; - virSkipSpaces(&cur); - /* parse the end of range */ - lastcpu = virParseNumber(&cur); - if (lastcpu < cpu) { - goto parse_error; - } - if (lastcpu >= maxcpu) { - vshError(ctl, _("Physical CPU %d doesn't exist."), maxcpu); - goto parse_error; - } - for (i = cpu; i <= lastcpu; i++) { - VIR_USE_CPU(cpumap, i); - } - virSkipSpaces(&cur); - } - - if (*cur == ',') { - cur++; - virSkipSpaces(&cur); - unuse = false; - } else if (*cur == 0) { - break; - } else { - goto parse_error; - } - } + if (!(cpumap = virParseCPUList(ctl, cpulist, maxcpu, cpumaplen))) + goto cleanup; if (flags == -1) flags = VIR_DOMAIN_AFFECT_LIVE; if (virDomainPinEmulator(dom, cpumap, cpumaplen, flags) != 0) - ret = false; + goto cleanup; + ret = true; cleanup: VIR_FREE(cpumap); virDomainFree(dom); return ret; - -parse_error: - vshError(ctl, "%s", _("cpulist: Invalid format.")); - ret = false; - goto cleanup; } /* -- 1.8.1.4

3 5

[libvirt] [PATCH] Resolve valgrind failure
by John Ferlan 02 Apr '13

02 Apr '13

Code added by commit id '523207fe8' TEST: qemuxml2argvtest ........................................ 40 ........................................ 80 ........................................ 120 ........................................ 160 ........................................ 200 ........................................ 240 ................................. 273 OK ==30993== 39 bytes in 1 blocks are definitely lost in loss record 33 of 87 ==30993== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==30993== by 0x41E501: fakeSecretGetValue (qemuxml2argvtest.c:33) ==30993== by 0x427591: qemuBuildDriveURIString (qemu_command.c:2571) ==30993== by 0x42C502: qemuBuildDriveStr (qemu_command.c:2627) ==30993== by 0x4335FC: qemuBuildCommandLine (qemu_command.c:6443) ==30993== by 0x41E8A0: testCompareXMLToArgvHelper (qemuxml2argvtest.c:154 ==30993== by 0x41FE8F: virtTestRun (testutils.c:157) ==30993== by 0x418BE3: mymain (qemuxml2argvtest.c:506) ==30993== by 0x4204CA: virtTestMain (testutils.c:719) ==30993== by 0x38D6821A04: (below main) (in /usr/lib64/libc-2.16.so) ==30993== ==30993== 46 bytes in 1 blocks are definitely lost in loss record 64 of 87 ==30993== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==30993== by 0x38D690A167: __vasprintf_chk (in /usr/lib64/libc-2.16.so) ==30993== by 0x4CB28E7: virVasprintf (stdio2.h:210) ==30993== by 0x4CB29A3: virAsprintf (virutil.c:2017) ==30993== by 0x4275B4: qemuBuildDriveURIString (qemu_command.c:2580) ==30993== by 0x42C502: qemuBuildDriveStr (qemu_command.c:2627) ==30993== by 0x4335FC: qemuBuildCommandLine (qemu_command.c:6443) ==30993== by 0x41E8A0: testCompareXMLToArgvHelper (qemuxml2argvtest.c:154 ==30993== by 0x41FE8F: virtTestRun (testutils.c:157) ==30993== by 0x418BE3: mymain (qemuxml2argvtest.c:506) ==30993== by 0x4204CA: virtTestMain (testutils.c:719) ==30993== by 0x38D6821A04: (below main) (in /usr/lib64/libc-2.16.so) ==30993== ==30993== 385 (56 direct, 329 indirect) bytes in 1 blocks are definitely los ==30993== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==30993== by 0x4C6B2CF: virAllocN (viralloc.c:152) ==30993== by 0x4C9C7EB: virObjectNew (virobject.c:191) ==30993== by 0x4D21810: virGetSecret (datatypes.c:642) ==30993== by 0x41E5D5: fakeSecretLookupByUsage (qemuxml2argvtest.c:51) ==30993== by 0x4D4BEC5: virSecretLookupByUsage (libvirt.c:15295) ==30993== by 0x4276A9: qemuBuildDriveURIString (qemu_command.c:2565) ==30993== by 0x42C502: qemuBuildDriveStr (qemu_command.c:2627) ==30993== by 0x4335FC: qemuBuildCommandLine (qemu_command.c:6443) ==30993== by 0x41E8A0: testCompareXMLToArgvHelper (qemuxml2argvtest.c:154 ==30993== by 0x41FE8F: virtTestRun (testutils.c:157) ==30993== by 0x418BE3: mymain (qemuxml2argvtest.c:506) ==30993== PASS: qemuxml2argvtest Interesting side note is that running the test singularly via 'make -C tests check TESTS=qemuxml2argvtest' didn't trip the valgrind error; however, running during 'make -C tests valgrind' did cause the error to be seen. --- src/qemu/qemu_command.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c278f..0f6a5a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2604,6 +2604,9 @@ cleanup: VIR_FREE(tmpscheme); VIR_FREE(volimg); VIR_FREE(sock); + virObjectUnref(sec); + VIR_FREE(secret); + VIR_FREE(user); return ret; -- 1.8.1.4

2 2

[libvirt] [PATCHv5 00/11] Introduce driver specific XML parsing callbacks
by Peter Krempa 02 Apr '13

02 Apr '13

This series now splits out everything unrelated from the virCaps object. See notes in individual patches for change summary. This series now contains 2 renaming patches that were suggested by Eric and Laine. Peter Krempa (11): conf: Add post XML parse callbacks and prepare for cleaning of virCaps conf callback: Rearrange function parameters qemu: Record the default NIC model in the domain XML virCaps: get rid of "defaultInitPath" value in the virCaps struct virCaps: get rid of defaultDiskDriverName virCaps: get rid of emulatorRequired virCaps: get rid of defaultDiskDriverType virCaps: get rid of hasWideScsiBus virCaps: get rid of macPrefix field virCaps: get rid of defaultConsoleTargetType callback maint: Rename xmlconf to xmlopt and virDomainXMLConfing to virDomainXMLOption src/conf/capabilities.c | 24 - src/conf/capabilities.h | 23 - src/conf/domain_conf.c | 658 ++++++++++++--------- src/conf/domain_conf.h | 103 ++-- src/conf/snapshot_conf.c | 4 +- src/conf/snapshot_conf.h | 2 +- src/esx/esx_driver.c | 32 +- src/esx/esx_private.h | 2 +- src/libvirt_private.syms | 10 +- src/libvirt_vmx.syms | 1 + src/libxl/libxl_conf.c | 13 - src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_driver.c | 101 ++-- src/lxc/lxc_conf.c | 21 +- src/lxc/lxc_conf.h | 4 +- src/lxc/lxc_controller.c | 10 +- src/lxc/lxc_domain.c | 34 ++ src/lxc/lxc_domain.h | 1 + src/lxc/lxc_driver.c | 71 ++- src/lxc/lxc_process.c | 8 +- src/openvz/openvz_conf.c | 16 +- src/openvz/openvz_conf.h | 2 +- src/openvz/openvz_driver.c | 64 +- src/parallels/parallels_driver.c | 37 +- src/parallels/parallels_utils.h | 2 +- src/phyp/phyp_driver.c | 24 +- src/phyp/phyp_driver.h | 2 +- src/qemu/qemu_capabilities.c | 19 - src/qemu/qemu_command.c | 27 +- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 16 +- src/qemu/qemu_conf.h | 5 +- src/qemu/qemu_domain.c | 98 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 147 +++-- src/qemu/qemu_migration.c | 21 +- src/qemu/qemu_process.c | 34 +- src/security/virt-aa-helper.c | 19 +- src/test/test_driver.c | 69 +-- src/uml/uml_conf.c | 9 - src/uml/uml_conf.h | 2 +- src/uml/uml_driver.c | 69 ++- src/vbox/vbox_tmpl.c | 33 +- src/vmware/vmware_conf.c | 21 +- src/vmware/vmware_conf.h | 2 +- src/vmware/vmware_driver.c | 24 +- src/vmx/vmx.c | 39 +- src/vmx/vmx.h | 12 +- src/xen/xen_driver.c | 37 +- src/xen/xen_driver.h | 4 +- src/xen/xen_hypervisor.c | 13 - src/xen/xend_internal.c | 20 +- src/xen/xm_internal.c | 16 +- src/xenapi/xenapi_driver.c | 40 +- src/xenapi/xenapi_driver_private.h | 2 +- tests/domainsnapshotxml2xmltest.c | 6 +- tests/lxcxml2xmldata/lxc-hostdev.xml | 1 + tests/lxcxml2xmldata/lxc-systemd.xml | 1 + tests/lxcxml2xmltest.c | 8 +- tests/qemuargv2xmltest.c | 6 +- tests/qemumonitorjsontest.c | 28 +- tests/qemumonitortestutils.c | 4 +- tests/qemumonitortestutils.h | 2 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-export.xml | 1 + ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 3 +- ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-unix.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd.args | 5 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 +- .../qemuxml2argv-disk-drive-network-sheepdog.xml | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-client.args | 4 +- .../qemuxml2argv-net-eth-ifname.args | 4 +- .../qemuxml2argv-net-eth-ifname.xml | 1 + .../qemuxml2argv-net-eth-names.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 4 +- .../qemuxml2argv-net-openvswitch.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-server.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + tests/qemuxml2argvtest.c | 6 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + tests/qemuxml2xmltest.c | 6 +- tests/qemuxmlnstest.c | 6 +- tests/securityselinuxlabeltest.c | 6 +- tests/testutilslxc.c | 9 - tests/testutilsqemu.c | 11 - tests/testutilsqemu.h | 2 +- tests/testutilsxen.c | 16 - tests/testutilsxen.h | 2 - tests/vmx2xmltest.c | 17 +- tests/xmconfigtest.c | 8 +- tests/xml2sexprtest.c | 9 +- tests/xml2vmxtest.c | 19 +- 108 files changed, 1273 insertions(+), 1050 deletions(-) -- 1.8.1.5

2 13

[libvirt] [PATCH v2] test: Return Libvirt logo as domain screenshot
by Michal Privoznik 02 Apr '13

02 Apr '13

This is just a bare Easter Egg. Whenever user run virDomainScreenshot over a domain in test driver, he'll get the Libvirt PNG logo in return. --- docs/Makefile.am | 1 + src/test/test_driver.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 7583772..b5d7575 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -287,6 +287,7 @@ install-data-local: for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done + $(INSTALL_DATA) $(srcdir)/../docs/libvirtLogo.png $(DESTDIR)$(pkgdatadir) uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c5fffb9..4dbd775 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -39,11 +39,13 @@ #include "virutil.h" #include "viruuid.h" #include "capabilities.h" +#include "configmake.h" #include "viralloc.h" #include "network_conf.h" #include "interface_conf.h" #include "domain_conf.h" #include "domain_event.h" +#include "fdstream.h" #include "storage_conf.h" #include "node_device_conf.h" #include "virxml.h" @@ -5773,6 +5775,27 @@ cleanup: return ret; } +static char * +testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, + virStreamPtr st, + unsigned int screen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *ret = NULL; + + virCheckFlags(0, NULL); + + if (!(ret = strdup("image/png"))) { + virReportOOMError(); + return NULL; + } + + if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY < 0)) + VIR_FREE(ret); + + return ret; +} + static virDriver testDriver = { .no = VIR_DRV_TEST, @@ -5843,6 +5866,7 @@ static virDriver testDriver = { .domainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ .isAlive = testIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ + .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ }; static virNetworkDriver testNetworkDriver = { -- 1.8.1.5

2 1

[libvirt] The problems of default settings
by Li Zhang 02 Apr '13

02 Apr '13

Hi all, I am recently considering about the default setting for different platforms. Currently, there is no good way to fix the default setting for PPC64 platform. For example, we prefer pseries on PPC64 as the default machine type users don't need to specify it. I am thinking about the solutions. 1. One solution I am thinking about is to create template xml files for different platforms. But if users give their own configuration XML files, how to keep the preferred configurations in domain definition. I think this solution should be better in management tools, for example, ovirt or openstack. After management tools can generate its own configuration files with different default settings, libvirt can help create according to XML files. 2. Another solution is to use hook in libvirt. But it seems that we need to use hook daemon. Is it complex to use? I am not familiar with hook. Any suggestion is appreciated. Thanks. :) --Li

2 1

[libvirt] migrate qemu domains
by Yin Olivia-R63875 01 Apr '13

01 Apr '13

Hi, I tried to migrate qemu domains between same two Freescale PPC platforms. 1) Migrate test domain from Host1(10.193.20.109) to Host2(10.193.20.181). root@ppc-host1:~# virsh migrate test qemu+tls://10.193.20.181/system or root@ppc-host2:~# virsh -c qemu+tls://10.193.20.109/system migrate test qemu:///system I waited for a while and finally got error message as below: error: Unable to read from monitor: Connection reset by peer Exactly, when waiting (I guess during migration), the migrated domain is pasued on both source and destination nodes. root@ppc-host1:~# virsh -c qemu:///system list --all Id Name State ---------------------------------------------------- 5 test paused And meanwhile, the destination domain is also paused when waiting root@ppc-host2:~# virsh -c qemu:///system list --all Id Name State ---------------------------------------------------- 2 test paused Finally, the migrated domain on source node is shut off. root@ppc-host1:~# virsh -c qemu:///system list --all Id Name State ---------------------------------------------------- - test shut off But can't find any domain on destination node any longer. root@ppc-host2:~# virsh -c qemu:///system list --all Id Name State ---------------------------------------------------- As I know qemu-system-ppc doesn't support live migration on Freescale PPC platform yet. My question is whether it depends on qemu implementation to migrate qemu hypervisor with libvirt? >From the above experiment, it seemed that migration happened but not succeeded finally. Best Regards, Olivia

2 2

[libvirt] [PATCHv4 0/9] Introduce driver specific callbacks and get rid of irrelevant data in virCaps
by Peter Krempa 01 Apr '13

01 Apr '13

This series now splits out almost everything from the virCaps object (except for the defaultConsoleTargetType callback that I will post later as It requires more tweaking). See notes in individual patches for change summary. Peter Krempa (9): conf: Add post XML parse callbacks and prepare for cleaning of virCaps qemu: Record the default NIC model in the domain XML virCaps: get rid of "defaultInitPath" value in the virCaps struct virCaps: get rid of defaultDiskDriverName virCaps: get rid of emulatorRequired conf: Enforce ranges on cputune variables virCaps: remove defaultDiskDriverType from the struct virCaps: Get rid of hasWideScsiBus virCaps: get rid of macPrefix field src/conf/capabilities.c | 24 --- src/conf/capabilities.h | 20 -- src/conf/domain_conf.c | 239 ++++++++++++++++----- src/conf/domain_conf.h | 40 +++- src/esx/esx_driver.c | 13 +- src/libvirt_private.syms | 6 +- src/libvirt_vmx.syms | 2 + src/libxl/libxl_conf.c | 2 - src/libxl/libxl_driver.c | 13 +- src/lxc/lxc_conf.c | 11 +- src/lxc/lxc_domain.c | 17 ++ src/lxc/lxc_domain.h | 1 + src/lxc/lxc_driver.c | 6 +- src/openvz/openvz_conf.c | 4 +- src/openvz/openvz_driver.c | 32 ++- src/parallels/parallels_driver.c | 12 +- src/phyp/phyp_driver.c | 10 +- src/qemu/qemu_capabilities.c | 6 - src/qemu/qemu_command.c | 15 +- src/qemu/qemu_conf.c | 14 +- src/qemu/qemu_conf.h | 3 +- src/qemu/qemu_domain.c | 89 ++++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 13 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 7 +- src/vbox/vbox_tmpl.c | 18 +- src/vmware/vmware_conf.c | 4 +- src/vmware/vmware_driver.c | 8 +- src/vmx/vmx.c | 39 ++-- src/vmx/vmx.h | 12 +- src/xen/xen_driver.c | 7 +- src/xen/xen_hypervisor.c | 2 - src/xen/xend_internal.c | 6 +- src/xen/xm_internal.c | 2 + src/xenapi/xenapi_driver.c | 2 +- tests/domainsnapshotxml2xmltest.c | 2 +- tests/lxcxml2xmldata/lxc-hostdev.xml | 1 + tests/lxcxml2xmldata/lxc-systemd.xml | 1 + tests/qemuargv2xmltest.c | 2 +- tests/qemumonitorjsontest.c | 2 +- .../qemuxml2argv-disk-drive-network-nbd.args | 5 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 +- .../qemuxml2argv-disk-drive-network-sheepdog.xml | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-client.args | 4 +- .../qemuxml2argv-net-eth-ifname.args | 4 +- .../qemuxml2argv-net-eth-ifname.xml | 1 + .../qemuxml2argv-net-eth-names.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 4 +- .../qemuxml2argv-net-openvswitch.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-server.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + tests/qemuxml2argvtest.c | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + tests/qemuxml2xmltest.c | 2 +- tests/qemuxmlnstest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/testutilsxen.c | 2 +- tests/vmx2xmltest.c | 11 +- tests/xml2vmxtest.c | 8 +- 73 files changed, 548 insertions(+), 251 deletions(-) -- 1.8.1.5

3 28

[libvirt] [PATCHv2 0/4] Fix race and crash in connection close callback.
by Peter Krempa 01 Apr '13

01 Apr '13

Originaly reported by Viktor, this changes a few bits I didn't like on the original series. Peter Krempa (2): virsh: Move cmdConnect from virsh-host.c to virsh.c virsh: Register and unregister the close callback also in cmdConnect Viktor Mihajlovski (2): libvirt: Increase connection reference count for callbacks virsh: Unregister the connection close notifier upon termination src/libvirt.c | 5 +++ tools/virsh-host.c | 67 ---------------------------------- tools/virsh.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 103 insertions(+), 72 deletions(-) -- 1.8.1.5

2 11

[libvirt] [PATCH] test: Return Libvirt logo as domain screenshot
by Michal Privoznik 31 Mar '13

31 Mar '13

This is just a bare Easter Egg. Whenever user run virDomainScreenshot over a domain in test driver, he'll get the Libvirt PNG logo in return. --- docs/Makefile.am | 1 + src/test/test_driver.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 7583772..b5d7575 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -287,6 +287,7 @@ install-data-local: for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done + $(INSTALL_DATA) $(srcdir)/../docs/libvirtLogo.png $(DESTDIR)$(pkgdatadir) uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c5fffb9..ad683f7 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -39,11 +39,13 @@ #include "virutil.h" #include "viruuid.h" #include "capabilities.h" +#include "configmake.h" #include "viralloc.h" #include "network_conf.h" #include "interface_conf.h" #include "domain_conf.h" #include "domain_event.h" +#include "fdstream.h" #include "storage_conf.h" #include "node_device_conf.h" #include "virxml.h" @@ -5773,6 +5775,25 @@ cleanup: return ret; } +static char * +testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, + virStreamPtr st, + unsigned int screen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *ret = NULL; + + virCheckFlags(0, NULL); + + if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY < 0)) + goto cleanup; + + ret = strdup("image/png"); + +cleanup: + return ret; +} + static virDriver testDriver = { .no = VIR_DRV_TEST, @@ -5843,6 +5864,7 @@ static virDriver testDriver = { .domainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ .isAlive = testIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ + .domainScreenshot = testDomainScreenshot, /* 1.0.4 */ }; static virNetworkDriver testNetworkDriver = { -- 1.8.1.5

3 2

[libvirt] [libvirt-glib 0/4] Add missing GVirConfigDomainGraphics* API
by Christophe Fergeau 30 Mar '13

30 Mar '13

Hey, This series adds various missing setters/getters to the GVirConfigDomainGraphics API. It also adds classes for the 'desktop' and 'rdp' graphics elements. Christophe

1 4

[libvirt] [PATCH] docs: Fix truncated sentence in RDP 'multiUser' attribute
by Christophe Fergeau 30 Mar '13

30 Mar '13

--- Usually I'd push this under the trivial rule, but I don't know if this is a valid thing to do during freezes, hence I'm posting it for review first. Christophe docs/formatdomain.html.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8bf0736..cf382e8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3506,10 +3506,10 @@ qemu-kvm -net nic,model=? /dev/null the TCP port to use. The <code>replaceUser</code> attribute is a boolean deciding whether multiple simultaneous connections to the VM are permitted. - The <code>multiUser</code> whether the existing connection - must be dropped and a new connection must be established - by the VRDP server, when a new client connects in single - connection mode. + The <code>multiUser</code> attribute is a boolean deciding + whether the existing connection must be dropped and a new + connection must be established by the VRDP server, when a + new client connects in single connection mode. </dd> <dt><code>"desktop"</code></dt> <dd> -- 1.8.1.4

2 2

[libvirt] [PATCH] Fix the stdout in print_job_progress()
by Yanbing Du 29 Mar '13

29 Mar '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d1e6f9d..10b646f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1407,7 +1407,7 @@ print_job_progress(const char *label, unsigned long long remaining, /* see comments in vshError about why we must flush */ fflush(stdout); - fprintf(stderr, "\r%s: [%3d %%]", label, progress); + fprintf(stdout, "\r%s: [%3d %%]", label, progress); fflush(stderr); } -- 1.7.1

2 2

[libvirt] [PATCH] virsh: don't call virSecretFree on NULL
by Ján Tomko 29 Mar '13

29 Mar '13

Since the refactoring in fbe2d49 we call virSecretFree even if virSecretDefineXML fails, which leads to overwriting the error message with: error: Invalid secret: virSecretFree Bug: https://bugzilla.redhat.com/show_bug.cgi?id=929045 --- tools/virsh-secret.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index ea0b0c3..7201522 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -117,7 +117,8 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(buffer); - virSecretFree(res); + if (res) + virSecretFree(res); return ret; } -- 1.8.1.5

2 2

[libvirt] [PATCH] storage: Avoid double virCommandFree in virStorageBackendLogicalDeletePool
by Martin Kletzander 29 Mar '13

29 Mar '13

When logical pool has no PVs associated with itself (user-created), virCommandFree(cmd) is called twice with the same pointer and that causes a segfault in daemon. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Worth v1.0.4 IMHO. --- src/storage/storage_backend_logical.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index bce407f..4cf6647 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -1,7 +1,7 @@ /* * storage_backend_logical.c: storage backend for logical volume handling * - * Copyright (C) 2007-2009, 2011 Red Hat, Inc. + * Copyright (C) 2007-2009, 2011, 2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -667,6 +667,7 @@ virStorageBackendLogicalDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED, if (virCommandRun(cmd, NULL) < 0) goto cleanup; virCommandFree(cmd); + cmd = NULL; /* now remove the pv devices and clear them out */ ret = 0; -- 1.8.1.5

2 2

[libvirt] [libvirt-designer 1/2] Fix several leaks of libvirt-gconfig data
by Christophe Fergeau 29 Mar '13

29 Mar '13

--- libvirt-designer/libvirt-designer-domain.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 49e8068..c3a5ce3 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -352,14 +352,19 @@ gvir_designer_domain_get_arch_native(GVirDesignerDomain *design) gvir_config_capabilities_host_get_cpu(host) : NULL; const gchar *arch = cpu ? gvir_config_capabilities_cpu_get_arch(cpu) : NULL; + gchar *arch_native; if (arch) { - return gvir_designer_domain_get_arch_normalized(arch); + arch_native = gvir_designer_domain_get_arch_normalized(arch); } else { struct utsname ut; uname(&ut); - return gvir_designer_domain_get_arch_normalized(ut.machine); + arch_native = gvir_designer_domain_get_arch_normalized(ut.machine); } + g_object_unref(G_OBJECT(cpu)); + g_object_unref(G_OBJECT(host)); + + return arch_native; } @@ -372,7 +377,7 @@ gvir_designer_domain_get_guest(GVirDesignerDomain *design, GList *tmp = guests; GVirConfigCapabilitiesGuest *ret = NULL; - while (tmp) { + while (tmp && !ret) { GVirConfigCapabilitiesGuest *guest = GVIR_CONFIG_CAPABILITIES_GUEST(tmp->data); GVirConfigCapabilitiesGuestArch *arch = @@ -388,13 +393,13 @@ gvir_designer_domain_get_guest(GVirDesignerDomain *design, guestos == GVIR_CONFIG_DOMAIN_OS_TYPE_XEN || guestos == GVIR_CONFIG_DOMAIN_OS_TYPE_UML)) { ret = g_object_ref(guest); - goto cleanup; } + g_object_unref(G_OBJECT(arch)); + tmp = tmp->next; } -cleanup: g_list_foreach(guests, (GFunc)g_object_unref, NULL); g_list_free(guests); return ret; @@ -561,7 +566,7 @@ gvir_designer_domain_setup_guest(GVirDesignerDomain *design, GVirConfigDomainOs *os = gvir_config_domain_os_new(); GVirConfigCapabilitiesGuestArch *arch = gvir_config_capabilities_guest_get_arch(guest); - GVirConfigCapabilitiesGuestDomain *domain; + GVirConfigCapabilitiesGuestDomain *domain = NULL; gboolean ret = FALSE; if (!(domain = gvir_designer_domain_best_guest_domain(arch, @@ -581,6 +586,9 @@ gvir_designer_domain_setup_guest(GVirDesignerDomain *design, ret = TRUE; cleanup: + if (domain != NULL) + g_object_unref(domain); + g_object_unref(arch); g_object_unref(os); return ret; } -- 1.8.1.4

2 3

[libvirt] [libvirt-glib] config: Fix 2 leaks in domain memory setters
by Christophe Fergeau 29 Mar '13

29 Mar '13

--- libvirt-gconfig/libvirt-gconfig-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index be572ab..7ef0be8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -414,6 +414,7 @@ void gvir_config_domain_set_memory(GVirConfigDomain *domain, guint64 memory) gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), "unit", "KiB", NULL); + g_object_unref(G_OBJECT(node)); g_object_notify(G_OBJECT(domain), "memory"); } @@ -439,6 +440,7 @@ void gvir_config_domain_set_current_memory(GVirConfigDomain *domain, gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), "unit", "KiB", NULL); + g_object_unref(G_OBJECT(node)); g_object_notify(G_OBJECT(domain), "current-memory"); } -- 1.8.1.4

1 1

[libvirt] [PATCH] nodedev: invert virIsCapableFCHost return value
by Ján Tomko 29 Mar '13

29 Mar '13

Both virIsCapableFCHost and virIsCapableVport return 0 when the respective sysfs path is accessible. --- src/node_device/node_device_linux_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index a1c3637..fd91430 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -46,7 +46,7 @@ detect_scsi_host_caps_linux(union _virNodeDevCapData *d) VIR_DEBUG("Checking if host%d is an FC HBA", d->scsi_host.host); - if (virIsCapableFCHost(NULL, d->scsi_host.host)) { + if (virIsCapableFCHost(NULL, d->scsi_host.host) == 0) { d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST; if (virReadFCHost(NULL, -- 1.8.1.5

3 3

[libvirt] Network definition questions
by Gene Czarcinski 29 Mar '13

29 Mar '13

If an IPv4 address is *not* specified, then the IPv4 network is isolated and, by default, internal (internal to the specific interface) IPv4 routing is enabled.. If an IPv6 address is *not* specified, then the IPv6 network is isolated and, by default, internal IPv6 routing is disabled but can be enabled if ipv6='yes' is specified on <network>. If an IPv6 address is specified, then it is routed. If an IPv4 address is specified, then it can be Network-Address-Translated or routed. Not having a <forward> explicitly specified does not mean that a route is not established. Do I understand thing correctly? Gene

2 2

[libvirt] [libvirt-designer] Fix various memory leaks of libosinfo data
by Christophe Fergeau 29 Mar '13

29 Mar '13

--- libvirt-designer/libvirt-designer-domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 9dc1d7d..b1aa838 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1066,6 +1066,7 @@ gvir_designer_domain_get_supported_disk_bus_types(GVirDesignerDomain *design) ret = g_list_copy(ret); cleanup: + g_list_free(devs); if (dev_list != NULL) g_object_unref(G_OBJECT(dev_list)); g_hash_table_destroy(bus_hash); @@ -1623,6 +1624,7 @@ gvir_designer_domain_get_resources(OsinfoResourcesList *res_list, break; } } + g_list_free(elem_list); } @@ -1678,5 +1680,11 @@ gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, gvir_config_domain_set_memory(design->priv->config, ram); cleanup: + if (res_list_min != NULL) + g_object_unref(G_OBJECT(res_list_min)); + if (res_list_rec != NULL) + g_object_unref(G_OBJECT(res_list_rec)); + g_object_unref(G_OBJECT(os)); + return ret; } -- 1.8.1.4

2 1

[libvirt] [PATCH v3] nwfilter: probe for inverted ctdir
by Stefan Berger 29 Mar '13

29 Mar '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 a UDP message over loopback and 3 filtering rules applied to INPUT two times, one time with '--ctdir original' which should then work on 'fixed' netfilter and one other time with '--ctdir reply' which should only work on the 'old' netfilter. If neither one of the tests gets the data through, then the loopback device is probably not configured correctly. If both tests get the data through something must be seriously wrong. In both of these two latter cases no '--ctdir' will then be applied to the rules. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- v2->v3: - probing with --ctdir original and --ctdir reply v1->v2: - using virSocketAddrParseIPv4 --- src/nwfilter/nwfilter_ebiptables_driver.c | 169 ++++++++++++++++++++++++++++++ 1 file changed, 169 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,10 @@ #include <string.h> #include <sys/stat.h> #include <fcntl.h> +#include <arpa/inet.h> +#include <sys/select.h> +#include <sys/time.h> +#include <unistd.h> #include "internal.h" @@ -85,6 +89,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. We probe for it. + */ +enum ctdirStatus { + CTDIR_STATUS_UNKNOWN = 0, + CTDIR_STATUS_CORRECTED = (1 << 0), + CTDIR_STATUS_OLD = (1 << 1), +}; +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 +1277,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 +4330,146 @@ ebiptablesDriverTestCLITools(void) return ret; } +static void +ebiptablesDriverProbeCtdir(void) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + static const char cmdline[] = + "$IPT -%c INPUT %c -i lo -p udp --dport %hu " + "-m state --state ESTABLISHED -j ACCEPT " CMD_SEPARATOR + "$IPT -%c INPUT %c -i lo -p udp --dport %hu " + "-m conntrack --ctdir %s -j ACCEPT " CMD_SEPARATOR + "$IPT -%c INPUT %c -i lo -p udp --dport %hu -j DROP"; + /* + * Above '--ctdir original' gets this test to receive a message on + * 'fixed' netfilter. + */ + unsigned short port; + int ssockfd = -1, csockfd = -1; + virSocketAddr saddr; + struct sockaddr_in *serveraddr = &saddr.data.inet4; + fd_set readfds; + struct timeval timeout = { + .tv_sec = 0, + .tv_usec = 1000 * 200, + }; + int n, i, results = 0; + const char *ctdiropts[2] = { "original", "reply" }; + unsigned char data[10]; + + if (virSocketAddrParseIPv4(&saddr, "127.0.0.1") < 0) { + VIR_ERROR(_("Could not parse IP address")); + goto cleanup; + } + + if ((ssockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0 || + (csockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + VIR_ERROR(_("Could not open UDP socket")); + goto cleanup; + } + + for (port = 0xffff; port > 1024; port--) { + serveraddr->sin_port = htons(port); + if (bind(ssockfd, (struct sockaddr *)serveraddr, + sizeof(*serveraddr)) == 0) + break; + } + if (port == 1024) { + VIR_ERROR(_("Could not bind to any UDP socket")); + goto cleanup; + } + + i = 0; + while (true) { + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'I', '1', port, + 'I', '2', port, ctdiropts[i], + 'I', '3', port); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto cleanup; + } + + if (ebiptablesExecCLI(&buf, NULL, NULL) < 0) { + VIR_ERROR(_("Could not apply iptables rules")); + goto cleanup_iptables; + } + + virBufferFreeAndReset(&buf); + + if (sendto(csockfd, cmdline, 1, 0, (struct sockaddr *)serveraddr, + sizeof(*serveraddr)) < 0) { + VIR_ERROR(_("Could not send to UDP socket")); + goto cleanup_iptables; + } + + FD_ZERO(&readfds); + FD_SET(ssockfd, &readfds); + + while (true) { + n = select(ssockfd + 1, &readfds, NULL, NULL, &timeout); + if (n < 0) { + if (errno == EINTR) + continue; + VIR_ERROR(_("Select failed")); + goto cleanup_iptables; + } + if (n == 0) { + VIR_INFO("Ctdir probing received no data"); + break; + } + VIR_INFO("Ctdir probing received data"); + results |= (1 << i); + read(ssockfd, data, sizeof(data)); + break; + } + + if (i + 1 == ARRAY_CARDINALITY(ctdiropts)) + break; + + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'D', ' ', port, + 'D', ' ', port, ctdiropts[i], + 'D', ' ', port); + ebiptablesExecCLI(&buf, NULL, NULL); + + i++; + } + + switch (results) { + case 0x0: + /* no test passed -- loopback device not setup? */ + case 0x3: + /* both test passed -- s.th. is wrong */ + iptables_ctdir_corrected = CTDIR_STATUS_UNKNOWN; + break; + case 0x1: + iptables_ctdir_corrected = CTDIR_STATUS_CORRECTED; + break; + case 0x2: + iptables_ctdir_corrected = CTDIR_STATUS_OLD; + break; + } + +cleanup_iptables: + virBufferFreeAndReset(&buf); + + NWFILTER_SET_IPTABLES_SHELLVAR(&buf); + virBufferAsprintf(&buf, cmdline, + 'D', ' ', port, + 'D', ' ', port, ctdiropts[i], + 'D', ' ', port); + ebiptablesExecCLI(&buf, NULL, NULL); + +cleanup: + virBufferFreeAndReset(&buf); + VIR_FORCE_CLOSE(ssockfd); + VIR_FORCE_CLOSE(csockfd); +} + static int ebiptablesDriverInit(bool privileged) { @@ -4341,6 +4507,9 @@ ebiptablesDriverInit(bool privileged) return -ENOTSUP; } + if (iptables_cmd_path) + ebiptablesDriverProbeCtdir(); + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; return 0;

4 12

[libvirt] [PATCH] security_manager.c: Append seclabel iff generated
by Michal Privoznik 29 Mar '13

29 Mar '13

With my previous patches, we unconditionally appended a seclabel, even if it wasn't generated but found in array of defined seclabels. This resulted in double free later when doing virDomainDefFree and iterating over the array of defined seclabels. Moreover, there was another possibility of double free, if the seclabel was generated in the last iteration of the process of walking trough security managers array. --- src/security/security_manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index b55af69..b671a91 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -463,6 +463,7 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } else if (vm->nseclabels && generated) { VIR_DEBUG("Skipping auto generated seclabel of type none"); virSecurityLabelDefFree(seclabel); + seclabel = NULL; continue; } } @@ -472,8 +473,8 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } else { /* The seclabel must be added to @vm prior calling domainGenSecurityLabel * which may require seclabel to be presented already */ - - if (VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) { + if (generated && + VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) { virReportOOMError(); goto cleanup; } @@ -484,6 +485,8 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, vm->nseclabels--; goto cleanup; } + + seclabel = NULL; } } -- 1.8.1.5

2 1

[libvirt] [PATCH] util: Fix the conflict type for virIsCapableFCHost
by Osier Yang 28 Mar '13

28 Mar '13

--- Pushed under build-breaker rule. --- src/util/virutil.c | 3 ++- src/util/virutil.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 557225c..d5f122f 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -3582,7 +3582,8 @@ virReadFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED, } int -virIsCapableFCHost(int host ATTRIBUTE_UNUSED) +virIsCapableFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED, + int host ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); return -1; diff --git a/src/util/virutil.h b/src/util/virutil.h index 47357fa..2a797cb 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -314,7 +314,7 @@ enum { int virManageVport(const int parent_host, const char *wwpn, const char *wwnn, - int operation) + int operation) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); #endif /* __VIR_UTIL_H__ */ -- 1.8.1.4

1 0

[libvirt] [PATCH] virutil: Fix compilation on non-linux platforms
by Michal Privoznik 28 Mar '13

28 Mar '13

There has been a typo in virIsCapbleVport function name. --- Pushed under build breaker rule. src/util/virutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index d5f122f..87a97c9 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -3590,8 +3590,8 @@ virIsCapableFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED, } int -virIsCapbleVport(const char *sysfs_prefix ATTRIBUTE_UNUSED, - int host ATTRIBUTE_UNUSED) +virIsCapableVport(const char *sysfs_prefix ATTRIBUTE_UNUSED, + int host ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); return -1; -- 1.8.1.5

1 0

[libvirt] [PATCH v2 0/2] Correctly treat seclabel of type none
by Michal Privoznik 28 Mar '13

28 Mar '13

Don't forget other seclabels when adding a <seclabel type='none'/>. Michal Privoznik (2): security_manager: Don't manipulate domain XML in virDomainDefGetSecurityLabelDef security: Don't add seclabel of type none if there's already a seclabel src/conf/domain_conf.c | 56 +++++++++++------------------------------ src/conf/domain_conf.h | 7 ++++-- src/libvirt_private.syms | 1 - src/security/security_manager.c | 55 +++++++++++++++++++++++++++------------- src/security/security_selinux.c | 8 ++++-- 5 files changed, 63 insertions(+), 64 deletions(-) -- 1.8.1.5

3 9

[libvirt] [libvirt-sandbox][PATCH] Sync lxc-enter-namespace options with libvirt
by Alex Jia 28 Mar '13

28 Mar '13

The option 'nolabel' has been changed by current libvirt upstream, it should be 'noseclabel' now, so need to sync the option change with libvirt. # ./tools/virsh -c lxc:/// lxc-enter-namespace --help | grep label lxc-enter-namespace <domain> [--noseclabel] {[--cmd] <string>}... --noseclabel Do not change process security label Signed-off-by: Alex Jia <ajia(a)redhat.com> --- bin/virt-sandbox-service | 6 +++--- bin/virt-sandbox-service-bash-completion.sh | 2 +- bin/virt-sandbox-service-execute.pod | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index c05e13f..478769d 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -838,8 +838,8 @@ def fullpath(cmd): def execute(args): myexec = [ "virsh", "-c", "lxc:///", "lxc-enter-namespace" ] # myexec = [ "virt-sandbox-service-util", "execute" ] - if args.nolabel: - myexec.append("--nolabel") + if args.noseclabel: + myexec.append("--noseclabel") myexec.extend([ args.name, "--", fullpath(args.command[0])] + args.command[1:]) os.execv("/usr/bin/virsh", myexec) # myexec.extend( "-e", cmd, args.name ] @@ -966,7 +966,7 @@ def gen_connect_args(subparser): def gen_execute_args(subparser): parser = subparser.add_parser("execute", help=("Execute a command within a sandbox container")) - parser.add_argument("-N", "--nolabel", dest="nolabel", + parser.add_argument("-N", "--noseclabel", dest="noseclabel", default=False, action="store_true", help=_("do not modify the label of the executable process. By default all commands execute with the label of the sandbox")) requires_name(parser) diff --git a/bin/virt-sandbox-service-bash-completion.sh b/bin/virt-sandbox-service-bash-completion.sh index a886cf4..c855fd2 100755 --- a/bin/virt-sandbox-service-bash-completion.sh +++ b/bin/virt-sandbox-service-bash-completion.sh @@ -57,7 +57,7 @@ _virt_sandbox_service () { [ALL]='-h --help' [CREATE]='-u --unitfile -p --path -t --type -l --level -d --dynamic -n --clone -i --image -s --size' [LIST]='-r --running' - [EXECUTE]='-N --nolabel' + [EXECUTE]='-N --noseclabel' ) for ((i=0; $i <= $COMP_CWORD; i++)); do diff --git a/bin/virt-sandbox-service-execute.pod b/bin/virt-sandbox-service-execute.pod index 46a3b2b..f79ce73 100644 --- a/bin/virt-sandbox-service-execute.pod +++ b/bin/virt-sandbox-service-execute.pod @@ -31,7 +31,7 @@ Display help message The connection URI for the hypervisor (only LXC or QEMU are supported currently). -=item B<-N>, B<--nolabel> +=item B<-N>, B<--noseclabel> Execute command within the container. -- 1.7.1

2 2

[libvirt] [PATCH] net: use newer iptables syntax
by Stefan Seyfried 28 Mar '13

28 Mar '13

Hi all, iptables-1.4.18 removed the long deprecated "state" match. Use "conntrack" instead in forwarding rules. Fixes openSUSE bug https://bugzilla.novell.com/811251 #811251. real patch is attached as I'm pretty sure that thunderbird will mess it up otherwise :( Basically it's s/--match state/--match conntrack/ s/--state /--ctstate/ in src/til/viriptables.c Best regards, Stefan -- Stefan Seyfried Linux Consultant & Developer Mail: seyfried(a)b1-systems.de GPG Key: 0x731B665B B1 Systems GmbH Osterfeldstraße 7 / 85088 Vohburg / http://www.b1-systems.de GF: Ralph Dehner / Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537

5 4

[libvirt] [PATCH] conf: fix memory leak of class_id bitmap
by Guannan Ren 28 Mar '13

28 Mar '13

When libvirtd loads active network configs from network state directory, it should release the class_id memory block which was allocated at the time of loading xml from network config directory. virBitmapParse will create a new memory block of bitmap class_id which causes a memory leak. This happens when at least one virtual network is active before. ==12234== 8,216 (24 direct, 8,192 indirect) bytes in 1 blocks are definitely \ lost in loss record 702 of 709 ==12234== at 0x4A06B2F: calloc (vg_replace_malloc.c:593) ==12234== by 0x37AB04D77D: virAlloc (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x37AB04EF89: virBitmapNew (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x37AB0BFB37: virNetworkAssignDef (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x37AB0BFD31: ??? (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x37AB0BFE92: virNetworkLoadAllConfigs (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x10650E5A: ??? (in /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so) ==12234== by 0x37AB0EB72F: virStateInitialize (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x40DE04: ??? (in /usr/sbin/libvirtd) ==12234== by 0x37AB0832E8: ??? (in /usr/lib64/libvirt.so.0.1000.3) ==12234== by 0x3796807D14: start_thread (in /usr/lib64/libpthread-2.16.so) ==12234== by 0x37960F246C: clone (in /usr/lib64/libc-2.16.so) --- src/conf/network_conf.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c022fe4..7a45414 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1995,14 +1995,16 @@ virNetworkObjUpdateParseFile(const char *filename, ctxt->node = node; class_id = virXPathString("string(./class_id[1]/@bitmap)", ctxt); - if (class_id && - virBitmapParse(class_id, 0, + if (class_id) { + virBitmapFree(net->class_id); + if (virBitmapParse(class_id, 0, &net->class_id, CLASS_ID_BITMAP_SIZE) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed 'class_id' attribute: %s"), - class_id); - VIR_FREE(class_id); - goto cleanup; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'class_id' attribute: %s"), + class_id); + VIR_FREE(class_id); + goto cleanup; + } } VIR_FREE(class_id); -- 1.7.11.2

2 2

[libvirt] [PATCH 1/2] qemu:release qemu config object when qemu driver shutdown
by Guannan Ren 28 Mar '13

28 Mar '13

--- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1f9b8b2..96bf235 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -950,6 +950,7 @@ qemuShutdown(void) { return -1; virNWFilterUnRegisterCallbackDriver(&qemuCallbackDriver); + virObjectUnref(qemu_driver->config); virObjectUnref(qemu_driver->activePciHostdevs); virObjectUnref(qemu_driver->inactivePciHostdevs); virObjectUnref(qemu_driver->activeUsbHostdevs); -- 1.7.11.2

2 2

[libvirt] [PATCH 2/2] uml:release config object when uml driver shutdown
by Guannan Ren 28 Mar '13

28 Mar '13

--- src/uml/uml_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index b08212d..09a777c 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -640,6 +640,7 @@ umlShutdown(void) { virEventRemoveHandle(uml_driver->inotifyWatch); VIR_FORCE_CLOSE(uml_driver->inotifyFD); virObjectUnref(uml_driver->caps); + virObjectUnref(uml_driver->xmlconf); /* shutdown active VMs * XXX allow them to stay around & reconnect */ -- 1.7.11.2

2 2

[libvirt] [PATCHv2 1/2] Optimize machine option to set more options with it.
by Li Zhang 28 Mar '13

28 Mar '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Currently, -machine option is used only when dump-guest-core is set. To use options defined in machine option for newer version of QEMU, it needs to use -machine xxx, and to be compatible with older version -M, this patch addes QEMU_CAPS_MACHINE_OPT capability for newer version, say 1.2.0. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v2 -> v1: * Split the patch to 2 parts suggested by Daniel P.Berrange * Rename QEMU_CAPS_MACH_OPT to QEMU_CAPS_MACHINE_OPT * Remove version 1.1 assertion for QEMU_CAPS_MACHINE_OPT src/qemu/qemu_capabilities.c | 6 +++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 30 +++++++++++++++++++----------- tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 519d2c5..778e825 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -210,7 +210,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "rng-random", /* 130 */ "rng-egd", - "virtio-ccw" + "virtio-ccw", + "machine-opt" ); struct _virQEMUCaps { @@ -2442,6 +2443,9 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasic(qemuCaps); + /* machine option is supported for newer version */ + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + if (!(archstr = qemuMonitorGetTargetArch(mon))) goto cleanup; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index da06e27..66df556 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -172,6 +172,7 @@ enum virQEMUCapsFlags { virtio rng */ QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ + QEMU_CAPS_MACHINE_OPT = 133, /* -machine xxxx*/ 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 dc49d44..c39faf0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4941,6 +4941,8 @@ qemuBuildMachineArgStr(virCommandPtr cmd, const virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + /* This should *never* be NULL, since we always provide * a machine in the capabilities data for QEMU. So this * check is just here as a safety in case the unexpected @@ -4948,27 +4950,33 @@ qemuBuildMachineArgStr(virCommandPtr cmd, if (!def->os.machine) return 0; - if (!def->mem.dump_core) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_OPT)) { /* if no parameter to the machine type is needed, we still use * '-M' to keep the most of the compatibility with older versions. */ virCommandAddArgList(cmd, "-M", def->os.machine, NULL); } else { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("dump-guest-core is not available " - " with this QEMU binary")); - return -1; - } /* However, in case there is a parameter to be added, we need to * use the "-machine" parameter because qemu is not parsing the * "-M" correctly */ + virCommandAddArg(cmd, "-machine"); - virCommandAddArgFormat(cmd, - "%s,dump-guest-core=%s", - def->os.machine, - virDomainMemDumpTypeToString(def->mem.dump_core)); + virBufferAsprintf(&buf, "%s", def->os.machine); + + if (def->mem.dump_core) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("dump-guest-core is not available " + " with this QEMU binary")); + return -1; + } + + virBufferAsprintf(&buf, ",dump-guest-core=%s", + virDomainMemDumpTypeToString(def->mem.dump_core)); + } + + virCommandAddArg(cmd, virBufferContentAndReset(&buf)); } return 0; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c77b73f..352b41f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -363,9 +363,9 @@ mymain(void) DO_TEST("minimal-s390", QEMU_CAPS_NAME); DO_TEST("machine-aliases1", NONE); DO_TEST("machine-aliases2", QEMU_CAPS_KVM); - DO_TEST("machine-core-on", QEMU_CAPS_DUMP_GUEST_CORE); - DO_TEST("machine-core-off", QEMU_CAPS_DUMP_GUEST_CORE); - DO_TEST_FAILURE("machine-core-on", NONE); + DO_TEST("machine-core-on", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST("machine-core-off", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST_FAILURE("machine-core-on", QEMU_CAPS_MACHINE_OPT, NONE); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); -- 1.7.10.1

2 6

[libvirt] [libvirt-sandbox][PATCH] Docs: update network options configuration
by Alex Jia 28 Mar '13

28 Mar '13

Signed-off-by: Alex Jia <ajia(a)redhat.com> --- bin/virt-sandbox-service-create.pod | 7 ++++++- bin/virt-sandbox.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/virt-sandbox-service-create.pod b/bin/virt-sandbox-service-create.pod index 84cbf0a..1f82e1d 100644 --- a/bin/virt-sandbox-service-create.pod +++ b/bin/virt-sandbox-service-create.pod @@ -56,7 +56,12 @@ key=val pairs, separated by commas. The following options are valid =item dhcp Configure the network interface using dhcp. This key takes no value. -No other keys may be specified. +No other keys may be specified. eg + + -N dhcp,source=default + --network dhcp,source=lan + +where 'source' is the name of any libvirt virtual network. =item source=NETWORK diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index 0396d9e..88c4333 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -335,7 +335,12 @@ key=val pairs, separated by commas. The following options are valid =item dhcp Configure the network interface using dhcp. This key takes no value. -No other keys may be specified. +No other keys may be specified. eg + + -N dhcp,source=default + --network dhcp,source=lan + +where 'source' is the name of any libvirt virtual network. =item source=NETWORK -- 1.7.1

2 2

[libvirt] [libvirt-sandbox][PATCH v2] Avoid segfault in gvir_sandbox_config_add_host_include_file
by Alex Jia 28 Mar '13

28 Mar '13

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=924574 Valgrind defects memory error: ==19297== Invalid free() / delete / delete[] / realloc() ==19297== at 0x4A077A6: free (vg_replace_malloc.c:446) ==19297== by 0x350F24D79E: g_free (in /usr/lib64/libglib-2.0.so.0.3400.2) ==19297== by 0x4C2C03F: gvir_sandbox_config_add_host_include_file (libvirt-sandbox-config.c:1319) ==19297== by 0x401FB7: main (virt-sandbox.c:171) ==19297== Address 0x4f2094c is 12 bytes inside a block of size 18 alloc'd ==19297== at 0x4A0883C: malloc (vg_replace_malloc.c:270) ==19297== by 0x350F24D68E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3400.2) ==19297== by 0x350F263F0B: g_strdup (in /usr/lib64/libglib-2.0.so.0.3400.2) ==19297== by 0x4C2BF95: gvir_sandbox_config_add_host_include_file (libvirt-sandbox-config.c:1292) ==19297== by 0x401FB7: main (virt-sandbox.c:171) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- libvirt-sandbox/libvirt-sandbox-config.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index fc852f5..a98f40b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -1337,6 +1337,7 @@ gboolean gvir_sandbox_config_add_host_include_file(GVirSandboxConfig *config, error))) { const gchar *host; gchar *guest; + const gchar *relguest; GVirSandboxConfigMount *mnt = NULL; GList *mnts = NULL; gchar *tmp; @@ -1354,8 +1355,10 @@ gboolean gvir_sandbox_config_add_host_include_file(GVirSandboxConfig *config, mnt = GVIR_SANDBOX_CONFIG_MOUNT(mnts->data); const gchar *target = gvir_sandbox_config_mount_get_target(mnt); if (g_str_has_prefix(guest, target)) { - guest = guest + strlen(target); + relguest = guest + strlen(target); break; + } else { + relguest = guest; } mnt = NULL; mnts = mnts->next; @@ -1367,7 +1370,7 @@ gboolean gvir_sandbox_config_add_host_include_file(GVirSandboxConfig *config, return FALSE; } - gvir_sandbox_config_mount_add_include(GVIR_SANDBOX_CONFIG_MOUNT(mnt), host, guest); + gvir_sandbox_config_mount_add_include(GVIR_SANDBOX_CONFIG_MOUNT(mnt), host, relguest); g_free(guest); g_free(line); } -- 1.7.1

2 2

[libvirt] [PATCH 0/5] Add domain modification impact flags to hot-management commands
by Peter Krempa 28 Mar '13

28 Mar '13

As promised in the RFC, this series adds the --live, --config, --current and --persistent flags to virsh commands that were lacking them. Peter Krempa (5): virsh-domain: Fix declarations of flag variables in cmdChangeMedia virsh: Fix semantics of --config for "update-device" command virsh-domain: Add --live, --config, --current logic to cmdDetachInterface virsh-domain: Add --live, --config, --current logic to cmdDetachDevice virsh-domain: Add --live, --config, --current logic to cmdDetachDisk tools/virsh-domain.c | 225 ++++++++++++++++++++++++++++++++++++--------------- tools/virsh.pod | 66 ++++++++++----- 2 files changed, 206 insertions(+), 85 deletions(-) -- 1.8.1.5

4 14