- CIM - libvirt List Archives

[PATCH] Fix asprintf warning in DevicePool
by Dan Smith 29 Oct '07

29 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193504300 25200 # Node ID b00e3353ccec10cdd9c3e6882067b2b73a5bd448 # Parent aaad430ea766d9a3bc0be035e595d8da17ee2122 Fix asprintf warning in DevicePool This fixes the compile warning (error) that was preventing a compile on Fedora 7. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r aaad430ea766 -r b00e3353ccec src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Fri Oct 26 13:34:26 2007 -0700 +++ b/src/Virt_DevicePool.c Sat Oct 27 09:58:20 2007 -0700 @@ -70,9 +70,11 @@ static char *netpool_member_of(const CMP for (i = 0; i < count; i++) { if (STREQ((devs[i].id), dev)) { - asprintf(&result, - "NetworkPool/%s", - devs[i].dev.net.bridge); + ret = asprintf(&result, + "NetworkPool/%s", + devs[i].dev.net.bridge); + if (ret == -1) + result = NULL; break; } }

2 1

[PATCH] Build changes for new libcmpiutil header placement
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193430866 25200 # Node ID aaad430ea766d9a3bc0be035e595d8da17ee2122 # Parent 239f76be94c5fbf730a315408af156c3b0b0d092 Build changes for new libcmpiutil header placement This attempts to find libcmpiutil by pkg-config, but falls back on looking in some of the normal locations. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 239f76be94c5 -r aaad430ea766 acinclude.m4 --- a/acinclude.m4 Fri Oct 26 09:15:15 2007 -0700 +++ b/acinclude.m4 Fri Oct 26 13:34:26 2007 -0700 @@ -258,7 +258,45 @@ AC_DEFUN([CHECK_LIBXML2], fi ] ) - + +AC_DEFUN([_CHECK_LIBCU_PC], + [ + if pkg-config --exists libcmpiutil; then + CPPFLAGS="$CPPFLAGS `pkg-config --cflags libcmpiutil`" + LDFLAGS="$LDFLAGS `pkg-config --libs libcmpiutil`" + found_libcu=yes + fi + ] +) + +AC_DEFUN([_CHECK_LIBCU_NOPC], + [ + DIRS="/usr /usr/local" + for dir in $DIRS; do + if test -f "${dir}/include/libcmpiutil/libcmpiutil.h"; then + CPPFLAGS="$CPPFLAGS -I${dir}/include/libcmpiutil" + LDFLAGS="$LDFLAGS -lcmpiutil -L${dir}/lib" + found_libcu=yes + fi + done + ] +) + +AC_DEFUN([CHECK_LIBCU], + [ + _CHECK_LIBCU_PC + if test "x$found_libcu" != "xyes"; then + _CHECK_LIBCU_NOPC + fi + AC_CHECK_LIB(cmpiutil, cu_check_args, [], [ + AC_MSG_ERROR(libcmpiutil not found) + ]) + AC_CHECK_HEADER([libcmpiutil.h], [], [ + AC_MSG_ERROR([libcmpiutil.h not found]) + ]) + ] +) + dnl dnl The check for the libvirt library dnl Sets the LIBVIRTDIR variable diff -r 239f76be94c5 -r aaad430ea766 configure.ac --- a/configure.ac Fri Oct 26 09:15:15 2007 -0700 +++ b/configure.ac Fri Oct 26 13:34:26 2007 -0700 @@ -133,10 +133,7 @@ fi CFLAGS_STRICT="-Werror" -AC_CHECK_LIB(cmpiutil, cu_check_args, [], [ - echo "libcmpiutil not found" - exit 1 - ]) +CHECK_LIBCU AC_ARG_ENABLE([werror], [ --enable-werror enable werror on builds [[default=yes]]],

2 3

