- CIM - libvirt List Archives

[PATCH] Add std_instance.h with updated MIStub macro
by Dan Smith 19 Nov '07

19 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195488042 28800 # Node ID 25497386647b6e757ed5c8893f2a4c648543829b # Parent 18403e085eaab25596f65d3273ad56befeb46463 Add std_instance.h with updated MIStub macro Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 18403e085eaa -r 25497386647b Makefile.am --- a/Makefile.am Fri Nov 16 08:49:15 2007 -0800 +++ b/Makefile.am Mon Nov 19 08:00:42 2007 -0800 @@ -13,7 +13,8 @@ libcmpiutilinc_HEADERS = libcmpiutil.h \ libcmpiutilinc_HEADERS = libcmpiutil.h \ std_invokemethod.h \ std_association.h \ - std_indication.h + std_indication.h \ + std_instance.h libcmpiutil_la_SOURCES = args_util.c instance_util.c std_invokemethod.c \ std_association.c inst_list.c std_indication.c \ diff -r 18403e085eaa -r 25497386647b std_instance.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/std_instance.h Mon Nov 19 08:00:42 2007 -0800 @@ -0,0 +1,72 @@ +/* + * Copyright IBM Corp. 2007 + * + * Authors: + * Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> + * Dan Smith <danms(a)us.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __STD_INSTANCE_H +#define __STD_INSTANCE_H + +/** + * Generates the function table and initialization stub for an + * instance provider. + * @param pfx The prefix for all mandatory association provider + * functions. + * @param pn The provider name under which this provider is + * registered. + * @param broker The CMPIBroker pointer. + * @param hook Perform additional initialization functions. + * @return The function table of this instance provider. + */ +#define STD_InstanceMIStub(pfx, pn, broker, hook) \ + static CMPIInstanceMIFT instMIFT__={ \ + CMPICurrentVersion, \ + CMPICurrentVersion, \ + "instance" #pn, \ + pfx##Cleanup, \ + pfx##EnumInstanceNames, \ + pfx##EnumInstances, \ + pfx##GetInstance, \ + pfx##CreateInstance, \ + pfx##ModifyInstance, \ + pfx##DeleteInstance, \ + pfx##ExecQuery, \ + }; \ + \ + CMPIInstanceMI * \ + pn##_Create_InstanceMI(const CMPIBroker *, \ + const CMPIContext *, \ + CMPIStatus *rc); \ + \ + \ + CMPI_EXTERN_C \ + CMPIInstanceMI* pn##_Create_InstanceMI(const CMPIBroker* brkr, \ + const CMPIContext *ctx, \ + CMPIStatus *rc) \ + { \ + static CMPIInstanceMI mi={ \ + NULL, \ + &instMIFT__, \ + }; \ + broker=brkr; \ + hook; \ + return &mi; \ + } + + #endif

2 1

[PATCH 0 of 4] Transition to connect_by_classname()
by Dan Smith 19 Nov '07

19 Nov '07

Updated set to not use PN macro, and fix the instance warnings.

2 5

[PATCH 0 of 3] Transition back to connect_by_classname()
by Dan Smith 19 Nov '07

19 Nov '07

A more formal version of the last set, this time as a proposed change instead of an RFC. Some testing of the first patch would be good to make sure that I didn't change a provider name to be incongruent with what is in the registration files.

3 6

[PATCH 0 of 2] Move to per-classname connections, without the race
by Dan Smith 19 Nov '07

19 Nov '07

This should fix the behavior Heidi and I were seeing with connect_by_classname() Comments and test feedback appreciated :)

4 8

[PATCH] Fix up the src/Makefile.am to support parallel builds
by Dan Smith 17 Nov '07

