- Devel - libvirt List Archives

[libvirt] [PATCH] build: drop conditional use of mdns code
by Eric Blake 06 Aug '12

06 Aug '12

Commit 1f6f723 missed a step. At first I was worried that scrubbing the conditionals would lead to a runtime failure when compiled without avahi, but my testing makes it appear that the runtime error will only occur if the .conf files in /etc request mdns advertisement; and the old behavior was to silently ignore the request, so this is actually a better behavior of explicitly failing only when the config requests the impossible. * src/rpc/virnetserver.c: Drop HAVE_AVAHI conditionals; all callers already passed NULL if mdns_adv was not configured. --- In response to: https://www.redhat.com/archives/libvir-list/2012-August/msg00130.html I originally thought it would be harder than this, but my testing seems to show that this works. Caveat: my testing without avahi was done in a VM and not on bare metal, and since nested virt is slower, I may have inadvertently cut an important corner and missed a flaw in my above reasoning about why this is safe. So a close review, including checking all call sites, would be appreciated. src/rpc/virnetserver.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 248ad9f..295e8fd 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -36,9 +36,7 @@ #include "util.h" #include "virfile.h" #include "event.h" -#if HAVE_AVAHI -# include "virnetservermdns.h" -#endif +#include "virnetservermdns.h" #ifndef SA_SIGINFO # define SA_SIGINFO 0 @@ -81,10 +79,8 @@ struct _virNetServer { int sigwatch; char *mdnsGroupName; -#if HAVE_AVAHI virNetServerMDNSPtr mdns; virNetServerMDNSGroupPtr mdnsGroup; -#endif size_t nservices; virNetServerServicePtr *services; @@ -364,7 +360,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, virReportOOMError(); goto error; } -#if HAVE_AVAHI if (srv->mdnsGroupName) { if (!(srv->mdns = virNetServerMDNSNew())) goto error; @@ -372,7 +367,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, srv->mdnsGroupName))) goto error; } -#endif if (virMutexInit(&srv->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -592,14 +586,13 @@ error: int virNetServerAddService(virNetServerPtr srv, virNetServerServicePtr svc, - const char *mdnsEntryName ATTRIBUTE_UNUSED) + const char *mdnsEntryName) { virNetServerLock(srv); if (VIR_EXPAND_N(srv->services, srv->nservices, 1) < 0) goto no_memory; -#if HAVE_AVAHI if (mdnsEntryName) { int port = virNetServerServiceGetPort(svc); @@ -608,7 +601,6 @@ int virNetServerAddService(virNetServerPtr srv, port)) goto error; } -#endif srv->services[srv->nservices-1] = svc; virNetServerServiceRef(svc); @@ -622,9 +614,7 @@ int virNetServerAddService(virNetServerPtr srv, no_memory: virReportOOMError(); -#if HAVE_AVAHI error: -#endif virNetServerUnlock(srv); return -1; } @@ -694,11 +684,9 @@ void virNetServerRun(virNetServerPtr srv) virNetServerLock(srv); -#if HAVE_AVAHI if (srv->mdns && virNetServerMDNSStart(srv->mdns) < 0) goto cleanup; -#endif srv->quit = 0; @@ -826,9 +814,7 @@ void virNetServerFree(virNetServerPtr srv) VIR_FREE(srv->clients); VIR_FREE(srv->mdnsGroupName); -#if HAVE_AVAHI virNetServerMDNSFree(srv->mdns); -#endif virMutexDestroy(&srv->lock); VIR_FREE(srv); -- 1.7.11.2

2 2

[libvirt] [PATCH 00/13 v2] Introduce a virObject module fo reference counting
by Daniel P. Berrange 06 Aug '12

06 Aug '12

A followup to https://www.redhat.com/archives/libvir-list/2012-July/msg00476.html Notable changes - Change virAtomicIntInc to return new value, instead of void for compat with existing API - Use verify_true instead of verify in macros - Most other fixes from previous series

4 29

[libvirt] Debian packaging for the Java bindings
by Wido den Hollander 06 Aug '12

06 Aug '12

Currently the Java bindings for libvirt do not provide a Debian package. Users with Debian based systems like Ubuntu are now forced to compile from source since no binary distribution of the JAR file is available. This patch adds building Debian packages with ant $ ant deb This will build a .deb file in the target directory. It requires dpkg-dev to be installed. Wido