[PATCH] Add a basic README file to libcmpiutil (without libxml2 as a requirement)
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193423426 25200 # Node ID 6cb1126452eb354573b95acd7c9077038cc24111 # Parent c771f49faf36a1d0dffc5b5ee0b053ed171fb500 Add a basic README file to libcmpiutil (without libxml2 as a requirement) Also updated the Makefile.am and spec file to include the readme. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c771f49faf36 -r 6cb1126452eb Makefile.am --- a/Makefile.am Fri Oct 26 19:12:06 2007 +0200 +++ b/Makefile.am Fri Oct 26 11:30:26 2007 -0700 @@ -3,7 +3,7 @@ SUBDIRS = tools EXTRA_DIST = libcmpiutil.spec.in libcmpiutil.spec COPYING \ libcmpiutil.pc.in libcmpiutil.pc \ - doc/doxygen.conf doc/mainpage doc/SubmittingPatches + doc/doxygen.conf doc/mainpage doc/SubmittingPatches README pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcmpiutil.pc diff -r c771f49faf36 -r 6cb1126452eb README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Fri Oct 26 11:30:26 2007 -0700 @@ -0,0 +1,36 @@ + libcmpiutil : A CMPI toolkit library for writing providers + +Libcmpiutil is a library of utility functions for CMPI providers. It +is free software available under the GNU Lesser General Public +License. The goal is to reduce the amount of repetitive work done in +most CMPI providers by encapsulating common procedures with more +"normal" APIs. This extends from operations like getting typed +instance properties to standardizing method dispatch and argument +checking. + +The latest version of the library can be found here: + + http://libvirt.org/hg/libcmpiutil + + Development discussion currently takes place on the libvirt-cim + mailing list: + + https://www.redhat.com/mailman/listinfo/libvirt-cim + +Building +-------- + +Requirements: + + - Pegasus or SFCB development headers + - Lex (if enabling the EO parser) + - Yacc (if enabling the EO parser) + - doxygen + +Procedure: + + $ ./autogen.sh + $ # You probably want the EO parser enabled + $ ./configure --enable-eoparser + $ make + $ sudo make install diff -r c771f49faf36 -r 6cb1126452eb libcmpiutil.spec.in --- a/libcmpiutil.spec.in Fri Oct 26 19:12:06 2007 +0200 +++ b/libcmpiutil.spec.in Fri Oct 26 11:30:26 2007 -0700 @@ -59,7 +59,7 @@ rm -fr %{buildroot} %files %defattr(-, root, root) -%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches +%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches README %{_libdir}/lib*.so.* %files devel @@ -70,7 +70,7 @@ rm -fr %{buildroot} %{_includedir}/libcmpiutil/*.h %{_libdir}/pkgconfig/libcmpiutil.pc -%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches +%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches README %changelog * Fri Oct 26 2007 Daniel Veillard <veillard(a)redhat.com> - 0.1-1

2 1

[PATCH] add packaging for libcmpiutil
by Daniel Veillard 26 Oct '07

26 Oct '07

