- CIM - libvirt List Archives

[PATCH] Cleanups and schema install additions to the RPM spec
by Dan Smith 09 Nov '07

09 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194624610 28800 # Node ID d2f6398c7174f362fddc07d9d07024e5ac9538b8 # Parent 581a0f3fb078ccb003378d6d5974f5fe4636f123 Cleanups and schema install additions to the RPM spec - Removed references to the register_bash.sh script - Added schema install/uninstall to scriptlets - Make HTML documentation be installed (and included in the RPM) - Remove references to beam in configure.ac - Check for xsltproc at configure time - Make RPM use configure-time namespace I have tested this on Fedora 8 with the bundled pegasus installation. We still need to figure out how we're going to get the CIM v2.16 Exp schema on the box, but if you do that manually (into /root/virt) before installing the RPM, it works as expected. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 581a0f3fb078 -r d2f6398c7174 configure.ac --- a/configure.ac Fri Nov 09 08:10:08 2007 -0800 +++ b/configure.ac Fri Nov 09 08:10:10 2007 -0800 @@ -54,20 +54,20 @@ AC_ARG_WITH([maxmem], [DEFINE_MAXMEM(4096)] ) +AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=path], + [path to html directory, default $datadir/doc/$PACKAGE-$VERSION/html]), + [test "x$withval" != "x" && HTML_DIR="$withval"], + [HTML_DIR='$(datadir)/doc/$(PACKAGE)-$(VERSION)/html']) +AC_SUBST(HTML_DIR) + # Autogenerate the autoconf header file to store build settings AC_CONFIG_HEADER([config.h]) -# We need a absolute here for beam to work topdir=`pwd` AC_SUBST(topdir) -AC_CHECK_PROG([found_beam_compile],[beam_compile],[yes]) - -BEAMFILES="parser-messages BEAM_STATS BEAM-complaints MISC_ERRORS *.beam" -AC_SUBST(BEAMFILES) - -# Autogenerate runbeam-c, which must be executable -#AC_CONFIG_FILES([beam/runbeam-c],[chmod a+x beam/runbeam-c]) +AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) # Autogenerate the Makefile AC_CONFIG_FILES([ @@ -140,11 +140,6 @@ else TESTSUITE_SUPPORT=Enabled fi -# -# Enable the beam source analysis system. This requires that beam's -# bin directory is in your path -# - CFLAGS_STRICT="-Werror" CHECK_LIBCU @@ -156,21 +151,6 @@ AC_ARG_ENABLE([werror], fi]) AC_SUBST(CFLAGS_STRICT) - -AC_ARG_ENABLE([beam], - [ --enable-beam use beam to compile source [[default=no]]], - [if test "x$enableval" = "xyes"; then - if test "x$found_beam_compile" = "xyes"; then - AC_MSG_NOTICE(Building beam configuration) - beam_configure --c $CC -o beam/compiler_c_config.tcl - CC="\$(top_srcdir)/beam/runbeam-c" - else - AC_CHECK_FAIL(beam,beam,http://w3.eda.ibm.com/beam, - Can not find beam_compile in path! Can not enable beam analysis! -) - fi - fi], - ) CFLAGS="$CFLAGS $CC_WARNINGS" diff -r 581a0f3fb078 -r d2f6398c7174 doc/Makefile.am --- a/doc/Makefile.am Fri Nov 09 08:10:08 2007 -0800 +++ b/doc/Makefile.am Fri Nov 09 08:10:10 2007 -0800 @@ -1,9 +1,25 @@ XSLTPROC = /usr/bin/xsltproc XSLTPROC = /usr/bin/xsltproc -WEB_PAGES = index.html +WEB_PAGES = index.html \ + architecture.html \ + downloads.html \ + intro.html \ + news.html \ + platforms.html \ + schema.html + +EXTRA_DIST = site.xsl libvirt-cim.html $(WEB_PAGES): libvirt-cim.html site.xsl - $(XSLTPROC) --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/libvirt-cim.html > index.html + -@(if [ -x $(XSLTPROC) ]; then \ + $(XSLTPROC) --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/libvirt-cim.html > index.html; \ + fi); + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) + @INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR) + +clean-local: + rm -f $(WEB_PAGES) all: $(WEB_PAGES) - diff -r 581a0f3fb078 -r d2f6398c7174 libvirt-cim.spec.in --- a/libvirt-cim.spec.in Fri Nov 09 08:10:08 2007 -0800 +++ b/libvirt-cim.spec.in Fri Nov 09 08:10:10 2007 -0800 @@ -34,7 +34,7 @@ rm -fr %{buildroot} rm -fr %{buildroot} %makeinstall PROVIDERDIR=%{buildroot}%{_libdir}/cmpi -cp provider-register.sh register_base.sh %{buildroot}%{_datadir}/libvirt-cim/ +cp provider-register.sh %{buildroot}%{_datadir}/libvirt-cim/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la @@ -43,17 +43,34 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a %clean rm -fr %{buildroot} +%pre +%define REGISTRATION %{_datadir}/%{name}/*.registration +%define SCHEMA %{_datadir}/%{name}/*.mof + +%{_datadir}/%{name}/provider-register.sh -d -t pegasus \ + -n /@CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} || true + %post /sbin/ldconfig -%postun +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n /@CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} || true + +%preun /sbin/ldconfig + +%{_datadir}/%{name}/provider-register.sh -d -t pegasus \ + -n /@CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} || true %files %defattr(-, root, root) %doc README doc/CodingStyle doc/SubmittingPatches -%doc provider-register.sh register_base.sh +%doc provider-register.sh +%doc doc/*.html %{_libdir}/lib*.so* %{_libdir}/cmpi/lib*.so* %{_datadir}/libvirt-cim/*.sh

