- CIM - libvirt List Archives

[PATCH 0 of 5] VSMS Dynamic Devices
by Dan Smith 08 Nov '07

08 Nov '07

This set adds dynamic attach/detach support to device_parsing, as well as some other tweaks necessary for the changes to VSMS to work. This makes VSMS dynamically attach/detach devices if the domain is running. Currently this only works for Network and Disk devices, but adding processor and memory support in the attach functions should be easy.

3 8

[PATCH] Update CS and VSMS for compare_ref changes
by Dan Smith 07 Nov '07

07 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194453696 28800 # Node ID 55d37343f11204b02dde1df910001e8021a5afc5 # Parent 704edab17bc7ceac8a0d59285cf7bfb3c900b188 Update CS and VSMS for compare_ref changes Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 704edab17bc7 -r 55d37343f112 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Mon Nov 05 11:12:26 2007 -0800 +++ b/src/Virt_ComputerSystem.c Wed Nov 07 08:41:36 2007 -0800 @@ -379,12 +379,7 @@ static CMPIStatus get_domain(const CMPIO CMPIInstance *inst[2] = {NULL, NULL}; CMPIStatus s; virConnectPtr conn = NULL; - const struct cu_property *prop; - static struct cu_property props[] = { - {"CreationClassName", 0}, - {"Name", 1}, - {NULL, 0} - }; + const char *prop = NULL; conn = lv_connect(_BROKER, &s); if (conn == NULL) @@ -398,11 +393,11 @@ static CMPIStatus get_domain(const CMPIO goto out; } - prop = cu_compare_ref(reference, inst[0], props); + prop = cu_compare_ref(reference, inst[0]); if (prop != NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, - "No such instance (%s)", prop->name); + "No such instance (%s)", prop); goto out; } diff -r 704edab17bc7 -r 55d37343f112 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Nov 05 11:12:26 2007 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Wed Nov 07 08:41:36 2007 -0800 @@ -1030,24 +1030,17 @@ static CMPIStatus GetInstance(CMPIInstan { CMPIInstance *inst; CMPIStatus s; - const struct cu_property *prop; - static struct cu_property props[] = { - {"CreationClassName", 0}, - {"SystemName", 0}, - {"SystemCreationClassName", 0}, - {"Name", 1}, - {NULL, 0} - }; + const char *prop; s = _get_vsms(ref, &inst, 0); if (s.rc != CMPI_RC_OK) return s; - prop = cu_compare_ref(ref, inst, props); + prop = cu_compare_ref(ref, inst); if (prop != NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, - "No such instance (%s)", prop->name); + "No such instance (%s)", prop); } else { CMSetStatus(&s, CMPI_RC_OK); CMReturnInstance(results, inst);

2 2

[PATCH] Make ResourcePoolConfigurationService return errors when appropriate
by Dan Smith 07 Nov '07

