- CIM - libvirt List Archives

[PATCH] Set PoolID for CIM_DiskResourceAllocationSettingData
by Sharad Mishra 20 Jul '11

20 Jul '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1311012637 25200 # Node ID d1f131ad4cf75263d8178ebb89ad9dada3997280 # Parent e8c1cdd5c9cbe887286ef169d8ff525cc9035485 Set PoolID for CIM_DiskResourceAllocationSettingData. PoolID wasn't getting set for DiskResourceAllocationSettingData. PoolID for DiskResourceAllocationSettingData is set by appending "DiskPool" to the Storage Pool name. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r e8c1cdd5c9cb -r d1f131ad4cf7 src/Virt_RASD.c --- a/src/Virt_RASD.c Sun Jul 17 12:37:31 2011 -0700 +++ b/src/Virt_RASD.c Mon Jul 18 11:10:37 2011 -0700 @@ -234,6 +234,7 @@ uint64_t cap = 0; uint16_t type; CMPIStatus s = {CMPI_RC_OK, NULL}; + char *poolid = NULL; get_vol_size(broker, ref, dev->dev.disk.source, &cap); @@ -253,6 +254,55 @@ (CMPIValue *)dev->dev.disk.source, CMPI_chars); + virConnectPtr conn = connect_by_classname(broker, CLASSNAME(ref), &s); + if (conn == NULL) { + virt_set_status(broker, &s, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Could not get connection to hypervisor"); + goto cont; + } + + virStorageVolPtr vol = virStorageVolLookupByPath(conn, + dev->dev.disk.source); + if (vol == NULL) { + virt_set_status(broker, &s, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Failed to get StorageVolPtr"); + goto cont; + } + + virStoragePoolPtr pool = virStoragePoolLookupByVolume(vol); + if (pool == NULL) { + virt_set_status(broker, &s, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Failed to get StoragePoolPtr"); + goto cont; + } + + char *pool_name = virStoragePoolGetName(pool); + if (pool_name == NULL) { + virt_set_status(broker, &s, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Failed to get Pool name for volume"); + goto cont; + } + + int ret = asprintf(&poolid, "DiskPool/%s", pool_name); + + if (ret == -1) { + CU_DEBUG("Failed to get disk poolid"); + goto cont; + } + + CMSetProperty(inst, + "PoolID", + (CMPIValue *)poolid, + CMPI_chars); + cont: CMSetProperty(inst, "BusType", (CMPIValue *)dev->dev.disk.bus_type,

2 2

[PATCH] Set PoolID for CIM_NetResourceAllocationSettingData
by Sharad Mishra 20 Jul '11

20 Jul '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1310931451 25200 # Node ID e8c1cdd5c9cbe887286ef169d8ff525cc9035485 # Parent 0563cf6502d4cd10418001d88c0c60b269370b3e Set PoolID for CIM_NetResourceAllocationSettingData. PoolID wasn't getting set for NETResourceAllocationSettingData. PoolID for NETResourceAllocationSettingData is set by appending "NetworkPool" to the network name. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 0563cf6502d4 -r e8c1cdd5c9cb libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Fri Jul 15 09:03:55 2011 -0700 +++ b/libxkutil/device_parsing.c Sun Jul 17 12:37:31 2011 -0700 @@ -372,8 +372,16 @@ if (ndev->source != NULL) continue; ndev->source = get_attr_value(child, "network"); - if (ndev->source != NULL) + if (ndev->source != NULL) { + int ret = asprintf(&ndev->poolid, + "NetworkPool/%s", + ndev->source); + if (ret == -1) { + CU_DEBUG("Failed to get network" + " poolid"); + } continue; + } ndev->source = get_attr_value(child, "dev"); ndev->net_mode = get_attr_value(child, "mode"); if ((ndev->source != NULL) && (ndev->net_mode != NULL)) diff -r 0563cf6502d4 -r e8c1cdd5c9cb libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Fri Jul 15 09:03:55 2011 -0700 +++ b/libxkutil/device_parsing.h Sun Jul 17 12:37:31 2011 -0700 @@ -61,6 +61,7 @@ char *type; char *mac; char *source; + char *poolid; char *model; char *device; char *net_mode; diff -r 0563cf6502d4 -r e8c1cdd5c9cb src/Virt_RASD.c --- a/src/Virt_RASD.c Fri Jul 15 09:03:55 2011 -0700 +++ b/src/Virt_RASD.c Sun Jul 17 12:37:31 2011 -0700 @@ -401,6 +401,12 @@ (CMPIValue *)dev->dev.net.model, CMPI_chars); + if (dev->dev.net.poolid != NULL) + CMSetProperty(inst, + "PoolID", + (CMPIValue *)dev->dev.net.poolid, + CMPI_chars); + return s; }