2 3

[PATCH] Cleanups and schema install additions to the RPM spec
by Dan Smith 09 Nov '07

09 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194625790 28800 # Node ID 7a89e6d4a4d5f5dc1e77992b22a8c1f173ded7df # Parent 581a0f3fb078ccb003378d6d5974f5fe4636f123 Cleanups and schema install additions to the RPM spec - Removed references to the register_bash.sh script - Added schema install/uninstall to scriptlets - Make HTML documentation be installed (and included in the RPM) - Remove references to beam in configure.ac - Check for xsltproc at configure time - Make RPM use configure-time namespace - Discard registration messages on %preun (failures are expected) - Include the generated web content in "make dist" I have tested this on Fedora 8 with the bundled pegasus installation. We still need to figure out how we're going to get the CIM v2.16 Exp schema on the box, but if you do that manually (into /root/virt) before installing the RPM, it works as expected. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 581a0f3fb078 -r 7a89e6d4a4d5 configure.ac --- a/configure.ac Fri Nov 09 08:10:08 2007 -0800 +++ b/configure.ac Fri Nov 09 08:29:50 2007 -0800 @@ -54,20 +54,20 @@ AC_ARG_WITH([maxmem], [DEFINE_MAXMEM(4096)] ) +AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=path], + [path to html directory, default $datadir/doc/$PACKAGE-$VERSION/html]), + [test "x$withval" != "x" && HTML_DIR="$withval"], + [HTML_DIR='$(datadir)/doc/$(PACKAGE)-$(VERSION)/html']) +AC_SUBST(HTML_DIR) + # Autogenerate the autoconf header file to store build settings AC_CONFIG_HEADER([config.h]) -# We need a absolute here for beam to work topdir=`pwd` AC_SUBST(topdir) -AC_CHECK_PROG([found_beam_compile],[beam_compile],[yes]) - -BEAMFILES="parser-messages BEAM_STATS BEAM-complaints MISC_ERRORS *.beam" -AC_SUBST(BEAMFILES) - -# Autogenerate runbeam-c, which must be executable -#AC_CONFIG_FILES([beam/runbeam-c],[chmod a+x beam/runbeam-c]) +AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) # Autogenerate the Makefile AC_CONFIG_FILES([ @@ -140,11 +140,6 @@ else TESTSUITE_SUPPORT=Enabled fi -# -# Enable the beam source analysis system. This requires that beam's -# bin directory is in your path -# - CFLAGS_STRICT="-Werror" CHECK_LIBCU @@ -156,21 +151,6 @@ AC_ARG_ENABLE([werror], fi]) AC_SUBST(CFLAGS_STRICT) - -AC_ARG_ENABLE([beam], - [ --enable-beam use beam to compile source [[default=no]]], - [if test "x$enableval" = "xyes"; then - if test "x$found_beam_compile" = "xyes"; then - AC_MSG_NOTICE(Building beam configuration) - beam_configure --c $CC -o beam/compiler_c_config.tcl - CC="\$(top_srcdir)/beam/runbeam-c" - else - AC_CHECK_FAIL(beam,beam,http://w3.eda.ibm.com/beam, - Can not find beam_compile in path! Can not enable beam analysis! -) - fi - fi], - ) CFLAGS="$CFLAGS $CC_WARNINGS" diff -r 581a0f3fb078 -r 7a89e6d4a4d5 doc/Makefile.am --- a/doc/Makefile.am Fri Nov 09 08:10:08 2007 -0800 +++ b/doc/Makefile.am Fri Nov 09 08:29:50 2007 -0800 @@ -1,9 +1,22 @@ XSLTPROC = /usr/bin/xsltproc XSLTPROC = /usr/bin/xsltproc -WEB_PAGES = index.html +WEB_PAGES = index.html \ + architecture.html \ + downloads.html \ + intro.html \ + news.html \ + platforms.html \ + schema.html + +EXTRA_DIST = site.xsl libvirt-cim.html $(WEB_PAGES) $(WEB_PAGES): libvirt-cim.html site.xsl - $(XSLTPROC) --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/libvirt-cim.html > index.html + -@(if [ -x $(XSLTPROC) ]; then \ + $(XSLTPROC) --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/libvirt-cim.html > index.html; \ + fi); + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) + @INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR) all: $(WEB_PAGES) - diff -r 581a0f3fb078 -r 7a89e6d4a4d5 libvirt-cim.spec.in --- a/libvirt-cim.spec.in Fri Nov 09 08:10:08 2007 -0800 +++ b/libvirt-cim.spec.in Fri Nov 09 08:29:50 2007 -0800 @@ -34,7 +34,7 @@ rm -fr %{buildroot} rm -fr %{buildroot} %makeinstall PROVIDERDIR=%{buildroot}%{_libdir}/cmpi -cp provider-register.sh register_base.sh %{buildroot}%{_datadir}/libvirt-cim/ +cp provider-register.sh %{buildroot}%{_datadir}/libvirt-cim/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la @@ -43,8 +43,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a %clean rm -fr %{buildroot} +%pre +%define REGISTRATION %{_datadir}/%{name}/*.registration +%define SCHEMA %{_datadir}/%{name}/*.mof + +%{_datadir}/%{name}/provider-register.sh -d -t pegasus \ + -n /@CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true + %post /sbin/ldconfig + +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n /@CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} || true + +%preun +%{_datadir}/%{name}/provider-register.sh -d -t pegasus \ + -n /@CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} || true %postun /sbin/ldconfig @@ -53,7 +70,8 @@ rm -fr %{buildroot} %defattr(-, root, root) %doc README doc/CodingStyle doc/SubmittingPatches -%doc provider-register.sh register_base.sh +%doc provider-register.sh +%doc doc/*.html %{_libdir}/lib*.so* %{_libdir}/cmpi/lib*.so* %{_datadir}/libvirt-cim/*.sh

