- Devel - libvirt List Archives

[libvirt] [PATCH] Fix missing error constants in libvirt python module
by Daniel P. Berrange 05 Feb '13

05 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous change to the generator, changed too much - only the functions are in 'virerror.c', the constants remained in 'virerror.h' which could not be renamed for API compat reasons. Add a test case to sanity check the generated python bindings Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- python/Makefile.am | 5 +++++ python/generator.py | 4 +++- python/sanitytest.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 python/sanitytest.py diff --git a/python/Makefile.am b/python/Makefile.am index dd69600..ef3c3eb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -119,6 +119,11 @@ $(libvirtmod_la_OBJECTS): $(GENERATED) $(libvirtmod_qemu_la_OBJECTS): $(QEMU_GENERATED) $(libvirtmod_lxc_la_OBJECTS): $(LXC_GENERATED) +EXTRA_DIST += sanitytest.py + +check-local: + $(AM_V_GEN)PYTHONPATH=$(abs_topbuilddir):$(abs_topbuilddir)/.libs $(PYTHON) $(srcdir)/sanitytest.py + install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) diff --git a/python/generator.py b/python/generator.py index 71ca883..ceade6b 100755 --- a/python/generator.py +++ b/python/generator.py @@ -122,8 +122,9 @@ class docParser(xml.sax.handler.ContentHandler): if attrs.has_key('field'): self.function_return_field = attrs['field'] elif tag == 'enum': + # enums come from header files, hence virterror.h if (attrs['file'] == "libvirt" or - attrs['file'] == "virerror"): + attrs['file'] == "virterror"): enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-lxc": lxc_enum(attrs['type'],attrs['name'],attrs['value']) @@ -134,6 +135,7 @@ class docParser(xml.sax.handler.ContentHandler): if debug: print "end %s" % tag if tag == 'function': + # fuctions come from source files, hence 'virerror.c' if self.function != None: if (self.function_module == "libvirt" or self.function_module == "virevent" or diff --git a/python/sanitytest.py b/python/sanitytest.py new file mode 100644 index 0000000..047450b --- /dev/null +++ b/python/sanitytest.py @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import libvirt + +globals = dir(libvirt) + +# Sanity test that the generator hasn't gone wrong + +# Look for core classes +assert("virConnect" in globals) +assert("virDomain" in globals) +assert("virDomainSnapshot" in globals) +assert("virInterface" in globals) +assert("virNWFilter" in globals) +assert("virNodeDevice" in globals) +assert("virNetwork" in globals) +assert("virSecret" in globals) +assert("virStoragePool" in globals) +assert("virStorageVol" in globals) +assert("virStream" in globals) +assert("VIR_CONNECT_RO" in globals) + +# Error related bits +assert("libvirtError" in globals) +assert("VIR_ERR_AUTH_FAILED" in globals) +assert("virGetLastError" in globals) + +# Some misc methods +assert("virInitialize" in globals) +assert("virEventAddHandle" in globals) +assert("virEventRegisterDefaultImpl" in globals) -- 1.7.11.7

3 2

[libvirt] [PATCH] virDomainSaveXML: Reject domains which name contain '/'
by Christophe Fergeau 05 Feb '13

05 Feb '13

Similarly to 790f912b4 which rejects snapshots names containing, this commit changes virDomainSaveXML to reject domains with a '/' in their name. The domain name is used as a filename, so this leads to unexpected results when used in combination with '..' --- If someone is using domains with '/' in their name, this will cause a regression for them as libvirt will no longer be able to re-write the domain XML and will just fail. However, if someone is (ab)using this, the domain must end up in an already existing directory as libvirt will not create it so this is hopefully unconvenient enough that noone is doing that. If we only want to error out on new domain creation, this may be doable by introducing a virDomainSaveXMLFlags, but will be more invasive. Christophe src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 85a798d..86641d6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14728,6 +14728,14 @@ int virDomainSaveXML(const char *configDir, char *configFile = NULL; int ret = -1; + if (strchr(def->name, '/')) { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid domain name '%s': name can't contain '/'"), + def->name); + goto cleanup; + + } + if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; -- 1.8.1

4 4

[libvirt] [PATCH] qemu: don't log failure during QMP add-fd probe
by Eric Blake 05 Feb '13

05 Feb '13

Otherwise, we get a lot of scary (but harmless) noise in the logs: 2013-02-05 15:35:48.555+0000: 8637: error : qemuMonitorJSONCheckError:353 : internal error unable to execute QEMU command 'add-fd': Parameter 'fdset-id' expects an existing fdset-id one for every qemu 1.2 binary that we probe. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONAddFd): During probe, avoid logging failures. --- src/qemu/qemu_monitor_json.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 686cee9..a86d90c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2660,8 +2660,16 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) ret = qemuMonitorJSONCommandWithFd(mon, cmd, fd, &reply); - if (ret == 0) + if (ret == 0) { + /* qemu 1.2 lacks the functionality we need; but we have to + * probe to find that out. Don't log errors in that case. */ + if (STREQ_NULLABLE(name, "/dev/null") && + qemuMonitorJSONHasError(reply, "GenericError")) { + ret = -2; + goto cleanup; + } ret = qemuMonitorJSONCheckError(cmd, reply); + } if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGet(reply, "return"); -- 1.8.1

