From 97f95666873a0bd44fd0c7c92dfbed11c304cee4 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 23 Feb 2006 11:26:17 +0000 Subject: * src/libvirt.c: fixing a bug before the release of 0.0.5 * python/generator.py python/libvir.c python/libvirt-python-api.xml: also fixing the binding for getting a domain UUID * python/tests/Makefile.am python/tests/uuid.py: added a test for the new UUID API Daniel --- ChangeLog | 8 ++++++++ docs/examples/examples.xml | 18 +++++++++--------- python/generator.py | 7 ++++++- python/libvir.c | 26 ++++++++++++++++++++++++++ python/libvirt-python-api.xml | 7 ++++++- python/tests/Makefile.am | 3 ++- python/tests/uuid.py | 39 +++++++++++++++++++++++++++++++++++++++ src/libvirt.c | 6 ++++++ 8 files changed, 102 insertions(+), 12 deletions(-) create mode 100755 python/tests/uuid.py diff --git a/ChangeLog b/ChangeLog index 93b5c46b0..6968673f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 23 06:24:46 EST 2006 Daniel Veillard + + * src/libvirt.c: fixing a bug before the release of 0.0.5 + * python/generator.py python/libvir.c python/libvirt-python-api.xml: + also fixing the binding for getting a domain UUID + * python/tests/Makefile.am python/tests/uuid.py: added a test + for the new UUID API + Thu Feb 23 11:41:06 CET 2006 Daniel Veillard * NEWS configure.in docs/libvir.html docs/news.html: preparing the diff --git a/docs/examples/examples.xml b/docs/examples/examples.xml index 84dbfe25f..5e5456784 100644 --- a/docs/examples/examples.xml +++ b/docs/examples/examples.xml @@ -29,15 +29,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/python/generator.py b/python/generator.py index c336f6114..d9fa80914 100755 --- a/python/generator.py +++ b/python/generator.py @@ -203,7 +203,9 @@ def enum(type, name, value): ####################################################################### functions_failed = [] -functions_skipped = [] +functions_skipped = [ + "virConnectListDomains" , "virDomainGetUUID" +] skipped_modules = { } @@ -259,6 +261,7 @@ foreign_encoding_args = ( skip_impl = ( 'virConnectListDomainsID', 'virDomainGetInfo', + 'virDomainGetUUID', ) def skip_function(name): @@ -568,6 +571,8 @@ def nameFixup(name, classe, type, file): func = name if func == "iD": func = "ID" + if func == "uUID": + func = "UUID" if func == "oSType": func = "OSType" if func == "xMLDesc": diff --git a/python/libvir.c b/python/libvir.c index 957f7ac11..3cd28490e 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -100,6 +100,31 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(py_retval); } +PyObject * +libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + unsigned char uuid[16]; + virDomainPtr domain; + PyObject *pyobj_domain; + virDomainInfo info; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetUUID", &pyobj_domain)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (domain == NULL) { + Py_INCREF(Py_None); + return(Py_None); + } + if (virDomainGetUUID(domain, &uuid[0]) < 0) { + Py_INCREF(Py_None); + return(Py_None); + } + py_retval = PyString_FromStringAndSize((char *) &uuid[0], 16); + + return(py_retval); +} + /************************************************************************ * * * The registration stuff * @@ -111,6 +136,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectClose", libvirt_virConnectClose, METH_VARARGS, NULL}, {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL}, {(char *) "virDomainGetInfo", libvirt_virDomainGetInfo, METH_VARARGS, NULL}, + {(char *) "virDomainGetUUID", libvirt_virDomainGetUUID, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; diff --git a/python/libvirt-python-api.xml b/python/libvirt-python-api.xml index d90da8a27..2a4328010 100644 --- a/python/libvirt-python-api.xml +++ b/python/libvirt-python-api.xml @@ -6,10 +6,15 @@ - + Extract information about a domain. Note that if the connection used to get the domain is limited only a partial set of the informations can be extracted. + + Extract the UUID unique Identifier of a domain. + + + diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 8ab52ded9..fd1d5fa8f 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -2,7 +2,8 @@ EXAMPLE_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)/examples PYTESTS= \ basic.py \ - create.py + create.py \ + uuid.py EXTRA_DIST = $(PYTESTS) diff --git a/python/tests/uuid.py b/python/tests/uuid.py new file mode 100755 index 000000000..d71d42068 --- /dev/null +++ b/python/tests/uuid.py @@ -0,0 +1,39 @@ +#!/usr/bin/python -u +import libvirt +import sys +import os + +if not os.access("/proc/xen", os.R_OK): + print 'System is not running a Xen kernel' + sys.exit(1) + +conn = libvirt.openReadOnly(None) +if conn == None: + print 'Failed to open connection to the hypervisor' + sys.exit(1) + +ids = conn.listDomainsID() +if ids == None or len(ids) == 0: + print 'Failed to list running domains' + sys.exit(1) + +id = ids[-1] + +dom = conn.lookupByID(id) +if dom == None: + print 'Failed to find the domain %d' + sys.exit(1) + +name0 = dom.name() +uuid = dom.UUID() +print "Using domain %s" % (name0) +dom2 = conn.lookupByUUID(uuid) +if dom2 == None: + print 'Failed to lookup domain %d based on its UUID' + sys.exit(1) +if dom2.name() != name0: + print 'lookup of %s based on UUID brings a different domain %s' % ( + name0, dom2.name()) + +print "OK" +sys.exit(0) diff --git a/src/libvirt.c b/src/libvirt.c index 489599a5d..6c4596da5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -103,6 +103,7 @@ virConnectOpen(const char *name) { ret = (virConnectPtr) malloc(sizeof(virConnect)); if (ret == NULL) goto failed; + memset(ret, 0, sizeof(virConnect)); ret->magic = VIR_CONNECT_MAGIC; ret->handle = handle; ret->xshandle = xshandle; @@ -158,6 +159,7 @@ virConnectOpenReadOnly(const char *name) { ret = (virConnectPtr) malloc(sizeof(virConnect)); if (ret == NULL) goto failed; + memset(ret, 0, sizeof(virConnect)); ret->magic = VIR_CONNECT_MAGIC; ret->handle = handle; ret->xshandle = xshandle; @@ -644,6 +646,7 @@ virDomainLookupByID(virConnectPtr conn, int id) { if (ret == NULL) { goto error; } + memset(ret, 0, sizeof(virDomain)); ret->magic = VIR_DOMAIN_MAGIC; ret->conn = conn; ret->handle = id; @@ -719,10 +722,12 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { free(name); return(NULL); } + memset(ret, 0, sizeof(virDomain)); ret->magic = VIR_DOMAIN_MAGIC; ret->conn = conn; ret->handle = id; ret->name = name; + ret->path = 0; memcpy(ret->uuid, uuid, 16); return(ret); @@ -794,6 +799,7 @@ do_found: ret = (virDomainPtr) malloc(sizeof(virDomain)); if (ret == NULL) goto done; + memset(ret, 0, sizeof(virDomain)); ret->magic = VIR_DOMAIN_MAGIC; ret->conn = conn; ret->handle = id; -- cgit v1.2.3-65-gdbad