1 0

[PATCH] Change installed namespace to root/virt
by Dan Smith 09 Nov '07

09 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194558864 28800 # Node ID 90ffd19dda747eb615f12b10aa04e4f9bc978b31 # Parent 114b074cb5e710e6c3613ca89edf205bbf945d4c Change installed namespace to root/virt This one deserves some serious testing, although I was pleasantly surprised at how few instances of the namespace we had hard-coded. We could probably use a configure flag to set the namespace, but the schema files would all have to change before it would work, so I'm not sure it's worth it. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 114b074cb5e7 -r 90ffd19dda74 Makefile.am --- a/Makefile.am Thu Nov 08 12:47:38 2007 -0800 +++ b/Makefile.am Thu Nov 08 13:54:24 2007 -0800 @@ -81,11 +81,11 @@ 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 provider-register.sh -v -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) + sh provider-register.sh -v -t @CIMSERVER@ -n /root/virt -r $(REGS) -m $(MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) preuninstall: - sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) + sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/virt -r $(REGS) -m $(MOFS) sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) rpm: clean diff -r 114b074cb5e7 -r 90ffd19dda74 doc/Makefile.am --- a/doc/Makefile.am Thu Nov 08 12:47:38 2007 -0800 +++ b/doc/Makefile.am Thu Nov 08 13:54:24 2007 -0800 @@ -1,6 +1,8 @@ XSLTPROC = /usr/bin/xsltproc XSLTPROC = /usr/bin/xsltproc WEB_PAGES = index.html + +EXTRA_DIST = site.xsl libvirt-cim.html $(WEB_PAGES): libvirt-cim.html site.xsl $(XSLTPROC) --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/libvirt-cim.html > index.html diff -r 114b074cb5e7 -r 90ffd19dda74 doc/libvirt-cim.html --- a/doc/libvirt-cim.html Thu Nov 08 12:47:38 2007 -0800 +++ b/doc/libvirt-cim.html Thu Nov 08 13:54:24 2007 -0800 @@ -73,9 +73,9 @@ $ mkdir cim216 $ cd cim216 $ unzip $PATH_TO_ZIPFILE - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd cimv216.mof - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd qualifiers.mof - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd qualifiers_optional.mof + $ 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 </code> <h4>To install the schema in SFCB:</h4> diff -r 114b074cb5e7 -r 90ffd19dda74 schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/AllocationCapabilities.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_AllocationCapabilities root/ibmsd Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance -KVM_AllocationCapabilities root/ibmsd Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +Xen_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +KVM_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ComputerSystem.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ComputerSystem root/ibmsd Virt_ComputerSystemProvider Virt_ComputerSystem instance method +Xen_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance method # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ComputerSystem root/ibmsd Virt_ComputerSystemProvider Virt_ComputerSystem instance +KVM_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ComputerSystemIndication.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 -Xen_ComputerSystemCreatedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -Xen_ComputerSystemDeletedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -KVM_ComputerSystemCreatedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -KVM_ComputerSystemDeletedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method diff -r 114b074cb5e7 -r 90ffd19dda74 schema/DiskPool.registration --- a/schema/DiskPool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/DiskPool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,2 +1,2 @@ Xen_DiskPool root/ibmsd Virt_DevicePoolP -Xen_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance -KVM_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +KVM_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ElementAllocatedFromPool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ElementAllocatedFromPool root/ibmsd Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association -KVM_ElementAllocatedFromPool root/ibmsd KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file +Xen_ElementAllocatedFromPool root/virt Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association +KVM_ElementAllocatedFromPool root/virt KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ElementConformsToProfile.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,7 +1,7 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -#Xen_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association # Classname Namespace ProviderName ProviderModule ProviderTypes ... -#KVM_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association diff -r 114b074cb5e7 -r 90ffd19dda74 schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/EnabledLogicalElementCapabilities.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_EnabledLogicalElementCapabilities root/ibmsd Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_EnabledLogicalElementCapabilities root/ibmsd Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/HostSystem.registration --- a/schema/HostSystem.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/HostSystem.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostSystem root/ibmsd Virt_HostSystemProvider Virt_HostSystem instance +Xen_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_HostSystem root/ibmsd Virt_HostSystemProvider Virt_HostSystem instance +KVM_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/HostedDependency.registration --- a/schema/HostedDependency.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/HostedDependency.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostedDependency root/ibmsd Virt_HostedDependencyProvider Virt_HostedDependency association +Xen_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_HostedDependency root/ibmsd Virt_HostedDependencyProvider Virt_HostedDependency association +KVM_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association diff -r 114b074cb5e7 -r 90ffd19dda74 schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/HostedResourcePool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_HostedResourcePool root/ibmsd Virt_HostedResourcePoolProvider Virt_HostedResourcePool association -KVM_HostedResourcePool root/ibmsd Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file +Xen_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association +KVM_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file diff -r 114b074cb5e7 -r 90ffd19dda74 schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/LogicalDisk.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_LogicalDisk root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_LogicalDisk root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/Memory.registration --- a/schema/Memory.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/Memory.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_Memory root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_Memory root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/MemoryPool.registration --- a/schema/MemoryPool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/MemoryPool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_MemoryPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_MemoryPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/NetPool.registration --- a/schema/NetPool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/NetPool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_NetworkPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance -KVM_NetworkPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file +Xen_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +KVM_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file diff -r 114b074cb5e7 -r 90ffd19dda74 schema/NetworkPort.registration --- a/schema/NetworkPort.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/NetworkPort.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_NetworkPort root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_NetworkPort root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/Processor.registration --- a/schema/Processor.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/Processor.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_Processor root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_Processor root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ProcessorPool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ProcessorPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ProcessorPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ResourceAllocationFromPool.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourceAllocationFromPool root/ibmsd Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association -KVM_ResourceAllocationFromPool root/ibmsd KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file +Xen_ResourceAllocationFromPool root/virt Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association +KVM_ResourceAllocationFromPool root/virt KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ResourceAllocationSettingData.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 -Xen_DiskResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_NetResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_ProcResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_MemResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance +Xen_DiskResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_NetResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_ProcResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_MemResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourcePoolConfigurationCapabilities root/ibmsd Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance -KVM_ResourcePoolConfigurationCapabilities root/ibmsd Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file +Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance +KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file diff -r 114b074cb5e7 -r 90ffd19dda74 schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/ResourcePoolConfigurationService.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourcePoolConfigurationService root/ibmsd Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method -KVM_ResourcePoolConfigurationService root/ibmsd Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file +Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method +KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file diff -r 114b074cb5e7 -r 90ffd19dda74 schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/SettingsDefineCapabilities.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineCapabilities root/ibmsd Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association -KVM_SettingsDefineCapabilities root/ibmsd KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +Xen_SettingsDefineCapabilities root/virt Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +KVM_SettingsDefineCapabilities root/virt KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association diff -r 114b074cb5e7 -r 90ffd19dda74 schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/SettingsDefineState.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineState root/ibmsd Xen_SettingsDefineStateProvider Virt_SettingsDefineState association -KVM_SettingsDefineState root/ibmsd KVM_SettingsDefineStateProvider Virt_SettingsDefineState association +Xen_SettingsDefineState root/virt Xen_SettingsDefineStateProvider Virt_SettingsDefineState association +KVM_SettingsDefineState root/virt KVM_SettingsDefineStateProvider Virt_SettingsDefineState association diff -r 114b074cb5e7 -r 90ffd19dda74 schema/SystemDevice.registration --- a/schema/SystemDevice.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/SystemDevice.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_SystemDevice root/ibmsd Xen_SystemDeviceProvider Virt_SystemDevice association -KVM_SystemDevice root/ibmsd KVM_SystemDeviceProvider Virt_SystemDevice association +Xen_SystemDevice root/virt Xen_SystemDeviceProvider Virt_SystemDevice association +KVM_SystemDevice root/virt KVM_SystemDeviceProvider Virt_SystemDevice association diff -r 114b074cb5e7 -r 90ffd19dda74 schema/VSSD.registration --- a/schema/VSSD.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/VSSD.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemSettingData root/ibmsd Virt_VSSDProvider Virt_VSSD instance -KVM_VirtualSystemSettingData root/ibmsd Virt_VSSDProvider Virt_VSSD instance +Xen_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance +KVM_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/VSSDComponent.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemSettingDataComponent root/ibmsd Xen_VSSDComponentProvider Virt_VSSDComponent association -KVM_VirtualSystemSettingDataComponent root/ibmsd KVM_VSSDComponentProvider Virt_VSSDComponent association +Xen_VirtualSystemSettingDataComponent root/virt Xen_VSSDComponentProvider Virt_VSSDComponent association +KVM_VirtualSystemSettingDataComponent root/virt KVM_VSSDComponentProvider Virt_VSSDComponent association diff -r 114b074cb5e7 -r 90ffd19dda74 schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/VirtualSystemManagementCapabilities.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemManagementCapabilities root/ibmsd Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_VirtualSystemManagementCapabilities root/ibmsd Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance diff -r 114b074cb5e7 -r 90ffd19dda74 schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Thu Nov 08 12:47:38 2007 -0800 +++ b/schema/VirtualSystemManagementService.registration Thu Nov 08 13:54:24 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance -KVM_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +Xen_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +KVM_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance diff -r 114b074cb5e7 -r 90ffd19dda74 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Thu Nov 08 12:47:38 2007 -0800 +++ b/src/Virt_ComputerSystemIndication.c Thu Nov 08 13:54:24 2007 -0800 @@ -142,7 +142,7 @@ static bool async_ind(CMPIContext *conte CMPIStatus s; const char *type_name; char *type_cn = NULL; - const char *ns = "root/ibmsd"; + const char *ns = "root/virt"; /* FIXME: Hmm, need to get the namespace a better way */ diff -r 114b074cb5e7 -r 90ffd19dda74 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Thu Nov 08 12:47:38 2007 -0800 +++ b/src/Virt_ElementConformsToProfile.c Thu Nov 08 13:54:24 2007 -0800 @@ -64,7 +64,7 @@ static CMPIStatus elem_instances(const C goto out; } - op = CMNewObjectPath(_BROKER, "/root/ibmsd", classname, &s); + op = CMNewObjectPath(_BROKER, "/root/virt", classname, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) goto error;