07 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194454371 28800 # Node ID 2626820d78b2d70564096dcacf6a2f1b2bc726e1 # Parent 55d37343f11204b02dde1df910001e8021a5afc5 Make ResourcePoolConfigurationService return errors when appropriate and fix up some other general error-handling around the needed changes. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 55d37343f112 -r 2626820d78b2 src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Wed Nov 07 08:41:36 2007 -0800 +++ b/src/Virt_ResourcePoolConfigurationService.c Wed Nov 07 08:52:51 2007 -0800 @@ -89,7 +89,8 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -static CMPIInstance *rpcs_instance(const CMPIObjectPath *reference) +static CMPIStatus rpcs_instance(const CMPIObjectPath *reference, + CMPIInstance **_inst) { CMPIInstance *inst; CMPIInstance *host; @@ -98,28 +99,47 @@ static CMPIInstance *rpcs_instance(const s = get_host_cs(_BROKER, reference, &host); if (s.rc != CMPI_RC_OK) - return NULL; + goto out; inst = get_typed_instance(_BROKER, "ResourcePoolConfigurationService", NAMESPACE(reference)); + if (inst == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get " + "ResourcePoolConfigurationService instance"); + goto out; + } CMSetProperty(inst, "Name", (CMPIValue *)"RPCS", CMPI_chars); prop = CMGetProperty(host, "CreationClassName", &s); - if (s.rc != CMPI_RC_OK) - return NULL; + if (s.rc != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get CreationClassName from HostSystem"); + goto out; + } + CMSetProperty(inst, "SystemCreationClassName", (CMPIValue *)&prop.value.string, CMPI_string); prop = CMGetProperty(host, "Name", NULL); - if (s.rc != CMPI_RC_OK) - return NULL; + if (s.rc != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get Name from HostSystem"); + goto out; + } + CMSetProperty(inst, "SystemName", (CMPIValue *)&prop.value.string, CMPI_string); - return inst; + *_inst = inst; + out: + return s; } static CMPIStatus GetInstance(CMPIInstanceMI *self, @@ -129,12 +149,23 @@ static CMPIStatus GetInstance(CMPIInstan const char **properties) { CMPIInstance *inst; - - inst = rpcs_instance(reference); - - CMReturnInstance(results, inst); - - return (CMPIStatus){CMPI_RC_OK, NULL}; + CMPIStatus s; + const char *prop = NULL; + + s = rpcs_instance(reference, &inst); + if (s.rc != CMPI_RC_OK) + return s; + + prop = cu_compare_ref(reference, inst); + if (prop != NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance (%s)", prop); + } else { + CMReturnInstance(results, inst); + } + + return s; } static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, @@ -143,12 +174,13 @@ static CMPIStatus EnumInstanceNames(CMPI const CMPIObjectPath *reference) { CMPIInstance *inst; - - inst = rpcs_instance(reference); - - cu_return_instance_name(results, inst); - - return (CMPIStatus){CMPI_RC_OK, NULL}; + CMPIStatus s; + + s = rpcs_instance(reference, &inst); + if (s.rc == CMPI_RC_OK) + cu_return_instance_name(results, inst); + + return s; } static CMPIStatus EnumInstances(CMPIInstanceMI *self, @@ -159,12 +191,13 @@ static CMPIStatus EnumInstances(CMPIInst { CMPIInstance *inst; - - inst = rpcs_instance(reference); - - CMReturnInstance(results, inst); - - return (CMPIStatus){CMPI_RC_OK, NULL}; + CMPIStatus s; + + s = rpcs_instance(reference, &inst); + if (s.rc == CMPI_RC_OK) + CMReturnInstance(results, inst); + + return s; }

2 1

[PATCH] Fix the XML we generate for an incoming system to include the <os> block
by Dan Smith 06 Nov '07

06 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1423944550 28800 # Node ID 5789eadba6e6f71822493043214c3a8749ebb2f6 # Parent babb2ffdc4c2c3f11a3281af4fb33cc3257127f8 Fix the XML we generate for an incoming system to include the <os> block which seems to be required. Without it, libvirt-0.2.0 seems to break. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r babb2ffdc4c2 -r 5789eadba6e6 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Tue Oct 30 11:11:32 2007 -0700 +++ b/libxkutil/xmlgen.c Sat Feb 14 12:09:10 2015 -0800 @@ -33,7 +33,6 @@ #include "cmpimacs.h" #endif -#if 0 static char *__tag_attr(struct kv *attrs, int count) { char *result = strdup(""); @@ -94,7 +93,6 @@ static char *tagify(char *tagname, char return result; } -#endif static char *disk_block_xml(const char *path, const char *vdev) { @@ -265,11 +263,55 @@ static char *system_xml(struct domain *d return xml; } +static char *os_xml(struct domain *domain) +{ + struct os_info *os = &domain->os_info; + int ret; + char *xml; + char *type = NULL; + char *kernel = NULL; + char *initrd = NULL; + char *cmdline = NULL; + + if (os->type == NULL) + os->type = strdup("linux"); + + if (os->kernel == NULL) + os->kernel = strdup("/dev/null"); + + type = tagify("type", os->type, NULL, 0); + kernel = tagify("kernel", os->kernel, NULL, 0); + initrd = tagify("initrd", os->initrd, NULL, 0); + cmdline = tagify("cmdline", os->cmdline, NULL, 0); + + ret = asprintf(&xml, + "<os>\n" + " %s\n" + " %s\n" + " %s\n" + " %s\n" + "</os>\n", + type, + kernel, + initrd, + cmdline); + if (ret == -1) + xml = NULL; + + free(type); + free(kernel); + free(initrd); + free(cmdline); + + return xml; +} + char *system_to_xml(struct domain *dominfo) { char *devxml = strdup(""); char *sysdevxml = strdup(""); char *sysxml = NULL; + char *osxml = NULL; char *xml = NULL; int ret; uint8_t uuid[16]; @@ -285,18 +327,21 @@ char *system_to_xml(struct domain *domin concat_devxml(&sysdevxml, dominfo->dev_vcpu, dominfo->dev_vcpu_ct); sysxml = system_xml(dominfo); + osxml = os_xml(dominfo); ret = asprintf(&xml, "<domain type='xen'>\n" "<uuid>%s</uuid>\n" - "%s\n" - "%s\n" + "%s" + "%s" + "%s" "<devices>\n" - "%s\n" + "%s" "</devices>\n" "</domain>\n", uuidstr, sysxml, + osxml, sysdevxml, devxml); if (ret == -1) @@ -304,6 +349,7 @@ char *system_to_xml(struct domain *domin free(devxml); free(sysdevxml); + free(osxml); free(sysxml); return xml;