2 3

[PATCH v2 2/2] Add SDL graphic device support
by Wayne Xia 20 Jul '11

20 Jul '11

# HG changeset patch # User Wayne Xia <xiawenc(a)linux.vnet.ibm.com> # Date 1311161825 -28800 # Node ID 4c47a4b500e86abe2bb6461fdaaf2fe5d2e1d861 # Parent 0c52e4f6c421cc2e168197a82a9333d4ce369655 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 diff -r 0c52e4f6c421 -r 4c47a4b500e8 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Wed Jul 20 18:03:54 2011 +0800 +++ b/libxkutil/device_parsing.c Wed Jul 20 19:37:05 2011 +0800 @@ -530,6 +530,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 0c52e4f6c421 -r 4c47a4b500e8 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed Jul 20 18:03:54 2011 +0800 +++ b/libxkutil/xmlgen.c Wed Jul 20 19:37:05 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 0c52e4f6c421 -r 4c47a4b500e8 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Wed Jul 20 18:03:54 2011 +0800 +++ b/schema/ResourceAllocationSettingData.mof Wed Jul 20 19:37:05 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 0c52e4f6c421 -r 4c47a4b500e8 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Jul 20 18:03:54 2011 +0800 +++ b/src/Virt_VirtualSystemManagementService.c Wed Jul 20 19:37:05 2011 +0800 @@ -1059,6 +1059,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) @@ -1162,6 +1208,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); @@ -1170,7 +1240,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",

1 0

Patch(es) for Virt_SettingsDefineCapabilities: incorrect Default ValueRole, strstr() misuse
by Gareth S Bestor 19 Jul '11

19 Jul '11

Please find below a patch to Virt_SettingsDefineCapabilities.c to fix a couple issues I found: - 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. [Thnx Sharad for catching this] Please excuse the fact the patch is not in the correct format - I am still setting up my mercurial to correctly format and post patches, thnx. # User Dr. Gareth S. Bestor <bestor(a)us.ibm.com> # diff -r 395f2d684c10 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Jul 05 15:52:31 2011 -0300 +++ b/src/Virt_SettingsDefineCapabilities.c Mon Jul 18 04:11:35 2011 -0700 @@ -2054,20 +2188,21 @@ 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; - CMSetProperty(ref_inst, "ValueRole", (CMPIValue *)&valuerole, CMPI_uint16); CMSetProperty(ref_inst, "ValueRange", Dr. Gareth S. Bestor IBM Senior Software Engineer Systems & Technology Group - Systems Management Standards 971-285-6375 (mobile) bestor(a)us.ibm.com

1 0

[PATCH] libxkutil: Handle vnc password when retrieving domain XML
by Eduardo Lima (Etrunko) 19 Jul '11

19 Jul '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1310998420 10800 # Node ID 3c90a88a5199a4ed931a4a76097cff8f55deae41 # Parent 3ac0556ffdf12015839ebafe035547cea5b715f5 libxkutil: Handle vnc password when retrieving domain XML Whenever a call for ModifyResourceSettings was issued, the XML for the domain was requested, parsed, the property had its value changed and then XML was updated with the new value. It occurs that we need to specify the VIR_DOMAIN_XML_SECURE flag to retrieve full domain info, including sensitive fields, such as passwords. This patch fixes the problem for vnc password, which was not handled in the XML parsing code. 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 @@ -525,6 +525,7 @@ gdev->port = get_attr_value(node, "port"); gdev->host = get_attr_value(node, "listen"); gdev->keymap = get_attr_value(node, "keymap"); + gdev->passwd = get_attr_value(node, "passwd"); if (gdev->port == NULL || gdev->host == NULL) goto err; @@ -1127,7 +1128,7 @@ char *xml; int ret; int start; - xml = virDomainGetXMLDesc(dom, 0); + xml = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_SECURE); if (xml == NULL) return 0;