2 3

Re: [Libvirt-cim] [PATCH] Make HostedResourcePool a little more discerning
by Dan Smith 08 Nov '07

08 Nov '07

KR> Oops, yes. I meant the pool_to_sys() side. =) Well, that is less of a problem I'd say. We don't really have the same issue of checking for a superclass where a subset of the children would be invalid parameters to the association, right? That's the root of the problem with the other direction. We could certainly look up an instance of the pool they're asking about and check their reference. I'm not sure it really matters as much as something like a GetInstance though, because the answer is always the same, no matter what pool they ask about. If someone deleted a pool between when they got a reference and when they asked about the host system for that pool, then we'd fail the association even though we already knew the answer and the answer is valid. Depends on your interpretation of CIM principles I suppose :) KR> Is there a defined CIM way for handling properties? I mostly KR> asked because I don't know much about them. I'm not sure what the policy is for property filtering and if keys can't be filtered. Something to revisit when we actually implement support for such, I'd say :) -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms(a)us.ibm.com

1 0

[PATCH] Make HostedResourcePool a little more discerning
by Dan Smith 08 Nov '07

08 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194548690 28800 # Node ID 4c736ba430524c00804b710b923ea0030808a893 # Parent bd1b1067d106ecc1546c3b2436a43f59f8eaba15 Make HostedResourcePool a little more discerning Use cu_compare_ref() to make sure the client specified the actual HostSystem instance and not a random CIM_System Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r bd1b1067d106 -r 4c736ba43052 src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Thu Nov 08 10:43:48 2007 -0800 +++ b/src/Virt_HostedResourcePool.c Thu Nov 08 11:04:50 2007 -0800 @@ -60,6 +60,21 @@ static CMPIStatus sys_to_pool(const CMPI CMPIStatus s; int i; virConnectPtr conn; + CMPIInstance *host; + const char *prop; + + s = get_host_cs(_BROKER, ref, &host); + if (s.rc != CMPI_RC_OK) + return s; + + prop = cu_compare_ref(ref, host); + if (prop != NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such HostSystem instance (%s)", + prop); + return s; + } conn = lv_connect(_BROKER, &s); if (conn == NULL)

