August 2011 - CIM - libvirt List Archives

[PATCH] ACL: Add 'Action' property to KVM_{IPHeaders, Hdr8021}Filter
by Eduardo Lima (Etrunko) 20 Sep '11

20 Sep '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1311872160 10800 # Node ID 4d837e60bb82daa73bba8e13bbab9041fc7632ee # Parent 277b56b3863b5f81a3faa18aeb7b9951b963b489 ACL: Add 'Action' property to KVM_{IPHeaders,Hdr8021}Filter This property should be defined in the CIM_FilterEntryBase parent class (would also apply to 'Direction' and 'Priority' properties), considering the fact that, according to libvirt documentation, the 'action' attribute of a rule is mandatory. For reference please check: http://libvirt.org/formatnwfilter.html#nwfelemsRules Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/schema/FilterEntry.mof b/schema/FilterEntry.mof --- a/schema/FilterEntry.mof +++ b/schema/FilterEntry.mof @@ -2,6 +2,14 @@ [Provider("cmpi::Virt_FilterEntry")] class KVM_Hdr8021Filter : CIM_Hdr8021Filter { + [Description ( + "This defines whether the action should be to forward or " + "deny traffic meeting the match condition specified in " + "this filter." ), + ValueMap { "1", "2" }, + Values { "Permit", "Deny" }] + uint16 Action; + [Description("This defines whether the Filter is used for input, " "output, or both input and output filtering. All values are " "used with respect to the interface for which the Filter " @@ -32,6 +40,14 @@ [Provider("cmpi::Virt_FilterEntry")] class KVM_IPHeadersFilter : CIM_IPHeadersFilter { + [Description ( + "This defines whether the action should be to forward or " + "deny traffic meeting the match condition specified in " + "this filter." ), + ValueMap { "1", "2" }, + Values { "Permit", "Deny" }] + uint16 Action; + [Description("This defines whether the Filter is used for input, " "output, or both input and output filtering. All values are " "used with respect to the interface for which the Filter " diff --git a/src/Virt_FilterEntry.c b/src/Virt_FilterEntry.c --- a/src/Virt_FilterEntry.c +++ b/src/Virt_FilterEntry.c @@ -159,6 +159,19 @@ return priority; } +static int convert_action(const char *s) +{ + enum {NONE=0, ACCEPT, DENY} action = NONE; + + if (s != NULL) { + if (STREQC(s, "accept")) + action = ACCEPT; + else if (STREQC(s, "drop") || STREQC(s, "reject")) + action = DENY; + } + return action; +} + static CMPIInstance *convert_mac_rule_to_instance( struct acl_rule *rule, const CMPIBroker *broker, @@ -169,7 +182,7 @@ CMPIInstance *inst = NULL; const char *sys_name = NULL; const char *sys_ccname = NULL; - int direction, priority = 0; + int action, direction, priority = 0; unsigned int bytes[48]; unsigned int size = 0; CMPIArray *array = NULL; @@ -203,6 +216,9 @@ CMSetProperty(inst, "SystemCreationClassName", sys_ccname, CMPI_chars); CMSetProperty(inst, "Name", (CMPIValue *)rule->name, CMPI_chars); + action = convert_action(rule->action); + CMSetProperty(inst, "Action", (CMPIValue *)&action, CMPI_uint16); + direction = convert_direction(rule->direction); CMSetProperty(inst, "Direction", (CMPIValue *)&direction, CMPI_uint16); @@ -259,7 +275,7 @@ CMPIInstance *inst = NULL; const char *sys_name = NULL; const char *sys_ccname = NULL; - int direction, priority = 0; + int action, direction, priority = 0; unsigned int bytes[48]; unsigned int size = 0; unsigned int n = 0; @@ -293,6 +309,9 @@ CMSetProperty(inst, "SystemCreationClassName", sys_ccname, CMPI_chars); CMSetProperty(inst, "Name", (CMPIValue *)rule->name, CMPI_chars); + action = convert_action(rule->action); + CMSetProperty(inst, "Action", (CMPIValue *)&action, CMPI_uint16); + direction = convert_direction(rule->direction); CMSetProperty(inst, "Direction", (CMPIValue *)&direction, CMPI_uint16);

2 1

Better to Add Code to check "End of line" character in schema file
by Wayne Xia 15 Sep '11

15 Sep '11

When I try add new class to libvirt-cim, I found that if the "end of line" character use the windows format(\t\n), then the rpm making would succeed, but the pegasus would not find the correct .so file, indeed pegasus seems to linked to a wrong file. It takes me a long time to find the reason, so I think it is better to add some scripts to check this, or show a warning for it. -- Best Regards Wayne Xia mail:xiawenc@linux.vnet.ibm.com tel:86-010-82450803

3 3

[PATCH] VirtualSystemManagementService: Fix yet another possible leak
by Eduardo Lima (Etrunko) 09 Sep '11

09 Sep '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1314112289 10800 # Node ID 277b56b3863b5f81a3faa18aeb7b9951b963b489 # Parent a346baf140d64177a9dc1066677c307ee6518236 VirtualSystemManagementService: Fix yet another possible leak Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -1377,7 +1377,11 @@ if (tmp == NULL) return false; - memcpy(tmp, *list, sizeof(*tmp) * cur); + if (*list) { + memcpy(tmp, *list, sizeof(*tmp) * cur); + free(*list); + } + *list = tmp; return true;

2 3