17 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195252274 28800 # Node ID 4fa05e74894807d8fa5e76f8dda6aad9b31ddd2b # Parent 5ccd8aa18359f59d02f664ec9ebd9f07b422a698 Fix up the src/Makefile.am to support parallel builds Fedora packaging guidelines suggest using parallel make where possible, and we were pretty broken in that regard. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 5ccd8aa18359 -r 4fa05e748948 src/Makefile.am --- a/src/Makefile.am Fri Nov 16 12:24:59 2007 -0800 +++ b/src/Makefile.am Fri Nov 16 14:31:14 2007 -0800 @@ -55,68 +55,84 @@ libVirt_ComputerSystem_la_SOURCES = Virt libVirt_ComputerSystem_la_SOURCES = Virt_ComputerSystem.c libVirt_Device_la_SOURCES = Virt_Device.c +libVirt_ComputerSystemIndication_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_ComputerSystemIndication_la_SOURCES = Virt_ComputerSystemIndication.c libVirt_ComputerSystemIndication_la_LIBADD = -lVirt_ComputerSystem -lpthread -lrt +libVirt_VirtualSystemManagementService_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_ComputerSystemIndication.la libVirt_RASD.la libVirt_HostSystem.la libVirt_VirtualSystemManagementService_la_SOURCES = Virt_VirtualSystemManagementService.c libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem -lVirt_ComputerSystemIndication -lVirt_RASD -lVirt_HostSystem libVirt_VirtualSystemManagementCapabilities_la_SOURCES = Virt_VirtualSystemManagementCapabilities.c +libVirt_SystemDevice_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_Device.la libVirt_SystemDevice_la_SOURCES = Virt_SystemDevice.c libVirt_SystemDevice_la_LIBADD = -lVirt_ComputerSystem -lVirt_Device libVirt_VSSD_la_SOURCES = Virt_VSSD.c libVirt_HostSystem_la_SOURCES = Virt_HostSystem.c +libVirt_HostedDependency_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_HostedDependency_la_SOURCES = Virt_HostedDependency.c libVirt_HostedDependency_la_LIBADD = -lVirt_ComputerSystem -lVirt_HostSystem libVirt_DevicePool_la_SOURCES = Virt_DevicePool.c +libVirt_ElementConformsToProfile_la_DEPENDENCIES = libVirt_RegisteredProfile.la libVirt_ElementConformsToProfile_la_SOURCES = Virt_ElementConformsToProfile.c libVirt_ElementConformsToProfile_la_LIBADD = -lVirt_RegisteredProfile libVirt_EnabledLogicalElementCapabilities_la_SOURCES = Virt_EnabledLogicalElementCapabilities.c +libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_ElementCapabilities_la_SOURCES = Virt_ElementCapabilities.c libVirt_ElementCapabilities_la_LIBADD = -lVirt_VirtualSystemManagementCapabilities \ -lVirt_EnabledLogicalElementCapabilities \ -lVirt_ComputerSystem \ -lVirt_HostSystem +libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD +libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c libVirt_SettingsDefineCapabilities_la_LIBADD = -lVirt_RASD -lVirt_DevicePool libVirt_RegisteredProfile_la_SOURCES = Virt_RegisteredProfile.c +libVirt_HostedResourcePool_la_DEPENDENCIES = libVirt_DevicePool.la libVirt_HostSystem.la libVirt_HostedResourcePool_la_SOURCES = Virt_HostedResourcePool.c libVirt_HostedResourcePool_la_LIBADD = -lVirt_DevicePool -lVirt_HostSystem libVirt_RASD_la_SOURCES = Virt_RASD.c +libVirt_ResourcePoolConfigurationService_la_DEPENDENCIES = libVirt_HostSystem.la libVirt_ResourcePoolConfigurationService_la_SOURCES = Virt_ResourcePoolConfigurationService.c libVirt_ResourcePoolConfigurationService_la_LIBADD = -lVirt_HostSystem libVirt_ResourcePoolConfigurationCapabilities_la_SOURCES = Virt_ResourcePoolConfigurationCapabilities.c +libVirt_VSSDComponent_la_DEPENDENCIES = libVirt_VSSD.la libVirt_RASD.la libVirt_VSSDComponent_la_SOURCES = Virt_VSSDComponent.c libVirt_VSSDComponent_la_LIBADD = -lVirt_VSSD -lVirt_RASD +libVirt_SettingsDefineState_la_DEPENDENCIES = libVirt_Device.la libVirt_RASD.la libVirt_VSSD.la libVirt_ComputerSystem.la libVirt_SettingsDefineState_la_SOURCES = Virt_SettingsDefineState.c libVirt_SettingsDefineState_la_LIBADD = -lVirt_Device -lVirt_RASD -lVirt_VSSD -lVirt_ComputerSystem +libVirt_ResourceAllocationFromPool_la_DEPENDENCIES = libVirt_DevicePool.la libVirt_RASD.la libVirt_ResourceAllocationFromPool_la_SOURCES = Virt_ResourceAllocationFromPool.c libVirt_ResourceAllocationFromPool_la_LIBADD = -lVirt_DevicePool -lVirt_RASD +libVirt_ElementAllocatedFromPool_la_DEPENDENCIES = libVirt_DevicePool.la libVirt_Device.la libVirt_ElementAllocatedFromPool_la_SOURCES = Virt_ElementAllocatedFromPool.c libVirt_ElementAllocatedFromPool_la_LIBADD = -lVirt_DevicePool -lVirt_Device +libVirt_HostedService_la_DEPENDENCIES = libVirt_VirtualSystemManagementService.la libVirt_ResourcePoolConfigurationService.la libVirt_HostedService_la_SOURCES = Virt_HostedService.c libVirt_HostedService_la_LIBADD = -lVirt_VirtualSystemManagementService -lVirt_ResourcePoolConfigurationService +libVirt_ElementSettingData_la_DEPENDENCIES = libVirt_VSSD.la libVirt_ElementSettingData_la_SOURCES = Virt_ElementSettingData.c libVirt_ElementSettingData_la_LIBADD = -lVirt_VSSD

