- CIM - libvirt List Archives

[PATCH 0 of 7] (#3) libcmpiutil: "Cosmetics"
by Eduardo Lima (Etrunko) 20 May '11

20 May '11

Third version of the series, this time with two new patches: 6/7: Removes exec permission from source code files. 7/7: Shuts up automake by defining LEX_OUTPUT_ROOT in configure.ac instead of Makefile.am. Best regards, -- Eduardo de Barros Lima Software Engineer, Open Virtualization Linux Technology Center - IBM/Brazil eblima(a)br.ibm.com

2 16

[PATCH] Fix for VirtualSystemManagementService/13_refconfig_additional_devs.py
by Chip Vincent 20 May '11

20 May '11

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1305746372 14400 # Node ID 7432d45a1fae6ef499f53a36e24b66df29bcf7f9 # Parent 90f8c9f2388e0563baa311c84024ca41a61e1890 Fix for VirtualSystemManagementService/13_refconfig_additional_devs.py The cimtest case was failing because libvirt-cim improperly processed graphics devices present in the ReferenceClass parameter in DefineSystem. Rather than overrdiing them, it was appending them. With this patch, the test case now passes and the debug log shows the following correct messages. Virt_VirtualSystemManagementService.c(1184): graphics = vnc Virt_VirtualSystemManagementService.c(1326): Overriding device vnc from refconf Signed-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c +++ b/src/Virt_VirtualSystemManagementService.c @@ -1162,17 +1162,26 @@ msg = "GraphicsRASD field Address not valid"; goto out; } - } else { + } else { CU_DEBUG("Unsupported graphics type %s", dev->dev.graphics.type); msg = "Unsupported graphics type"; goto out; - } - - CU_DEBUG("graphics = %s:%s:%s", - dev->dev.graphics.type, - dev->dev.graphics.host, - dev->dev.graphics.port); + } + + free(dev->id); + if (STREQC(dev->dev.graphics.type, "vnc")) + ret = asprintf(&dev->id, "%s", dev->dev.graphics.type); + else + ret = asprintf(&dev->id, "%s:%s", + dev->dev.graphics.type, dev->dev.graphics.port); + + if (ret == -1) { + msg = "Failed to create graphics is string"; + goto out; + } + + CU_DEBUG("graphics = %s", dev->id); out: return msg; @@ -1313,9 +1322,6 @@ "DiskResourceAllocationSettingData in a single " "guest"; - if (dev->type == CIM_RES_TYPE_GRAPHICS) - continue; - if (STREQC(ptr->id, dev->id)) { CU_DEBUG("Overriding device %s from refconf", ptr->id); cleanup_virt_device(ptr); @@ -1425,7 +1431,7 @@ &domain->dev_net_ct); } else if (type == CIM_RES_TYPE_GRAPHICS) { struct virt_device dev; - int ncount = count + domain->dev_graphics_ct; + int gcount = count + domain->dev_graphics_ct; memset(&dev, 0, sizeof(dev)); msg = rasd_to_vdev(inst, @@ -1435,7 +1441,7 @@ if (msg == NULL) msg = add_device_nodup(&dev, domain->dev_graphics, - ncount, + gcount, &domain->dev_graphics_ct); } else if (type == CIM_RES_TYPE_INPUT) { domain->dev_input_ct = 1;

2 1

[PATCH] [TEST] Update Graphics RASD tests to handle new InstanceIDs
by Chip Vincent 20 May '11

20 May '11

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1305740945 14400 # Node ID d6951b8799a80d0e5b3639b6f75da405c32a9a77 # Parent 4c8e0c673d796ae7a5e17ee771d935e449b77bce [TEST] Update Graphics RASD tests to handle new InstanceIDs 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. NOTE: VirtualSystemManagementService/13_refconfig_additional_devs.py fails due to a problem in libvirt-cim. Seperate patch to follow shortly. Signed-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff --git a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py @@ -147,7 +147,7 @@ curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) if curr_cim_rev >= input_graphics_pool_rev: keys['InputResourceAllocationSettingData'] = input_device - keys['GraphicsResourceAllocationSettingData'] = "%s/graphics" % test_dom + keys['GraphicsResourceAllocationSettingData'] = "%s/vnc" % test_dom ret = cxml.cim_define(options.ip) if not ret: diff --git a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py @@ -144,7 +144,7 @@ display = { 'SystemName' : test_dom, 'CreationClassName' : display_inst, - 'DeviceID' : "%s/%s" % (test_dom, "graphics"), + 'DeviceID' : "%s/%s" % (test_dom, "vnc"), } point = { diff --git a/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py b/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py --- a/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py +++ b/suites/libvirt-cim/cimtest/KVMRedirectionSAP/02_ipv6_support.py @@ -92,7 +92,7 @@ if not ret: raise Exception("Failed to define the dom: %s" % test_dom) - devid = "%s/%s" % (test_dom, 'graphics') + devid = "%s/%s" % (test_dom, 'vnc') vnc = get_typed_class(virt, "DisplayController") key_list = { 'DeviceID' : devid, 'CreationClassName' : vnc, diff --git a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py @@ -118,7 +118,7 @@ curr_cim_rev, changeset = get_provider_version(virt, server) if curr_cim_rev >= input_graphics_pool_rev: graphics_cn = get_typed_class(virt, "DisplayController") - exp_pllist[graphics_cn] = ['%s/graphics' % test_dom] + exp_pllist[graphics_cn] = ['%s/vnc' % test_dom] try: diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py @@ -49,7 +49,7 @@ classname, len(rasd_list)) return FAIL - inst_id = "%s/graphics" % default_dom + inst_id = "%s/vnc" % default_dom for rasd in rasd_list: # Verify the Password for the domain is set if rasd['InstanceID'] == inst_id: diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py @@ -100,7 +100,7 @@ rlist.append(input) rlist.append(graphics) prop_list[input] = "%s/%s" % (test_dom, input_device) - prop_list[graphics] = "%s/%s" % (test_dom, "graphics") + prop_list[graphics] = "%s/%s" % (test_dom, "vnc") if virt == 'LXC': prop_list = {rlist[1] : "%s/%s" % (test_dom, "mem")} diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py @@ -95,7 +95,7 @@ "disk_rasd" : '%s/%s' %(test_dom, test_disk), "mem_rasd" : '%s/%s' %(test_dom, "mem"), "input_rasd": '%s/%s' %(test_dom, input_device), - "grap_rasd" : '%s/%s' %(test_dom, "graphics") + "grap_rasd" : '%s/%s' %(test_dom, "vnc") } diff --git a/suites/libvirt-cim/lib/XenKvmLib/rasd.py b/suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py @@ -110,7 +110,7 @@ "VirtualQuantity" : (t_mem * 1024), }, dc_cn : { - "InstanceID" : "%s/%s" %(t_dom, "graphics") + "InstanceID" : "%s/%s" %(t_dom, "vnc") }, pd_cn : { "InstanceID" : point_device

2 1

[PATCH] (#3) Fix connection leaks
by Sharad Mishra 19 May '11

19 May '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1305736505 25200 # Node ID 846303186ec24f6d514a76224dd3ba921232ba52 # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 (#3) Fix connection leaks. libvirt-cim had few connection leaks which were causing it to crash. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> #2 - cimtest showed another leak, which was fixed in this version. #3 - Review comments to move and rename dom2 - virDomainPtr to _dom. Move virConnectClose during migration to migrate_do. diff -r 8b428df21c36 -r 846303186ec2 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/pool_parsing.c Wed May 18 09:35:05 2011 -0700 @@ -453,6 +453,7 @@ CU_DEBUG("Unable to refresh storage " "pool"); } + virStoragePoolFree(pool_ptr); ret = 1; } diff -r 8b428df21c36 -r 846303186ec2 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_AllocationCapabilities.c Wed May 18 09:35:05 2011 -0700 @@ -79,7 +79,6 @@ const char *id, struct inst_list *list) { - virConnectPtr conn = NULL; CMPIInstance *alloc_cap_inst; struct inst_list device_pool_list; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -91,15 +90,6 @@ if (!provider_is_responsible(broker, ref, &s)) goto out; - conn = connect_by_classname(broker, CLASSNAME(ref), &s); - if (conn == NULL) { - if (id) - cu_statusf(broker, &s, - CMPI_RC_ERR_NOT_FOUND, - "Instance not found."); - goto out; - } - s = enum_pools(broker, ref, CIM_RES_TYPE_ALL, &device_pool_list); if (s.rc != CMPI_RC_OK) { cu_statusf(broker, &s, @@ -141,7 +131,6 @@ } out: - virConnectClose(conn); inst_list_free(&device_pool_list); return s; diff -r 8b428df21c36 -r 846303186ec2 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_ComputerSystem.c Wed May 18 09:35:05 2011 -0700 @@ -907,6 +907,7 @@ { int ret; virConnectPtr conn = NULL; + virDomainPtr _dom = NULL; char *xml = NULL; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -938,12 +939,12 @@ goto out; } - dom = virDomainLookupByName(conn, + _dom = virDomainLookupByName(conn, virDomainGetName(dom)); - if (dom == NULL) { - dom = virDomainDefineXML(conn, xml); - if (dom == NULL) { + if (_dom == NULL) { + _dom = virDomainDefineXML(conn, xml); + if (_dom == NULL) { CU_DEBUG("Failed to define domain from XML"); virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -953,10 +954,10 @@ } } - if (!domain_online(dom)) + if (!domain_online(_dom)) CU_DEBUG("Guest is now offline"); - ret = virDomainCreate(dom); + ret = virDomainCreate(_dom); if (ret != 0) virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -965,6 +966,7 @@ out: free(xml); + virDomainFree(_dom); return s; } diff -r 8b428df21c36 -r 846303186ec2 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_ComputerSystemIndication.c Wed May 18 09:35:05 2011 -0700 @@ -422,7 +422,6 @@ } static bool async_ind(CMPIContext *context, - virConnectPtr conn, int ind_type, struct dom_xml prev_dom, char *prefix, @@ -557,7 +556,7 @@ for (i = 0; i < cur_count; i++) { res = dom_in_list(cur_xml[i].uuid, prev_count, prev_xml); if (!res) - async_ind(context, conn, CS_CREATED, + async_ind(context, CS_CREATED, cur_xml[i], prefix, args); } @@ -565,14 +564,14 @@ for (i = 0; i < prev_count; i++) { res = dom_in_list(prev_xml[i].uuid, cur_count, cur_xml); if (!res) - async_ind(context, conn, CS_DELETED, + async_ind(context, CS_DELETED, prev_xml[i], prefix, args); } for (i = 0; i < prev_count; i++) { res = dom_changed(prev_xml[i], cur_xml, cur_count); if (res) { - async_ind(context, conn, CS_MODIFIED, + async_ind(context, CS_MODIFIED, prev_xml[i], prefix, args); } diff -r 8b428df21c36 -r 846303186ec2 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_DevicePool.c Wed May 18 09:35:05 2011 -0700 @@ -451,8 +451,8 @@ free(host); free(dev); + virDomainFree(dom); virConnectClose(conn); - virDomainFree(dom); return pool; } diff -r 8b428df21c36 -r 846303186ec2 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VSMigrationService.c Wed May 18 09:35:05 2011 -0700 @@ -1294,7 +1294,6 @@ "Completed"); raise_deleted_ind(job); - virConnectClose(job->conn); free(job->domain); free(job->ref_cn); free(job->ref_ns); @@ -1511,6 +1510,7 @@ out: CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32); + virConnectClose(job->conn); return s; }

2 1

[PATCH] (#2) Fix connection leaks
by Sharad Mishra 19 May '11

19 May '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1305650840 25200 # Node ID e780814a3ab17bd84c0f69dfb2fa0a4f5bc8efab # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 (#2) Fix connection leaks. libvirt-cim had few connection leaks which were causing it to crash. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> #2 - cimtest showed another leak, which was fixed in this version. diff -r 8b428df21c36 -r e780814a3ab1 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/pool_parsing.c Tue May 17 09:47:20 2011 -0700 @@ -453,6 +453,7 @@ CU_DEBUG("Unable to refresh storage " "pool"); } + virStoragePoolFree(pool_ptr); ret = 1; } diff -r 8b428df21c36 -r e780814a3ab1 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_AllocationCapabilities.c Tue May 17 09:47:20 2011 -0700 @@ -79,7 +79,6 @@ const char *id, struct inst_list *list) { - virConnectPtr conn = NULL; CMPIInstance *alloc_cap_inst; struct inst_list device_pool_list; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -91,15 +90,6 @@ if (!provider_is_responsible(broker, ref, &s)) goto out; - conn = connect_by_classname(broker, CLASSNAME(ref), &s); - if (conn == NULL) { - if (id) - cu_statusf(broker, &s, - CMPI_RC_ERR_NOT_FOUND, - "Instance not found."); - goto out; - } - s = enum_pools(broker, ref, CIM_RES_TYPE_ALL, &device_pool_list); if (s.rc != CMPI_RC_OK) { cu_statusf(broker, &s, @@ -141,7 +131,6 @@ } out: - virConnectClose(conn); inst_list_free(&device_pool_list); return s; diff -r 8b428df21c36 -r e780814a3ab1 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_ComputerSystem.c Tue May 17 09:47:20 2011 -0700 @@ -938,12 +938,12 @@ goto out; } - dom = virDomainLookupByName(conn, + virDomainPtr dom2 = virDomainLookupByName(conn, virDomainGetName(dom)); - if (dom == NULL) { - dom = virDomainDefineXML(conn, xml); - if (dom == NULL) { + if (dom2 == NULL) { + dom2 = virDomainDefineXML(conn, xml); + if (dom2 == NULL) { CU_DEBUG("Failed to define domain from XML"); virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -953,10 +953,10 @@ } } - if (!domain_online(dom)) + if (!domain_online(dom2)) CU_DEBUG("Guest is now offline"); - ret = virDomainCreate(dom); + ret = virDomainCreate(dom2); if (ret != 0) virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -965,6 +965,7 @@ out: free(xml); + virDomainFree(dom2); return s; } diff -r 8b428df21c36 -r e780814a3ab1 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_ComputerSystemIndication.c Tue May 17 09:47:20 2011 -0700 @@ -422,7 +422,6 @@ } static bool async_ind(CMPIContext *context, - virConnectPtr conn, int ind_type, struct dom_xml prev_dom, char *prefix, @@ -557,7 +556,7 @@ for (i = 0; i < cur_count; i++) { res = dom_in_list(cur_xml[i].uuid, prev_count, prev_xml); if (!res) - async_ind(context, conn, CS_CREATED, + async_ind(context, CS_CREATED, cur_xml[i], prefix, args); } @@ -565,14 +564,14 @@ for (i = 0; i < prev_count; i++) { res = dom_in_list(prev_xml[i].uuid, cur_count, cur_xml); if (!res) - async_ind(context, conn, CS_DELETED, + async_ind(context, CS_DELETED, prev_xml[i], prefix, args); } for (i = 0; i < prev_count; i++) { res = dom_changed(prev_xml[i], cur_xml, cur_count); if (res) { - async_ind(context, conn, CS_MODIFIED, + async_ind(context, CS_MODIFIED, prev_xml[i], prefix, args); } diff -r 8b428df21c36 -r e780814a3ab1 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_DevicePool.c Tue May 17 09:47:20 2011 -0700 @@ -451,8 +451,8 @@ free(host); free(dev); + virDomainFree(dom); virConnectClose(conn); - virDomainFree(dom); return pool; } diff -r 8b428df21c36 -r e780814a3ab1 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VSMigrationService.c Tue May 17 09:47:20 2011 -0700 @@ -1511,6 +1511,7 @@ out: CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32); + virConnectClose(job->conn); return s; }

2 1

[PATCH] Ensure graphics devices have unique IDs
by Chip Vincent 18 May '11

18 May '11

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1305131981 14400 # Node ID 90f8c9f2388e0563baa311c84024ca41a61e1890 # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 Ensure graphics devices have unique IDs Now that multiple graphics device types are supported, it important that they have unique names that are consistent over time. This patch updates the graphics->id to replace 'graphics' with <graphics_type> for vnc and <graphics_type>:<port> for serial/console. The port is ommitted from vnc connections because it changes when VM started if autoport is enabled and only one connection is currently supported. The source path is ommitted from serial/console connections because it is present only when the VM is running. Since libvirt limits the number of serial/console pty resources and ensures they have unique ports, the source path is not necessary to ensure consistent unique names. Examples of new graphics id format: InstanceID="test_domain/serial:0" InstanceID="test_domain/serial:1" InstanceID="test_domain/console:0" InstanceID="test_domain/vnc" Signed-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff --git a/libxkutil/device_parsing.c b/libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c +++ b/libxkutil/device_parsing.c @@ -503,6 +503,7 @@ struct virt_device *vdev = NULL; struct graphics_device *gdev = NULL; xmlNode *child = NULL; + int ret; vdev = calloc(1, sizeof(*vdev)); if (vdev == NULL) @@ -547,14 +548,16 @@ } vdev->type = CIM_RES_TYPE_GRAPHICS; - vdev->id = strdup("graphics"); + + if (STREQC(gdev->type, "vnc")) + ret = asprintf(&vdev->id, "%s", gdev->type); + else + ret = asprintf(&vdev->id, "%s:%s", gdev->type, gdev->port); - /* FIXME: IDs should be unique, but that breaks existing tests. - ret = asprintf(&vdev->id, "graphics:%s", gdev->type); - if(ret == -1) { + if (ret == -1) { CU_DEBUG("Failed to create graphics is string"); goto err; - } */ + } *vdevs = vdev;

2 3

[PATCH] Fix connection leaks
by Sharad Mishra 17 May '11

17 May '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1305298464 25200 # Node ID d0ccdb5447c796123c0175873c6d108a77dc1e39 # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 Fix connection leaks. libvirt-cim had few connection leaks which were causing it to crash. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 8b428df21c36 -r d0ccdb5447c7 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/pool_parsing.c Fri May 13 07:54:24 2011 -0700 @@ -453,6 +453,7 @@ CU_DEBUG("Unable to refresh storage " "pool"); } + virStoragePoolFree(pool_ptr); ret = 1; } diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_AllocationCapabilities.c Fri May 13 07:54:24 2011 -0700 @@ -79,7 +79,6 @@ const char *id, struct inst_list *list) { - virConnectPtr conn = NULL; CMPIInstance *alloc_cap_inst; struct inst_list device_pool_list; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -91,15 +90,6 @@ if (!provider_is_responsible(broker, ref, &s)) goto out; - conn = connect_by_classname(broker, CLASSNAME(ref), &s); - if (conn == NULL) { - if (id) - cu_statusf(broker, &s, - CMPI_RC_ERR_NOT_FOUND, - "Instance not found."); - goto out; - } - s = enum_pools(broker, ref, CIM_RES_TYPE_ALL, &device_pool_list); if (s.rc != CMPI_RC_OK) { cu_statusf(broker, &s, @@ -141,7 +131,6 @@ } out: - virConnectClose(conn); inst_list_free(&device_pool_list); return s; diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_ComputerSystem.c Fri May 13 07:54:24 2011 -0700 @@ -938,12 +938,12 @@ goto out; } - dom = virDomainLookupByName(conn, + virDomainPtr dom2 = virDomainLookupByName(conn, virDomainGetName(dom)); - if (dom == NULL) { - dom = virDomainDefineXML(conn, xml); - if (dom == NULL) { + if (dom2 == NULL) { + dom2 = virDomainDefineXML(conn, xml); + if (dom2 == NULL) { CU_DEBUG("Failed to define domain from XML"); virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -953,10 +953,10 @@ } } - if (!domain_online(dom)) + if (!domain_online(dom2)) CU_DEBUG("Guest is now offline"); - ret = virDomainCreate(dom); + ret = virDomainCreate(dom2); if (ret != 0) virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -965,6 +965,8 @@ out: free(xml); + virDomainFree(dom2); + virConnectClose(conn); return s; } diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_ComputerSystemIndication.c Fri May 13 07:54:24 2011 -0700 @@ -422,7 +422,6 @@ } static bool async_ind(CMPIContext *context, - virConnectPtr conn, int ind_type, struct dom_xml prev_dom, char *prefix, @@ -557,7 +556,7 @@ for (i = 0; i < cur_count; i++) { res = dom_in_list(cur_xml[i].uuid, prev_count, prev_xml); if (!res) - async_ind(context, conn, CS_CREATED, + async_ind(context, CS_CREATED, cur_xml[i], prefix, args); } @@ -565,14 +564,14 @@ for (i = 0; i < prev_count; i++) { res = dom_in_list(prev_xml[i].uuid, cur_count, cur_xml); if (!res) - async_ind(context, conn, CS_DELETED, + async_ind(context, CS_DELETED, prev_xml[i], prefix, args); } for (i = 0; i < prev_count; i++) { res = dom_changed(prev_xml[i], cur_xml, cur_count); if (res) { - async_ind(context, conn, CS_MODIFIED, + async_ind(context, CS_MODIFIED, prev_xml[i], prefix, args); } diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_DevicePool.c Fri May 13 07:54:24 2011 -0700 @@ -451,8 +451,8 @@ free(host); free(dev); + virDomainFree(dom); virConnectClose(conn); - virDomainFree(dom); return pool; } diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VSMigrationService.c Fri May 13 07:54:24 2011 -0700 @@ -1511,6 +1511,7 @@ out: CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32); + virConnectClose(job->conn); return s; }

2 1

[PATCH 0 of 5] libcmpiutil: "Cosmetics"
by Eduardo Lima (Etrunko) 14 May '11

14 May '11

This is a series of simple, straightforward patches intended to cleanup the libcmpiutil source tree. Comments are welcome. Best regards, -- Eduardo de Barros Lima Software Engineer, Open Virtualization Linux Technology Center - IBM/Brazil eblima(a)br.ibm.com

1 6

[PATCH 0 of 5] (#2) libcmpiutil: "Cosmetics"
by Eduardo Lima (Etrunko) 14 May '11

14 May '11

Second version of the series. Nothing really changed, but the "Signed-off-by" in each patch. Best regards, -- Eduardo de Barros Lima Software Engineer, Open Virtualization Linux Technology Center - IBM/Brazil eblima(a)br.ibm.com

1 5

[PATCH] (#2) Configure: Check for libuuid
by Eduardo Lima (Etrunko) 14 May '11

14 May '11

2 3