- CIM - libvirt List Archives

[PATCH 0 of 2] Updated ElementSettingData to support RASD instances.
by Kaitlin Rupert 27 Nov '07

27 Nov '07

Revised so that get_rasd_instance() is no longer static. This function should be used by other providers - there isn't a need for a new function. Also, cleaned up some of the confusion structure / function names in Virt_ElementSettingData. Fixed whitespace issues in Virt_RASD.h

1 2

[PATCH] Enumeration on VirtualSystemManagementService class is returning dups
by Heidi Eckhart 27 Nov '07

27 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195735052 -3600 # Node ID fb84303afda80d4d180e9951b114f2769a5d6baa # Parent 710a381591c1a67e5a79ad3b04aaa8bc7adbb108 Enumeration on VirtualSystemManagementService class is returning dups On systems where only one hypervisor is existing, the provider returned instance for all known subclasses (Xen, KVM). Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 710a381591c1 -r fb84303afda8 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu Nov 22 13:13:00 2007 +0100 +++ b/src/Virt_VirtualSystemManagementService.c Thu Nov 22 13:37:32 2007 +0100 @@ -1048,26 +1048,32 @@ CMPIStatus get_vsms(const CMPIObjectPath CMPIStatus get_vsms(const CMPIObjectPath *reference, CMPIInstance **_inst, const CMPIBroker *broker) -{ - CMPIStatus s; - CMPIInstance *inst; - CMPIInstance *host; +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst = NULL; + CMPIInstance *host = NULL; char *val = NULL; + virConnectPtr conn = NULL; + + conn = connect_by_classname(broker, CLASSNAME(reference), &s); + if (conn == NULL) + goto out; s = get_host_cs(broker, reference, &host); if (s.rc != CMPI_RC_OK) - goto out; + goto err; inst = get_typed_instance(broker, - CLASSNAME(reference), + pfx_from_conn(conn), "VirtualSystemManagementService", NAMESPACE(reference)); + if (inst == NULL) { CU_DEBUG("Failed to get typed instance"); cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, "Failed to create instance"); - goto out; + goto err; } CMSetProperty(inst, "Name", @@ -1076,8 +1082,8 @@ CMPIStatus get_vsms(const CMPIObjectPath if (cu_get_str_prop(host, "Name", &val) != CMPI_RC_OK) { cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, - "Unable to get name of System"); - goto out; + "Unable to get name of HostSystem"); + goto err; } CMSetProperty(inst, "SystemName", @@ -1087,8 +1093,8 @@ CMPIStatus get_vsms(const CMPIObjectPath if (cu_get_str_prop(host, "CreationClassName", &val) != CMPI_RC_OK) { cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, - "Unable to get creation class of system"); - goto out; + "Unable to get creation class of HostSystem"); + goto err; } CMSetProperty(inst, "SystemCreationClassName", @@ -1097,8 +1103,11 @@ CMPIStatus get_vsms(const CMPIObjectPath CMSetStatus(&s, CMPI_RC_OK); + err: + virConnectClose(conn); + + out: *_inst = inst; - out: return s; } @@ -1106,19 +1115,17 @@ static CMPIStatus return_vsms(const CMPI const CMPIResult *results, int name_only) { + CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst; - CMPIStatus s; s = get_vsms(reference, &inst, _BROKER); - if (s.rc != CMPI_RC_OK) + if (s.rc != CMPI_RC_OK || inst == NULL) goto out; if (name_only) cu_return_instance_name(results, inst); else CMReturnInstance(results, inst); - - CMSetStatus(&s, CMPI_RC_OK); out: return s; }

3 3

[PATCH] Add installation instructions for root/interop namespace
by Heidi Eckhart 27 Nov '07

27 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195733580 -3600 # Node ID 710a381591c1a67e5a79ad3b04aaa8bc7adbb108 # Parent 8c0410bfe3d3da3ef61aa40bfe75f1f23426b77d Add installation instructions for root/interop namespace Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 8c0410bfe3d3 -r 710a381591c1 doc/libvirt-cim.html --- a/doc/libvirt-cim.html Thu Nov 22 13:08:29 2007 +0100 +++ b/doc/libvirt-cim.html Thu Nov 22 13:13:00 2007 +0100 @@ -76,6 +76,7 @@ $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt cimv216.mof $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers.mof $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers_optional.mof + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/interop cimv216-interop.mof </code> <h4>To install the schema in SFCB:</h4> @@ -111,6 +112,23 @@ +//#pragma include ("Security/CIM_IPNetworkSecurityIndication.mof") +//#pragma include ("Security/CIM_IPPacketFilterIndication.mof") #pragma include ("Support/PRS_ActivityContact.mof") +</code> + +cimv216-interop.mof is not part of the official DMTF + CIM v2.16 schema package. Please create with the folloing content: + + +<code> +#pragma locale ("en_US") +#pragma include ("qualifiers.mof") +#pragma include ("qualifiers_optional.mof") +#pragma include ("Core/CIM_ManagedElement.mof") +#pragma include ("Interop/CIM_RegisteredProfile.mof") +#pragma include ("Interop/CIM_RegisteredSubProfile.mof") +#pragma include ("Core/CIM_Dependency.mof") +#pragma include ("Interop/CIM_ElementConformsToProfile.mof") +#pragma include ("Interop/CIM_ReferencedProfile.mof") +#pragma include ("Interop/CIM_SubProfileRequiresProfile.mof") </code> <h2><a name="Platforms">Platform Support</a></h2>

