- Devel - libvirt List Archives

[libvirt] [libvirt-glib] gconfig: Add API to set domain/pm tree
by Zeeshan Ali (Khattak) 11 Oct '12

11 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> API for new domain power management configuration. --- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-domain-power-management.c | 101 +++++++++++++++++++++ .../libvirt-gconfig-domain-power-management.h | 76 ++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.c | 16 ++++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 + libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 11 +++ 7 files changed, 210 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 5a80123..caa62f0 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -50,6 +50,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-memballoon.h \ libvirt-gconfig-domain-os.h \ libvirt-gconfig-domain-parallel.h \ + libvirt-gconfig-domain-power-management.h \ libvirt-gconfig-domain-redirdev.h \ libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-serial.h \ @@ -121,6 +122,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-memballoon.c \ libvirt-gconfig-domain-os.c \ libvirt-gconfig-domain-parallel.c \ + libvirt-gconfig-domain-power-management.c \ libvirt-gconfig-domain-redirdev.c \ libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-serial.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c new file mode 100644 index 0000000..c6b1962 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-power-management.c: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ + GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, \ + GVirConfigDomainPowerManagementPrivate)) + +struct _GVirConfigDomainPowerManagementPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainPowerManagement, + gvir_config_domain_power_management, + GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_power_management_class_init + (GVirConfigDomainPowerManagementClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainPowerManagementPrivate)); +} + + +static void +gvir_config_domain_power_management_init(GVirConfigDomainPowerManagement *pm) +{ + g_debug("Init GVirConfigDomainPowerManagement=%p", pm); + + pm->priv = GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(pm); +} + + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +GVirConfigDomainPowerManagement * +gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL, xml, error); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +void gvir_config_domain_power_management_set_ram_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-ram", + "enabled", + enabled? "yes" : "no"); +} + +void gvir_config_domain_power_management_set_disk_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-disk", + "enabled", + enabled? "yes" : "no"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.h b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h new file mode 100644 index 0000000..1d9b3b7 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-power-management.h: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ + +#include <libvirt-gconfig/libvirt-gconfig-domain-timer.h> + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT (gvir_config_domain_power_management_get_type ()) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagement)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) + +typedef struct _GVirConfigDomainPowerManagement GVirConfigDomainPowerManagement; +typedef struct _GVirConfigDomainPowerManagementPrivate GVirConfigDomainPowerManagementPrivate; +typedef struct _GVirConfigDomainPowerManagementClass GVirConfigDomainPowerManagementClass; + +struct _GVirConfigDomainPowerManagement +{ + GVirConfigObject parent; + + GVirConfigDomainPowerManagementPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainPowerManagementClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_power_management_get_type(void); + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void); +GVirConfigDomainPowerManagement * +gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_power_management_set_ram_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled); +void gvir_config_domain_power_management_set_disk_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled); + + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index e679e3a..e664351 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -804,3 +804,19 @@ void gvir_config_domain_set_cpu(GVirConfigDomain *domain, "cpu", GVIR_CONFIG_OBJECT(cpu)); } + +/** + * gvir_config_domain_set_power_management: + * @domain: a #GVirConfigDomain + * @pm: (allow-none): a #GVirPowerManagement instance + */ +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + g_return_if_fail(pm != NULL || GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(domain), + "pm", + GVIR_CONFIG_OBJECT(pm)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index a7bd73b..3a7be12 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -32,6 +32,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-cpu.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> G_BEGIN_DECLS @@ -143,6 +144,8 @@ gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, GVirConfigDomainCpu *gvir_config_domain_get_cpu(GVirConfigDomain *domain); void gvir_config_domain_set_cpu(GVirConfigDomain *domain, GVirConfigDomainCpu *cpu); +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 4b5ccbd..0428259 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -67,6 +67,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-memballoon.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> #include <libvirt-gconfig/libvirt-gconfig-domain-parallel.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> #include <libvirt-gconfig/libvirt-gconfig-domain-redirdev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-serial.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2ec2e80..c19cd79 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -472,4 +472,15 @@ LIBVIRT_GCONFIG_0.1.3 { gvir_config_domain_graphics_vnc_set_socket; } LIBVIRT_GCONFIG_0.1.0; +LIBVIRT_GCONFIG_0.1.4 { + global: + gvir_config_domain_power_management_get_type; + gvir_config_domain_power_management_new; + gvir_config_domain_power_management_new_from_xml; + gvir_config_domain_power_management_set_ram_suspend_enabled; + gvir_config_domain_power_management_set_disk_suspend_enabled; + + gvir_config_domain_set_power_management; +} LIBVIRT_GCONFIG_0.1.3; + # .... define new API here using predicted next version number .... -- 1.7.12.1

2 4

[libvirt] feature?
by Gene Czarcinski 11 Oct '12

11 Oct '12

By accident I had virtual guests running where the ip6 network definition was different than the one specified in the network xml file ... and it worked! Of course I did get an "extra" network address on the interface (due I assume to radvd) but it worked. Now, this is really an isolated network and I like this as a feature. For "regular" private or isolated virtual networks, the virtualization host can still get to any guest and any network ... except the ones where I had forgot to update the virtual network xml. comments? Gene

1 0

[libvirt] [PATCH] storage: Report UUID/name consistently in driver errors
by Cole Robinson 11 Oct '12

11 Oct '12