# HG changeset patch # User Daniel Veillard <veillard(a)redhat.com> # Date 1193418726 -7200 # Node ID d08da2d71ea4fbc8302758688de452bf125dd924 # Parent cdd77491efaac8f60428cbf0ef92ec8b566f5b60 - libcmpiutil.spec.in template file for libcmpiutil allowing to build RPMs - libcmpiutil.pc.in template file for libcmpiutil for a pkgconfig file - modifications to configure.ac to generate the spec and pkgconfig files - modifications to Makefile.am to include the current docs (README will have to be added) - modifications to Makefile.am to move the includes to a safer place /usr/include/libcmpiutil - modification to Makefile.am to add a 'make rpm' command which can be quite convenient at times. Daniel diff -r cdd77491efaa -r d08da2d71ea4 Makefile.am --- a/Makefile.am Thu Oct 25 13:44:11 2007 -0700 +++ b/Makefile.am Fri Oct 26 19:12:06 2007 +0200 @@ -1,7 +1,16 @@ # Copyright IBM Corp. 2007 SUBDIRS = tools -include_HEADERS = libcmpiutil.h \ +EXTRA_DIST = libcmpiutil.spec.in libcmpiutil.spec COPYING \ + libcmpiutil.pc.in libcmpiutil.pc \ + doc/doxygen.conf doc/mainpage doc/SubmittingPatches + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libcmpiutil.pc + +libcmpiutilincdir = $(includedir)/libcmpiutil + +libcmpiutilinc_HEADERS = libcmpiutil.h \ std_invokemethod.h \ std_association.h \ std_indication.h @@ -33,4 +42,8 @@ endif endif clean-local: - rm -f $(BUILT_SOURCES) *~ \ No newline at end of file + rm -f $(BUILT_SOURCES) *~ + +rpm: clean + @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) + diff -r cdd77491efaa -r d08da2d71ea4 configure.ac --- a/configure.ac Thu Oct 25 13:44:11 2007 -0700 +++ b/configure.ac Fri Oct 26 19:12:06 2007 +0200 @@ -61,4 +61,5 @@ echo "Build Embedded Object parser: echo "Build Embedded Object parser: $eoparser" echo "" -AC_OUTPUT \ No newline at end of file +AC_OUTPUT(libcmpiutil.spec libcmpiutil.pc) + diff -r cdd77491efaa -r d08da2d71ea4 libcmpiutil.pc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libcmpiutil.pc.in Fri Oct 26 19:12:06 2007 +0200 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@/libcmpiutil + +Name: libcmpiutil +Version: @VERSION@ +Description: CMPI Utility Library +Requires: +Libs: -L${libdir} -lcmpiutil +Cflags: -I${includedir} diff -r cdd77491efaa -r d08da2d71ea4 libcmpiutil.spec.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libcmpiutil.spec.in Fri Oct 26 19:12:06 2007 +0200 @@ -0,0 +1,77 @@ +# -*- rpm-spec -*- + +Summary: CMPI Utility Library +Name: libcmpiutil +Version: @PACKAGE_VERSION@ +Release: 1%{?dist}%{?extra_release} +License: LGPL +Group: Development/Libraries +Source: libcmpiutil-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://libvirt.org/CIM/ +BuildRequires: sblim-cmpi-devel +BuildRequires: flex +BuildRequires: bison + +%description +Libcmpiutil is a library of utility functions for CMPI providers. +The goal is to reduce the amount of repetitive work done in +most CMPI providers by encapsulating common procedures with more +"normal" APIs. This extends from operations like getting typed +instance properties to standardizing method dispatch and argument checking. + +%package devel +Summary: Libraries, includes, etc. to use the CMPI utility library +Group: Development/Libraries +Requires: sblim-cmpi-devel +Requires: pkgconfig + +%description devel +Includes and documentations for the CMPI utility library +The goal is to reduce the amount of repetitive work done in +most CMPI providers by encapsulating common procedures with more +"normal" APIs. This extends from operations like getting typed +instance properties to standardizing method dispatch and argument checking. + +%prep +%setup -q + +%build +%configure +make + +%install +rm -fr %{buildroot} + +%makeinstall +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + +%clean +rm -fr %{buildroot} + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-, root, root) + +%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches +%{_libdir}/lib*.so.* + +%files devel +%defattr(-, root, root) + +%{_libdir}/lib*.so +%dir %{_includedir}/ +%{_includedir}/libcmpiutil/*.h +%{_libdir}/pkgconfig/libcmpiutil.pc + +%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches + +%changelog +* Fri Oct 26 2007 Daniel Veillard <veillard(a)redhat.com> - 0.1-1 +- created

2 3

[PATCH] Add a basic README file
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193414283 25200 # Node ID 6e4b77769d72ea84581f50c173bb98e3e977edac # Parent cdd77491efaac8f60428cbf0ef92ec8b566f5b60 Add a basic README file Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r cdd77491efaa -r 6e4b77769d72 README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Fri Oct 26 08:58:03 2007 -0700 @@ -0,0 +1,37 @@ + libcmpiutil : A CMPI toolkit library for writing providers + +Libcmpiutil is a library of utility functions for CMPI providers. It +is free software available under the GNU Lesser General Public +License. The goal is to reduce the amount of repetitive work done in +most CMPI providers by encapsulating common procedures with more +"normal" APIs. This extends from operations like getting typed +instance properties to standardizing method dispatch and argument +checking. + +The latest version of the library can be found here: + + http://libvirt.org/hg/libcmpiutil + + Development discussion currently takes place on the libvirt-cim + mailing list: + + https://www.redhat.com/mailman/listinfo/libvirt-cim + +Building +-------- + +Requirements: + + - Pegasus or SFCB development headers + - libxml2 + - Lex (if enabling the EO parser) + - Yacc (if enabling the EO parser) + - doxygen + +Procedure: + + $ ./autogen.sh + $ # You probably want the EO parser enabled + $ ./configure --enable-eoparser + $ make + $ sudo make install

2 2