2 2

[libvirt] [PATCH 0/4] Implement basic support for virtio-rng
by Peter Krempa 05 Feb '13

05 Feb '13

This patchset implements very basic functionality that will allow to use the virtio-rng device. I will follow up later with more advanced sections of this support as I have to figure out how hotplug of the qom backend device could work in qemu. I'm posting this so we can settle on the naming scheme and other stuff. Peter Krempa (4): doc: schema: Add basic documentation for the virtual RNG device support conf: Use correct type for device type enum in virDomainDeviceDefFree conf: Add basic support for RNG configuration qemu: Implement support for the RNG device and the random backend docs/formatdomain.html.in | 54 +++++++++++++++ docs/schemas/domaincommon.rng | 31 +++++++++ src/conf/domain_conf.c | 157 +++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 36 ++++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 5 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 108 +++++++++++++++++++++++++++++ 8 files changed, 393 insertions(+), 3 deletions(-) -- 1.8.1

2 12

[libvirt] persistent virtual networks
by Gene Czarcinski 05 Feb '13

05 Feb '13

I seem to remember that, if you use net-define, the network will be persistent and, if you use net-create, the network will not be persistent. I am now running libvirt-1.0.2 on Fedora 18. When I use net-define a network from a template and then do a net-list --all, the network is NOT marked as persistent. If I restart libvirtd.service, then the defined networks are persistent. I noticed that the libvirt-1.0.2 announcement included: - network: bridge: Fix regression when defining persistent networks (Peter Krempa) Do I have a bug to report? Gene

3 2

[libvirt] [PATCH] build: Add libcurl dependency to libvirt_driver.la
by Jiri Denemark 05 Feb '13

05 Feb '13

libvirt.c calls curl_global_init() if WITH_CURL is defined and thus it should be linked with libcurl. This fixes link failure in case neither xenapi nor esx driver is enabled (they are the only users of libcurl). --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 070a089..f6162df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -792,9 +792,11 @@ noinst_LTLIBRARIES += libvirt_driver.la libvirt_la_BUILT_LIBADD += libvirt_driver.la libvirt_driver_la_SOURCES = $(DRIVER_SOURCES) -libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \ +libvirt_driver_la_CFLAGS = \ + $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) $(CURL_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS) +libvirt_driver_la_LIBADD = \ + $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) USED_SYM_FILES = $(srcdir)/libvirt_private.syms -- 1.8.1.2

3 5

[libvirt] [PATCH v2] spec: Fix minor changelog issues
by Jiri Denemark 05 Feb '13

05 Feb '13

When a changelog entry references an RPM macro, % needs to be escaped so that it does not appear expanded in package changelog. Fri Mar 4 2009 is incorrect since Mar 4 was Wednesday. Since libvirt-0.6.1 was released on Mar 4 2009, we should change Fri to Wed. --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8df908d..c2da6ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2309,7 +2309,7 @@ fi * Fri Apr 3 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.2-1 - release of 0.6.2 -* Fri Mar 4 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 +* Wed Mar 4 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 - release of 0.6.1 * Sat Jan 31 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.0-1 @@ -2448,7 +2448,7 @@ fi - it's pkgconfig not pgkconfig ! * Mon Nov 6 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-2 -- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel +- fixing spec file, added %%dist, -devel requires pkgconfig and xen-devel - Resolves: rhbz#202320 * Mon Oct 16 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-1 -- 1.8.1.2

3 3

[libvirt] [PATCH] fix build erro when building with --without-libvirtd
by Hu Tao 05 Feb '13

05 Feb '13