2 2

[PATCH] Cleanups and schema install additions to the RPM spec
by Dan Smith 08 Nov '07

08 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194559255 28800 # Node ID fbc36f46718fd7390d43e61bbb35276a1ba55a6e # Parent 90ffd19dda747eb615f12b10aa04e4f9bc978b31 Cleanups and schema install additions to the RPM spec - Removed references to the register_bash.sh script - Added schema install/uninstall to scriptlets I have tested this on Fedora 8 with the bundled pegasus installation. We still need to figure out how we're going to get the CIM v2.16 Exp schema on the box, but if you do that manually (into /root/virt) before installing the RPM, it works as expected. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 90ffd19dda74 -r fbc36f46718f libvirt-cim.spec.in --- a/libvirt-cim.spec.in Thu Nov 08 13:54:24 2007 -0800 +++ b/libvirt-cim.spec.in Thu Nov 08 14:00:55 2007 -0800 @@ -34,7 +34,7 @@ rm -fr %{buildroot} rm -fr %{buildroot} %makeinstall PROVIDERDIR=%{buildroot}%{_libdir}/cmpi -cp provider-register.sh register_base.sh %{buildroot}%{_datadir}/libvirt-cim/ +cp provider-register.sh %{buildroot}%{_datadir}/libvirt-cim/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la @@ -43,17 +43,34 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a %clean rm -fr %{buildroot} +%pre +%define REGISTRATION %{_datadir}/%{name}/*.registration +%define SCHEMA %{_datadir}/%{name}/*.mof +%define NAMESPACE /root/virt + +%{_datadir}/%{name}/provider-register.sh -d -t pegasus \ + -n %{NAMESPACE} \ + -r %{REGISTRATION} -m %{SCHEMA} || true + %post /sbin/ldconfig -%postun +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n %{NAMESPACE} \ + -r %{REGISTRATION} -m %{SCHEMA} || true + +%preun /sbin/ldconfig + +%{_datadir}/%{name}/provider-register.sh -d -t pegasus \ + -n %{NAMESPACE} \ + -r %{REGISTRATION} -m %{SCHEMA} || true %files %defattr(-, root, root) %doc README doc/CodingStyle doc/SubmittingPatches -%doc provider-register.sh register_base.sh +%doc provider-register.sh %{_libdir}/lib*.so* %{_libdir}/cmpi/lib*.so* %{_datadir}/libvirt-cim/*.sh

