- Devel - libvirt List Archives

[libvirt] [PATCH] build: commit to 0.10.0 release naming
by Eric Blake 02 Aug '12

02 Aug '12

With 0.10.0-rc0 out the door, we are committed to the next version number. * src/libvirt_public.syms (LIBVIRT_0.9.14): Rename... (LIBVIRT_0.10.0): ...to this. * docs/formatdomain.html.in: Fix fallout. * src/openvz/openvz_driver.c (openvzDriver): Likewise. * src/remote/remote_driver.c (remote_driver): Likewise. --- I almost pushed this under the trivial rule, but realized that anyone that builds an app against rc0 will be binary incompatible with the .so post-patch. Are we okay declaring that rc0 is unsupported so the ABI break is okay, or do I need to respin the .syms portion of this patch to keep the LIBVIRT_0.9.14 label even though we had no 0.9.14 release? docs/formatdomain.html.in | 2 +- src/libvirt_public.syms | 2 +- src/openvz/openvz_driver.c | 2 +- src/remote/remote_driver.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b8db76e..54e0f13 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -780,7 +780,7 @@ CPU model will fail. Supported values for <code>fallback</code> attribute are: <code>allow</code> (this is the default), and <code>forbid</code>. The optional <code>vendor_id</code> attribute - (<span class="since">Since 0.9.14</span>) can be used to set the + (<span class="since">Since 0.10.0</span>) can be used to set the vendor id seen by the guest. It must be exactly 12 characters long. If not set the vendor id of the host is used. Typical possible values are "AuthenticAMD" and "GenuineIntel".</dd> diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 5004182..e3ba119 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -544,7 +544,7 @@ LIBVIRT_0.9.13 { virDomainSnapshotRef; } LIBVIRT_0.9.11; -LIBVIRT_0.9.14 { +LIBVIRT_0.10.0 { global: virDomainGetHostname; virConnectRegisterCloseCallback; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 4cc7f46..48b5219 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2170,7 +2170,7 @@ static virDriver openvzDriver = { .domainIsUpdated = openvzDomainIsUpdated, /* 0.8.6 */ .isAlive = openvzIsAlive, /* 0.9.8 */ .domainUpdateDeviceFlags = openvzDomainUpdateDeviceFlags, /* 0.9.13 */ - .domainGetHostname = openvzDomainGetHostname, /* 0.9.14 */ + .domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */ }; int openvzRegister(void) { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9ac27b2..23b13d3 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5378,7 +5378,7 @@ static virDriver remote_driver = { .domainGetDiskErrors = remoteDomainGetDiskErrors, /* 0.9.10 */ .domainSetMetadata = remoteDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = remoteDomainGetMetadata, /* 0.9.10 */ - .domainGetHostname = remoteDomainGetHostname, /* 0.9.14 */ + .domainGetHostname = remoteDomainGetHostname, /* 0.10.0 */ }; static virNetworkDriver network_driver = { -- 1.7.11.2

3 4

[libvirt] [PATCH] qemu: Fix typo in qemuDomainModifyDeviceFlags
by Michal Privoznik 02 Aug '12

02 Aug '12

One of our latest commits fbe87126 introduced this nasty typo: func(vmdef, ...); where func() dereference vmdef->ncontrollers, and vmdef was initialized to NULL. This leaves us with unconditional immediate segfault. It should be vm->def instead. --- Despite this could qualify to be pushed under trivial rule, I'd feel more comfortable with an ACK. src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b3f946c..270e4dd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5833,7 +5833,7 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - if (virDomainDefCompatibleDevice(vmdef, dev) < 0) + if (virDomainDefCompatibleDevice(vm->def, dev) < 0) goto endjob; /* Make a copy for updated domain. */ -- 1.7.8.6

2 2

[libvirt] [PATCH] daemon: Portable auto-detection of driver module directory
by Jiri Denemark 02 Aug '12

02 Aug '12

When running libvirtd from a build directory on a system with unmodified libtool, libvirtd's binary is not renamed as "lt-libvirtd". Check for "/daemon/.libs/libvirtd" in addition to "lt-libvirtd". --- daemon/libvirtd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ffbe067..a316427 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -972,7 +972,8 @@ int main(int argc, char **argv) { virLogSetFromEnv(); #ifdef WITH_DRIVER_MODULES - if (strstr(argv[0], "lt-libvirtd")) { + if (strstr(argv[0], "lt-libvirtd") || + strstr(argv[0], "/daemon/.libs/libvirtd")) { char *tmp = strrchr(argv[0], '/'); if (!tmp) { fprintf(stderr, _("%s: cannot identify driver directory\n"), argv[0]); -- 1.7.11.1

2 2

[libvirt] [PATCH 1/2] build: Link security manager into libvirt.so
by Jiri Denemark 02 Aug '12

02 Aug '12

Security manager is not a dynamically loadable driver, it's a common infrastructure similar to util, conf, cpu, etc. used by individual drivers. Such code is allowed to be linked into libvirt.so. This reverts commit ec5b7bd2ecbf40ceff5b2d4fc00d5cfdfba966a4 and most of aae5cfb69948fddef556f8f5b9f80a444f9c6125. This patch is supposed to fix virdrivermoduletest failures for qemu and lxc drivers as well as libvirtd's ability to load qemu and lxc drivers. --- daemon/Makefile.am | 1 - src/Makefile.am | 3 +-- src/libvirt_private.syms | 31 +++++++++++++++++++++++++++++++ tests/Makefile.am | 5 ++--- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index b8ecbef..928aeaf 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -164,7 +164,6 @@ endif if WITH_NWFILTER libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la endif -libvirtd_LDADD += ../src/libvirt_driver_security.la endif libvirtd_LDADD += ../src/libvirt.la diff --git a/src/Makefile.am b/src/Makefile.am index 6f8838b..2b09141 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1161,8 +1161,7 @@ endif libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES) noinst_LTLIBRARIES += libvirt_driver_security.la -# Stateful, so linked to daemon instead -#libvirt_la_BUILT_LIBADD += libvirt_driver_security.la +libvirt_la_BUILT_LIBADD += libvirt_driver_security.la libvirt_driver_security_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_security_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 97f3b14..71341a2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -962,6 +962,37 @@ virSecretUsageTypeTypeFromString; virSecretUsageTypeTypeToString; +# security_driver.h +virSecurityDriverLookup; + + +# security_manager.h +virSecurityManagerClearSocketLabel; +virSecurityManagerFree; +virSecurityManagerGenLabel; +virSecurityManagerGetDOI; +virSecurityManagerGetModel; +virSecurityManagerGetProcessLabel; +virSecurityManagerNew; +virSecurityManagerNewStack; +virSecurityManagerNewDAC; +virSecurityManagerReleaseLabel; +virSecurityManagerReserveLabel; +virSecurityManagerRestoreImageLabel; +virSecurityManagerRestoreAllLabel; +virSecurityManagerRestoreHostdevLabel; +virSecurityManagerRestoreSavedStateLabel; +virSecurityManagerSetAllLabel; +virSecurityManagerSetDaemonSocketLabel; +virSecurityManagerSetImageFDLabel; +virSecurityManagerSetImageLabel; +virSecurityManagerSetHostdevLabel; +virSecurityManagerSetProcessLabel; +virSecurityManagerSetSavedStateLabel; +virSecurityManagerSetSocketLabel; +virSecurityManagerVerify; +virSecurityManagerGetMountOptions; + # sexpr.h sexpr_append; sexpr_cons; diff --git a/tests/Makefile.am b/tests/Makefile.am index b931cea..a466480 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -294,8 +294,7 @@ endif if WITH_QEMU -qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la \ - ../src/libvirt_driver_security.la +qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la if WITH_NETWORK qemu_LDADDS += ../src/libvirt_driver_network_impl.la endif @@ -520,7 +519,7 @@ virauthconfigtest_LDADD = $(LDADDS) seclabeltest_SOURCES = \ seclabeltest.c -seclabeltest_LDADD = $(LDADDS) ../src/libvirt_driver_security.la +seclabeltest_LDADD = $(LDADDS) virbuftest_SOURCES = \ virbuftest.c testutils.h testutils.c -- 1.7.11.1

2 4

[libvirt] [PATCH v4 00/12] Support hypervisor-threads-pin in vcpupin.
by tangchen 02 Aug '12

02 Aug '12

Users can use vcpupin command to bind a vcpu thread to a specific physical cpu. But besides vcpu threads, there are alse some other threads created by qemu (known as hypervisor threads) that could not be explicitly bound to physical cpus. The first 3 patches are from Wen Congyang, which implement Cgroup for differrent hypervisors. The other 10 patches implemented hypervisor threads binding, in two ways: 1) Use sched_setaffinity() function; 2) Use cpuset cgroup. A new xml element is introduced, and vcpupin command is improved, see below. 1. Introduce new xml elements: <cputune> ...... <hypervisorpin cpuset='1'/> </cputune> 2. Improve vcpupin command to support hypervisor threads binding. For example, vm1 has the following configuration: <cputune> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='0' cpuset='0'/> <hypervisorpin cpuset='1'/> </cputune> 1) query all threads pining # vcpupin vm1 VCPU: CPU Affinity ---------------------------------- 0: 0 1: 1 Hypervisor: CPU Affinity ---------------------------------- *: 1 2) query hypervisor threads pining only # vcpupin vm1 --hypervisor Hypervisor: CPU Affinity ---------------------------------- *: 1 3) change hypervisor threads pining # vcpupin vm1 --hypervisor 0-1 # vcpupin vm1 --hypervisor Hypervisor: CPU Affinity ---------------------------------- *: 0-1 # taskset -p 397 pid 397's current affinity mask: 3 Note: If users want to pin a vcpu thread to pcpu, --vcpu option could no longer be omitted. Tang Chen (9): Enable cpuset cgroup and synchronous vcpupin info to cgroup. Support hypervisorpin xml parse. Introduce qemuSetupCgroupHypervisorPin and synchronize hypervisorpin info to cgroup. Add qemuProcessSetHypervisorAffinites and set hypervisor threads affinities Introduce virDomainHypervisorPinAdd and virDomainHypervisorPinDel functions Introduce virDomainPinHypervisorFlags and virDomainGetHypervisorPinInfo functions. Introduce qemudDomainPinHypervisorFlags and qemudDomainGetHypervisorPinInfo in qemu driver. Introduce remoteDomainPinHypervisorFlags and remoteDomainGetHypervisorPinInfo functions in remote driver. Improve vcpupin to support hypervisorpin dynically. Wen Congyang (3): Introduce the function virCgroupForHypervisor Introduce the function virCgroupMoveTask create a new cgroup and move all hypervisor threads to the new cgroup daemon/remote.c | 103 +++++++++ docs/schemas/domaincommon.rng | 7 + include/libvirt/libvirt.h.in | 10 + src/conf/domain_conf.c | 169 +++++++++++++- src/conf/domain_conf.h | 7 + src/driver.h | 13 +- src/libvirt.c | 147 +++++++++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 2 + src/qemu/qemu_cgroup.c | 151 ++++++++++++- src/qemu/qemu_cgroup.h | 5 + src/qemu/qemu_driver.c | 267 ++++++++++++++++++++++- src/qemu/qemu_process.c | 60 ++++- src/remote/remote_driver.c | 102 +++++++++ src/remote/remote_protocol.x | 23 +- src/remote_protocol-structs | 24 ++ src/util/cgroup.c | 188 +++++++++++++++- src/util/cgroup.h | 15 ++ tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/vcpupin | 6 +- tools/virsh.c | 147 ++++++++----- tools/virsh.pod | 16 +- 22 files changed, 1393 insertions(+), 77 deletions(-) -- 1.7.10.2 -- Best Regards, Tang chen