2 5

[libvirt] [test-API][PATCH] Fix xml parser problem when node have both attribute and value
by Wayne Sun 06 Aug '12

06 Aug '12

When xml node have both attribute and value at first level, the parser will broke. After fix, the node key will have a dictionary with both value and attr inside. For example, the xml node: <capacity unit='bytes'>536870912000</capacity> will be parsed into: {u'capacity': {'attr': {u'unit': u'bytes'}, 'value': u'536870912000'}} Also when fetch the attribute key, should use a new param (attrkey) other than exist key in outside loop. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- utils/xml_parser.py | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/utils/xml_parser.py b/utils/xml_parser.py index 04e7501..01b928f 100644 --- a/utils/xml_parser.py +++ b/utils/xml_parser.py @@ -88,15 +88,21 @@ class xml_parser(object): if thenode.attributes != None: tmpattr = dict() if thenode.attributes.length > 0: - for key in thenode.attributes.keys(): + for attrkey in thenode.attributes.keys(): tmpattr.update( - {key:thenode.attributes.get(key).nodeValue}) + {attrkey:thenode.attributes.get(attrkey).nodeValue}) attrdic = { "attr":tmpattr } if key in out: if out[key] == None: - out[key] = value if attrdic != None: - out[key].update(attrdic) + if value == None: + out[key] = attrdic + else: + valdic = { "value":value } + valdic.update(attrdic) + out[key] = valdic + else: + out[key] = value elif type(out[key]) == list: if attrdic != None: newdict.update(attrdic) @@ -111,7 +117,13 @@ class xml_parser(object): else: out[key] = value if attrdic != None: - out[key].update(attrdic) + if value == None: + newdict[key] = attrdic + else: + valdic = { "value":value } + valdic.update(attrdic) + newdict = valdic + out[key] = newdict self.parseintodict(thenode, level+1, out, key) return out -- 1.7.1

2 1

[libvirt] [libvirt-php] [PATCH] libvirt_domain_update_device() not defined
by Katelyn Schiesser 04 Aug '12

04 Aug '12

This patch makes libvirt_domain_update_device() available within PHP. Previously it simply threw an error for undefinded function. Katelyn Schiesser (1): Make libvirt_domain_update_device() available. src/libvirt-php.c | 1 + 1 file changed, 1 insertion(+) -- 1.7.11.3

1 1

[libvirt] [PATCH] [RFC] xen-xm: Generate UUID if not specified
by Jim Fehlig 04 Aug '12

04 Aug '12

I received a bug report about 'virsh domxml-from-native xen-xm' failing when the xm configuration does not contain a UUID. IMO, this is a bit harsh since UUID is not even required when defining a domain. I first took the approach of skipping the parsing of UUID when it is not specified in the xm config, but that results in a UUID of all zeros, which is the dom0 UUID from the xen tools perspective. I'd like to hear what other folks think about the attached patch, which generates a UUID if it is not specified in the xm config. Regards, Jim

2 2

[libvirt] [PATCH] client: Free message when freeing client
by Peter Krempa 04 Aug '12

04 Aug '12

The last message of the client was not freed leaking 4 bytes of memory in the client when the remote daemon crashed while processing a message. --- src/rpc/virnetclient.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index b210a72..cb373b6 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -499,6 +499,9 @@ void virNetClientFree(virNetClientPtr client) #if HAVE_SASL virNetSASLSessionFree(client->sasl); #endif + + virNetMessageClear(&client->msg); + virNetClientUnlock(client); virMutexDestroy(&client->lock); -- 1.7.8.6

2 2

[libvirt] [PATCH] conf: Remove console stream callback only when freeing console helper
by Peter Krempa 04 Aug '12

04 Aug '12