[PATCH] Add a basic README file to libcmpiutil (without libxml2 as a requirement)
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193417112 25200 # Node ID 28180922bc19dc31223ceed66358cd108e2e2124 # Parent cdd77491efaac8f60428cbf0ef92ec8b566f5b60 Add a basic README file to libcmpiutil (without libxml2 as a requirement) Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r cdd77491efaa -r 28180922bc19 README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Fri Oct 26 09:45:12 2007 -0700 @@ -0,0 +1,36 @@ + libcmpiutil : A CMPI toolkit library for writing providers + +Libcmpiutil is a library of utility functions for CMPI providers. It +is free software available under the GNU Lesser General Public +License. The goal is to reduce the amount of repetitive work done in +most CMPI providers by encapsulating common procedures with more +"normal" APIs. This extends from operations like getting typed +instance properties to standardizing method dispatch and argument +checking. + +The latest version of the library can be found here: + + http://libvirt.org/hg/libcmpiutil + + Development discussion currently takes place on the libvirt-cim + mailing list: + + https://www.redhat.com/mailman/listinfo/libvirt-cim + +Building +-------- + +Requirements: + + - Pegasus or SFCB development headers + - Lex (if enabling the EO parser) + - Yacc (if enabling the EO parser) + - doxygen + +Procedure: + + $ ./autogen.sh + $ # You probably want the EO parser enabled + $ ./configure --enable-eoparser + $ make + $ sudo make install

1 0

[PATCH 0 of 3] Add DiskPool support
by Dan Smith 26 Oct '07

26 Oct '07

This set adds disk pool support and the relevant changes to RAFP and EAFP to support discovery of membership from LogicalDisk and DiskRASD. It's a little raw right now, but it works.

2 5

[PATCH] Add a basic README file
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193412852 25200 # Node ID ca75b48896652c812520d6b08eac07bc4e9473ec # Parent d41b62edd9412659b17b39c36d9ad488ca24f622 Add a basic README file I'm sure the list of requirements is not complete here, but it's a start Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r d41b62edd941 -r ca75b4889665 README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Fri Oct 26 08:34:12 2007 -0700 @@ -0,0 +1,36 @@ + + libvirt-cim : A CIM provider for libvirt + +Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC +virtualization model. It is free software available under the GNU +Lesser General Public License. The goal is to support most of the +features exported by libvirt itself, enabling management of multiple +platforms with a single provider. + +The latest version of the library can be found here: + + http://libvirt.org/hg/libvirt-cim + +and the development discussion mailing list is here: + + https://www.redhat.com/mailman/listinfo/libvirt-cim + +Building +-------- + +Requirements: + + - Pegasus or SFCB development headers + - libvirt 0.2.3 or greater + - e2fsprogs-devel + - libxml2 + - libcmpiutil (http://libvirt.org/hg/libcmpiutil) + - DMTF v2.16 experimental CIM Schema installed + +Procedure: + + $ ./autoconfiscate.sh + $ ./configure + $ make + $ sudo make install + $ sudo make postinstall

2 2

[PATCH] Make VSMS an instance provider
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193407878 25200 # Node ID 1fef15850ba5557cc421206fb3ff569f6845ad99 # Parent c0f41fb8b46631e3a636e28beb50be22a7929a1e Make VSMS an instance provider Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c0f41fb8b466 -r 1fef15850ba5 schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Fri Oct 26 07:05:10 2007 -0700 +++ b/schema/VirtualSystemManagementService.registration Fri Oct 26 07:11:18 2007 -0700 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method -KVM_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method +Xen_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +KVM_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance diff -r c0f41fb8b466 -r 1fef15850ba5 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Oct 26 07:05:10 2007 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri Oct 26 07:11:18 2007 -0700 @@ -896,6 +896,80 @@ STDIM_MethodMIStub(, Virt_VirtualSystemM STDIM_MethodMIStub(, Virt_VirtualSystemManagementService, _BROKER, CMNoHook, my_handlers); + +static CMPIStatus return_vsms(const CMPIObjectPath *reference, + const CMPIResult *results, + int name_only) +{ + CMPIStatus s; + CMPIInstance *inst; + + inst = get_typed_instance(_BROKER, + "VirtualSystemManagementService", + NAMESPACE(reference)); + if (inst == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Failed to create instance"); + goto out; + } + + CMSetProperty(inst, "Name", + (CMPIValue *)"Management Service", CMPI_chars); + + if (name_only) + cu_return_instance_name(results, inst); + else + CMReturnInstance(results, inst); + + CMSetStatus(&s, CMPI_RC_OK); + + out: + return s; +} + +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return return_vsms(reference, results, 1); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + + return return_vsms(reference, results, 0); +} + +static CMPIStatus GetInstance(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + return return_vsms(reference, results, 0); +} + +DEFAULT_CI(); +DEFAULT_MI(); +DEFAULT_DI(); +DEFAULT_EQ(); +DEFAULT_INST_CLEANUP(); + +/* Avoid a warning in the stub macro below */ +CMPIInstanceMI * +Virt_VirtualSystemManagementService_Create_InstanceMI(const CMPIBroker *, + const CMPIContext *, + CMPIStatus *rc); + +CMInstanceMIStub(, Virt_VirtualSystemManagementService, _BROKER, CMNoHook); + + /* * Local Variables: * mode: C