3 24

[libvirt] Stored secrets seem to get corrupted
by Wido den Hollander 02 Aug '12

02 Aug '12

Hi, On one of my systems I'm having troubles with my RBD storage backend. At first I thought it was a problem with my code, but after trying the same code on a second machine I'm a bit confused. The problem is that the storage backend tries to retrieve the value of a secret and base64 decode it, that fails. My debug log shows: debug : virStorageBackendRBDOpenRADOSConn:65 : Using cephx authorization debug : virStorageBackendRBDOpenRADOSConn:75 : Looking up secret by UUID: 322bccea-f2ed-4eae-a7e5-d0793ffb162d debug : virSecretLookupByUUIDString:14128 : conn=0x7fac9c0009c0, uuidstr=322bccea-f2ed-4eae-a7e5-d0793ffb162d debug : virSecretLookupByUUID:14086 : conn=0x7fac9c0009c0, uuid=322bccea-f2ed-4eae-a7e5-d0793ffb162d debug : virSecretGetValue:14486 : secret=0x7fac94000d30, value_size=0x7facad481918, flags=0 debug : virStorageBackendRBDOpenRADOSConn:103 : Found cephx key: `I^% debug : virStorageBackendRBDOpenRADOSConn:135 : Found 1 RADOS cluster monitors in the pool configuration debug : virStorageBackendRBDOpenRADOSConn:159 : RADOS mon_host has been set to: 31.25.100.131:6789, error : virStorageBackendRBDOpenRADOSConn:171 : internal error failed to connect to the RADOS monitor on: 31.25.100.131:6789, It goes wrong at "Found cephx key: <garbage>" So I figured it had to be something in my code and I went over the code again, but nothing seemed odd. I tried the same checkout (tag: 0.9.13-rc1) on a different host (also Ubuntu 12.04) and that worked. The secret and pool XML's are the same, but what I found is that the secret storage on disk seems to go wrong on one machine. Notice this behavior: root@stack01:~# virsh secret-set-value 322bccea-f2ed-4eae-a7e5-d0793ffb162d AQAE+uJPCFpELBAAkTniQvHabBGj0Quwnu2imA== Secret value set root@stack01:~# md5sum /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 b4b147bc522828731f1a016bfa72c073 /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 root@stack01:~# virsh secret-set-value 322bccea-f2ed-4eae-a7e5-d0793ffb162d AQAE+uJPCFpELBAAkTniQvHabBGj0Quwnu2imA== Secret value set root@stack01:~# md5sum /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 927e2458c32cc3f6754d91694e41333f /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 root@stack01:~# As you can see, the md5sum of the file changes when I set the value of the secret to the same. I tried the same on the other host: root@stack02:~# virsh secret-set-value 322bccea-f2ed-4eae-a7e5-d0793ffb162d AQAE+uJPCFpELBAAkTniQvHabBGj0Quwnu2imA== Secret value set root@stack02:~# md5sum /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 c30db27f9ebfe3f7903470d4bd542d1d /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 root@stack02:~# virsh secret-set-value 322bccea-f2ed-4eae-a7e5-d0793ffb162d AQAE+uJPCFpELBAAkTniQvHabBGj0Quwnu2imA== Secret value set root@stack02:~# md5sum /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 c30db27f9ebfe3f7903470d4bd542d1d /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 root@stack02:~# virsh secret-set-value 322bccea-f2ed-4eae-a7e5-d0793ffb162d AQAE+uJPCFpELBAAkTniQvHabBGj0Quwnu2imA== Secret value set root@stack02:~# md5sum /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 c30db27f9ebfe3f7903470d4bd542d1d /etc/libvirt/secrets/322bccea-f2ed-4eae-a7e5-d0793ffb162d.base64 root@stack02:~# The md5sum stays the same on stack02. I verified that stack01 isn't out of disk space or out of inodes, those are in the acceptable values range. Any suggestions? For the record, the hosts: OS: Ubuntu 12.04 x864_64 Kernel: 3.2.0-25-generic Libvirt commit: 0fce94fe1bd782ac4c33fdd59d13ee37b3437413 Thank you, Wido

4 21

[libvirt] [PATCH] Change function signature for creating new lock manager instances
by Daniel P. Berrange 02 Aug '12

02 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> To allow a virLockManagerPtr to be created directly from a driver table struct, replace the virLockManagerPluginPtr parameter with a virLockDriverPtr parameter. * src/locking/domain_lock.c, src/locking/lock_manager.c, src/locking/lock_manager.h: Replace plugin param with a driver in virLockManagerNew --- src/locking/domain_lock.c | 2 +- src/locking/lock_manager.c | 31 +++++++++++++++++++------------ src/locking/lock_manager.h | 3 ++- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c index 55f5640..ba49f9c 100644 --- a/src/locking/domain_lock.c +++ b/src/locking/domain_lock.c @@ -124,7 +124,7 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin, memcpy(params[0].value.uuid, dom->def->uuid, VIR_UUID_BUFLEN); - if (!(lock = virLockManagerNew(plugin, + if (!(lock = virLockManagerNew(virLockManagerPluginGetDriver(plugin), VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN, ARRAY_CARDINALITY(params), params, diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 18e739e..5f65ecf 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -39,11 +39,11 @@ #define VIR_FROM_THIS VIR_FROM_LOCKING -#define CHECK_PLUGIN(field, errret) \ - if (!plugin->driver->field) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Missing '%s' field in lock manager driver"), \ - #field); \ +#define CHECK_DRIVER(field, errret) \ + if (!driver->field) { \ + virLockError(VIR_ERR_INTERNAL_ERROR, \ + _("Missing '%s' field in lock manager driver"), \ + #field); \ return errret; \ } @@ -265,9 +265,16 @@ bool virLockManagerPluginUsesState(virLockManagerPluginPtr plugin) } +virLockDriverPtr virLockManagerPluginGetDriver(virLockManagerPluginPtr plugin) +{ + VIR_DEBUG("plugin=%p", plugin); + + return plugin->driver; +} + /** * virLockManagerNew: - * @plugin: the plugin implementation to use + * @driver: the lock manager implementation to use * @type: the type of process to be supervised * @flags: optional flags, currently unused * @@ -276,27 +283,27 @@ bool virLockManagerPluginUsesState(virLockManagerPluginPtr plugin) * * Returns a new lock manager context */ -virLockManagerPtr virLockManagerNew(virLockManagerPluginPtr plugin, +virLockManagerPtr virLockManagerNew(virLockDriverPtr driver, unsigned int type, size_t nparams, virLockManagerParamPtr params, unsigned int flags) { virLockManagerPtr lock; - VIR_DEBUG("plugin=%p type=%u nparams=%zu params=%p flags=%x", - plugin, type, nparams, params, flags); + VIR_DEBUG("driver=%p type=%u nparams=%zu params=%p flags=%x", + driver, type, nparams, params, flags); virLockManagerLogParams(nparams, params); - CHECK_PLUGIN(drvNew, NULL); + CHECK_DRIVER(drvNew, NULL); if (VIR_ALLOC(lock) < 0) { virReportOOMError(); return NULL; } - lock->driver = plugin->driver; + lock->driver = driver; - if (plugin->driver->drvNew(lock, type, nparams, params, flags) < 0) { + if (driver->drvNew(lock, type, nparams, params, flags) < 0) { VIR_FREE(lock); return NULL; } diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h index b548d45..25c7f7f 100644 --- a/src/locking/lock_manager.h +++ b/src/locking/lock_manager.h @@ -37,8 +37,9 @@ void virLockManagerPluginUnref(virLockManagerPluginPtr plugin); const char *virLockManagerPluginGetName(virLockManagerPluginPtr plugin); bool virLockManagerPluginUsesState(virLockManagerPluginPtr plugin); +virLockDriverPtr virLockManagerPluginGetDriver(virLockManagerPluginPtr plugin); -virLockManagerPtr virLockManagerNew(virLockManagerPluginPtr plugin, +virLockManagerPtr virLockManagerNew(virLockDriverPtr driver, unsigned int type, size_t nparams, virLockManagerParamPtr params, -- 1.7.11.2

1 0

[libvirt] Next release schedule and a snapshot
by Daniel Veillard 02 Aug '12

02 Aug '12

Hello everybody, as suggested when we rolled out 0.9.13, I'm planning to make the next release at the end of August. Since we added a driver we should probably bump the medium number and shoot for 0.10.0. Also 2 months without some official tarball to test was quite long so I made a snapshot called 0.9.10-rc0, it's not a release candidate, just a snapshot, development goes as usual. I tagged it into the git too and it's available at ftp://libvirt.org/libvirt/ So there is 3 more weeks of development before entering the 0.10.0 freeze, 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/

2 5

[libvirt] [libvirt-glib 1/2] Add async variant of gvir_domain_resume()
by Zeeshan Ali (Khattak) 02 Aug '12

02 Aug '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 56 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 ++++ libvirt-gobject/libvirt-gobject.sym | 2 ++ 3 files changed, 65 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 861f713..d6d804d 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -446,6 +446,62 @@ gboolean gvir_domain_resume(GVirDomain *dom, return TRUE; } +static void +gvir_domain_resume_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GError *err = NULL; + + if (!gvir_domain_resume(dom, &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_domain_resume_async: + * @dom: the domain + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_resume. + */ +void gvir_domain_resume_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_resume_async); + g_simple_async_result_run_in_thread(res, + gvir_domain_resume_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +gboolean gvir_domain_resume_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_resume_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) + return FALSE; + + return TRUE; +} + /** * gvir_domain_stop: * @dom: the domain diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index c61a2f5..6f74a97 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -162,6 +162,13 @@ gboolean gvir_domain_start_finish(GVirDomain *dom, gboolean gvir_domain_resume(GVirDomain *dom, GError **err); +void gvir_domain_resume_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_resume_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); gboolean gvir_domain_stop(GVirDomain *dom, guint flags, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index fe3de97..926381d 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -177,6 +177,8 @@ LIBVIRT_GOBJECT_0.0.9 { LIBVIRT_GOBJECT_0.1.1 { global: + gvir_domain_resume_async; + gvir_domain_resume_finish; gvir_domain_shutdown_flags_get_type; gvir_domain_xml_flags_get_type; } LIBVIRT_GOBJECT_0.0.9; -- 1.7.11.2

3 7

[libvirt] [glib PATCH V5] Add bindings for virDomainRestore*()
by Jovanka Gulicoska 02 Aug '12

02 Aug '12

--- libvirt-gobject/libvirt-gobject-connection.c | 164 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 20 ++++ libvirt-gobject/libvirt-gobject.sym | 4 + 3 files changed, 188 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3a99034..dacac68 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1605,3 +1605,167 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, return g_object_ref(caps); } + +/** + * gvir_connection_restore_domain_from_file: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain or NULL + * @flags: the flags + * + * Returns: TRUE on success, FALSE otherwise + * + * Restores the domain saved with #gvir_domain_save_to_file + */ +gboolean gvir_connection_restore_domain_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err) +{ + GVirConnectionPrivate *priv; + int ret; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((filename != NULL), FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; + + if (flags || (custom_conf != NULL)) { + gchar *custom_xml = NULL; + + if (custom_conf != NULL) + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(custom_conf)); + + ret = virDomainRestoreFlags(priv->conn, filename, custom_xml, flags); + g_free (custom_xml); + } + else { + ret = virDomainRestore(priv->conn, filename); + } + + if (ret < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to restore domain"); + + return FALSE; + } + + return TRUE; +} + +typedef struct { + gchar *filename; + GVirConfigDomain *custom_conf; + guint flags; +} RestoreDomainFromFileData; + +static void restore_domain_from_file_data_free(RestoreDomainFromFileData *data) +{ + g_free(data->filename); + if (data->custom_conf != NULL) + g_object_unref(data->custom_conf); + g_slice_free(RestoreDomainFromFileData, data); +} + + +static void +gvir_connection_restore_domain_from_file_helper + (GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + RestoreDomainFromFileData *data; + GError *err = NULL; + + data = g_simple_async_result_get_op_res_gpointer(res); + + if (!gvir_connection_restore_domain_from_file(conn, data->filename, + data->custom_conf, + data->flags, &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_connection_restore_domain_from_file_async: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain + * @flags: the flags + * @cancellable: (allow-none) (transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_connection_restore_domain_from_file + */ +void +gvir_connection_restore_domain_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + RestoreDomainFromFileData *data; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail(filename != NULL); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(RestoreDomainFromFileData); + data->filename = g_strdup(filename); + if (custom_conf != NULL) + data->custom_conf = g_object_ref(custom_conf); + data->flags = flags; + + res = g_simple_async_result_new + (G_OBJECT(conn), + callback, + user_data, + gvir_connection_restore_domain_from_file_async); + g_simple_async_result_set_op_res_gpointer + (res, + data, + (GDestroyNotify)restore_domain_from_file_data_free); + + g_simple_async_result_run_in_thread + (res, + gvir_connection_restore_domain_from_file_helper, + G_PRIORITY_DEFAULT, + cancellable); + + g_object_unref(res); +} + +/** + * gvir_connection_restore_domain_from_file_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_restore_domain_from_file_async. + * + * Returns: TRUE if domain was restored successfully, FALSE otherwise. + */ +gboolean +gvir_connection_restore_domain_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid + (result, G_OBJECT(conn), + gvir_connection_restore_domain_from_file_async), + FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), + err)) + return FALSE; + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c80eecf..d658b01 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -202,6 +202,26 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, GAsyncResult *result, GError **err); +gboolean +gvir_connection_restore_domain_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err); + +void +gvir_connection_restore_domain_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean +gvir_connection_restore_domain_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 54a093a..c31ed0f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -169,6 +169,10 @@ LIBVIRT_GOBJECT_0.0.9 { gvir_connection_get_capabilities_async; gvir_connection_get_capabilities_finish; + gvir_connection_restore_domain_from_file; + gvir_connection_restore_domain_from_file_async; + gvir_conecction_restore_domain_from_file_finish; + gvir_domain_start_async; gvir_domain_start_finish; } LIBVIRT_GOBJECT_0.0.8; -- 1.7.10.4

3 2