1 0

[PATCH] Add association results filtering
by Kaitlin Rupert 08 Nov '07

08 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194546376 28800 # Node ID 66548720dc50f268b861d336ac295003a9a03ec9 # Parent 404c4803b1b542676c4d283226a7cc3b7f3ab58d Add association results filtering. This adds result filtering so that an association only returns instances that match the result class specified during the query. Such an example is the following: HostedService needs to return VSMS and RPCS instances when queried using CIM_ManagedElement as the result class. However, if CIM_VSMS is specified as the result class, then only the VSMS instance needs to be returned. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 404c4803b1b5 -r 66548720dc50 std_association.c --- a/std_association.c Fri Nov 02 15:29:38 2007 -0700 +++ b/std_association.c Thu Nov 08 10:26:16 2007 -0800 @@ -47,6 +47,17 @@ void set_reference(struct std_assoc *ass (CMPIValue *)&target, CMPI_ref); } +static bool match_op(const CMPIBroker *broker, + CMPIObjectPath *op, + const char *filter_class) +{ + if ((filter_class == NULL) || + CMClassPathIsA(broker, op, filter_class, NULL)) + return true; + else + return false; +} + static bool match_class(const CMPIBroker *broker, const char *ns, const char *test_class, @@ -58,10 +69,44 @@ static bool match_class(const CMPIBroker if ((test_class == NULL) || (comp_class == NULL) || - CMClassPathIsA(broker, rop, comp_class, NULL)) + match_op(broker, rop, comp_class)) return true; else return false; +} + +static CMPIStatus filter_results(struct inst_list *list, + char *ns, + const char *filter_class, + const CMPIBroker *broker) +{ + struct inst_list result_list; + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIObjectPath *op; + int i; + + result_list = *list; + inst_list_init(list); + + for (i = 0; result_list.list[i] != NULL; i++) { + op = CMGetObjectPath(result_list.list[i], &s); + if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) + goto out; + + s = CMSetNameSpace(op, ns); + if (s.rc != CMPI_RC_OK) + goto out; + + if (!match_op(broker, op, filter_class)) + continue; + + inst_list_add(list, result_list.list[i]); + } + +out: + inst_list_free(&result_list); + + return s; } static struct std_assoc * @@ -142,6 +187,20 @@ static CMPIStatus do_assoc(struct std_as goto out; } else { CU_DEBUG("\thandler returned CMPI_RC_OK.\n"); + } + + if (list.list == NULL) { + CU_DEBUG("\tlist is empty.\n"); + goto out; + } + + s = filter_results(&list, + NAMESPACE(ref), + info->result_class, + ctx->brkr); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("\tfilter_results did not return CMPI_RC_OK.\n"); + goto out; } if (list.list == NULL) {