4 10

[PATCH] Add cu_compare_ref()
by Dan Smith 05 Nov '07

05 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194042578 25200 # Node ID 0df048ad2e99c8eda6c843f148168a9fa0161399 # Parent 05b01d03f0b801afe266d8d012bc464be6a2d165 Add cu_compare_ref() This provides a generic way to easily compare a given ref against an instance, which should be useful in GetInstance functions for making sure the returned instance matches what was asked. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 05b01d03f0b8 -r 0df048ad2e99 instance_util.c --- a/instance_util.c Sun Feb 15 22:01:53 2015 -0800 +++ b/instance_util.c Fri Nov 02 15:29:38 2007 -0700 @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdbool.h> +#include <string.h> #include "libcmpiutil.h" @@ -68,6 +69,59 @@ unsigned int cu_return_instance_names(co return c; } +static bool _compare_data(const CMPIData *a, const CMPIData *b) +{ + if (a->type != b->type) + return false; + + if (a->type & CMPI_string) { + const char *as = CMGetCharPtr(a->value.string); + const char *bs = CMGetCharPtr(b->value.string); + + return STREQ(as, bs); + } else if (a->type & CMPI_INTEGER) { + return memcmp(&a->value, &b->value, sizeof(a->value)) == 0; + } + + CU_DEBUG("Unhandled CMPI type: `%i'", a->type); + + return false; +} + +const struct cu_property *cu_compare_ref(const CMPIObjectPath *ref, + const CMPIInstance *inst, + const struct cu_property *props) +{ + const struct cu_property *p = NULL; + int i; + CMPIStatus s; + + for (i = 0; props[i].name != NULL; i++) { + CMPIData kd, pd; + + p = &props[i]; + + kd = CMGetKey(ref, p->name, &s); + if (s.rc != CMPI_RC_OK) { + if (p->required) + goto out; + else + continue; + } + + pd = CMGetProperty(inst, p->name, &s); + if (s.rc != CMPI_RC_OK) + goto out; + + if (!_compare_data(&kd, &pd)) + goto out; + } + + p = NULL; + out: + return p; +} + /* * Local Variables: * mode: C diff -r 05b01d03f0b8 -r 0df048ad2e99 libcmpiutil.h --- a/libcmpiutil.h Sun Feb 15 22:01:53 2015 -0800 +++ b/libcmpiutil.h Fri Nov 02 15:29:38 2007 -0700 @@ -336,6 +336,27 @@ void inst_list_free(struct inst_list *li * @returns nonzero on success, zero on failure */ int inst_list_add(struct inst_list *list, CMPIInstance *inst); + +struct cu_property { + const char *name; + bool required; +}; + +/** + * Compare key values in a reference to properties in an instance, + * making sure they are identical. If props identifies a particular + * key as not required, then absence in the object path will not + * result in failure of this test. + * + * @param ref The ObjectPath to examine + * @param inst The Instance to compare + * @param props A NULL-terminated list of properties to compare + * @returns A pointer to the property structure of the first + * non-matching property, or NULL if all match + */ +const struct cu_property *cu_compare_ref(const CMPIObjectPath *ref, + const CMPIInstance *inst, + const struct cu_property *props); #define DEFAULT_EIN(pn) \ static CMPIStatus pn##EnumInstanceNames(CMPIInstanceMI *self, \