Commit ba226d334acbc49f6751b430e0c4e00f69eef6bf tried to fix crash of the daemon when a domain with a open console was destroyed. The fix was wrong as it tried to remove the callback also when the stream was aborted, where at that point the fd stream driver was already freed and removed. This patch clears the callbacks with a helper right before the hash is freed, so that it doesn't interfere with other codepaths where the stream object is freed. --- src/conf/virconsole.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c index 912aff6..b3f6eb6 100644 --- a/src/conf/virconsole.c +++ b/src/conf/virconsole.c @@ -219,9 +219,6 @@ static void virConsoleHashEntryFree(void *data, const char *pty = name; virStreamPtr st = data; - /* remove callback from stream */ - virFDStreamSetInternalCloseCb(st, NULL, NULL, NULL); - /* free stream reference */ virStreamFree(st); @@ -290,6 +287,18 @@ error: } /** + * Helper to clear stream callbacks when freeing the hash + */ +static void virConsoleFreeClearCallbacks(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) +{ + virStreamPtr st = payload; + + virFDStreamSetInternalCloseCb(st, NULL, NULL, NULL); +} + +/** * Free structures for handling open console streams. * * @cons Pointer to the private structure. @@ -300,6 +309,7 @@ void virConsoleFree(virConsolesPtr cons) return; virMutexLock(&cons->lock); + virHashForEach(cons->hash, virConsoleFreeClearCallbacks, NULL); virHashFree(cons->hash); virMutexUnlock(&cons->lock); virMutexDestroy(&cons->lock); -- 1.7.8.6

3 4

[libvirt] [PATCH v1] ESX: Add "Byte" datatype
by Ata E Husain Bohra 03 Aug '12

03 Aug '12