2 1

[PATCH 0 of 2] Updated ElementSettingData to support RASD instances.
by Kaitlin Rupert 27 Nov '07

27 Nov '07

Revised so that get_rasd_instance() is no longer static. This function should be used by other providers - there isn't a need for a new function. Also, cleaned up some of the confusion structure / function names in Virt_ElementSettingData.

4 8

[PATCH] [RFC] ECTP: Adoption of changes to std_association logic
by Heidi Eckhart 23 Nov '07

23 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195818927 -3600 # Node ID 1078f8d5a4fb8b33f3714dbf72437a7d7f1eaa8f # Parent 883d767c64256f4d582f06125e05f392454f8a15 [RFC] ECTP: Adoption of changes to std_association logic Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 883d767c6425 -r 1078f8d5a4fb src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Fri Nov 23 11:11:22 2007 +0100 +++ b/src/Virt_ElementConformsToProfile.c Fri Nov 23 12:55:27 2007 +0100 @@ -218,27 +218,44 @@ static CMPIInstance *make_ref(const CMPI return assoc_inst; } +char* conformant_standard[] = { + "Xen_RegisteredProfile", + "KVM_RegisteredProfile", + NULL +}; + +char* managed_element[] = { + "CIM_ManagedElement", + NULL +}; + +char* assoc_classname[] = { + "Xen_ElementConformsToProfile", + "KVM_ElementConformsToProfile", + NULL +}; + struct std_assoc forward = { - .source_class = "CIM_RegisteredProfile", + .source_class = (char**)&conformant_standard, .source_prop = "ConformantStandard", - .target_class = "CIM_ManagedElement", + .target_class = (char**)&managed_element, .target_prop = "ManagedElement", - .assoc_class = NULL, + .assoc_class = (char**)&assoc_classname, .handler = prof_to_elem, .make_ref = make_ref }; struct std_assoc backward = { - .source_class = "CIM_ManagedElement", + .source_class = (char**)&managed_element, .source_prop = "ManagedElement", - .target_class = "CIM_RegisteredProfile", + .target_class = (char**)&conformant_standard, .target_prop = "ConformantStandard", - .assoc_class = NULL, + .assoc_class = (char**)&assoc_classname, .handler = elem_to_prof, .make_ref = make_ref @@ -249,7 +266,6 @@ struct std_assoc *assoc_handlers[] = { &backward, NULL }; - STDA_AssocMIStub(, Virt_ElementConformsToProfileProvider, _BROKER, libvirt_cim_init(), assoc_handlers); /*

1 0

[PATCH] Add installation instructions for root/interop namespace
by Heidi Eckhart 22 Nov '07

22 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195206999 -3600 # Node ID 15cc86eee7e50fb5b6dd648d519013327b8e8c57 # Parent c9e977e820e99070f0c0c0397061229f7382ac7b Add installation instructions for root/interop namespace Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r c9e977e820e9 -r 15cc86eee7e5 doc/libvirt-cim.html --- a/doc/libvirt-cim.html Wed Nov 14 13:06:06 2007 +0100 +++ b/doc/libvirt-cim.html Fri Nov 16 10:56:39 2007 +0100 @@ -76,6 +76,7 @@ $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt cimv216.mof $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers.mof $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers_optional.mof + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/interop cimv216-interop.mof< </code> <h4>To install the schema in SFCB:</h4> @@ -111,6 +112,23 @@ +//#pragma include ("Security/CIM_IPNetworkSecurityIndication.mof") +//#pragma include ("Security/CIM_IPPacketFilterIndication.mof") #pragma include ("Support/PRS_ActivityContact.mof") +</code> + +cimv216-interop.mof is not part of the official DMTF + CIM v2.16 schema package. Please create with the folloing content: + + +<code> +#pragma locale ("en_US") +#pragma include ("qualifiers.mof") +#pragma include ("qualifiers_optional.mof") +#pragma include ("Core/CIM_ManagedElement.mof") +#pragma include ("Interop/CIM_RegisteredProfile.mof") +#pragma include ("Interop/CIM_RegisteredSubProfile.mof") +#pragma include ("Core/CIM_Dependency.mof") +#pragma include ("Interop/CIM_ElementConformsToProfile.mof") +#pragma include ("Interop/CIM_ReferencedProfile.mof") +#pragma include ("Interop/CIM_SubProfileRequiresProfile.mof") </code> <h2><a name="Platforms">Platform Support</a></h2>

2 2

[PATCH 0 of 2] Updated ElementSettingData to support RASD instances.
by Kaitlin Rupert 22 Nov '07