2 1

[PATCH] Fix device pool list to include Disk and Network
by Dan Smith 08 Nov '07

08 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194547428 28800 # Node ID bd1b1067d106ecc1546c3b2436a43f59f8eaba15 # Parent 0dddeb4368b37821390aa7c56fdcca2db839e824 Fix device pool list to include Disk and Network This makes HostedResourcePool return all four pools instead of just Memory and Processor pools. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 0dddeb4368b3 -r bd1b1067d106 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Thu Nov 08 09:56:43 2007 -0800 +++ b/src/Virt_DevicePool.c Thu Nov 08 10:43:48 2007 -0800 @@ -45,7 +45,11 @@ static const CMPIBroker *_BROKER; -char *device_pool_names[] = {"ProcessorPool", "MemoryPool", NULL}; +char *device_pool_names[] = {"ProcessorPool", + "MemoryPool", + "DiskPool", + "NetworkPool", + NULL}; struct disk_pool { char *tag;

2 1

[PATCH] Add association results filtering
by Kaitlin Rupert 08 Nov '07

08 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194471308 28800 # Node ID 5959f8f0e5e87540fb7da0bc5a0365388112452b # Parent 404c4803b1b542676c4d283226a7cc3b7f3ab58d Add association results filtering. This adds result filtering so that an association only returns instances that match the result class specified during the query. Such an example is the following: HostedService needs to return VSMS and RPCS instances when queried using CIM_ManagedElement as the result class. However, if CIM_VSMS is specified as the result class, then only the VSMS instance needs to be returned. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 404c4803b1b5 -r 5959f8f0e5e8 std_association.c --- a/std_association.c Fri Nov 02 15:29:38 2007 -0700 +++ b/std_association.c Wed Nov 07 13:35:08 2007 -0800 @@ -47,6 +47,17 @@ void set_reference(struct std_assoc *ass (CMPIValue *)&target, CMPI_ref); } +static bool match_op(const CMPIBroker *broker, + CMPIObjectPath *op, + const char *filter_class) +{ + if ((filter_class == NULL) || + CMClassPathIsA(broker, op, filter_class, NULL)) + return true; + else + return false; +} + static bool match_class(const CMPIBroker *broker, const char *ns, const char *test_class, @@ -58,10 +69,55 @@ static bool match_class(const CMPIBroker if ((test_class == NULL) || (comp_class == NULL) || - CMClassPathIsA(broker, rop, comp_class, NULL)) + match_op(broker, rop, comp_class)) return true; else return false; +} + +static CMPIStatus filter_results(struct inst_list *list, + char *ns, + const char *filter_class, + const CMPIBroker *broker) +{ + struct inst_list result_list; + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIObjectPath *op; + int i, c = 0; + + inst_list_init(&result_list); + + for (i = 0; list->list[i] != NULL; i++) { + op = CMGetObjectPath(list->list[i], &s); + if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) + goto out; + + s = CMSetNameSpace(op, ns); + if (s.rc != CMPI_RC_OK) + goto out; + + if (!match_op(broker, op, filter_class)) + continue; + + inst_list_add(&result_list, list->list[i]); + c++; + } + + inst_list_free(list); + if (list->list != NULL) { + CU_DEBUG("\tinst_list_free failed.\n"); + goto out; + } + + inst_list_init(list); + + for (i = 0; i <= c; i++) + inst_list_add(list, result_list.list[i]); + +out: + inst_list_free(&result_list); + + return s; } static struct std_assoc * @@ -142,6 +198,20 @@ static CMPIStatus do_assoc(struct std_as goto out; } else { CU_DEBUG("\thandler returned CMPI_RC_OK.\n"); + } + + if (list.list == NULL) { + CU_DEBUG("\tlist is empty.\n"); + goto out; + } + + s = filter_results(&list, + NAMESPACE(ref), + info->result_class, + ctx->brkr); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("\tfilter_results did not return CMPI_RC_OK.\n"); + goto out; } if (list.list == NULL) {