3 3

[PATCH] Add SDL graphic device support
by Wayne Xia 18 Jul '11

18 Jul '11

# HG changeset patch # User Wayne Xia <xiawenc(a)linux.vnet.ibm.com> # Date 1310271518 -28800 # Node ID ec5e5be04391afa9bab3b4a59bc5596a68a9f175 # Parent 395f2d684c1046455462db7e4e87d30e7aae0feb Add SDL graphic device support the options are described in ResourceAllocationSettingData.mof Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com> diff -r 395f2d684c10 -r ec5e5be04391 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Tue Jul 05 15:52:31 2011 -0300 +++ b/libxkutil/device_parsing.c Sun Jul 10 12:18:38 2011 +0800 @@ -90,11 +90,16 @@ static void cleanup_graphics_device(struct graphics_device *dev) { - free(dev->type); - free(dev->port); - free(dev->host); - free(dev->keymap); - free(dev->passwd); + if (dev->type !=NULL) + free(dev->type); + if (dev->port !=NULL) + free(dev->port); + if (dev->host !=NULL) + free(dev->host); + if (dev->keymap !=NULL) + free(dev->keymap); + if (dev->passwd !=NULL) + free(dev->passwd); } static void cleanup_input_device(struct input_device *dev) @@ -529,6 +534,13 @@ if (gdev->port == NULL || gdev->host == NULL) goto err; } + else if (STREQC(gdev->type, "sdl")) { + SDL_display(gdev) = get_attr_value(node, "display"); + SDL_xauth(gdev) = get_attr_value(node, "xauth"); + SDL_fullscreen(gdev) = get_attr_value(node, "fullscreen"); + gdev->passwd = NULL; + } + else if (STREQC(gdev->type, "pty")) { if (node->name == NULL) goto err; diff -r 395f2d684c10 -r ec5e5be04391 libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Tue Jul 05 15:52:31 2011 -0300 +++ b/libxkutil/device_parsing.h Sun Jul 10 12:18:38 2011 +0800 @@ -83,6 +83,9 @@ char *path; }; +#define SDL_display(dev) (dev->port) +#define SDL_xauth(dev) (dev->host) +#define SDL_fullscreen(dev) (dev->keymap) struct graphics_device { char *type; char *port; diff -r 395f2d684c10 -r ec5e5be04391 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Tue Jul 05 15:52:31 2011 -0300 +++ b/libxkutil/xmlgen.c Sun Jul 10 12:18:38 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 (SDL_display(dev)) { + xmlNewProp(tmp, BAD_CAST "display", + BAD_CAST SDL_display(dev)); + } + if (SDL_xauth(dev)) { + xmlNewProp(tmp, BAD_CAST "xauth", + BAD_CAST SDL_xauth(dev)); + } + if (SDL_fullscreen(dev)) { + xmlNewProp(tmp, BAD_CAST "fullscreen", + BAD_CAST SDL_fullscreen(dev)); + } + return NULL; + } if (dev->port) { xmlNewProp(tmp, BAD_CAST "port", BAD_CAST dev->port); diff -r 395f2d684c10 -r ec5e5be04391 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Tue Jul 05 15:52:31 2011 -0300 +++ b/schema/ResourceAllocationSettingData.mof Sun Jul 10 12:18:38 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 395f2d684c10 -r ec5e5be04391 src/Virt_RASD.c --- a/src/Virt_RASD.c Tue Jul 05 15:52:31 2011 -0300 +++ b/src/Virt_RASD.c Sun Jul 10 12:18:38 2011 +0800 @@ -416,12 +416,14 @@ virDomainPtr dom = NULL; struct infostore_ctx *infostore = NULL; bool has_passwd = false; - + const struct graphics_device *gdev = &dev->dev.graphics; + CMSetProperty(inst, "ResourceSubType", (CMPIValue *)dev->dev.graphics.type, CMPI_chars); - if (STREQC(dev->dev.graphics.type, "sdl")) - rc = asprintf(&addr_str, "%s", dev->dev.graphics.type); + if (STREQC(dev->dev.graphics.type, "sdl")) { + rc = asprintf(&addr_str, "%s:%s", SDL_xauth(gdev), SDL_display(gdev)); + } else { rc = asprintf(&addr_str, "%s:%s", diff -r 395f2d684c10 -r ec5e5be04391 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Jul 05 15:52:31 2011 -0300 +++ b/src/Virt_VirtualSystemManagementService.c Sun Jul 10 12:18:38 2011 +0800 @@ -1059,6 +1059,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) @@ -1103,6 +1149,7 @@ const char *msg = NULL; bool ipv6 = false; int ret; + struct graphics_device *gdev = &dev->dev.graphics; if (cu_get_str_prop(inst, "ResourceSubType", &val) != CMPI_RC_OK) { msg = "GraphicsRASD ResourceSubType field not valid"; @@ -1162,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"); + SDL_display(gdev) = NULL; + SDL_xauth(gdev) = NULL; + } + else { + ret = parse_sdl_address(val, + &SDL_display(gdev), + &SDL_xauth(gdev)); + if (ret != 1) { + msg = "GraphicsRASD sdl Address not valid"; + goto out; + } + } + SDL_fullscreen(gdev) = NULL; + if (cu_get_bool_prop(inst, "IsIPV6Only", &ipv6) == + CMPI_RC_OK) { + if (ipv6) + SDL_fullscreen(gdev) = strdup("yes"); + else + SDL_fullscreen(gdev) = strdup("no"); + } } else { CU_DEBUG("Unsupported graphics type %s", dev->dev.graphics.type); @@ -1172,6 +1243,9 @@ free(dev->id); if (STREQC(dev->dev.graphics.type, "vnc")) ret = asprintf(&dev->id, "%s", dev->dev.graphics.type); + else if (STREQC(dev->dev.graphics.type, "sdl")) + ret = asprintf(&dev->id, "%s:%s:%s", + dev->dev.graphics.type, SDL_xauth(gdev), SDL_display(gdev)); else ret = asprintf(&dev->id, "%s:%s", dev->dev.graphics.type, dev->dev.graphics.port); @@ -1493,7 +1567,6 @@ "Failed to lookup resulting system"); goto out; } - out: virDomainFree(dom); virConnectClose(conn);