22 Nov '07

Revised so that get_rasd_instance_from_ref() takes an InstanceID argument. Also, cleaned up some of the confusion structure / function names in Virt_ElementSettingData.

2 4

[PATCH] Add new function cu_copy_prop, which copies a property from one instance to another
by Dan Smith 21 Nov '07

21 Nov '07

This is Jay's cu_copy_prop() function, which I got privately and forgot to put in the tree before his patch that uses it. I'm going to commit it now. -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms(a)us.ibm.com # HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1195502361 18000 # Node ID 805e9c0e7a9d3c7c6fe4e4f9546f48df5bd6c372 # Parent d6f1b6d1296bbe43c4edcc35475a05eef570e806 Add new function cu_copy_prop, which copies a property from one instance to another. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r d6f1b6d1296b -r 805e9c0e7a9d instance_util.c --- a/instance_util.c Thu Nov 15 13:07:50 2007 -0800 +++ b/instance_util.c Mon Nov 19 14:59:21 2007 -0500 @@ -156,6 +156,37 @@ const char *cu_compare_ref(const CMPIObj prop = NULL; out: return prop; +} + +CMPIStatus cu_copy_prop(const CMPIBroker *broker, + CMPIInstance *src_inst, CMPIInstance *dest_inst, + char *src_name, char *dest_name) +{ + CMPIData data; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + if (src_name == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "No property name given"); + goto out; + } + + if (dest_name == NULL) + dest_name = src_name; + + data = CMGetProperty(src_inst, src_name, &s); + if (s.rc != CMPI_RC_OK || CMIsNullValue(data)) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Copy failed. Could not get prop '%s'.", src_name); + goto out; + } + + CMSetProperty(dest_inst, dest_name, &(data.value), data.type); + + out: + return s; } /* diff -r d6f1b6d1296b -r 805e9c0e7a9d libcmpiutil.h --- a/libcmpiutil.h Thu Nov 15 13:07:50 2007 -0800 +++ b/libcmpiutil.h Mon Nov 19 14:59:21 2007 -0500 @@ -61,6 +61,20 @@ * If set to anything else, uses value as name of log file to fprintf to. */ void debug_print(char *fmt, ...); + +/** + * Copies a property from one CMPIInstance to another. If dest_name is NULL, + * it is assumed to be the same as src_name. + * + * @param broker CIM broker, needed for status calls + * @param src_inst Instance to copy from + * @param dest_inst Instance to copy to + * @param src_name Name of property to be copied from src_inst + * @param dest_name Name of property to be copied to dest_inst + */ +CMPIStatus cu_copy_prop(const CMPIBroker *broker, + CMPIInstance *src_inst, CMPIInstance *dest_inst, + char *src_name, char *dest_name); /** * Check arguments (names and count)

3 2

[PATCH 0 of 3] Changes from Fedora review
by Dan Smith 21 Nov '07

21 Nov '07

These are changes I had to make to get libcmpiutil to pass the Fedora review cycle.

2 6

[PATCH] More rpm changes, per Fedora package review process
by Dan Smith 21 Nov '07

21 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195572986 28800 # Node ID 820db60ea59d76e6fc2080ba3f2851415191fc76 # Parent f2c751be5069df9eb23a8bdbaafd5d55b3fd24e9 More rpm changes, per Fedora package review process Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f2c751be5069 -r 820db60ea59d libcmpiutil.spec.in --- a/libcmpiutil.spec.in Mon Nov 19 12:57:42 2007 -0800 +++ b/libcmpiutil.spec.in Tue Nov 20 07:36:26 2007 -0800 @@ -4,7 +4,7 @@ Name: libcmpiutil Name: libcmpiutil Version: @PACKAGE_VERSION@ Release: 1%{?dist}%{?extra_release} -License: LGPL +License: LGPLv2+ Group: Development/Libraries Source: libcmpiutil-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -26,6 +26,7 @@ Group: Development/Libraries Group: Development/Libraries Requires: tog-pegasus-devel Requires: pkgconfig +Requires: %{name} = %{version}-%{release} %description devel Includes and documentations for the CMPI utility library @@ -36,42 +37,41 @@ instance properties to standardizing met %prep %setup -q +chmod -x *.c *.y *.h *.l %build %configure -make +make %{?_smp_mflags} %install -rm -fr %{buildroot} +rm -fr $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean -rm -fr %{buildroot} +rm -fr $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-, root, root) -%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches README +%doc doc/doxygen.conf doc/mainpage README %{_libdir}/lib*.so.* %files devel %defattr(-, root, root) %{_libdir}/lib*.so -%dir %{_includedir}/ +%dir %{_includedir}/libcmpiutil %{_includedir}/libcmpiutil/*.h %{_libdir}/pkgconfig/libcmpiutil.pc -%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches README +%doc doc/SubmittingPatches %changelog * Fri Oct 26 2007 Daniel Veillard <veillard(a)redhat.com> - 0.1-1

2 4