[PATCH] (#2) Workaround to fix race condition around libvirt init
by Sharad Mishra 09 Sep '11

09 Sep '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1314719316 25200 # Node ID c54aafd0b2c6414f91b96bc30e2f148bb78d5c59 # Parent 277b56b3863b5f81a3faa18aeb7b9951b963b489 (#2) Workaround to fix race condition around libvirt init. This patch fixes the race condition caused when mutiple threads try to start VMs at the same time. This patch also fixes the issue of incorrect mem allocation for VSSD property - emulator. #2: included Edurdo's patch for make_space took care of coding guidelines. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff --git a/libxkutil/misc_util.c b/libxkutil/misc_util.c --- a/libxkutil/misc_util.c +++ b/libxkutil/misc_util.c @@ -28,6 +28,7 @@ #include <stdbool.h> #include <stdarg.h> #include <unistd.h> +#include <pthread.h> #include <libvirt/libvirt.h> #include <libvirt/virterror.h> @@ -45,6 +46,9 @@ #include "misc_util.h" #include "cs_util.h" +static pthread_mutex_t libvirt_mutex = PTHREAD_MUTEX_INITIALIZER; +/* libvirt library not initialized */ +static int libvirt_initialized = 0; #define URI_ENV "HYPURI" @@ -114,11 +118,15 @@ CU_DEBUG("Connecting to libvirt with uri `%s'", uri); + pthread_mutex_lock(&libvirt_mutex); + if (is_read_only()) conn = virConnectOpenReadOnly(uri); else conn = virConnectOpen(uri); + pthread_mutex_unlock(&libvirt_mutex); + if (!conn) { CU_DEBUG("Unable to connect to `%s'", uri); return NULL; @@ -530,7 +538,19 @@ bool libvirt_cim_init(void) { - return virInitialize() == 0; + int ret = 0; + + /* double-check lock pattern used for performance reasons */ + if (libvirt_initialized == 0) { + pthread_mutex_lock(&libvirt_mutex); + if (libvirt_initialized == 0) { + ret = virInitialize(); + if (ret == 0) + libvirt_initialized = 1; + } + pthread_mutex_unlock(&libvirt_mutex); + } + return (ret == 0); } bool check_refs_pfx_match(const CMPIObjectPath *refa, diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -188,6 +188,24 @@ return 1; } +static bool make_space(struct virt_device **list, int cur, int new) +{ + struct virt_device *tmp; + + tmp = calloc(cur + new, sizeof(*tmp)); + if (tmp == NULL) + return false; + + if (*list) { + memcpy(tmp, *list, sizeof(*tmp) * cur); + free(*list); + } + + *list = tmp; + + return true; +} + static bool fv_set_emulator(struct domain *domain, const char *emu) { @@ -198,6 +216,11 @@ if (emu == NULL) return true; + if (!make_space(&domain->dev_emu, 0, 1)) { + CU_DEBUG("Failed to alloc disk list"); + return false; + } + cleanup_virt_device(domain->dev_emu); domain->dev_emu->type = CIM_RES_TYPE_EMU; @@ -1369,24 +1392,6 @@ return msg; } -static bool make_space(struct virt_device **list, int cur, int new) -{ - struct virt_device *tmp; - - tmp = calloc(cur + new, sizeof(*tmp)); - if (tmp == NULL) - return false; - - if (*list) { - memcpy(tmp, *list, sizeof(*tmp) * cur); - free(*list); - } - - *list = tmp; - - return true; -} - static char *add_device_nodup(struct virt_device *dev, struct virt_device *list, int max,

2 2

[PATCH] DO NOT PUSH UPSTREAM
by Sharad Mishra 30 Aug '11

30 Aug '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1314380301 25200 # Node ID 73e7bb11410f3c10d3b0b61678531314262f09b7 # Parent 2984ede9c082bab48b3494ef4b9f5561fadef2ad DO NOT PUSH UPSTREAM This is the workaround that was given to zGryphon team to prevent unloading of idle providers. There is a bug in libvirt that needs to be fixed. That fix will be the actual fix for this problem that cause segfault when those providers are unloaded that make a call to virConnectOpen. This patch is being put on mailing list just for archiving reasons. It should not be pushed upstream. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff --git a/libcmpiutil.h b/libcmpiutil.h --- a/libcmpiutil.h +++ b/libcmpiutil.h @@ -508,7 +508,16 @@ static CMPIStatus pn##Cleanup(CMPIInstanceMI *mi, \ const CMPIContext *c, \ CMPIBoolean terminating) \ - { RETURN_UNSUPPORTED(); } + { \ + if (terminating) \ + { \ + return (CMPIStatus) {CMPI_RC_OK, NULL}; \ + } \ + else \ + { \ + return (CMPIStatus) {CMPI_RC_NEVER_UNLOAD, NULL}; \ + } \ + } #define DEFAULT_IND_CLEANUP(pn) \ static CMPIStatus pn##IndicationCleanup(CMPIIndicationMI *mi, \ diff --git a/libcmpiutil.spec.in b/libcmpiutil.spec.in --- a/libcmpiutil.spec.in +++ b/libcmpiutil.spec.in @@ -3,7 +3,7 @@ Summary: CMPI Utility Library Name: libcmpiutil Version: @PACKAGE_VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: System Environment/Libraries Source: libcmpiutil-%{version}.tar.gz

2 2

[PATCH] Workaround to fix race condition around libvirt init
by Sharad Mishra 29 Aug '11

29 Aug '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1314379933 25200 # Node ID a42b68361ed9cb4f7d6f15de5b58ccc68e88ef38 # Parent a346baf140d64177a9dc1066677c307ee6518236 Workaround to fix race condition around libvirt init. This patch fixes the race condition caused when mutiple threads try to start a VM. This patch also fixes the issue of incorrect mem allocation for VSSD property - emulator. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff --git a/libxkutil/misc_util.c b/libxkutil/misc_util.c --- a/libxkutil/misc_util.c +++ b/libxkutil/misc_util.c @@ -28,6 +28,7 @@ #include <stdbool.h> #include <stdarg.h> #include <unistd.h> +#include <pthread.h> #include <libvirt/libvirt.h> #include <libvirt/virterror.h> @@ -45,6 +46,9 @@ #include "misc_util.h" #include "cs_util.h" +static pthread_mutex_t libvirt_mutex = PTHREAD_MUTEX_INITIALIZER; +/* libvirt library not initialized */ +static int libvirt_initialized = 0; #define URI_ENV "HYPURI" @@ -114,11 +118,15 @@ CU_DEBUG("Connecting to libvirt with uri `%s'", uri); + pthread_mutex_lock(&libvirt_mutex); + if (is_read_only()) conn = virConnectOpenReadOnly(uri); else conn = virConnectOpen(uri); + pthread_mutex_unlock(&libvirt_mutex); + if (!conn) { CU_DEBUG("Unable to connect to `%s'", uri); return NULL; @@ -530,7 +538,19 @@ bool libvirt_cim_init(void) { - return virInitialize() == 0; + int ret=0; + + /* double-check lock pattern used for performance reasons */ + if (0 == libvirt_initialized) { + pthread_mutex_lock(&libvirt_mutex); + if (0 == libvirt_initialized) { + ret = virInitialize(); + if (ret == 0) + libvirt_initialized=1; + } + pthread_mutex_unlock(&libvirt_mutex); + } + return (ret == 0); } bool check_refs_pfx_match(const CMPIObjectPath *refa, diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -188,6 +188,20 @@ return 1; } +static bool make_space(struct virt_device **list, int cur, int new) +{ + struct virt_device *tmp; + + tmp = calloc(cur + new, sizeof(*tmp)); + if (tmp == NULL) + return false; + + memcpy(tmp, *list, sizeof(*tmp) * cur); + *list = tmp; + + return true; +} + static bool fv_set_emulator(struct domain *domain, const char *emu) { @@ -198,6 +212,11 @@ if (emu == NULL) return true; + if (!make_space(&domain->dev_emu, 0, 1)) { + CU_DEBUG("Failed to alloc disk list"); + return false; + } + cleanup_virt_device(domain->dev_emu); domain->dev_emu->type = CIM_RES_TYPE_EMU; @@ -1369,20 +1388,6 @@ return msg; } -static bool make_space(struct virt_device **list, int cur, int new) -{ - struct virt_device *tmp; - - tmp = calloc(cur + new, sizeof(*tmp)); - if (tmp == NULL) - return false; - - memcpy(tmp, *list, sizeof(*tmp) * cur); - *list = tmp; - - return true; -} - static char *add_device_nodup(struct virt_device *dev, struct virt_device *list, int max,

3 5

[PATCH] (#2) VirtualSystemManagementService: Fixing potential null dereferences
by Eduardo Lima (Etrunko) 18 Aug '11

18 Aug '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1312918075 10800 # Node ID a346baf140d64177a9dc1066677c307ee6518236 # Parent 90ba6e1f899ea3ec47bc175e86bd245983e9375f VirtualSystemManagementService: Fixing potential null dereferences As reported in https://bugzilla.redhat.com/show_bug.cgi?id=728245 line 1048 - Comparing "path" to null implies that "path" might be null. line 1057 - Dereferencing null variable "path". line 1088 - Comparing "port" to null implies that "port" might be null. line 1094 - Dereferencing null variable "port". Changes since #1 - Removed free calls, incorporated at revision 1130. - Avoid NULL dereference in parse_sdl_address as well. Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -1047,9 +1047,10 @@ ret = 1; - out: - CU_DEBUG("Exiting parse_console_address, ip is %s, port is %s", - *path, *port); + out: + if (path && port) + CU_DEBUG("Exiting parse_console_address, ip is %s, port is %s", + *path, *port); free(tmp_path); free(tmp_port); @@ -1097,8 +1098,9 @@ ret = 1; out: - CU_DEBUG("Exiting parse_sdl_address, display is %s, xauth is %s", - *display, *xauth); + if (display && xauth) + CU_DEBUG("Exiting parse_sdl_address, display is %s, xauth is %s", + *display, *xauth); free(tmp_display); free(tmp_xauth); @@ -1137,8 +1139,9 @@ ret = 1; out: - CU_DEBUG("Exiting parse_vnc_address, ip is %s, port is %s", - *ip, *port); + if (ip && port) + CU_DEBUG("Exiting parse_vnc_address, ip is %s, port is %s", + *ip, *port); free(tmp_ip); free(tmp_port);

2 1

[PATCH] device_parsing: Fixing potential leaks
by Eduardo Lima (Etrunko) 18 Aug '11

18 Aug '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1313075262 10800 # Node ID c0f20dbefb8fd73c278a619bbbd2efb567da07d4 # Parent 2b1b79a72ab0288d649399118dffce26fd05e066 device_parsing: Fixing potential leaks As reported in https://bugzilla.redhat.com/show_bug.cgi?id=728245 line 106 - Function cleanup_virt_device does not free its parameter dev (this causes a lot of Coverity Resource leak warnings). In future use cases, please consider using cleanup_virt_devices function instead of cleanup_virt_device if the virt_device structure is allocated dynamically. Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/libxkutil/device_parsing.c b/libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c +++ b/libxkutil/device_parsing.c @@ -829,12 +829,10 @@ if (ret <= 0) return ret; - mdev = malloc(sizeof(*mdev)); + mdev = calloc(1, sizeof(*mdev)); if (mdev == NULL) return 0; - memset(mdev, 0, sizeof(*mdev)); - /* We could get one or two memory devices back, depending on * if there is a currentMemory tag or not. Coalesce these * into a single device to return @@ -870,12 +868,10 @@ if (ret <= 0) return ret; - proc_dev = malloc(sizeof(*proc_dev)); + proc_dev = calloc(1, sizeof(*proc_dev)); if (proc_dev == NULL) return 0; - memset(proc_dev, 0, sizeof(*proc_dev)); - proc_dev->type = CIM_RES_TYPE_PROC; proc_dev->id = strdup("proc"); proc_dev->dev.vcpu.quantity = proc_devs[0].dev.vcpu.quantity; @@ -1031,8 +1027,6 @@ xmlNode **nodes = nsv->nodeTab; xmlNode *child; - memset(dominfo, 0, sizeof(*dominfo)); - dominfo->typestr = get_attr_value(nodes[0], "type"); for (child = nodes[0]->children; child != NULL; child = child->next) { @@ -1098,7 +1092,7 @@ int ret; CU_DEBUG("In get_dominfo_from_xml"); - *dominfo = malloc(sizeof(**dominfo)); + *dominfo = calloc(1, sizeof(**dominfo)); if (*dominfo == NULL) return 0; diff --git a/libxkutil/xmlgen.c b/libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c +++ b/libxkutil/xmlgen.c @@ -832,7 +832,7 @@ dominfo->dev_input = dev; break; default: - cleanup_virt_device(dev); + cleanup_virt_devices(&dev, 1); goto out; } diff --git a/src/Virt_AppliedFilterList.c b/src/Virt_AppliedFilterList.c --- a/src/Virt_AppliedFilterList.c +++ b/src/Virt_AppliedFilterList.c @@ -516,7 +516,7 @@ free(net_name); cleanup_filter(filter); - cleanup_virt_device(device); + cleanup_virt_devices(&device, 1); virDomainFree(dom); virConnectClose(conn); @@ -626,7 +626,7 @@ free(net_name); cleanup_filter(filter); - cleanup_virt_device(device); + cleanup_virt_devices(&device, 1); virDomainFree(dom); virConnectClose(conn); diff --git a/src/Virt_Device.c b/src/Virt_Device.c --- a/src/Virt_Device.c +++ b/src/Virt_Device.c @@ -700,14 +700,15 @@ } for (i = 0; i < count; i++) { - if (STREQC(device, list[i].id)) + if (STREQC(device, list[i].id)) { dev = virt_device_dup(&list[i]); + break; + } - cleanup_virt_device(&list[i]); } + cleanup_virt_devices(&list, count); out: - free(list); return dev; } @@ -785,7 +786,7 @@ &tmp_list); } - cleanup_virt_device(dev); + cleanup_virt_devices(&dev, 1); *_inst = tmp_list.list[0]; diff --git a/src/Virt_RASD.c b/src/Virt_RASD.c --- a/src/Virt_RASD.c +++ b/src/Virt_RASD.c @@ -664,7 +664,7 @@ char *host = NULL; char *devid = NULL; virConnectPtr conn = NULL; - struct virt_device *dev; + struct virt_device *dev = NULL; conn = connect_by_classname(broker, CLASSNAME(reference), &s); if (conn == NULL) { @@ -700,8 +700,8 @@ "Failed to set instance properties"); else *_inst = inst; - - cleanup_virt_device(dev); + + cleanup_virt_devices(&dev, 1); out: virConnectClose(conn); @@ -863,10 +863,7 @@ tmp_dev->id = strdup("proc"); - for (i = 0; i < count; i++) - cleanup_virt_device(&devs[i]); - - free(devs); + cleanup_virt_devices(&devs, count); devs = tmp_dev; count = 1; } @@ -877,9 +874,6 @@ CMPI_RC_ERR_FAILED, "Failed to get domain name"); - for (i = 0; i < count; i++) - cleanup_virt_device(&devs[i]); - goto out; } @@ -893,12 +887,10 @@ properties); if (dev) inst_list_add(list, dev); - - cleanup_virt_device(&devs[i]); } out: - free(devs); + cleanup_virt_devices(&devs, count); return s; } diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -200,12 +200,6 @@ cleanup_virt_device(domain->dev_emu); - domain->dev_emu = calloc(1, sizeof(*domain->dev_emu)); - if (domain->dev_emu == NULL) { - CU_DEBUG("Failed to allocate default emulator device"); - return false; - } - domain->dev_emu->type = CIM_RES_TYPE_EMU; domain->dev_emu->dev.emu.path = strdup(emu); domain->dev_emu->id = strdup("emulator");

2 3

which vols added to storage pool during refresh?
by Gareth S Bestor 18 Aug '11

18 Aug '11

We're looking at a problem when we have a libvirt pool defined, below [root@xnl2192 ~]# virsh pool-dumpxml ScsiPool-host2 <pool type='scsi'> <name>ScsiPool-host2</name> <uuid>f2ea1882-881f-9f49-838d-39e070f68002</uuid> <capacity>136583315456</capacity> <allocation>136583315456</allocation> <available>0</available> <source> <adapter name='host2'/> </source> <target> <path>/dev/disk/by-id</path> <permissions> <mode>0700</mode> <owner>-1</owner> <group>-1</group> </permissions> </target> </pool> As you can see, this pool maps to /dev/disk/by-id. There may be a large number of actual volume entries in /dev/disk/by-id, however it appears only a distinct subset of them are actually added into the libvirt pool when you do a pool-refresh. What does libvirt check when determining which, and whether or not, to add one of these volume into the vol-list? In particular, we have a case when one specific volume in /dev/disk/by-id is *not* added into the pool, and no amount of pool-refresh makes a difference. We did notice that if you remove all the sym links in /dev/disk/by-id and do a pool-refresh, that libvirt re-scans the bus, recreates the links in /dev/disk/by-id, and adds (some of) the volumes back into the vol-list. But not this one problematic vol, so clearly there is something about this vol that libvirt doesnt like and why it is (deliberately?) not added to the pool. What checks, etc does libvirt make against vols when determining whether to add them to a pool? - G Dr. Gareth S. Bestor IBM Senior Software Engineer Systems & Technology Group - Systems Management Standards 971-285-6375 (mobile) bestor(a)us.ibm.com

3 2

Patches for Virt_SettingsDefineCapabilities: incorrect Default ValueRole, strstr() misuse
by Gareth S Bestor 18 Aug '11

18 Aug '11

# HG changeset patch # User Gareth S. Bestor <bestor(a)us.ibm.com> # Date 1313162799 25200 # Node ID 39c85f57c94fa36c681d4e9caa6e14617dcc7e60 # Parent 8b4f6d69f40904ced24f7948f04f89e770e37bce Patches for Virt_SettingsDefineCapabilities: incorrect Default ValueRole, strstr() misuse - The CIM_AllocationCapabilities for 'Default' RASDs have the incorrect ValueRole. per DSP1043 "Allocation Capabilities Profile", Section 10.5 "CIM_SettingsDefineCapabilities – Default" the ValueRole should be 0 ("Default") - Fixed mistake with usage of strstr() swapping the arguments; should be: char *strstr(const char *haystack, const char *needle); This may not have mattered before when both strings were always exactly same or didnt match, but now for new 'Point' instances the instanceid has a prefix. Signed-off-by: Gareth S. Bestor <bestor(a)us.ibm.com> diff -r 8b4f6d69f409 -r 39c85f57c94f src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Mon Aug 08 11:40:09 2011 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Fri Aug 12 08:26:39 2011 -0700 @@ -2054,19 +2054,22 @@ goto out; } - if (strstr("Default", iid) != NULL) + if (strstr(iid, "Default") != NULL) { valuerange = SDC_RANGE_POINT; - else if (strstr("Increment", iid) != NULL) + valuerole = SDC_ROLE_DEFAULT; + } + else if (strstr(iid, "Point") != NULL) + valuerange = SDC_RANGE_POINT; + else if (strstr(iid, "Increment") != NULL) valuerange = SDC_RANGE_INC; - else if (strstr("Maximum", iid) != NULL) + else if (strstr(iid, "Maximum") != NULL) valuerange = SDC_RANGE_MAX; - else if (strstr("Minimum", iid) != NULL) + else if (strstr(iid, "Minimum") != NULL) valuerange = SDC_RANGE_MIN; - else - CU_DEBUG("Unknown default RASD type: `%s'", iid); - - if (valuerange == SDC_RANGE_POINT) - valuerole = SDC_ROLE_DEFAULT; + else { + CU_DEBUG("Unknown RASD type: `%s'", iid); + goto out; + } CMSetProperty(ref_inst, "ValueRole", (CMPIValue *)&valuerole, CMPI_uint16);

3 2

[PATCH 0 of 2] Add SDL frame buffer support in libvirt-cim, V5
by Wayne Xia 18 Aug '11

18 Aug '11

these patches would add support for SDL frame buffer configuration, also fix some memory leak problem.

2 4

[PATCH] acl_parsing: Fixing potential leaks
by Eduardo Lima (Etrunko) 17 Aug '11

17 Aug '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1313005735 10800 # Node ID 2b1b79a72ab0288d649399118dffce26fd05e066 # Parent 8759e60c17c42101118f914215d071138340c70f acl_parsing: Fixing potential leaks Also adds missing checks for errors in some function calls. As reported in https://bugzilla.redhat.com/show_bug.cgi?id=728245 line 144 - Function cleanup_filter does not free its parameter filter (this causes a lot of Coverity Resource leak warnings). line 397 - Dynamically allocated variable rule is not freed in function parse_acl_filter as a result of line #399. line 630 - Function "malloc" without NULL check. line 659 - Function "malloc" without NULL check. Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/libxkutil/acl_parsing.c b/libxkutil/acl_parsing.c --- a/libxkutil/acl_parsing.c +++ b/libxkutil/acl_parsing.c @@ -139,6 +139,7 @@ }; rule->type = UNKNOWN_RULE; + free(rule); } void cleanup_filter(struct acl_filter *filter) @@ -152,10 +153,8 @@ free(filter->name); free(filter->chain); - for (i = 0; i < filter->rule_ct; i++) { + for (i = 0; i < filter->rule_ct; i++) cleanup_rule(filter->rules[i]); - free(filter->rules[i]); - } free(filter->rules); filter->rule_ct = 0; @@ -401,14 +400,16 @@ if (parse_acl_rule(child, rule) == 0) goto err; - append_filter_rule(filter, rule); + if (append_filter_rule(filter, rule) == 0) + goto err; } else if (XSTREQ(child->name, "filterref")) { filter_ref = get_attr_value(child, "filter"); if (filter_ref == NULL) goto err; - append_filter_ref(filter, filter_ref); + if (append_filter_ref(filter, filter_ref) == 0) + goto err; } } @@ -440,14 +441,15 @@ if (xmldoc == NULL) goto err; - *filter = malloc(sizeof(**filter)); + *filter = calloc(1, sizeof(**filter)); if (*filter == NULL) goto err; - memset(*filter, 0, sizeof(**filter)); - parse_acl_filter(xmldoc->children, *filter); - - ret = 1; + ret = parse_acl_filter(xmldoc->children, *filter); + if (ret == 0) { + free(*filter); + *filter = NULL; + } err: xmlSetGenericErrorFunc(NULL, NULL); @@ -508,9 +510,7 @@ if (xml == NULL) return 0; - get_filter_from_xml(xml, filter); - - return 1; + return get_filter_from_xml(xml, filter); #else return 0; #endif @@ -534,7 +534,8 @@ virConnectListNWFilters(conn, names, count); - filters = malloc(count * sizeof(struct acl_filter)); + filters = calloc(count, sizeof(*filters)); + if (filters == NULL) goto err; @@ -542,7 +543,8 @@ { struct acl_filter *filter = NULL; - get_filter_by_name(conn, names[i], &filter); + if (get_filter_by_name(conn, names[i], &filter) == 0) + break; memcpy(&filters[i], filter, sizeof(*filter)); } @@ -630,6 +632,12 @@ filter->rules = malloc((filter->rule_ct + 1) * sizeof(struct acl_rule *)); + if (filter->rules == NULL) { + CU_DEBUG("Failed to allocate memory for new rule"); + filter->rules = old_rules; + return 0; + } + memcpy(filter->rules, old_rules, filter->rule_ct * sizeof(struct acl_rule *)); @@ -657,6 +665,13 @@ old_refs = filter->refs; filter->refs = malloc((filter->ref_ct + 1) * sizeof(char *)); + + if (filter->refs == NULL) { + CU_DEBUG("Failed to allocate memory for new ref"); + filter->refs = old_refs; + return 0; + } + memcpy(filter->refs, old_refs, filter->ref_ct * sizeof(char *)); filter->refs[filter->ref_ct] = name; @@ -682,8 +697,9 @@ if (STREQC(old_refs[i], name)) { free(old_refs[i]); } - else - append_filter_ref(filter, old_refs[i]); + else if(append_filter_ref(filter, old_refs[i]) == 0) { + return 0; + } } return 1;

2 1

[PATCH] (#3) add sdl frame buffer support
by Wayne Xia 17 Aug '11

17 Aug '11

# HG changeset patch # User Wayne Xia <xiawenc(a)linux.vnet.ibm.com> # Date 1311670971 -28800 # Node ID d0bb7e93d02d3bd55d9b984165db0265c9865462 # Parent 792db1a6ead075375fad4a7d22143a0f978b5e48 (#3) add sdl frame buffer support. Now libvirt still supports sdl frame buffer, and it may take three parameters: display,xauth,fullscreen. This patch enable the libvirt-cim to accept these configuration and pass them in XML define to let libvirt know about it. Exposed interface could be found in the file ResourceAllocationSettingData.mof. https://bugzilla.linux.ibm.com/show_bug.cgi?id=71347 Signed-off-by: Wayne Xia (Wayne) <xiawenc(a)linux.vnet.ibm.com> diff -r 792db1a6ead0 -r d0bb7e93d02d libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Mon Jul 25 19:39:08 2011 +0800 +++ b/libxkutil/device_parsing.c Tue Jul 26 17:02:51 2011 +0800 @@ -538,6 +538,11 @@ if (gdev->dev.vnc.port == NULL || gdev->dev.vnc.host == NULL) goto err; } + else if (STREQC(gdev->type, "sdl")) { + gdev->dev.sdl.display = get_attr_value(node, "display"); + gdev->dev.sdl.xauth = get_attr_value(node, "xauth"); + gdev->dev.sdl.fullscreen = get_attr_value(node, "fullscreen"); + } else if (STREQC(gdev->type, "pty")) { if (node->name == NULL) goto err; diff -r 792db1a6ead0 -r d0bb7e93d02d libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Mon Jul 25 19:39:08 2011 +0800 +++ b/libxkutil/xmlgen.c Tue Jul 26 17:02:51 2011 +0800 @@ -421,8 +421,21 @@ xmlNewProp(tmp, BAD_CAST "type", BAD_CAST dev->type); - if (STREQC(dev->type, "sdl")) - return NULL; + if (STREQC(dev->type, "sdl")) { + if (dev->dev.sdl.display) { + xmlNewProp(tmp, BAD_CAST "display", + BAD_CAST dev->dev.sdl.display); + } + if (dev->dev.sdl.xauth) { + xmlNewProp(tmp, BAD_CAST "xauth", + BAD_CAST dev->dev.sdl.xauth); + } + if (dev->dev.sdl.fullscreen) { + xmlNewProp(tmp, BAD_CAST "fullscreen", + BAD_CAST dev->dev.sdl.fullscreen); + } + return NULL; + } if (dev->dev.vnc.port) { xmlNewProp(tmp, BAD_CAST "port", BAD_CAST dev->dev.vnc.port); diff -r 792db1a6ead0 -r d0bb7e93d02d schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Mon Jul 25 19:39:08 2011 +0800 +++ b/schema/ResourceAllocationSettingData.mof Tue Jul 26 17:02:51 2011 +0800 @@ -219,7 +219,9 @@ [Description ("If ResourceSubType is 'vnc', this is a VNC Address. " "IPv4 in a.b.c.d:port or IPv6 in [ip]:port format. If ResourceSubType " "is 'console', this is a character device path in " - "path:port format (e.g., '/dev/pts/3:0'\)")] + "path:port format (e.g., '/dev/pts/3:0'\) " + "if ResourceSubType is 'sdl', this is a combination of its params as " + "xauth:display (e.g., '/root/.Xauthority::0'\)")] string Address; [Description ("Keyboard keymapping")] @@ -228,7 +230,8 @@ [Description ("VNC password")] string Password; - [Description ("Is IPv6 only addressing is to be used")] + [Description ("Is IPv6 only addressing is to be used." + "if ResourceSubType is 'sdl', this means whether sdl is fullscreen")] boolean IsIPv6Only; }; diff -r 792db1a6ead0 -r d0bb7e93d02d src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Jul 25 19:39:08 2011 +0800 +++ b/src/Virt_VirtualSystemManagementService.c Tue Jul 26 17:02:51 2011 +0800 @@ -1060,6 +1060,52 @@ return ret; } +static int parse_sdl_address(const char *id, + char **display, + char **xauth) +{ + int ret; + char *tmp_display = NULL; + char *tmp_xauth = NULL; + + CU_DEBUG("Entering parse_sdl_address, address is %s", id); + + ret = sscanf(id, "%a[^:]:%as", &tmp_xauth, &tmp_display); + + if (ret <= 0) { + ret = sscanf(id, ":%as", &tmp_display); + if (ret <= 0) { + if (STREQC(id, ":")) { + /* do nothing, it is empty */ + } + else { + ret = 0; + goto out; + } + } + } + + if (display) { + if (tmp_display == NULL) + *display = NULL; + else + *display = strdup(tmp_display); + } + if (xauth) { + if (tmp_xauth == NULL) + *xauth = NULL; + else + *xauth = strdup(tmp_xauth); + } + ret = 1; + + out: + CU_DEBUG("Exiting parse_sdl_address, display is %s, xauth is %s", + *display, *xauth); + + return ret; +} + static int parse_vnc_address(const char *id, char **ip, char **port) @@ -1163,6 +1209,30 @@ msg = "GraphicsRASD field Address not valid"; goto out; } + } + else if (STREQC(dev->dev.graphics.type, "sdl")) { + if (cu_get_str_prop(inst, "Address", &val) != CMPI_RC_OK) { + CU_DEBUG("sdl graphics Address empty, using default"); + dev->dev.graphics.dev.sdl.display = NULL; + dev->dev.graphics.dev.sdl.xauth = NULL; + } + else { + ret = parse_sdl_address(val, + &dev->dev.graphics.dev.sdl.display, + &dev->dev.graphics.dev.sdl.xauth); + if (ret != 1) { + msg = "GraphicsRASD sdl Address not valid"; + goto out; + } + } + dev->dev.graphics.dev.sdl.fullscreen = NULL; + if (cu_get_bool_prop(inst, "IsIPV6Only", &ipv6) == + CMPI_RC_OK) { + if (ipv6) + dev->dev.graphics.dev.sdl.fullscreen = strdup("yes"); + else + dev->dev.graphics.dev.sdl.fullscreen = strdup("no"); + } } else { CU_DEBUG("Unsupported graphics type %s", dev->dev.graphics.type); @@ -1171,7 +1241,8 @@ } free(dev->id); - if (STREQC(dev->dev.graphics.type, "vnc")) + if ((STREQC(dev->dev.graphics.type, "vnc"))|| + (STREQC(dev->dev.graphics.type, "sdl"))) ret = asprintf(&dev->id, "%s", dev->dev.graphics.type); else ret = asprintf(&dev->id, "%s:%s",

3 2

Is virStoragePoolRefresh() synchronous or asynchronous?
by Gareth S Bestor 12 Aug '11

12 Aug '11

Basically, when you call virStoragePoolRefresh(), eg to pickup any new disks that may have just been created under the pool path, when the API returns are you guaranteed that the refresh operation is completed, or might the pool still be refreshing itself? I ask because I understand this refresh operation can be 'expensive', so I'm wondering if in fact things may still be going on in the background after the API returns... - Gareth Dr. Gareth S. Bestor IBM Senior Software Engineer Systems & Technology Group - Systems Management Standards 971-285-6375 (mobile) bestor(a)us.ibm.com

3 2

[PATCH] VirtualSystemManagementService: Fixing potential null dereferences and leaks
by Eduardo Lima (Etrunko) 12 Aug '11

12 Aug '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1312918075 10800 # Node ID 8759e60c17c42101118f914215d071138340c70f # Parent 0291fb05e93a0cbcbf2b80c894a47d58f7c37d23 VirtualSystemManagementService: Fixing potential null dereferences and leaks As reported in https://bugzilla.redhat.com/show_bug.cgi?id=728245 line 1048 - Comparing "path" to null implies that "path" might be null. line 1057 - Dereferencing null variable "path". line 1088 - Comparing "port" to null implies that "port" might be null. line 1094 - Dereferencing null variable "port". Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -1054,8 +1054,12 @@ ret = 1; out: - CU_DEBUG("Exiting parse_console_address, ip is %s, port is %s", - *path, *port); + free(tmp_path); + free(tmp_port); + + if (path && port) + CU_DEBUG("Exiting parse_console_address, ip is %s, port is %s", + *path, *port); return ret; } @@ -1091,8 +1095,12 @@ ret = 1; out: - CU_DEBUG("Exiting parse_vnc_address, ip is %s, port is %s", - *ip, *port); + free(tmp_ip); + free(tmp_port); + + if (ip && port) + CU_DEBUG("Exiting parse_vnc_address, ip is %s, port is %s", + *ip, *port); return ret; }

3 2

[PATCH 0 of 2] Add SDL frame buffer support in libvirt-cim, V4
by Wayne Xia 11 Aug '11

11 Aug '11

these patches would add support of SDL frame buffer configuration.

2 5

Network-pool seems not conform to profile
by Wayne Xia 11 Aug '11

11 Aug '11

By executing following command: wbemcli -nl ei http://root:123456@localhost:5988/root/virt:KVM_NetworkPool There would be 2 network pool, NetworkPool/default and NetworkPool/0. I think NetworkPool/0 is OK, which represent the primordial pool for network device, but NetworkPool/default should not be there, because it comes from the calling of the libvirt's API which returns the existing logical network device on the host, not the network pool. Another issue is that, it seems now libvirt-cim supports the creation of NetworkPool as a child, but the libvirt now does not support that. So I think this function should be removed, otherwise we need extra files to record the organization of the network pools. -- Best Regards Wayne Xia mail:xiawenc@linux.vnet.ibm.com tel:86-010-82450803

2 2

[PATCH] Check to see if stream is non-null before closing
by Sharad Mishra 11 Aug '11

11 Aug '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1312828809 25200 # Node ID 8b4f6d69f40904ced24f7948f04f89e770e37bce # Parent dd060dd8dbbd6c1d9a73de4dffa9fb2ab84d62b9 Check to see if stream is non-null before closing. Added a check to see if the stream is non-null before calling close. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r dd060dd8dbbd -r 8b4f6d69f409 src/Virt_SwitchService.c --- a/src/Virt_SwitchService.c Thu Aug 04 11:22:32 2011 -0400 +++ b/src/Virt_SwitchService.c Mon Aug 08 11:40:09 2011 -0700 @@ -91,7 +91,8 @@ "No VSI Support found"); out: - pclose(stream); + if (stream != NULL) + pclose(stream); return s; }

3 2

[PATCH] (#2) bugfix: KVM_MemResourceAllocationSettingData does not conform to profile
by Wayne Xia 10 Aug '11

10 Aug '11

# HG changeset patch # User Wayne Xia <xiawenc(a)linux.vnet.ibm.com> # Date 1311231387 -28800 # Node ID d4002b23fffc97fd358811d551abbce28659839b # Parent dd060dd8dbbd6c1d9a73de4dffa9fb2ab84d62b9 (#2) bugfix: KVM_MemResourceAllocationSettingData does not conform to profile According to the discuss and profile, the reserved property means the memory actually allocated to support the VM running, and the unit should be byte*2^10. This patch added some code to retrieve VM's state, and the report the memory status according to that. #2 removed the unit changing to avoid impacting to existing user case. Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com> diff -r dd060dd8dbbd -r d4002b23fffc libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Thu Aug 04 11:22:32 2011 -0400 +++ b/libxkutil/device_parsing.c Thu Jul 21 14:56:27 2011 +0800 @@ -801,6 +801,7 @@ } else if (dev->type == CIM_RES_TYPE_MEM) { dev->dev.mem.size = _dev->dev.mem.size; dev->dev.mem.maxsize = _dev->dev.mem.maxsize; + dev->dev.mem.reserved = _dev->dev.mem.reserved; } else if (dev->type == CIM_RES_TYPE_PROC) { dev->dev.vcpu.quantity = _dev->dev.vcpu.quantity; } else if (dev->type == CIM_RES_TYPE_EMU) { @@ -895,8 +896,22 @@ if (xml == NULL) return 0; - if (type == CIM_RES_TYPE_MEM) + if (type == CIM_RES_TYPE_MEM) { ret = _get_mem_device(xml, list); + if (*list != NULL) { + virDomainInfo dom_info; + if (virDomainGetInfo(dom, &dom_info) == 0) { + (*list)->dev.mem.reserved = dom_info.memory; + if (dom_info.state == 5) { /* VM not active */ + (*list)->dev.mem.reserved = 0; + } + } + else { + CU_DEBUG("failed to get dom state for mem"); + ret = -1; + } + } + } else if (type == CIM_RES_TYPE_PROC) ret = _get_proc_device(xml, list); else diff -r dd060dd8dbbd -r d4002b23fffc libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Thu Aug 04 11:22:32 2011 -0400 +++ b/libxkutil/device_parsing.h Thu Jul 21 14:56:27 2011 +0800 @@ -72,6 +72,7 @@ struct mem_device { uint64_t size; uint64_t maxsize; + uint64_t reserved; }; struct vcpu_device { diff -r dd060dd8dbbd -r d4002b23fffc src/Virt_RASD.c --- a/src/Virt_RASD.c Thu Aug 04 11:22:32 2011 -0400 +++ b/src/Virt_RASD.c Thu Jul 21 14:56:27 2011 +0800 @@ -633,7 +633,7 @@ CMSetProperty(inst, "VirtualQuantity", (CMPIValue *)&dev->dev.mem.size, CMPI_uint64); CMSetProperty(inst, "Reservation", - (CMPIValue *)&dev->dev.mem.size, CMPI_uint64); + (CMPIValue *)&dev->dev.mem.reserved, CMPI_uint64); CMSetProperty(inst, "Limit", (CMPIValue *)&dev->dev.mem.maxsize, CMPI_uint64); } else if (dev->type == CIM_RES_TYPE_PROC) {

1 0

[PATCH] bug fix: KVM_MemResourceAllocationSettingData does not conform to profile
by Wayne Xia 08 Aug '11

08 Aug '11

# HG changeset patch # User Wayne Xia <xiawenc(a)linux.vnet.ibm.com> # Date 1311231387 -28800 # Node ID 677867c3d2a16a97591bde2828808f9f39b859a7 # Parent 3c90a88a5199a4ed931a4a76097cff8f55deae41 changed a bit to make it conform to CIM profile According to the discuss and profile, the reserved property means the memory actually allocated to support the VM running, and the unit should be byte*2^10. This patch added some code to retrieve VM's state, and the report the memory status according to that. https://bugzilla.linux.ibm.com/show_bug.cgi?id=72759 Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com> diff -r 3c90a88a5199 -r 677867c3d2a1 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Mon Jul 18 11:13:40 2011 -0300 +++ b/libxkutil/device_parsing.c Thu Jul 21 14:56:27 2011 +0800 @@ -792,6 +792,7 @@ } else if (dev->type == CIM_RES_TYPE_MEM) { dev->dev.mem.size = _dev->dev.mem.size; dev->dev.mem.maxsize = _dev->dev.mem.maxsize; + dev->dev.mem.reserved = _dev->dev.mem.reserved; } else if (dev->type == CIM_RES_TYPE_PROC) { dev->dev.vcpu.quantity = _dev->dev.vcpu.quantity; } else if (dev->type == CIM_RES_TYPE_EMU) { @@ -885,8 +886,22 @@ if (xml == NULL) return 0; - if (type == CIM_RES_TYPE_MEM) + if (type == CIM_RES_TYPE_MEM) { ret = _get_mem_device(xml, list); + if (*list != NULL) { + virDomainInfo dom_info; + if (virDomainGetInfo(dom, &dom_info) == 0) { + (*list)->dev.mem.reserved = dom_info.memory; + if (dom_info.state == 5) { /* VM not active */ + (*list)->dev.mem.reserved = 0; + } + } + else { + CU_DEBUG("failed to get dom state for mem"); + ret = -1; + } + } + } else if (type == CIM_RES_TYPE_PROC) ret = _get_proc_device(xml, list); else diff -r 3c90a88a5199 -r 677867c3d2a1 libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Mon Jul 18 11:13:40 2011 -0300 +++ b/libxkutil/device_parsing.h Thu Jul 21 14:56:27 2011 +0800 @@ -71,6 +71,7 @@ struct mem_device { uint64_t size; uint64_t maxsize; + uint64_t reserved; }; struct vcpu_device { diff -r 3c90a88a5199 -r 677867c3d2a1 src/Virt_RASD.c --- a/src/Virt_RASD.c Mon Jul 18 11:13:40 2011 -0300 +++ b/src/Virt_RASD.c Thu Jul 21 14:56:27 2011 +0800 @@ -576,14 +576,14 @@ inst); } else if (dev->type == CIM_RES_TYPE_MEM) { - const char *units = "KiloBytes"; + const char *units = "byte*2^10"; CMSetProperty(inst, "AllocationUnits", (CMPIValue *)units, CMPI_chars); CMSetProperty(inst, "VirtualQuantity", (CMPIValue *)&dev->dev.mem.size, CMPI_uint64); CMSetProperty(inst, "Reservation", - (CMPIValue *)&dev->dev.mem.size, CMPI_uint64); + (CMPIValue *)&dev->dev.mem.reserved, CMPI_uint64); CMSetProperty(inst, "Limit", (CMPIValue *)&dev->dev.mem.maxsize, CMPI_uint64); } else if (dev->type == CIM_RES_TYPE_PROC) {

3 5

[PATCH] Retrun object paths for newly created filter associations
by Chip Vincent 04 Aug '11

04 Aug '11

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1312471352 14400 # Node ID 43d8048faffd40edd88ec339b7e615ff48a70b6a # Parent 5dc300d4dfd7b9741a6086e4e5b8da632bcdcd2d Retrun object paths for newly created filter associations. Fix to return the resulting new association object path at the end CreateInstance for Nested and AppliedFilterList. This is simply passing back the object path that was passed to the provider if there are no failures during the creation process. Signed-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff --git a/src/Virt_AppliedFilterList.c b/src/Virt_AppliedFilterList.c --- a/src/Virt_AppliedFilterList.c +++ b/src/Virt_AppliedFilterList.c @@ -508,6 +508,7 @@ goto out; } + CMReturnObjectPath(results, reference); CU_DEBUG("CreateInstance complete"); out: diff --git a/src/Virt_NestedFilterList.c b/src/Virt_NestedFilterList.c --- a/src/Virt_NestedFilterList.c +++ b/src/Virt_NestedFilterList.c @@ -386,6 +386,7 @@ goto out; } + CMReturnObjectPath(results, reference); CU_DEBUG("CreateInstance completed"); out:

1 0

[PATCH] New entry "poolid" was not getting DUPed
by Sharad Mishra 03 Aug '11

03 Aug '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1311797923 25200 # Node ID 5dc300d4dfd7b9741a6086e4e5b8da632bcdcd2d # Parent 0f42cab9c45c53cc13407b16418399ed8ed4a026 New entry "poolid" was not getting DUPed. A recent patch added support for network poolid, but missed to add DUP for it. This patch fixes the issue. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 0f42cab9c45c -r 5dc300d4dfd7 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Mon Jul 25 13:14:22 2011 -0700 +++ b/libxkutil/device_parsing.c Wed Jul 27 13:18:43 2011 -0700 @@ -775,6 +775,7 @@ DUP_FIELD(dev, _dev, dev.net.type); DUP_FIELD(dev, _dev, dev.net.source); DUP_FIELD(dev, _dev, dev.net.model); + DUP_FIELD(dev, _dev, dev.net.poolid); DUP_FIELD(dev, _dev, dev.net.device); DUP_FIELD(dev, _dev, dev.net.net_mode); DUP_FIELD(dev, _dev, dev.net.filter_ref);

3 2

[PATCH] [TEST] Reduce the length of bridge name
by Sharad Mishra 03 Aug '11

03 Aug '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1311878184 25200 # Node ID 8c23ed99a218f1d1eea5c662b2fa3c211fe6d531 # Parent 3bc1a0fc5683d705c022014364cacf6d5860ba28 [TEST] Reduce the length of bridge name. Lately I have seen this (VirtualSystemManagementService - 06_addresource.py) test fails with following error - # virsh -c qemu:///system net-create /home/net.xml error: Failed to create network from /home/net.xml error: cannot create dummy tap device 'testbridge55-nic' to set mac address on bridge 'testbridge55': Invalid argument Reducing the size of bridge name fixed this issue. I looked on the net but could not find more info on when this behaviour changed in libvirt. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 3bc1a0fc5683 -r 8c23ed99a218 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Tue Jul 12 16:02:27 2011 -0300 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Thu Jul 28 11:36:24 2011 -0700 @@ -58,7 +58,7 @@ # vxml.NetXML -default_bridge_name = 'testbridge' +default_bridge_name = 'testbr' default_network_name = 'cimtest-networkpool' default_net_type = 'network'

2 1

[PATCH] [TEST] Update RASDIndication test to use "vnc" instead of "graphics"
by Sharad Mishra 03 Aug '11

03 Aug '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1311864875 25200 # Node ID 3c23103a2ca19d6cf66d84a7d87f4dd93e2d609f # Parent 3bc1a0fc5683d705c022014364cacf6d5860ba28 [TEST] Update RASDIndication test to use "vnc" instead of "graphics" Graphics RASDs now include support for serial/consoel devices, which includes support for unqiue InstanceIDs. This patch updates the test to look for <vm_name>/vnc where is used to just look for graphics Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 3bc1a0fc5683 -r 3c23103a2ca1 suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py --- a/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py Tue Jul 12 16:02:27 2011 -0300 +++ b/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py Thu Jul 28 07:54:35 2011 -0700 @@ -108,7 +108,7 @@ elif ind_name == 'delete': cn = 'GraphicsResourceAllocationSettingData' - inst_id = '%s/%s' % (test_dom, "graphics") + inst_id = '%s/%s' % (test_dom, "vnc") classname = get_typed_class(virt, cn) nrasd = get_rasd_rec(virt, cn, s_sysname, inst_id)

3 2