2 2

[PATCH] Fix some really horrible cruft in ComputerSystem
by Dan Smith 08 Nov '07

08 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194492744 28800 # Node ID af241b38b17ee4b3f2c2ee94f41aafd3023240d7 # Parent 92ed39296eb881deddc2d34fa9ee0524aefc1a53 Fix some really horrible cruft in ComputerSystem Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 92ed39296eb8 -r af241b38b17e src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Nov 07 09:01:06 2007 -0800 +++ b/src/Virt_ComputerSystem.c Wed Nov 07 19:32:24 2007 -0800 @@ -376,7 +376,7 @@ static CMPIStatus get_domain(const CMPIO const CMPIResult *results, char *name) { - CMPIInstance *inst[2] = {NULL, NULL}; + CMPIInstance *inst; CMPIStatus s; virConnectPtr conn = NULL; const char *prop = NULL; @@ -385,15 +385,15 @@ static CMPIStatus get_domain(const CMPIO if (conn == NULL) return s; - inst[0] = instance_from_name(_BROKER, conn, name, reference); - if (inst[0] == NULL) { + inst = instance_from_name(_BROKER, conn, name, reference); + if (inst == NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Unable to find `%s'", name); goto out; } - prop = cu_compare_ref(reference, inst[0]); + prop = cu_compare_ref(reference, inst); if (prop != NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, @@ -401,10 +401,8 @@ static CMPIStatus get_domain(const CMPIO goto out; } - cu_return_instances(results, inst); - + CMReturnInstance(results, inst); CMSetStatus(&s, CMPI_RC_OK); - out: virConnectClose(conn);

2 1