2 1

[PATCH] Move RASD base classes out of provider MOFs
by Dan Smith 26 Oct '07

26 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193407510 25200 # Node ID c0f41fb8b46631e3a636e28beb50be22a7929a1e # Parent d41b62edd9412659b17b39c36d9ad488ca24f622 Move RASD base classes out of provider MOFs. This adds another script that can be used to register additional base classes to the schema, without registering a new provider. This lets us extend the base schema with our Xen_RASD and KVM_RASD classes. It also provides us a framework to install bundled base schema, which may be necessary at some point. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r d41b62edd941 -r c0f41fb8b466 Makefile.am --- a/Makefile.am Thu Oct 25 14:37:09 2007 -0700 +++ b/Makefile.am Fri Oct 26 07:05:10 2007 -0700 @@ -69,6 +69,10 @@ INTEROP_REGS = \ schema/RegisteredProfile.registration \ schema/ElementConformsToProfile.registration +EXTRA_BASE_MOFS = \ + schema/Xen_ResourceAllocationSettingData.mof \ + schema/KVM_ResourceAllocationSettingData.mof + pkgdata_DATA = $(MOFS) $(REGS) pkgdata_SCRIPTS = provider-register.sh @@ -77,6 +81,7 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pk # Un/Register the providers and class definitions from/to the current CIMOM. # @CIMSERVER@ is set by the configure script postinstall: + sh register_base.sh @CIMSERVER@ $(EXTRA_BASE_MOFS) sh provider-register.sh -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) sh provider-register.sh -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) diff -r d41b62edd941 -r c0f41fb8b466 register_base.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/register_base.sh Fri Oct 26 07:05:10 2007 -0700 @@ -0,0 +1,33 @@ +#!/bin/bash +# +# A script to register base classes with the CIMOM +# +# Copyright IBM Corp. 2007 +# Author: Dan Smith <danms(a)us.ibm.com> +# +# Usage: +# +# $ register_base.sh (sfcb|pegasus) [MOF...] +# +# FIXME: Need to make pegasus location and namespace variable + +CIMOM=$1 + +if [ -z "$CIMOM" ]; then + echo "Usage: $0 (pegasus|sfcb)" + exit 1 +fi + +shift + +if [ "$CIMOM" = "pegasus" ]; then + for i in $*; do + cimmofl -W -uc -aEV -R/var/lib/Pegasus -n /root/ibmsd $i + done +elif [ "$CIMOM" = "sfcb" ]; then + for i in $*; do + sfcbstage -n /root/ibmsd $i + done +else + echo "Unknown CIMOM type: $CIMOM" +fi diff -r d41b62edd941 -r c0f41fb8b466 schema/KVM_ResourceAllocationSettingData.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/KVM_ResourceAllocationSettingData.mof Fri Oct 26 07:05:10 2007 -0700 @@ -0,0 +1,9 @@ +// Copyright IBM Corp. 2007 +class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { + + [Key, + Description ("The type of allocated resource"), + Override ("ResourceType")] + uint16 ResourceType; + +}; diff -r d41b62edd941 -r c0f41fb8b466 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Thu Oct 25 14:37:09 2007 -0700 +++ b/schema/ResourceAllocationSettingData.mof Fri Oct 26 07:05:10 2007 -0700 @@ -1,22 +1,4 @@ // Copyright IBM Corp. 2007 -class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - - [Key, - Description ("The type of allocated resource"), - Override ("ResourceType")] - uint16 ResourceType; - -}; - -class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - - [Key, - Description ("The type of allocated resource"), - Override ("ResourceType")] - uint16 ResourceType; - -}; - [Description ("Xen virtual disk configuration")] class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData{ diff -r d41b62edd941 -r c0f41fb8b466 schema/Xen_ResourceAllocationSettingData.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/Xen_ResourceAllocationSettingData.mof Fri Oct 26 07:05:10 2007 -0700 @@ -0,0 +1,9 @@ +// Copyright IBM Corp. 2007 +class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { + + [Key, + Description ("The type of allocated resource"), + Override ("ResourceType")] + uint16 ResourceType; + +};

2 1