- Devel - libvirt List Archives

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

01 Aug '12

Append "Byte" to set of predefined object data types. 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 | 28 +++++++++++++++++++++ 3 files changed, 86 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..b287c22 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -777,6 +777,9 @@ esxVI_Type_ToString(esxVI_Type type) case esxVI_Type_Short: return "xsd:short"; + case esxVI_Type_Byte: + return "xsd:byte"; + case esxVI_Type_Int: return "xsd:int"; @@ -818,6 +821,8 @@ esxVI_Type_FromString(const char *type) return esxVI_Type_String; } else if (STREQ(type, "xsd:short")) { return esxVI_Type_Short; + } else if (STREQ(type, "xsd:byte")) { + return esxVI_Type_Byte; } else if (STREQ(type, "xsd:int")) { return esxVI_Type_Int; } else if (STREQ(type, "xsd:long")) { @@ -946,6 +951,10 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) (*dest)->int16 = src->int16; break; + case esxVI_Type_Byte: + (*dest)->int8 = src->int8; + break; + case esxVI_Type_Int: (*dest)->int32 = src->int32; break; @@ -1063,6 +1072,10 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) _DESERIALIZE_NUMBER(Short, "xsd:short", int16, INT16_MIN, INT16_MAX); break; + case esxVI_Type_Byte: + _DESERIALIZE_NUMBER(Byte, "xsd:byte", int8, INT8_MIN, INT8_MAX); + break; + case esxVI_Type_Int: _DESERIALIZE_NUMBER(Int, "xsd:int", int32, INT32_MIN, INT32_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, "%c", (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..8298b4c 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; @@ -74,6 +75,7 @@ enum _esxVI_Type { esxVI_Type_AnyType, esxVI_Type_String, esxVI_Type_Short, + esxVI_Type_Byte, esxVI_Type_Int, esxVI_Type_Long, esxVI_Type_DateTime, @@ -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 */ @@ -197,6 +200,31 @@ int esxVI_String_DeserializeList(xmlNodePtr node, esxVI_String **stringList); 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] Syntax error in src/qemu/qemu_hotplug.c
by Ryan Bourgeois 01 Aug '12

01 Aug '12

Fixed use of colon as statement terminator. This is against the latest git master. My email client chomps whitespace so I've attached the patch. Ryan Bourgeois

2 2

[libvirt] [PATCH] Fix rpm build failures
by Daniel Veillard 01 Aug '12

01 Aug '12

The 'make check' was rebuilding the binaries just overrided, so for more safety also override the C program Also daemon-conf isn't built anymore so remove it from the list Pushed under the build breaker rule Daniel diff --git a/libvirt.spec.in b/libvirt.spec.in index c642f80..2d86e3c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1323,11 +1323,13 @@ rm -fr %{buildroot} %check cd tests -# These 3 tests don't current work in a mock build root -for i in nodeinfotest daemon-conf seclabeltest +make +# These tests don't current work in a mock build root +for i in nodeinfotest seclabeltest do rm -f $i - printf "#!/bin/sh\nexit 0\n" > $i + printf 'int main(void) { return(0); }' > $i.c + printf '#!/bin/sh\nexit 0\n' > $i chmod +x $i done make check -- 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 2

[libvirt] [test-API][PATCH] Fix logical volume create problem
by Wayne Sun 01 Aug '12

01 Aug '12

* capacity should be int type * delete unused capacity suffix convert * fix xml param name Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/storage/create_logical_volume.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/repos/storage/create_logical_volume.py b/repos/storage/create_logical_volume.py index 170bbf5..098c148 100644 --- a/repos/storage/create_logical_volume.py +++ b/repos/storage/create_logical_volume.py @@ -73,10 +73,8 @@ def create_logical_volume(params): logger = params['logger'] poolname = params['poolname'] volname = params['volname'] - capacity = params['capacity'] - xmlstr = params['xmlstr'] - - dicts = utils.get_capacity_suffix_size(capacity) + capacity = int(params['capacity']) + xmlstr = params['xml'] conn = sharedmod.libvirtobj['conn'] pool_names = conn.listDefinedStoragePools() -- 1.7.1

2 1

[libvirt] [PATCH] gitignore: Reorder alphabetically
by Michal Privoznik 01 Aug '12

01 Aug '12

One of our latest patches added some files to .gitignore. However, not in the right place leaving the file not sorted. Since my git is set up to sort these files contents, fix this issue as it keeps showing up in git status. --- Pushing under trivial rule. .gitignore | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index e4b3932..5ea281a 100644 --- a/.gitignore +++ b/.gitignore @@ -104,11 +104,11 @@ /src/libvirt_lxc /src/locking/qemu-sanlock.conf /src/locking/test_libvirt_sanlock.aug -/src/lxc/test_libvirtd_lxc.aug /src/lxc/lxc_controller_dispatch.h /src/lxc/lxc_monitor_dispatch.h /src/lxc/lxc_protocol.c /src/lxc/lxc_protocol.h +/src/lxc/test_libvirtd_lxc.aug /src/qemu/test_libvirtd_qemu.aug /src/remote/*_client_bodies.h /src/remote/*_protocol.[ch] -- 1.7.8.6

1 0

[libvirt] [PATCH 0/3] Fix check-symfile test case & some linkage bugs
by Daniel P. Berrange 01 Aug '12

01 Aug '12

The check-symfile test case was causing problems for people depending on how they configured libvirt. This turns out to be mostly due to a flaw in linking the nwfilter, network and secrets driver. Once those flaws are fixed, the symfile test works in the same way regardless of whether driver modules are enabled

4 11

[libvirt] [PATCH] spec: Remove extra () with return statement
by Jiri Denemark 01 Aug '12

01 Aug '12

--- Pushed as trivial. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2d86e3c..67b955a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1328,7 +1328,7 @@ make for i in nodeinfotest seclabeltest do rm -f $i - printf 'int main(void) { return(0); }' > $i.c + printf 'int main(void) { return 0; }' > $i.c printf '#!/bin/sh\nexit 0\n' > $i chmod +x $i done -- 1.7.11.1

1 0

[libvirt] QEMU CPU model versioning/compatibility (was Re: KVM call minutes July 31th)
by Eduardo Habkost 01 Aug '12

01 Aug '12

On Tue, Jul 31, 2012 at 04:32:05PM +0200, Juan Quintela wrote: > - 1.2 plans for CPU model versioning/compatibility (eduardo) > (global properties vs QOM vs qdev) > how to do it ? configuration file? moving back to the code? > different external interface from internal one (CCing libvir-list) So, the problem is (please correct me if I am wrong): - libvirt expects the CPU models from the current config file to be provided by QEMU. libvirt won't write a cpudef config file. - Fixing compatibility problems on the CPU models (even the ones that are in config files) are expected to be QEMU's responsibility. Moving the CPU models inside the code is a step backwards, IMO. I don't think loading some kind of data from an external file (provided and maintained by QEMU itself) should be considered something special and magic, and make the data there a second-class citizen (that QEMU refuses to give proper support and keep compatibility). But if it will make us stop running in circles every time something related to those files needs to be changed (remember the -no-user-config discussion?), I think I will accept that. -- Eduardo

2 1

[libvirt] [PATCH] Add missing parallels_utils.h to Makefile.am
by Daniel Veillard 01 Aug '12

01 Aug '12

Otherwise the file is missing from the dist tarball and distcheck fails Pushed under the build breaker rule Daniel diff --git a/src/Makefile.am b/src/Makefile.am index c5dc28a..b48ce65 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -532,7 +532,8 @@ HYPERV_DRIVER_EXTRA_DIST = \ PARALLELS_DRIVER_SOURCES = \ parallels/parallels_driver.h \ parallels/parallels_driver.c \ - parallels/parallels_utils.c \ + parallels/parallels_utils.c \ + parallels/parallels_utils.h \ parallels/parallels_storage.c NETWORK_DRIVER_SOURCES = \ -- 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

[libvirt] [test-API][PATCH 1/2] Fix the undefined local variable problem in remote_exec
by Wayne Sun 01 Aug '12

01 Aug '12

* subproc_flag should be global when used between functions * print error msg when exception happened Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- utils/utils.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/utils/utils.py b/utils/utils.py index 455e9cf..be87cdc 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -32,6 +32,8 @@ import subprocess from xml.dom import minidom from urlparse import urlparse +subproc_flag = 0 + def get_hypervisor(): if commands.getoutput("lsmod | grep kvm"): return 'kvm' @@ -439,10 +441,12 @@ def support_virt(self): return True def subproc(a, b): + global subproc_flag subproc_flag = 1 def remote_exec(hostname, username, password, cmd): """Remote execution on specified host""" + global subproc_flag pid, fd = pty.fork() if pid == 0: try: @@ -479,6 +483,7 @@ def remote_exec(hostname, username, password, cmd): subproc_flag = 0 return ret except Exception, e: + print e subproc_flag = 0 return -1 -- 1.7.1

2 4