3 6

[PATCH] Make ResourcePoolConfigurationService return errors when appropriate
by Dan Smith 05 Nov '07

05 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194283579 28800 # Node ID 0ae96e2255c9d6b095b3cbdcbb247621a8abd91a # Parent fa10054ee62b6f5bb7fc3f832464e4d6caf6f274 Make ResourcePoolConfigurationService return errors when appropriate and fix up some other general error-handling around the needed changes. This includes a use of the (now controversial) cu_compare_ref() function, so I won't commit this until we come to a decision about it, but the act of checking the reference is something we need to do here, no matter how it shakes out. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r fa10054ee62b -r 0ae96e2255c9 src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Mon Nov 05 06:59:19 2007 -0800 +++ b/src/Virt_ResourcePoolConfigurationService.c Mon Nov 05 09:26:19 2007 -0800 @@ -89,7 +89,8 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -static CMPIInstance *rpcs_instance(const CMPIObjectPath *reference) +static CMPIStatus rpcs_instance(const CMPIObjectPath *reference, + CMPIInstance **_inst) { CMPIInstance *inst; CMPIInstance *host; @@ -98,28 +99,47 @@ static CMPIInstance *rpcs_instance(const s = get_host_cs(_BROKER, reference, &host); if (s.rc != CMPI_RC_OK) - return NULL; + goto out; inst = get_typed_instance(_BROKER, "ResourcePoolConfigurationService", NAMESPACE(reference)); + if (inst == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get " + "ResourcePoolConfigurationService instance"); + goto out; + } CMSetProperty(inst, "Name", (CMPIValue *)"RPCS", CMPI_chars); prop = CMGetProperty(host, "CreationClassName", &s); - if (s.rc != CMPI_RC_OK) - return NULL; + if (s.rc != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get CreationClassName from HostSystem"); + goto out; + } + CMSetProperty(inst, "SystemCreationClassName", (CMPIValue *)&prop.value.string, CMPI_string); prop = CMGetProperty(host, "Name", NULL); - if (s.rc != CMPI_RC_OK) - return NULL; + if (s.rc != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get Name from HostSystem"); + goto out; + } + CMSetProperty(inst, "SystemName", (CMPIValue *)&prop.value.string, CMPI_string); - return inst; + *_inst = inst; + out: + return s; } static CMPIStatus GetInstance(CMPIInstanceMI *self, @@ -129,12 +149,30 @@ static CMPIStatus GetInstance(CMPIInstan const char **properties) { CMPIInstance *inst; - - inst = rpcs_instance(reference); - - CMReturnInstance(results, inst); - - return (CMPIStatus){CMPI_RC_OK, NULL}; + CMPIStatus s; + const struct cu_property *prop; + static struct cu_property props[] = { + {"CreationClassName", 0}, + {"SystemCreationClassName", 0}, + {"SystemName", 0}, + {"Name", 1}, + {NULL, 0} + }; + + s = rpcs_instance(reference, &inst); + if (s.rc != CMPI_RC_OK) + return s; + + prop = cu_compare_ref(reference, inst, props); + if (prop != NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance (%s)", prop->name); + } else { + CMReturnInstance(results, inst); + } + + return s; } static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, @@ -143,12 +181,13 @@ static CMPIStatus EnumInstanceNames(CMPI const CMPIObjectPath *reference) { CMPIInstance *inst; - - inst = rpcs_instance(reference); - - cu_return_instance_name(results, inst); - - return (CMPIStatus){CMPI_RC_OK, NULL}; + CMPIStatus s; + + s = rpcs_instance(reference, &inst); + if (s.rc == CMPI_RC_OK) + cu_return_instance_name(results, inst); + + return s; } static CMPIStatus EnumInstances(CMPIInstanceMI *self, @@ -159,12 +198,13 @@ static CMPIStatus EnumInstances(CMPIInst { CMPIInstance *inst; - - inst = rpcs_instance(reference); - - CMReturnInstance(results, inst); - - return (CMPIStatus){CMPI_RC_OK, NULL}; + CMPIStatus s; + + s = rpcs_instance(reference, &inst); + if (s.rc == CMPI_RC_OK) + CMReturnInstance(results, inst); + + return s; }