3 3

[PATCH] SwitchService will show the nic connected to VSI switch
by Sharad Mishra 16 Jul '11

16 Jul '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1310745835 25200 # Node ID d458bd51459cd1b470bf9ec74304abb7ff05b53c # Parent 395f2d684c1046455462db7e4e87d30e7aae0feb SwitchService will show the nic connected to VSI switch. SwitchService instance will list out the interface connected to the VSI capable switch. This helps identify which nic is conneced to VSI switch when there are multiple nics. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 395f2d684c10 -r d458bd51459c schema/SwitchService.mof --- a/schema/SwitchService.mof Tue Jul 05 15:52:31 2011 -0300 +++ b/schema/SwitchService.mof Fri Jul 15 09:03:55 2011 -0700 @@ -5,6 +5,7 @@ { [Description("Flag to determine if VSI is supported on the switch")] boolean IsVSISupported; + string VSIInterface; }; @@ -13,6 +14,7 @@ { [Description("Flag to determine if VSI is supported on the switch")] boolean IsVSISupported; + string VSIInterface; }; @@ -21,6 +23,7 @@ { [Description("Flag to determine if VSI is supported on the switch")] boolean IsVSISupported; + string VSIInterface; }; diff -r 395f2d684c10 -r d458bd51459c src/Virt_SwitchService.c --- a/src/Virt_SwitchService.c Tue Jul 05 15:52:31 2011 -0300 +++ b/src/Virt_SwitchService.c Fri Jul 15 09:03:55 2011 -0700 @@ -250,6 +250,8 @@ s = check_vsi_support(cmd); if (s.rc == CMPI_RC_OK) { vsi = true; + CMSetProperty(inst, "VSIInterface", + (CMPIValue *)if_list[i], CMPI_chars); break; } else

3 2

[PATCH] Make libconfig requirement optional
by Eduardo Lima (Etrunko) 16 Jul '11