2 1

[PATCH] Add ASSOC_MATCH() to HostedService to prevent duplicate classes from being returned if CIM_HostedService is used as the association class option during an association related query
by Kaitlin Rupert 16 Nov '07

16 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1195253640 28800 # Node ID 92c1de7f036cf77048be756ddc79c0b2fd88b79e # Parent 006c7d27c968fb509fc667f4d5513cd79a9c197a Add ASSOC_MATCH() to HostedService to prevent duplicate classes from being returned if CIM_HostedService is used as the association class option during an association related query. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 006c7d27c968 -r 92c1de7f036c src/Virt_HostedService.c --- a/src/Virt_HostedService.c Thu Nov 15 09:49:45 2007 -0800 +++ b/src/Virt_HostedService.c Fri Nov 16 14:54:00 2007 -0800 @@ -43,6 +43,8 @@ static CMPIStatus service_to_host(const CMPIStatus s; CMPIInstance *instance; + ASSOC_MATCH(info->provider_name, CLASSNAME(ref)); + s = get_host_cs(_BROKER, ref, &instance); if (s.rc == CMPI_RC_OK) inst_list_add(list, instance); @@ -56,6 +58,8 @@ static CMPIStatus host_to_service(const { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst; + + ASSOC_MATCH(info->provider_name, CLASSNAME(ref)); s = rpcs_instance(ref, &inst, _BROKER); if (s.rc != CMPI_RC_OK)

2 1

[PATCH] Make libcmpiutil spec include %{release} in BuildRoot
by Dan Smith 16 Nov '07

16 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1195231755 28800 # Node ID 18403e085eaab25596f65d3273ad56befeb46463 # Parent dde4ae874d36a23fb3f4e1ec6ffea308aa0e7daa Make libcmpiutil spec include %{release} in BuildRoot Per the Fedora packaging guidelines. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r dde4ae874d36 -r 18403e085eaa libcmpiutil.spec.in --- a/libcmpiutil.spec.in Fri Nov 16 08:04:48 2007 -0800 +++ b/libcmpiutil.spec.in Fri Nov 16 08:49:15 2007 -0800 @@ -7,7 +7,7 @@ License: LGPL License: LGPL Group: Development/Libraries Source: libcmpiutil-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/CIM/ BuildRequires: tog-pegasus-devel BuildRequires: flex

3 2

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

16 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1195117117 -3600 # Node ID 937ed1f28893f71163de1b673ffaf587d1169db9 # Parent c9e977e820e99070f0c0c0397061229f7382ac7b Add installation instructions for root/interop namespace Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r c9e977e820e9 -r 937ed1f28893 doc/libvirt-cim.html --- a/doc/libvirt-cim.html Wed Nov 14 13:06:06 2007 +0100 +++ b/doc/libvirt-cim.html Thu Nov 15 09:58:37 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>

3 3

[PATCH] Add bridge network type
by lizg＠cn.ibm.com 16 Nov '07

16 Nov '07

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1195194642 -28800 # Node ID fcc119ccdfa54df6f6296d2174670042b7b6d75a # Parent 99988c7788133e216451cc0c1f3440260e996fbf Add bridge network type Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 99988c778813 -r fcc119ccdfa5 src/Virt_Device.c --- a/src/Virt_Device.c Fri Nov 16 14:24:36 2007 +0800 +++ b/src/Virt_Device.c Fri Nov 16 14:30:42 2007 +0800 @@ -47,7 +47,8 @@ static int net_set_type(CMPIInstance *in { uint16_t cim_type; - if (STREQC(dev->type, "ethernet")) + if (STREQC(dev->type, "ethernet") || + STREQC(dev->type, "bridge")) cim_type = CIM_NET_ETHERNET; else cim_type = CIM_NET_UNKNOWN;