Done with: sed -i -e "s/no pool with matching uuid/no storage pool with matching uuid/g" src/storage/storage_driver.c sed -i -e 's/"%s", _("no storage pool with matching uuid")/_("no storage pool with matching uuid %s"), obj->uuid/g' src/storage/storage_driver.c sed -i -e 's/"%s", _("storage pool is not active")/_("storage pool '%s' is not active"), pool->def->name/g' src/storage/storage_driver.c And a couple fixups before, during, and after, and a manual inspection pass to make sure nothing was wonky. --- src/storage/storage_driver.c | 122 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 5ba3076..28829d3 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -269,7 +269,7 @@ storagePoolLookupByUUID(virConnectPtr conn, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no pool with matching uuid")); + _("no storage pool with matching uuid %s"), uuid); goto cleanup; } @@ -294,7 +294,7 @@ storagePoolLookupByName(virConnectPtr conn, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - _("no pool with matching name '%s'"), name); + _("no storage pool with matching name '%s'"), name); goto cleanup; } @@ -621,13 +621,14 @@ storagePoolUndefine(virStoragePoolPtr obj) { pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("pool is still active")); + _("storage pool '%s' is still active"), + pool->def->name); goto cleanup; } @@ -679,7 +680,7 @@ storagePoolStart(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -688,7 +689,8 @@ storagePoolStart(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("pool already active")); + _("storage pool '%s' is already active"), + pool->def->name); goto cleanup; } if (backend->startPool && @@ -725,7 +727,7 @@ storagePoolBuild(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -734,7 +736,8 @@ storagePoolBuild(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is already active")); + _("storage pool '%s' is already active"), + pool->def->name); goto cleanup; } @@ -762,7 +765,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -771,7 +774,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -822,7 +825,7 @@ storagePoolDelete(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -831,7 +834,8 @@ storagePoolDelete(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is still active")); + _("storage pool '%s' is still active"), + pool->def->name); goto cleanup; } @@ -875,7 +879,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -884,7 +888,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -931,7 +935,7 @@ storagePoolGetInfo(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -971,7 +975,7 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1001,7 +1005,7 @@ storagePoolGetAutostart(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1030,7 +1034,7 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1090,13 +1094,13 @@ storagePoolNumVolumes(virStoragePoolPtr obj) { if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } ret = pool->volumes.count; @@ -1123,13 +1127,13 @@ storagePoolListVolumes(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -1172,14 +1176,15 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, storageDriverUnlock(driver); if (!obj) { - virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", - _("no storage pool with matching uuid")); + virReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching uuid %s"), + pool->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(obj)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("storage pool is not active")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), obj->def->name); goto cleanup; } @@ -1234,13 +1239,13 @@ storageVolumeLookupByName(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -1288,7 +1293,7 @@ storageVolumeLookupByKey(virConnectPtr conn, if (!ret) virReportError(VIR_ERR_NO_STORAGE_VOL, - "%s", _("no storage vol with matching key")); + _("no storage vol with matching key %s"), key); return ret; } @@ -1339,7 +1344,7 @@ storageVolumeLookupByPath(virConnectPtr conn, if (!ret) virReportError(VIR_ERR_NO_STORAGE_VOL, - "%s", _("no storage vol with matching path")); + _("no storage vol with matching path %s"), path); VIR_FREE(cleanpath); storageDriverUnlock(driver); @@ -1367,13 +1372,13 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -1386,7 +1391,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (virStorageVolDefFindByName(pool, voldef->name)) { virReportError(VIR_ERR_NO_STORAGE_VOL, - "%s", _("storage vol already exists")); + _("storage vol '%s' already exists"), voldef->name); goto cleanup; } @@ -1496,7 +1501,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, storageDriverUnlock(driver); if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1509,13 +1514,14 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } if (origpool && !virStoragePoolObjIsActive(origpool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), + origpool->def->name); goto cleanup; } @@ -1655,13 +1661,14 @@ storageVolumeDownload(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -1717,13 +1724,14 @@ storageVolumeUpload(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -1779,14 +1787,15 @@ storageVolumeResize(virStorageVolPtr obj, storageDriverUnlock(driver); if (!pool) { - virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", - _("no storage pool with matching uuid")); + virReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("storage pool is not active")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -2074,13 +2083,14 @@ storageVolumeWipePattern(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -2138,13 +2148,14 @@ storageVolumeDelete(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -2219,13 +2230,14 @@ storageVolumeGetInfo(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -2275,13 +2287,14 @@ storageVolumeGetXMLDesc(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -2322,13 +2335,14 @@ storageVolumeGetPath(virStorageVolPtr obj) { storageDriverUnlock(driver); if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } -- 1.7.11.4

2 2

[libvirt] [PATCH 0/2] Cleanly save session VMs on logout/shutdown
by Alexander Larsson 11 Oct '12

11 Oct '12

Atm, when you exit the sessin (via logout or shutdown for instance) we just leave the qemu:///session handling libvirtd process around, including any running VMs. This is not particularly nice, as there is no way to know that the VMs are running, and you risk data loss if you shutdown while the VMs are running. This new version is basically the same as the previous, except it runs inside libvirtd, and it exits libvirtd too after saving the VMs. Alexander Larsson (2): virdbus: Add virDBusGetSessionBus helper Shut down session libvirtd cleanly daemon/libvirtd.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/util/virdbus.c | 84 ++++++++++++---- src/util/virdbus.h | 1 + 4 files changed, 310 insertions(+), 20 deletions(-) -- 1.7.12.1

2 4

[libvirt] [PATCH] Make virInitialize thread safe
by Daniel P. Berrange 10 Oct '12

10 Oct '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently there is a restriction that multi-threaded applications must manually call virInitialize, before threads start using libvirt, because it is not thread-safe. By switching it to use a virOnceControl initializer we gain thread safety, and thus applications no longer need to manually call it. They can rely on virConnectOpen invoking it for them. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt.c | 139 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 68 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 76e4401..b616f41 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -59,6 +59,7 @@ #include "command.h" #include "virrandom.h" #include "viruri.h" +#include "threads.h" #ifdef WITH_TEST # include "test/test_driver.h" @@ -119,7 +120,7 @@ static int virNWFilterDriverTabCount = 0; static virStateDriverPtr virStateDriverTab[MAX_DRIVERS]; static int virStateDriverTabCount = 0; #endif -static int initialized = 0; + #if defined(POLKIT_AUTH) static int virConnectAuthGainPolkit(const char *privilege) { @@ -391,29 +392,16 @@ static struct gcry_thread_cbs virTLSThreadImpl = { } \ } while (0) -/** - * virInitialize: - * - * Initialize the library. It's better to call this routine at startup - * in multithreaded applications to avoid potential race when initializing - * the library. - * - * Calling virInitialize is mandatory, unless your first API call is one of - * virConnectOpen*. - * - * Returns 0 in case of success, -1 in case of error - */ -int -virInitialize(void) -{ - if (initialized) - return 0; - initialized = 1; +static bool virGlobalError = false; +static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; +static void +virGlobalInit(void) +{ if (virThreadInitialize() < 0 || virErrorInitialize() < 0) - return -1; + goto error; gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); gcry_check_version(NULL); @@ -429,47 +417,87 @@ virInitialize(void) VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H - if (winsock_init () == -1) return -1; + if (winsock_init () == -1) + goto error; #endif if (!bindtextdomain(PACKAGE, LOCALEDIR)) - return -1; + goto error; /* * Note that the order is important: the first ones have a higher * priority when calling virConnectOpen. */ #ifdef WITH_TEST - if (testRegister() == -1) return -1; + if (testRegister() == -1) + goto error; #endif #ifdef WITH_OPENVZ - if (openvzRegister() == -1) return -1; + if (openvzRegister() == -1) + goto error; #endif #ifdef WITH_VMWARE - if (vmwareRegister() == -1) return -1; + if (vmwareRegister() == -1) + goto error; #endif #ifdef WITH_PHYP - if (phypRegister() == -1) return -1; + if (phypRegister() == -1) + goto error; #endif #ifdef WITH_VBOX - if (vboxRegister() == -1) return -1; + if (vboxRegister() == -1) + goto error; #endif #ifdef WITH_ESX - if (esxRegister() == -1) return -1; + if (esxRegister() == -1) + goto error; #endif #ifdef WITH_HYPERV - if (hypervRegister() == -1) return -1; + if (hypervRegister() == -1) + goto error; #endif #ifdef WITH_XENAPI - if (xenapiRegister() == -1) return -1; + if (xenapiRegister() == -1) + goto error; #endif #ifdef WITH_PARALLELS - if (parallelsRegister() == -1) return -1; + if (parallelsRegister() == -1) + goto error; #endif #ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; + if (remoteRegister () == -1) + goto error; #endif + return; + +error: + virGlobalError = true; +} + +/** + * virInitialize: + * + * Initialize the library. + * + * This method is invoked automatically by any of the virConnectOpen API + * calls. Since release 1.0.0, there is no need to call this method even + * in a multithreaded application, since initialization is performed in + * a thread safe manner. + * + * The only time it would be neccessary to call virInitialize is if the + * application did not invoke virConnectOpen as its first API call. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virInitialize(void) +{ + if (virOnce(&virGlobalOnce, virGlobalInit) < 0) + return -1; + + if (virGlobalError) + return -1; return 0; } @@ -553,9 +581,6 @@ DllMain (HINSTANCE instance ATTRIBUTE_UNUSED, int virRegisterNetworkDriver(virNetworkDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virNetworkDriverTabCount >= MAX_DRIVERS) { @@ -583,9 +608,6 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) int virRegisterInterfaceDriver(virInterfaceDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virInterfaceDriverTabCount >= MAX_DRIVERS) { @@ -613,9 +635,6 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) int virRegisterStorageDriver(virStorageDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virStorageDriverTabCount >= MAX_DRIVERS) { @@ -643,9 +662,6 @@ virRegisterStorageDriver(virStorageDriverPtr driver) int virRegisterDeviceMonitor(virDeviceMonitorPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virDeviceMonitorTabCount >= MAX_DRIVERS) { @@ -673,9 +689,6 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) int virRegisterSecretDriver(virSecretDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virSecretDriverTabCount >= MAX_DRIVERS) { @@ -703,9 +716,6 @@ virRegisterSecretDriver(virSecretDriverPtr driver) int virRegisterNWFilterDriver(virNWFilterDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virNWFilterDriverTabCount >= MAX_DRIVERS) { @@ -736,9 +746,6 @@ virRegisterDriver(virDriverPtr driver) { VIR_DEBUG("driver=%p name=%s", driver, driver ? NULLSTR(driver->name) : "(null)"); - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virDriverTabCount >= MAX_DRIVERS) { @@ -767,9 +774,6 @@ virRegisterDriver(virDriverPtr driver) int virRegisterStateDriver(virStateDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virStateDriverTabCount >= MAX_DRIVERS) { @@ -895,9 +899,8 @@ virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, { VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; if (libVer == NULL) goto error; @@ -1332,9 +1335,9 @@ virConnectPtr virConnectOpen (const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); virResetLastError(); @@ -1367,9 +1370,9 @@ virConnectPtr virConnectOpenReadOnly(const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); virResetLastError(); @@ -1406,9 +1409,9 @@ virConnectOpenAuth(const char *name, unsigned int flags) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); virResetLastError(); -- 1.7.11.2

3 3

[libvirt] Schedule for the next release: 1.0.0
by Daniel Veillard 10 Oct '12

10 Oct '12

After checking with Dan and other developpers, there is some agreement that we should finally bump the major release number, and we would like to do it beginning of November i.e. in sync for the next release. As usual all API and ABIs will be kept, this is just a numbering issue ! To try to avoid if possible another "brown paper bag" release just after 1.0.0, it seems logical to extend the testing period a bit, to a week and a half. So be prepared to enter freeze for 1.0.0 around the 24th in a couple of weeks, and celebrate around Nov 2 ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] libvirt: Change maximum CPU per node calculation.
by Viktor Mihajlovski 10 Oct '12

10 Oct '12

The macro VIR_NODEINFO_MAXCPUS computes the maximum number of supported CPUs for a node as the product of sockets, cores and threads from the virNodeInfo structure. Since topology cannot be discovered for offline CPUs, any of the values for sockets, cores or threads can be wrong (too small). As a consequence the per-VCPU CPU masks are truncated incorrectly and it's impossible to correlate the bits in the masks with actual CPUs on the host. Example: Host has 3 logical CPUs, 1 socket, 3 cores, 1 thread. Guest has 1 virtual CPU and is started while all 3 host CPUs are online. $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.4s CPU Affinity: yyy $ echo 0 > /sys/devices/system/cpu/cpu1/online $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.5s CPU Affinity: y- The correct display for CPU affinity would have been y-y, as the guest continues to use CPUs 0 and 2. This is not a display problem only, because it is also not possible to explicitly pin the virtual CPU to host CPUs 0 and 2, due to the truncated CPU mask. To prevent this, the following changes have been made: 1. In virNodeParseNode count all logical CPUs, offline or online and pass them back in a new argument 'maxcpus'. 2. Extend the virNodeInfo struct with a new member 'maxcpus' containing the number of all logical CPUs, online and offline. 3. Change the macro VIR_NODEINFO_MAXCPUS to return virNodeInfo.maxpus Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 3 ++- src/nodeinfo.c | 17 +++++++++++++---- src/remote/remote_protocol.x | 1 + src/remote_protocol-structs | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 81f12a4..16265b5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -445,6 +445,7 @@ struct _virNodeInfo { total number of CPU sockets otherwise */ unsigned int cores; /* number of cores per socket */ unsigned int threads;/* number of threads per core */ + unsigned int maxcpus;/* number of maximum cpus - online and offline */ }; /** @@ -1039,7 +1040,7 @@ int virDomainMigrateGetMaxSpeed(virDomainPtr domain, */ -#define VIR_NODEINFO_MAXCPUS(nodeinfo) ((nodeinfo).nodes*(nodeinfo).sockets*(nodeinfo).cores*(nodeinfo).threads) +#define VIR_NODEINFO_MAXCPUS(nodeinfo) ((nodeinfo).maxcpus) /** * virNodeInfoPtr: diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c0e60d8..2e9c111 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -202,9 +202,11 @@ CPU_COUNT(cpu_set_t *set) /* parses a node entry, returning number of processors in the node and * filling arguments */ static int -virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) +virNodeParseNode(const char *node, int *sockets, int *cores, + int *threads, int *cpus) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_NONNULL(5) { int ret = -1; int processors = 0; @@ -223,6 +225,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) *threads = 0; *cores = 0; *sockets = 0; + *cpus = 0; if (!(cpudir = opendir(node))) { virReportSystemError(errno, _("cannot opendir %s"), node); @@ -275,6 +278,8 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + (*cpus)++; + if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) goto cleanup; @@ -348,7 +353,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, char line[1024]; DIR *nodedir = NULL; struct dirent *nodedirent = NULL; - int cpus, cores, socks, threads; + int cpus, cores, socks, threads, maxcpus; unsigned int node; int ret = -1; char *sysfs_nodedir = NULL; @@ -358,6 +363,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, nodeinfo->mhz = 0; nodeinfo->cores = 0; nodeinfo->nodes = 0; + nodeinfo->maxcpus = 0; /* Start with parsing CPU clock speed from /proc/cpuinfo */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { @@ -470,12 +476,13 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, } if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, - &cores, &threads)) < 0) + &cores, &threads, &maxcpus)) < 0) goto cleanup; VIR_FREE(sysfs_cpudir); nodeinfo->cpus += cpus; + nodeinfo->maxcpus += maxcpus; if (socks > nodeinfo->sockets) nodeinfo->sockets = socks; @@ -505,7 +512,8 @@ fallback: goto cleanup; } - if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, &cores, &threads)) < 0) + if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, &cores, + &threads, &maxcpus)) < 0) goto cleanup; nodeinfo->nodes = 1; @@ -513,6 +521,7 @@ fallback: nodeinfo->sockets = socks; nodeinfo->cores = cores; nodeinfo->threads = threads; + nodeinfo->maxcpus = maxcpus; done: /* There should always be at least one cpu, socket, node, and thread. */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b0b530c..40883d0 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -465,6 +465,7 @@ struct remote_node_get_info_ret { /* insert@1 */ int sockets; int cores; int threads; + int maxcpus; }; struct remote_get_capabilities_ret { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4d2627a..8fece92 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -144,6 +144,7 @@ struct remote_node_get_info_ret { int sockets; int cores; int threads; + int maxcpus; }; struct remote_get_capabilities_ret { remote_nonnull_string capabilities; -- 1.7.0.4

2 3

[libvirt] [PATCH] qemu: Create or remove cgroup when doing vcpu (un)hotpluging
by Osier Yang 10 Oct '12

10 Oct '12

Various APIs use cgroup to either set or get the statistics of host or guest. Hotplug or unhotplug new vcpus without creating or removing the cgroup for the vcpus could cause problems for those APIs. E.g. % virsh vcpucount dom maximum config 10 maximum live 10 current config 1 current live 1 % virsh setvcpu dom 2 % virsh schedinfo dom --set vcpu_quota=1000 Scheduler : posix error: Unable to find vcpu cgroup for rhel6.2(vcpu: 1): No such file or directory This patch fixes the problem by creating cgroups for each of the onlined vcpus, and destroying cgroups for each of the offlined vcpus. --- src/qemu/qemu_driver.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97ad23e..b8ceca1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3601,6 +3601,8 @@ static int qemudDomainHotplugVcpus(struct qemud_driver *driver, int vcpus = oldvcpus; pid_t *cpupids = NULL; int ncpupids; + virCgroupPtr cgroup = NULL; + virCgroupPtr cgroup_vcpu = NULL; qemuDomainObjEnterMonitor(driver, vm); @@ -3654,6 +3656,53 @@ static int qemudDomainHotplugVcpus(struct qemud_driver *driver, goto cleanup; } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0) { + int rv = -1; + + if (nvcpus > oldvcpus) { + for (i = oldvcpus; i < nvcpus; i++) { + /* Create cgroup for the onlined vcpu */ + rv = virCgroupForVcpu(cgroup, i, &cgroup_vcpu, 1); + if (rv < 0) { + virReportSystemError(-rv, + _("Unable to create vcpu cgroup for %s(vcpu:" + " %d)"), + vm->def->name, i); + goto cleanup; + } + + /* Add vcpu thread to the cgroup */ + rv = virCgroupAddTask(cgroup_vcpu, cpupids[i]); + if (rv < 0) { + virReportSystemError(-rv, + _("unable to add vcpu %d task %d to cgroup"), + i, cpupids[i]); + virCgroupRemove(cgroup_vcpu); + goto cleanup; + } + + virCgroupFree(&cgroup_vcpu); + } + } else { + for (i = oldvcpus - 1; i >= nvcpus; i--) { + rv = virCgroupForVcpu(cgroup, i, &cgroup_vcpu, 0); + if (rv < 0) { + virReportSystemError(-rv, + _("Unable to access vcpu cgroup for %s(vcpu:" + " %d)"), + vm->def->name, i); + goto cleanup; + } + + /* Remove cgroup for the offlined vcpu */ + virCgroupRemove(cgroup_vcpu); + virCgroupFree(&cgroup_vcpu); + } + } + + virCgroupFree(&cgroup); + } + priv->nvcpupids = ncpupids; VIR_FREE(priv->vcpupids); priv->vcpupids = cpupids; @@ -3664,6 +3713,10 @@ cleanup: vm->def->vcpus = vcpus; VIR_FREE(cpupids); virDomainAuditVcpu(vm, oldvcpus, nvcpus, "update", rc == 1); + if (cgroup) + virCgroupFree(&cgroup); + if (cgroup_vcpu) + virCgroupFree(&cgroup_vcpu); return ret; unsupported: -- 1.7.7.6

3 3

[libvirt] [PATCH] win32: Pretend that close-on-exec works
by Matthias Bolte 10 Oct '12

10 Oct '12

Currently virNetSocketNew fails because virSetCloseExec fails as there is no proper implementation for it on Windows at the moment. Workaround this by pretending that setting close-on-exec on the fd works. This can be done because libvirt currently lacks the ability to create child processes on Windows anyway. So there is no point in failing to set a flag that isn't useful at the moment anyway. --- src/util/util.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 43fdaf1..356a03a 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -275,7 +275,11 @@ int virSetInherit(int fd, bool inherit) { int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED) { - return -1; + /* FIXME: Currently creating child processes is not supported on + * Win32, so there is no point in failing calls that are only relevant + * when creating child processes. So just pretend that we changed the + * inheritance property of the given fd as requested. */ + return 0; } #endif /* WIN32 */ -- 1.7.4.1

2 2

[libvirt] [PATCH] esx: Fix dynamic dispatch for types with more than one level of inheritance
by Matthias Bolte 10 Oct '12

10 Oct '12

Traverse the whole inheritance hierarchy for dynamic dispatch as it is already done for the dynamic cast. Also make AnyType cast errors more verbose. Reported by Ata Bohra. --- src/esx/esx_vi_generator.py | 36 ++++++++++++++++++++++++------------ src/esx/esx_vi_types.c | 12 ++++++++---- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index c4bbb03..af4e7e8 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -484,6 +484,26 @@ class Object(Type): return members + def generate_dispatch(self, suffix, is_first=True): + source = "" + + if self.extended_by is not None: + if not is_first: + source += "\n" + + source += " /* %s */\n" % self.name + + for extended_by in self.extended_by: + source += " ESX_VI__TEMPLATE__DISPATCH__%s(%s)\n" \ + % (suffix, extended_by) + + for extended_by in self.extended_by: + source += objects_by_name[extended_by] \ + .generate_dispatch(suffix, False) + + return source + + def generate_free_code(self, add_banner=False): source = "" @@ -835,9 +855,7 @@ class Object(Type): source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s,\n" % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__DEEP_COPY(%s)\n" \ - % extended_by + source += self.generate_dispatch('DEEP_COPY') source += "},\n" source += "{\n" @@ -863,9 +881,7 @@ class Object(Type): % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__CAST_FROM_ANY_TYPE(%s)\n" \ - % extended_by + source += self.generate_dispatch('CAST_FROM_ANY_TYPE') source += "})\n\n" @@ -895,9 +911,7 @@ class Object(Type): source += "ESX_VI__TEMPLATE__DYNAMIC_SERIALIZE(%s,\n" % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__SERIALIZE(%s)\n" \ - % extended_by + source += self.generate_dispatch('SERIALIZE') source += "},\n" source += "{\n" @@ -933,9 +947,7 @@ class Object(Type): % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__DESERIALIZE(%s)\n" \ - % extended_by + source += self.generate_dispatch('DESERIALIZE') source += "},\n" source += "{\n" diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index d2c71c7..c5ddb51 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -212,8 +212,10 @@ { \ if (anyType->type != esxVI_Type_##_type) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), \ - __FUNCTION__, anyType->other); \ + _("Call to %s for unexpected type '%s', " \ + "expected '%s'"), \ + __FUNCTION__, anyType->other, \ + esxVI_Type_ToString(esxVI_Type_##_type)); \ return -1; \ } \ }, /* nothing */) @@ -225,8 +227,10 @@ { \ if (anyType->type != esxVI_Type_##_type) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), \ - __FUNCTION__, anyType->other); \ + _("Call to %s for unexpected type '%s', " \ + "expected '%s'"), \ + __FUNCTION__, anyType->other, \ + esxVI_Type_ToString(esxVI_Type_##_type)); \ return -1; \ } \ }, Value) -- 1.7.4.1

2 2

[libvirt] IPV6 and routing
by Gene Czarcinski 10 Oct '12

10 Oct '12

As I have mentioned in other messages, I am interested in having full support for IPv6 in libvirt. To me this includes having dhcp6 for IPV6 address assignment and using RA (radvd) to establish the default route. This is what I am using on my real LANs. Before starting into adding dhcp6 support to libvirt, I wanted to see just how it works with the current software. First of all, it appears that, when nat or routed are specified for IPv4, the IPv6 is routed. If it is an isolated/private network, then it can only work with other guests on that network. The iptables and ip6tables settings corresponded and were as expected. On the virtualization host, both IPv4 and IPv6 forwarding are enabled. While I can easily do stuff like ping6 and ssh -6 from virtual guests to the virtualization host, I have been unable to do anything with external hosts ... unless I add a static route for the virtual IPv6 network on the target host back to the virtualization host. This is the only way I have gotten anything to work. To complicate things, it seem that "everything" wants the IPv6 network to have prefix=64 or things do not work correctly. The real systems use fd00:dead:beef:17::/64 for their network. The virtual networks all use fd00:face:17:xx::/64 for their networks. The network traffic on the virtualization host is forwarded to the target host ... I can see the packets with wireshark on the target host. On the target host I tried specifying a static route for network fd00:face:17::/48 ... well, that really screwed things up, resulted in some "redirects" from the virtualization host saying the that it was sent a malformed packed ... it took a reboot to clean things up. OK, so leave the fd00:face:17:6::/64 static route on the target host but subnetwork this network on the virtualization host using networks like fd00:face:17:6:8::/80 and fd00:face:6:9::/80. This works if I manually configure IPv6 on the virtual guest. Since radvd is "upset" by a non-prefix=64 network, I was not surprised when the guest's automatic IPv6 address/network was not configured. OK, what am I missing? What don't I understand? If IPv6 is going to be useful in virtualization, then there must be some "easy" way to have other systems understand that the virtualization host is acting as a router for the virtual IPv6 networks it runs. While being able to go between the virtualization hosts and the virtual guests is very useful, I do not consider this sufficient. I have googled and found some stuff as well as reading more RFCs than I wanted to but I cannot find anything to address this issue. IIRC, I did find something under a libvirt document that indicates "routed" will be used for some kind of subnetworking. Does libvirt need an IPv6 "NAT" to make this work? Comments? Suggestions? Gene

3 5

[libvirt] ANNOUNCE: libvirt 0.9.11.6 maintenance release
by Cole Robinson 10 Oct '12

10 Oct '12

libvirt 0.9.11.6 maintenance release is now available. This is libvirt 0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.11.6.tar.gz Changes in this version: * remove dnsmasq command line parameter "--filterwin2k" * dnsmasq: avoid forwarding queries without a domain * security: Fix libvirtd crash possibility For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

3 3

[libvirt] [PATCH] hooks: let virCommand do the error reporting
by Eric Blake 09 Oct '12

09 Oct '12

The code was reporting raw exit status without decoding it into normal vs. signal exit. virCommandRun already does this, but with a different error type, so all we have to do is recast the error to the correct type. Reported by li guang. * src/util/hooks.c (virHookCall): Simplify. --- In response to: https://www.redhat.com/archives/libvir-list/2012-October/msg00308.html src/util/hooks.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/util/hooks.c b/src/util/hooks.c index f5890d2..8817a4e 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -1,7 +1,7 @@ /* * hooks.c: implementation of the synchronous hooks support * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010 Daniel Veillard * * This library is free software; you can redistribute it and/or @@ -206,7 +206,6 @@ virHookCall(int driver, char **output) { int ret; - int exitstatus; char *path; virCommandPtr cmd; const char *drvstr; @@ -279,12 +278,11 @@ virHookCall(int driver, if (output) virCommandSetOutputBuffer(cmd, output); - ret = virCommandRun(cmd, &exitstatus); - if (ret == 0 && exitstatus != 0) { - virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, - _("Hook script %s %s failed with error code %d"), - path, drvstr, exitstatus); - ret = -1; + ret = virCommandRun(cmd, NULL); + if (ret < 0) { + /* Convert INTERNAL_ERROR into known error. */ + virErrorPtr err = virGetLastError(); + virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, "%s", err->message); } virCommandFree(cmd); -- 1.7.11.4

2 3

[libvirt] [libvirt-designer][PATCH 1/2] spec: Update changelog
by Michal Privoznik 09 Oct '12

09 Oct '12

to reflect the brand new release --- libvirt-designer.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index 667366c..2ff7487 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -103,3 +103,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libvirt-designer %changelog + +Tue Oct 09 2012 Daniel P. Berrange <berrange(a)redhat.com> 0.0.1-1 +- created -- 1.7.8.6

2 5

[libvirt] [PATCH] doc: update description about user/group in qemu.conf
by Marcelo Cerri 09 Oct '12

09 Oct '12

As a side effect of changes in the functions virGetUserID and virGetGroupID, the user and group configurations for DAC in qemu.conf are now able to accept both names and IDs, supporting a leading plus sign to ensure that a numeric value will not be interpreted as a name. This patch updates the comments in qemu.conf, including a description of this new behavior. --- src/qemu/qemu.conf | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 18105ca..dd853c8 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -180,10 +180,25 @@ # guests will be blocked. Defaults to 0. #security_require_confined = 1 -# The user ID for QEMU processes run by the system instance. +# The user for QEMU processes run by the system instance. It can be +# specified as a user name or as a user id. The qemu driver will try to +# parse this value first as a name and then, if the name doesn't exist, +# as a user id. +# +# Since a sequence of digits is a valid user name, a leading plus sign +# can be used to ensure that a user id will not be interpreted as a user +# name. +# +# Some examples of valid values are: +# +# user = "qemu" # A user named "qemu" +# user = "+0" # Super user (uid=0) +# user = "100" # A user named "100" or a user with uid=100 +# #user = "root" -# The group ID for QEMU processes run by the system instance. +# The group for QEMU processes run by the system instance. It can be +# specified in a similar way to user. #group = "root" # Whether libvirt should dynamically change file ownership -- 1.7.12

2 1

[libvirt] [PATCH] nodeinfo: Fully convert to new virReportError
by Michal Privoznik 09 Oct '12

09 Oct '12

With our latest s/[a-z]+ReportError/virReportError/ rewrite (47ab34e2) we forgot to update arm part of the code. --- Thanks to my masochist idea of compiling libvirt on my Raspberry PI I've discovered this. Pushing under trivial & build breaker (on arm platforms obviously) rules. For those who are interested, it took ages and we don't build cleanly: http://pastebin.com/dkrJaV5Z But I am not sure how to fix those 'cast increases required alignment of target type' warnings. And I am not sure anybody else is ever going to use libvirt on arm. src/nodeinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 4cbfe63..c0e60d8 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -423,8 +423,8 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, buf++; if (*buf != ':' || !buf[1]) { - nodeReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("parsing cpu MHz from cpuinfo")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpu MHz from cpuinfo")); goto cleanup; } -- 1.7.8.6

3 2

[libvirt] [PATCH] docs: Drop useless </p> in drvphyp.html.in
by Michal Privoznik 09 Oct '12

09 Oct '12

--- Pushing under trivial rule. docs/drvphyp.html.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/docs/drvphyp.html.in b/docs/drvphyp.html.in index 0bd20dd..50e26b2 100644 --- a/docs/drvphyp.html.in +++ b/docs/drvphyp.html.in @@ -43,6 +43,5 @@ phyp://user@ivm/system (IVM connection) <pre> phyp://[username@]{hmc|ivm}/managed_system </pre> - </p> </body></html> -- 1.7.8.6

1 0

[libvirt] [PATCH v2 0/2] extend virGetUserID and virGetGroupID
by Marcelo Cerri 09 Oct '12

09 Oct '12

This patch series moves the logic for parsing users and groups in a similar way to coreutils' chown from security_dac.c to util.c, as suggested by Eric Blake. This change has two majors side effects: 1. Some error messages that were issued when security_dac.c tried to parse an ID as a name are no longer issued. 2. The keys `user` and `group` in qemu.conf can now be defined in the same way that in DAC security labels. Peter Krempa's fix for correctly handling errors returned by getpwnam_r and getgrnam_r is squashed into this patch series. Marcelo Cerri (2): util: extend virGetUserID and virGetGroupID to support names and IDs security: update user and group parsing in security_dac.c src/security/security_dac.c | 45 +++----------- src/util/util.c | 143 ++++++++++++++++++++++++++++++++------------ 2 files changed, 112 insertions(+), 76 deletions(-) -- 1.7.12

2 4

[libvirt] [PATCH 0/3] Cleanly save session VMs on logout/shutdown
by Alexander Larsson 09 Oct '12

09 Oct '12

Atm, when you exit the sessin (via logout or shutdown for instance) we just leave the qemu:///session handling libvirtd process around, including any running VMs. This is not particularly nice, as there is no way to know that the VMs are running, and you risk data loss if you shutdown while the VMs are running. This patch series adds a babysitter to the session that will track session lifetime and shutdown events and save running VMs as needed. Outstanding questions: Can this code be inside libvirtd itself? I.E. is it possible to do VM management calls like virDomainManagedSave() from inside libvirtd itself. If not, who will launch the babysitter? Alexander Larsson (3): Fix typo in HAVE_DBUS automake conditional virdbus: Add virDBusGetSessionBus helper Add new libvirt-babysitter tool configure.ac | 2 +- src/util/virdbus.c | 84 ++++++++++---- src/util/virdbus.h | 1 + tools/Makefile.am | 21 ++++ tools/libvirt-babysitter.c | 276 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 363 insertions(+), 21 deletions(-) create mode 100644 tools/libvirt-babysitter.c -- 1.7.12.1

4 9

[libvirt] [PATCH 00/12] Structured syslog (Lumberjack/CEE) support
by Miloslav Trmač 09 Oct '12

09 Oct '12

This patch set adds structured syslog support to libvirt. In short, the idea is to embed JSON in a syslog record. This format is used in a new log output type called "syslog/json". Example "syslog/json" record (line-wrapped for readability): Sep 20 19:59:40 kulicka libvirt: @cee: {"msg":"libvirt version: 0.10.1", "category":"../../src/test/test_driver.c","priority":"info", "funcname":"virLogVMessage","line":769, "timestamp":"2012-09-20 17:59:40.853+0000"} compared with existing "syslog" record format: Sep 20 20:02:24 kulicka libvirt: 5896: info : libvirt version: 0.10.1 This JSON embedding format is defined by the Lumberjack project led by the major Open Source syslog implementations (https://fedorahosted.org/lumberjack/) The format is also a base for a future MITRE CEE standard. Some of the fields are specified at https://fedorahosted.org/lumberjack/wiki/FieldList , but applications are free to use whatever fields make sense for them. The JSON structure makes easy to process logs by programs without writing code that understands the specific format used by each application, or using unreliable regexps (https://fedorahosted.org/ceelog/ is a companion project that allows processing such logs). Current systems will store and these records unmodified and present them to users unmodified, but tools (and probably /var/log/messages) will be able to show only the "msg" field; this allows us to add more detailed information without worsening the user experience (the example above already shows added information that is currently being thrown away when logging to syslog). The patch set, aside from building the required infrastructure, has two main components: * Add the "syslog/json" output type, and use it to record all information passed to virLogMessage. The example result is shown above. This primarily makes it easier to parse the message. * Allow callers of virLogMessage to add arbitrary additional JSON fields, and use it in virRaiseErrorFull and its callers. Because the additional fields for errors include virErrorDomain and virErrorNumber, this allows _programs_ to _automatically_ detect the event and react to it, perhaps alerting the user about a situation that requires immediate attention, or automatically suggesting a solution. This has not been possible until now because the current logs contain only a translated error message, so the log record doesn't contain anything stable that could be detected by a program. It is assumed that other parts of libvirt may add more event-specific JSON fields in the future, based on demand by applications that process the logs; I have, however, no immediate plans to add more. Miloslav Trmač (12): Drop unused return value of virLogOutputFunc Add JSON API for preallocated objects. Split yajl_gen allocation into a separate function. Split adding object properties from virJSONValueToStringOne Add a JSON generator API. Pass the "raw" log message to each virLogOutputFunc Split priority conversion from virLogOutputToSyslog Add "syslog/json" log output format. Add a JSON properties parameter to virLog{,V}Message Add a JSON properties parameter to virLogOutputFunc Add detailed error information to JSON syslog Add a test for the new error reporting mechanism. docs/logging.html.in | 3 + src/libvirt_private.syms | 4 + src/uml/uml_conf.c | 2 +- src/util/json.c | 232 +++++++++++++++++++++++++++++++++++++++++----- src/util/json.h | 26 ++++++ src/util/logging.c | 233 ++++++++++++++++++++++++++++++++++------------- src/util/logging.h | 35 +++---- src/util/viraudit.c | 4 +- src/util/virterror.c | 32 ++++++- tests/Makefile.am | 6 +- tests/errorjsontest.c | 211 ++++++++++++++++++++++++++++++++++++++++++ tests/testutils.c | 7 +- 12 files changed, 684 insertions(+), 111 deletions(-) create mode 100644 tests/errorjsontest.c -- 1.7.11.4

4 24

[libvirt] [ANNOUNCE] libvirt-designer 0.0.1 release
by Daniel P. Berrange 09 Oct '12

09 Oct '12

I am pleased to announce that the first release of the libvirt-designer package, version 0.0.1, is now available from ftp://ftp.libvirt.org/libvirt/designer/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Everything ! The libvirt-designer package provides a library that integrates libosinfo and libvirt-gconfig. Given an operating system identifier and libvirt host capabilities, it queries the libosinfo database to determine optimal hardware configuration and uses this information to design suitable domain XML for running the OS as a guest. In a similar manner it facilitates the setup of guest hardware devices such as disks, network interfaces, video cards, etc. These APIs are inspired by experience creating internal APIs for similar tasks in the virt-install/virt-manager projects. Since it builds on libosinfo and libvirt-gconfig, the libvirt-designer library relies on GObject introspection to provide access to its APIs for non-C programming languages. In addition it explicitly avoids a direct depedancy on libvirt.so, to enable usage by applications using alternative SNMP, CIM, etc bindings to libvirt, or those applications which simply need to construct libvirt XML without actually booting the guests afterwards. These early releases of libvirt-designer should be considered experimental. While we don't actively plan to change/break the API/ABI, we are not going to guarantee API/ABI stability of libvirt-designer at this time. Follow up comments about libvirt-designer should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release, in particular Michal who is actually doing the vast majority of the hard work here. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] qemu: Fix QMP detection of QXL graphics
by Jiri Denemark 09 Oct '12

09 Oct '12

With the recent introduction of QMP capabilities probing, libvirt failed to detect support for QXL graphics in QEMU 1.2 and newer. In addition to fixing that, this patch also causes libvirt to detect QXL support for qemu-kvm-0.13.0, which doesn't advertise it in -help output but mentions it in device list. Since qemu-kvm-0.13.0 supported -spice, it looks like not having qxl in -help was a bug. --- src/qemu/qemu_capabilities.c | 1 + tests/qemuhelptest.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d16a7bc..982b875 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1276,6 +1276,7 @@ struct qemuCapsStringFlags qemuCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI_PCI }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, + { "qxl", QEMU_CAPS_VGA_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, { "scsi-cd", QEMU_CAPS_SCSI_CD }, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 681f425..df30ac1 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -467,6 +467,7 @@ mymain(void) QEMU_CAPS_NESTING, QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, + QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, -- 1.7.12

3 3

[libvirt] [PATCH 0/3] non-shared migration without target disk images
by liguang 09 Oct '12

09 Oct '12

by now, if you want a non-shared migration, you have to create same files at target as source side, which seems intorlerable! this issue was reported by Reinier Schoof http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html These patches try to let migrate --copy-storage-* work without pre-exist disk image files at target side. we may also hope qemu to aware of this issue hooks/qemu | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 3 ++ src/util/hooks.c | 2 +- 3 files changed, 59 insertions(+), 1 deletions(-)

3 7

[libvirt] [libvirt-list] question about the commands: domhostname and hostname
by Li Zhang 09 Oct '12

09 Oct '12

Hi all, I am testing the virsh commands, and I found that these two commands: * domhostname * hostname >From the manual of virsh commands: * hostname Print the hypervisor hostname. * domhostname domain Returns the hostname of a domain, if the hypervisor makes it available It seems that both of them want to get the host name. What's the difference between them? >From the source code, domhostname only is supported for openvz on 0.10.1. Will this be only for openvz in the future? Any idea? Thanks a lot in advance. -:) -- Best Regards -Li

3 7

[libvirt] virsh blockcommit tests (w/ libvirt & qemu git)
by Kashyap Chamarthy 09 Oct '12

09 Oct '12

Hi, Here are a few tests I've done over the weekend to test blockcommit w/ Eric's block commit patches: - https://www.redhat.com/archives/libvir-list/2012-October/msg00091.html - https://www.redhat.com/archives/libvir-list/2012-October/msg00091.html Most of these are from an earlier disscussion from Eric. (1) (POSITIVE-TEST) Commit data from 3 backing image files into 'base' (top to base) using blockcommit, w/ base & resulting overlays as qcow2: actual state: [base] <-- [snap-1] <-- [snap-2] <-- [snap3] <-- [active-layer] desired state: [base] <-- [act-f17-base.qcow2] (resulting in invalidating snap1, snap2, snap3) #======================# [root@moon libvirt]# virsh blockcommit --domain f17-base vda --wait --base /export/vmimgs2/f17-base.qcow2 --top /export/vmimgs2/snap3-f17-base.qcow2 --verbose Block Commit: [100 %] Commit complete [root@moon libvirt]# #======================# [root@moon ~]# qemu-img info /export/vmimgs2/act-f17-base.qcow2 image: /export/vmimgs2/act-f17-base.qcow2 file format: qcow2 virtual size: 2.0G (2147483648 bytes) disk size: 648K cluster_size: 65536 backing file: /export/vmimgs2/f17-base.qcow2 [root@moon ~]# #======================# (2) (POSITIVE-TEST) Commit data from 2 backing image files into 'base' (top to base) using blockcommit, w/ base as raw & resulting overlays as qcow2: actual state: [base] <-- [snap-1] <-- [snap-2] <-- [snap3] <-- [active-layer] desired state: [base] <--- [snap-3] <--- [active-layer] (resulting in invalidating snap1, snap2) #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 --top /var/lib/ libvirt/images/snap3-of-test-f17base.qcow2 --verbose Block Commit: [100 %] Commit complete [root@moon qemu]# #======================# [root@moon qemu]# qemu-img info /var/lib/libvirt/images/snap4-of-test-f17base.qcow2 image: /var/lib/libvirt/images/snap4-of-test-f17base.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 2.3M cluster_size: 65536 backing file: /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 [root@moon qemu]# #======================# (3) (NEGATIVE-TEST) Try blockcommit to a base image which is a 'raw' device - Question: I assume the below is expected, right? We cannot do blockcommit into a NON-qcow2 base file? #======================# [root@moon qemu]# virsh blockcommit --domain raw-base vda --wait --base /export/vmimgs2/raw-base.img --top /var/lib/libvirt/images/snap3-b-raw-base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Could not open '/export/vmimgs2/raw-base.img' [root@moon qemu]# #======================# (4) (NEGATIVE-TEST) Try blockcommit while the guest is 'offline' #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of-test-f17-base.qcow2 --top /var/lib/libvirt/images/snap3-of-test-f17-base.qcow2 --verbose error: Requested operation is not valid: domain is not running #======================# (5) (NEGATIVE-TEST) Provide a non-existent file path for base or top(and both) #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 --top /var/lib/libvirt/images/snap3-of--f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Top image file /var/lib/libvirt/images/snap3-of--f17base.qcow2 not found #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of--f17base.qcow2 --top /var/lib/libvirt/images/snap3-of-test-f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Base '/var/lib/libvirt/images/snap1-of--f17base.qcow2' not found #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of--f17base.qcow2 --top /var/lib/libvirt/images/snap3-of--f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Base '/var/lib/libvirt/images/snap1-of--f17base.qcow2' not found #======================# (6) (NEGATIVE-TEST) Provide --base & --top values out of order: #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap3-of-test-f17base.qcow2 --top /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Base '/var/lib/libvirt/images/snap3-of-test-f17base.qcow2' not found [root@moon qemu]# #======================# NOTES: ----- (a) To quickly check differences between the snapshot image files, I added a text file in each of the snapshot images, just before taking a snapshot. And, when I do a commit operation, I just check w/ 'guestfish' on the relevant disk image if all the expected content reflect. $ guestfish --ro -i -a /export/vmimgs2/f17-base.qcow2 Welcome to guestfish, the libguestfs filesystem interactive shell for editing virtual machine filesystems. Type: 'help' for help on commands 'man' to read the manual 'quit' to quit the shell Operating system: Fedora release 17 (Beefy Miracle) /dev/sda1 mounted on / ><fs> ls /export file2.txt file3.txt file4.txt ><fs> Is there a simpler way? (b) The snapshot-create command I use is something like below: # virsh snapshot-create-as --domain raw-base snap4 snap4-desc --disk-only --diskspec vda,snapshot=external,file=/var/lib/libvirt/images/snap4-b-raw-base.qcow2 --atomic Question: At this point in time, I guess 'snapshot-revert' command is not uhelpful for any practical purposes while dealing with external snapshots,right? - To rephrase, is there a way(in future?),a coherent way to use 'blockcommit'(or blockpull) in conjunction with 'snapshot-revert' command? Yet to test: (1) Use a raw block device(LVM, or direct block /dev/sda1) as backing file (2) Try testing the case of a backing file smaller than the top file being committed ( with data located at various offsets) + In-progress: I'm testing this by adding a 'virsh attach-device' Thanks -- /kashyap

2 4