3 2

[PATCH] Fixes improper formatting in ElementAllocatedFromPool.mof. This was causing an error during the postinstall with Pegasus, which prevented the mof from being added to the repository correctly
by Kaitlin Rupert 05 Nov '07

05 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194289946 28800 # Node ID ffb35bc02f07812cee133ebab999d8b463d51d03 # Parent e8577c608398eeb0812342dc942a4788116d4515 Fixes improper formatting in ElementAllocatedFromPool.mof. This was causing an error during the postinstall with Pegasus, which prevented the mof from being added to the repository correctly. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r e8577c608398 -r ffb35bc02f07 schema/ElementAllocatedFromPool.mof --- a/schema/ElementAllocatedFromPool.mof Mon Nov 05 12:40:33 2007 +0100 +++ b/schema/ElementAllocatedFromPool.mof Mon Nov 05 11:12:26 2007 -0800 @@ -1,5 +1,7 @@ // Copyright IBM Corp. 2007 -Xen_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { +[Association] +class Xen_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { }; -KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { +[Association] +class KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { };

2 1

[PATCH] Fix non-DMTF-conform property values on RegisteredProfile
by Heidi Eckhart 05 Nov '07

05 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1194262833 -3600 # Node ID 86babdd4b732e6b1203acab9372cf42970032cbf # Parent 8ddace706d4a00e3097553e734dd1842aca0a97a Fix non-DMTF-conform property values on RegisteredProfile Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 8ddace706d4a -r 86babdd4b732 src/profiles.h --- a/src/profiles.h Fri Nov 02 15:31:09 2007 -0700 +++ b/src/profiles.h Mon Nov 05 12:40:33 2007 +0100 @@ -31,15 +31,15 @@ struct reg_prof { struct reg_prof SystemVirtualization = { .reg_org = 2, - .reg_id = "DSP1042-1.0.0a", - .reg_name = "System Virtualization Profile", - .reg_version = "1.0.0a", + .reg_id = "CIM:DSP1042-SystemVirtualization-1.0.0", + .reg_name = "System Virtualization", + .reg_version = "1.0.0", .provider_name = "HostSystem" }; struct reg_prof VirtualSystem = { .reg_org = 2, - .reg_id = "DSP1057-1.0.0a", + .reg_id = "CIM:DSP1057-VirtualSystem-1.0.0a", .reg_name = "Virtual System Profile", .reg_version = "1.0.0a", .provider_name = "ComputerSystem"

2 1

[PATCH] Replace #include of libvirt.h in ComputerSystem
by Dan Smith 05 Nov '07

05 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194274759 28800 # Node ID fa10054ee62b6f5bb7fc3f832464e4d6caf6f274 # Parent 8ddace706d4a00e3097553e734dd1842aca0a97a Replace #include of libvirt.h in ComputerSystem Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 8ddace706d4a -r fa10054ee62b src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Fri Nov 02 15:31:09 2007 -0700 +++ b/src/Virt_ComputerSystem.c Mon Nov 05 06:59:19 2007 -0800 @@ -28,6 +28,8 @@ #include <cmpift.h> #include <cmpimacs.h> +#include <libvirt.h> + #include "cs_util.h" #include "libcmpiutil.h" #include "misc_util.h"

2 1

Namespace of association ElementCapabilities
by Heidi Eckhart 05 Nov '07

05 Nov '07

The association ElementCapabilities seems to be registered to the wrong namespace ? Shouldn't it be root/ibmsd ? Xen_ElementCapabilities root/interop Xen_ElementCapabilitiesProvider Virt_ElementCapabilities association KVM_ElementCapabilities root/interop KVM_ElementCapabilitiesProvider Virt_ElementCapabilities association -- Regards Heidi Eckhart Software Engineer Linux Technology Center - Open Hypervisor heidieck(a)linux.vnet.ibm.com ************************************************** IBM Deutschland Entwicklung GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschaeftsfuehrung: Herbert Kircher Sitz der Gesellschaft: Boeblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

2 1