1 0

[PATCH] Add function to parse InstanceIDs
by Kaitlin Rupert 15 Nov '07

15 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1195172367 28800 # Node ID 499034149a6bc4072ad76f06d107059613277d6a # Parent ae4810e6764b1ea14df6f429eab972593e919e37 Add function to parse InstanceIDs. This function currently supports InstanceIDs in the format <Org>:<LocalID>, such as "Xen:Domain-0" for VSSD. The functionality is based on the parsing from VSSDComponent, so the code for parsing the InstanceID is replaced by the function. Updated function so that it can return both the InstanceID prefix (org) and the localID. The call has the option of supplying NULL for either argument. Also added a wrapper function that takes a CMPIObjectPath ref, grabs the instanceID, and then calls the parse_id() function. Fixed memory leak. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ae4810e6764b -r 499034149a6b libxkutil/misc_util.c --- a/libxkutil/misc_util.c Thu Nov 15 09:49:47 2007 -0800 +++ b/libxkutil/misc_util.c Thu Nov 15 16:19:27 2007 -0800 @@ -371,6 +371,55 @@ bool domain_online(virDomainPtr dom) (info.state == VIR_DOMAIN_RUNNING); } +int parse_id(char *id, + char **pfx, + char **name) +{ + int ret; + char *tmp_pfx; + char *tmp_name; + + ret = sscanf(id, "%a[^:]:%as", &tmp_pfx, &tmp_name); + if (ret != 2) { + ret = 0; + goto out; + } + + if (pfx) + *pfx = strdup(tmp_pfx); + + if (name) + *name = strdup(tmp_name); + + ret = 1; + + out: + free(tmp_pfx); + free(tmp_name); + + return ret; +} + +bool parse_instanceid(const CMPIObjectPath *ref, + char **pfx, + char **name) +{ + int ret; + char *id = NULL; + + id = cu_get_str_path(ref, "InstanceID"); + if (id == NULL) + return false; + + ret = parse_id(id, pfx, name); + + free(id); + + if (!ret) + return false; + + return true; +} /* * Local Variables: diff -r ae4810e6764b -r 499034149a6b libxkutil/misc_util.h --- a/libxkutil/misc_util.h Thu Nov 15 09:49:47 2007 -0800 +++ b/libxkutil/misc_util.h Thu Nov 15 16:19:27 2007 -0800 @@ -89,6 +89,9 @@ char *association_prefix(const char *pro char *association_prefix(const char *provider_name); bool match_pn_to_cn(const char *pn, const char *cn); +int parse_id(char *id, char **pfx, char **name); +bool parse_instanceid(const CMPIObjectPath *ref, char **pfx, char **name); + #define ASSOC_MATCH(pn, cn) \ if (!match_pn_to_cn((pn), (cn))) { \ return (CMPIStatus){CMPI_RC_OK, NULL}; \ diff -r ae4810e6764b -r 499034149a6b src/Virt_VSSDComponent.c --- a/src/Virt_VSSDComponent.c Thu Nov 15 09:49:47 2007 -0800 +++ b/src/Virt_VSSDComponent.c Thu Nov 15 16:19:27 2007 -0800 @@ -41,10 +41,7 @@ static CMPIStatus vssd_to_rasd(const CMP struct inst_list *list) { CMPIStatus s; - char *id = NULL; - char *pfx = NULL; char *name = NULL; - int ret; int i = 0; int types[] = { CIM_RASD_TYPE_PROC, @@ -56,19 +53,10 @@ static CMPIStatus vssd_to_rasd(const CMP ASSOC_MATCH(info->provider_name, CLASSNAME(ref)); - id = cu_get_str_path(ref, "InstanceID"); - if (id == NULL) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing InstanceID"); - goto out; - } - - ret = sscanf(id, "%a[^:]:%as", &pfx, &name); - if (ret != 2) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Invalid InstanceID"); + if (!parse_instanceid(ref, NULL, &name)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get system name"); goto out; } @@ -83,8 +71,6 @@ static CMPIStatus vssd_to_rasd(const CMP CMSetStatus(&s, CMPI_RC_OK); out: - free(id); - free(pfx); free(name); return s;

2 1