Append "Byte" to set of predefined datatype objects. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_vi_generator.py | 1 + src/esx/esx_vi_types.c | 57 +++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_types.h | 29 ++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 910478c..af2d57e 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1496,6 +1496,7 @@ def open_and_print(filename): predefined_enums = ["Boolean"] predefined_objects = ["AnyType", + "Byte", "Int", "Long", "String", diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 708aeda..d7bd3b7 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -774,6 +774,9 @@ esxVI_Type_ToString(esxVI_Type type) case esxVI_Type_String: return "xsd:string"; + case esxVI_Type_Byte: + return "xsd:byte"; + case esxVI_Type_Short: return "xsd:short"; @@ -816,6 +819,8 @@ esxVI_Type_FromString(const char *type) return esxVI_Type_AnyType; } else if (STREQ(type, "xsd:string")) { return esxVI_Type_String; + } else if (STREQ(type, "xsd:byte")) { + return esxVI_Type_Byte; } else if (STREQ(type, "xsd:short")) { return esxVI_Type_Short; } else if (STREQ(type, "xsd:int")) { @@ -942,6 +947,10 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) (*dest)->string = (*dest)->value; break; + case esxVI_Type_Byte: + (*dest)->int8 = src->int8; + break; + case esxVI_Type_Short: (*dest)->int16 = src->int16; break; @@ -1059,6 +1068,10 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) (*anyType)->string = (*anyType)->value; break; + case esxVI_Type_Byte: + _DESERIALIZE_NUMBER(Byte, "xsd:byte", int8, INT8_MIN, INT8_MAX); + break; + case esxVI_Type_Short: _DESERIALIZE_NUMBER(Short, "xsd:short", int16, INT16_MIN, INT16_MAX); break; @@ -1299,6 +1312,50 @@ esxVI_String_DeserializeValue(xmlNodePtr node, char **value) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * XSD: Byte + */ + +/* esxVI_Byte_Alloc */ +ESX_VI__TEMPLATE__ALLOC(Byte) + +/* esxVI_Byte_Free */ +ESX_VI__TEMPLATE__FREE(Byte, +{ + esxVI_Byte_Free(&item->_next); +}) + +/* esxVI_Byte_Validate */ +ESX_VI__TEMPLATE__VALIDATE(Byte, +{ +}) + +/* esxVI_Byte_AppendToList */ +ESX_VI__TEMPLATE__LIST__APPEND(Byte) + +/* esxVI_Byte_DeepCopy */ +ESX_VI__TEMPLATE__DEEP_COPY(Byte, +{ + (*dest)->value = src->value; +}) + +/* esxVI_Byte_DeepCopyList */ +ESX_VI__TEMPLATE__LIST__DEEP_COPY(Byte) + +/* esxVI_Byte_Serialize */ +ESX_VI__TEMPLATE__SERIALIZE(Byte, +{ + virBufferAsprintf(output, "%d", (int8_t)item->value); +}) + +/* esxVI_Byte_SerializeList */ +ESX_VI__TEMPLATE__LIST__SERIALIZE(Byte) + +/* esxVI_Byte_Deserialize */ +ESX_VI__TEMPLATE__DESERIALIZE_NUMBER(Byte, "xsd:byte", INT8_MIN, INT8_MAX); + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * XSD: Int */ diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index dbcfee0..4df0157 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -38,6 +38,7 @@ typedef struct _esxVI_ManagedObject esxVI_ManagedObject; typedef enum _esxVI_Boolean esxVI_Boolean; typedef struct _esxVI_AnyType esxVI_AnyType; typedef struct _esxVI_String esxVI_String; +typedef struct _esxVI_Byte esxVI_Byte; typedef struct _esxVI_Int esxVI_Int; typedef struct _esxVI_Long esxVI_Long; typedef struct _esxVI_DateTime esxVI_DateTime; @@ -73,6 +74,7 @@ enum _esxVI_Type { esxVI_Type_Boolean, esxVI_Type_AnyType, esxVI_Type_String, + esxVI_Type_Byte, esxVI_Type_Short, esxVI_Type_Int, esxVI_Type_Long, @@ -146,6 +148,7 @@ struct _esxVI_AnyType { union { esxVI_Boolean boolean; /* optional */ char *string; /* optional */ + int8_t int8; /* optional */ int16_t int16; /* optional */ int32_t int32; /* optional */ int64_t int64; /* optional */ @@ -199,6 +202,32 @@ int esxVI_String_DeserializeValue(xmlNodePtr node, char **value); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * XSD: Byte + */ + +struct _esxVI_Byte { + esxVI_Byte *_next; /* optional */ + esxVI_Type _type; /* required */ + + int8_t value; /* required */ +}; + +int esxVI_Byte_Alloc(esxVI_Byte **number); +void esxVI_Byte_Free(esxVI_Byte **numberList); +int esxVI_Byte_Validate(esxVI_Byte *number); +int esxVI_Byte_AppendToList(esxVI_Byte **numberList, esxVI_Byte *number); +int esxVI_Byte_DeepCopy(esxVI_Byte **dest, esxVI_Byte *src); +int esxVI_Byte_DeepCopyList(esxVI_Byte **destList, esxVI_Byte *srcList); +int esxVI_Byte_Serialize(esxVI_Byte *number, const char *element, + virBufferPtr output); +int esxVI_Byte_SerializeList(esxVI_Byte *numberList, const char *element, + virBufferPtr output); +int esxVI_Byte_Deserialize(xmlNodePtr node, esxVI_Byte **number); + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * XSD: Int */ -- 1.7.9.5

2 1

[libvirt] [PATCH v10 0/9] Add basic driver for Parallels Cloud Server
by Dmitry Guryanov 03 Aug '12

03 Aug '12

Parallels Cloud Server is a virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. More information can be found here: http://www.parallels.com/products/pcs/ Also beta version of Parallels Cloud Server can be downloaded there. Changes in v10: * Change the FSF address * Replace format strings without % with ' "%s", string ' Dmitry Guryanov (9): parallels: add driver skeleton add function virCommandNewVAList parallels: add functions to list domains and get info parallels: implement functions for domain life cycle management parallels: get info about serial ports parallels: add support of VNC remote display parallels: implement virDomainDefineXML operation for existing domains parallels: add storage driver parallels: implement VM creation configure.ac | 61 +- docs/drvparallels.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 9 +- mingw-libvirt.spec.in | 6 + po/POTFILES.in | 3 + src/Makefile.am | 15 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 9 + src/parallels/parallels_driver.c | 1735 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_driver.h | 28 + src/parallels/parallels_storage.c | 1390 +++++++++++++++++++++++++++++ src/parallels/parallels_utils.c | 149 ++++ src/parallels/parallels_utils.h | 66 ++ src/util/command.c | 22 + src/util/command.h | 3 + src/util/virterror.c | 3 +- 19 files changed, 3511 insertions(+), 22 deletions(-) create mode 100644 docs/drvparallels.html.in create mode 100644 src/parallels/parallels_driver.c create mode 100644 src/parallels/parallels_driver.h create mode 100644 src/parallels/parallels_storage.c create mode 100644 src/parallels/parallels_utils.c create mode 100644 src/parallels/parallels_utils.h

4 16