--- src/driver.h | 4 --- src/libvirt.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt_internal.h | 2 -- 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/src/driver.h b/src/driver.h index 02ddd83..dab7495 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1512,7 +1512,6 @@ struct _virStorageDriver { virDrvStoragePoolIsPersistent poolIsPersistent; }; -# ifdef WITH_LIBVIRTD typedef int (*virDrvStateInitialize) (bool privileged, virStateInhibitCallback callback, @@ -1531,7 +1530,6 @@ struct _virStateDriver { virDrvStateReload reload; virDrvStateStop stop; }; -# endif typedef struct _virDeviceMonitor virDeviceMonitor; @@ -1768,9 +1766,7 @@ int virRegisterStorageDriver(virStorageDriverPtr); int virRegisterDeviceMonitor(virDeviceMonitorPtr); int virRegisterSecretDriver(virSecretDriverPtr); int virRegisterNWFilterDriver(virNWFilterDriverPtr); -# ifdef WITH_LIBVIRTD int virRegisterStateDriver(virStateDriverPtr); -# endif void virDriverModuleInitialize(const char *defmoddir); void *virDriverLoadModule(const char *name); diff --git a/src/libvirt.c b/src/libvirt.c index f81a3de..38e4f6e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -885,8 +885,76 @@ int virStateStop(void) { return ret; } -#endif +#else /* WITH_LIBVIRTD */ + +/** + * virRegisterStateDriver: + * @driver: pointer to a driver block + * + * Register a virtualization driver + * + * Returns the driver priority or -1 in case of error. + */ +int +virRegisterStateDriver(virStateDriverPtr driver ATTRIBUTE_UNUSED) +{ + return 0; +} + +/** + * virStateInitialize: + * @privileged: set to true if running with root privilege, false otherwise + * @callback: callback to invoke to inhibit shutdown of the daemon + * @opaque: data to pass to @callback + * + * Initialize all virtualization drivers. + * + * Returns 0 if all succeed, -1 upon any failure. + */ +int virStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + return 0; +} + +/** + * virStateCleanup: + * + * Run each virtualization driver's cleanup method. + * + * Returns 0 if all succeed, -1 upon any failure. + */ +int virStateCleanup(void) +{ + return 0; +} + +/** + * virStateReload: + * + * Run each virtualization driver's reload method. + * + * Returns 0 if all succeed, -1 upon any failure. + */ +int virStateReload(void) +{ + return 0; +} + +/** + * virStateStop: + * + * Run each virtualization driver's "stop" method. + * + * Returns 0 if successful, -1 on failure + */ +int virStateStop(void) +{ + return 0; +} +#endif /* WITH_LIBVIRTD */ /** diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 595d2db..b82f6b9 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -27,7 +27,6 @@ # include "internal.h" -# ifdef WITH_LIBVIRTD typedef void (*virStateInhibitCallback)(bool inhibit, void *opaque); @@ -37,7 +36,6 @@ int virStateInitialize(bool privileged, int virStateCleanup(void); int virStateReload(void); int virStateStop(void); -# endif /* Feature detection. This is a libvirt-private interface for determining * what features are supported by the driver. -- 1.8.0.1.240.ge8a1f5a

4 10

[libvirt] A question about booting from the snapshot image by specifying snapshot id in Libvirt
by harryxiyou 05 Feb '13

05 Feb '13

Hi all, I test libvirt boots QEMU VM from Sheepdog snapshot image by specify snapshot id like following. 1, $ collie vdi list Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 2, $ cat > sheepdog_vm1.xml <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="testvdi:1"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> </domain> 3, $ virsh create sheepdog_vm1.xml domain testvm is created ( from sheepdog_vm1.xml） 4, $ virsh destroy testvm domain testvm is deleted 5, $ collie vdi list Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 s testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 testvdi 4 20 MB 12 MB 8.0 MB 2013-02-04 13:15 f348bd 2 My question is before i boot VM from sheepdog:testvdi:1, my vdi list like Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 However, after VM is destroied, my vdi list like Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 s testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 testvdi 4 20 MB 12 MB 8.0 MB 2013-02-04 13:15 f348bd 2 There is another snapshot of testvdi created. I am not clear about why another one is created? I just boot a VM from snapshot testvdi, which id is 1. Could anyone please give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 2

[libvirt] How to start a snapshot of Sheepdog volume in Libvirt
by harryxiyou 05 Feb '13

05 Feb '13

Hi all, I wanna test start a snapshot of Sheepdog volume in Libvirt. However, i cannot find a test description from https://github.com/collie/sheepdog/wiki/Libvirt. >From http://libvirt.org/formatsnapshot.html, i can find some snapshot operations in Libvirt, which may be different from Sheepdog volume snapshot, right? Now, i have some questions like following. 1, What are the differences between Libvirt snapshot operations and Sheepdog Volume snapshot operations? The object of Libvirt snapshot is a file and Sheepdog volume is a block device, right? 2, Can we use Libvirt XML layout from http://libvirt.org/formatsnapshot.html to create a Sheepdog volume snapshot and start from it? If not, which Libvirt XML form should we use to create&start from this snapshot? 3, Is following XML layout right? <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="Alice:1"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> </domain> NOTE: Alice:1 is a snapshot of Alice. $ collie vdi list name id size used shared creation time object id -------------------------------------------------------------------- Bob 0 2.0 GB 1.6 GB 0.0 MB 2010-03-23 16:16 80000 Alice 0 256 GB 0.0 MB 0.0 MB 2010-03-23 16:21 c0000 s Alice 1 256 GB 0.0 MB 0.0 MB 2010-03-23 16:16 40000 Could anyone please give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 2