- Devel - libvirt List Archives

[libvirt] [PATCH v9] support offline migration
by liguang 11 Oct '12

11 Oct '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. so, this migration result is just make domain definition alive at target side. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 ++++++++++++ src/qemu/qemu_migration.c | 53 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 70 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 79c7689..627e9d4 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6848924..105febf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9631,6 +9631,15 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9643,6 +9652,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9878,6 +9888,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8e85875..411a4c2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) + virBufferAsprintf(buf, " <offline/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +667,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +731,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1151,6 +1165,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1314,6 +1335,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1856,7 +1886,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2372,6 +2403,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2477,7 +2510,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2587,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2617,7 +2650,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2941,6 +2974,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -3038,7 +3073,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3074,6 +3109,7 @@ qemuMigrationFinish(struct qemud_driver *driver, endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; + } else if (flags & VIR_MIGRATE_OFFLINE) { } else if (!vm->persistent && !virDomainObjIsActive(vm)) { qemuDomainRemoveInactive(driver, vm); vm = NULL; @@ -3120,7 +3156,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..b4f6a77 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 505169b..2218379 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6647,6 +6647,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6713,6 +6714,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

3 4

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

11 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(-)

4 14

[libvirt] build libvirt error. lack of AppArmor .
by yue 10 Oct '12

10 Oct '12

error occur when attach a rbd-disk to domain. 1.configure: error: You must install the AppArmor development package in order to compile libvirt 2. 2012-10-10 17:36:16.305+0000: 3808: warning : qemuDomainObjTaint:1297 : Domain id=2 name='xpSP3' uuid=b45bd66a-6700-4905-c5f4-4c799413d7b7 is tainted: high-privileges 2012-10-10 17:36:16.712+0000: 3808: error : qemuMonitorOpenUnix:266 : failed to connect to monitor socket: No such process 2012-10-10 17:36:16.712+0000: 3808: error : qemuProcessWaitForMonitor:1510 : internal error process exited while connecting to monitor: char device redirected to /dev/pts/4 qemu-kvm: -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw: could not open disk image rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789: No such file or directory centos6.2 2.6.32-220.el6.x86_64

2 1

[libvirt] Correct name of domain/pm/suspend-to-mem in docs
by Zeeshan Ali (Khattak) 10 Oct '12

10 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3cc6c51..f9fe6ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -983,7 +983,7 @@ ... <pm> <suspend-to-disk enabled='no'/> - <suspend-to-ram enabled='yes'/> + <suspend-to-mem enabled='yes'/> </pm> ...</pre> -- 1.7.12.1

2 1

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

10 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 10 Oct '12

10 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 10 Oct '12

10 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 10 Oct '12

10 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