16 Jul '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1310149559 10800 # Node ID 2823d4e157125fc47668a9f0d6ef2f52e52169ce # Parent 395f2d684c1046455462db7e4e87d30e7aae0feb Make libconfig requirement optional libconfig is a required to build libvirt-cim since r1104, but the package is not included in RHEL 5, which we still support. This patch enables libvirt-cim to be built even if libconfig is not found. Note that it will not be possible for users of that distro to configure libvirt-cim to operate in read-only mode. Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -272,7 +272,11 @@ AC_DEFUN([CHECK_LIBCONFIG], [ - PKG_CHECK_MODULES([LIBCONFIG], [libconfig]) + PKG_CHECK_MODULES([LIBCONFIG], [libconfig], + [LIBCONFIG_FOUND=yes], [LIBCONFIG_FOUND=no]) + if test "$LIBCONFIG_FOUND" = "yes" ; then + AC_DEFINE(HAVE_LIBCONFIG, 1, [Define if libconfig development files were found]) + fi AC_SUBST([LIBCONFIG_CFLAGS]) AC_SUBST([LIBCONFIG_LIBS]) CPPFLAGS="$CPPFLAGS $LIBCONFIG_CFLAGS" diff --git a/libvirt-cim.spec.in b/libvirt-cim.spec.in --- a/libvirt-cim.spec.in +++ b/libvirt-cim.spec.in @@ -22,11 +22,11 @@ BuildRequires: e2fsprogs-devel %else BuildRequires: libuuid-devel +BuildRequires: libconfig-devel %endif BuildRequires: libxml2-devel BuildRequires: libcmpiutil-devel -BuildRequires: libconfig-devel BuildConflicts: sblim-cmpi-devel %description diff --git a/libxkutil/misc_util.c b/libxkutil/misc_util.c --- a/libxkutil/misc_util.c +++ b/libxkutil/misc_util.c @@ -20,6 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -35,12 +37,14 @@ #include <libcmpiutil/libcmpiutil.h> #include <libcmpiutil/std_association.h> + +#ifdef HAVE_LIBCONFIG #include <libconfig.h> +#endif #include "misc_util.h" #include "cs_util.h" -#include "config.h" #define URI_ENV "HYPURI" @@ -58,8 +62,11 @@ static int is_read_only(void) { + int readonly = 0; + +#ifdef HAVE_LIBCONFIG config_t conf; - int ret, readonly = 0; + int ret; const char *readonly_str = "readonly"; config_init(&conf); @@ -82,6 +89,7 @@ LIBVIRTCIM_CONF, readonly); out: config_destroy(&conf); +#endif /* Default value is 0 (false) */ return readonly;

2 2

[PATCH] [TEST] Update .hgignore
by Eduardo Lima (Etrunko) 16 Jul '11

16 Jul '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1310497347 10800 # Node ID 021243e63a3b9e0b709618886b63a66d6ab5adc3 # Parent 26f6e541a714d5a915e4149554e057ba7ac328d1 [TEST] Update .hgignore Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,1 +1,4 @@ .*.pyc +.*.log +.*~ +run_report.txt

2 1

[PATCH] libvirt-cim.spec: Use %config(noreplace) for libvirt-cim.conf
by Eduardo Lima (Etrunko) 07 Jul '11

07 Jul '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1309891951 10800 # Node ID cd4aec302d94b587ede84e68356998c01188f265 # Parent 20138a9d4f2b4780664545e412cab7a4c26d7503 libvirt-cim.spec: Use %config(noreplace) for libvirt-cim.conf This way we avoid overwriting eventual changes to the config file introduced manually. Reference: - http://www-uxsup.csx.cam.ac.uk/~jw35/docs/rpm_config.html Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff --git a/libvirt-cim.spec.in b/libvirt-cim.spec.in --- a/libvirt-cim.spec.in +++ b/libvirt-cim.spec.in @@ -136,7 +136,7 @@ %{_datadir}/libvirt-cim/*.registration %{_datadir}/libvirt-cim/cim_schema_*-MOFs.zip %{_sysconfdir}/ld.so.conf.d/libvirt-cim.conf -%{_sysconfdir}/libvirt-cim.conf +%config(noreplace) %{_sysconfdir}/libvirt-cim.conf %changelog * Wed Oct 28 2009 Richard Maciel <rmaciel(a)linux.vnet.ibm.com> - 0.1-1

3 2