Hello community,
here is the log from the commit of package libvirt-cim
checked in at Wed Oct 8 11:57:00 CEST 2008.
--------
--- arch/i386/libvirt-cim/libvirt-cim.changes 2008-09-17 02:30:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/libvirt-cim/libvirt-cim.changes 2008-10-08 02:33:50.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Oct 3 15:58:32 MDT 2008 - jfehlig@novell.com
+
+- Another snapshot of libvirt-cim head
+ + more LXC support
+ + ServiceAffectsElement association
+
+-------------------------------------------------------------------
+Thu Oct 2 18:29:10 MDT 2008 - dpmerrill@novell.com
+
+- Added LibvirtVersion to Xen_VirtualSystemManagementService
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
versions.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt-cim.spec ++++++
--- /var/tmp/diff_new_pack.y16496/_old 2008-10-08 11:55:37.000000000 +0200
+++ /var/tmp/diff_new_pack.y16496/_new 2008-10-08 11:55:37.000000000 +0200
@@ -26,13 +26,14 @@
Group: System/Management
AutoReqProv: yes
Version: 0.5.1
-Release: 28
+Release: 29
Summary: CMPI-based CIM provider implementing DMTF SVPC model
Source: %{name}-%{version}.tar.bz2
Source1: libvirt-cim-rpmlintrc
Patch0: rm-dup-217-schema.patch
Patch1: provider-reg.patch
Patch2: netpool-suse.patch
+Patch3: versions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: cim-server
Requires: libxml2 >= 2.6.0
@@ -64,6 +65,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
chmod -x src/* libxkutil/* schema/* README doc/* base_schema/README*
chmod +X src/* libxkutil/* schema/*
@@ -127,6 +129,12 @@
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/cim
%changelog
+* Fri Oct 03 2008 jfehlig@novell.com
+- Another snapshot of libvirt-cim head
+ + more LXC support
+ + ServiceAffectsElement association
+* Thu Oct 02 2008 dpmerrill@novell.com
+- Added LibvirtVersion to Xen_VirtualSystemManagementService
* Tue Sep 16 2008 jfehlig@novell.com
- Another snapshot of libvirt-cim head.
- Do not use libvirt network API at this time
++++++ libvirt-cim-0.5.1.tar.bz2 ++++++
++++ 2683 lines of diff (skipped)
++++++ netpool-suse.patch ++++++
--- /var/tmp/diff_new_pack.y16496/_old 2008-10-08 11:55:39.000000000 +0200
+++ /var/tmp/diff_new_pack.y16496/_new 2008-10-08 11:55:39.000000000 +0200
@@ -1,6 +1,7 @@
-diff -ru a/src/Virt_DevicePool.c b/src/Virt_DevicePool.c
---- a/src/Virt_DevicePool.c 2008-08-09 00:39:00.000000000 -0600
-+++ b/src/Virt_DevicePool.c 2008-09-16 17:57:05.000000000 -0600
+Index: libvirt-cim-0.5.1/src/Virt_DevicePool.c
+===================================================================
+--- libvirt-cim-0.5.1.orig/src/Virt_DevicePool.c
++++ libvirt-cim-0.5.1/src/Virt_DevicePool.c
@@ -27,6 +27,10 @@
#include
#include
@@ -12,7 +13,7 @@
#include
#include
-@@ -660,6 +664,70 @@
+@@ -660,6 +664,70 @@ static CMPIStatus procpool_instance(virC
return s;
}
@@ -83,7 +84,7 @@
static CMPIStatus _netpool_for_network(struct inst_list *list,
const char *ns,
virConnectPtr conn,
-@@ -670,18 +738,7 @@
+@@ -670,18 +738,7 @@ static CMPIStatus _netpool_for_network(s
CMPIStatus s = {CMPI_RC_OK, NULL};
char *id = NULL;
char *cap = NULL;
@@ -102,7 +103,7 @@
inst = get_typed_instance(broker,
refcn,
-@@ -703,8 +760,7 @@
+@@ -703,8 +760,7 @@ static CMPIStatus _netpool_for_network(s
goto out;
}
@@ -112,7 +113,7 @@
cu_statusf(broker, &s,
CMPI_RC_ERR_FAILED,
"");
-@@ -714,11 +770,9 @@
+@@ -714,11 +770,9 @@ static CMPIStatus _netpool_for_network(s
set_params(inst, CIM_RES_TYPE_NET, id, NULL, cap);
free(id);
free(cap);
@@ -124,7 +125,7 @@
return s;
}
-@@ -732,7 +786,7 @@
+@@ -732,7 +786,7 @@ static CMPIStatus netpool_instance(virCo
CMPIStatus s = {CMPI_RC_OK, NULL};
char **netnames = NULL;
int i;
@@ -133,7 +134,7 @@
if (id != NULL) {
return _netpool_for_network(list,
-@@ -743,24 +797,15 @@
+@@ -743,24 +797,15 @@ static CMPIStatus netpool_instance(virCo
broker);
}
@@ -161,7 +162,7 @@
for (i = 0; i < nets; i++) {
_netpool_for_network(list,
ns,
-@@ -771,6 +816,7 @@
+@@ -771,6 +816,7 @@ static CMPIStatus netpool_instance(virCo
}
out:
@@ -169,17 +170,16 @@
free(netnames);
return s;
-Only in b/src: Virt_DevicePool.c~
-diff -ru a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c
---- a/src/Virt_VirtualSystemManagementService.c 2008-08-09 00:39:00.000000000 -0600
-+++ b/src/Virt_VirtualSystemManagementService.c 2008-09-16 17:48:09.000000000 -0600
-@@ -319,7 +319,7 @@
- const char *val = NULL;
+Index: libvirt-cim-0.5.1/src/Virt_VirtualSystemManagementService.c
+===================================================================
+--- libvirt-cim-0.5.1.orig/src/Virt_VirtualSystemManagementService.c
++++ libvirt-cim-0.5.1/src/Virt_VirtualSystemManagementService.c
+@@ -383,7 +383,7 @@ static const char *net_rasd_to_vdev(CMPI
+ dev->id = strdup(dev->dev.net.mac);
free(dev->dev.net.type);
- dev->dev.net.type = strdup("network");
+ dev->dev.net.type = strdup("bridge");
if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK)
- val = _default_network(inst);
-Only in b/src: Virt_VirtualSystemManagementService.c~
+ val = _default_network(inst, ns);
++++++ versions.patch ++++++
Index: libvirt-cim-0.5.1/schema/VirtualSystemManagementService.mof
===================================================================
--- libvirt-cim-0.5.1.orig/schema/VirtualSystemManagementService.mof
+++ libvirt-cim-0.5.1/schema/VirtualSystemManagementService.mof
@@ -8,6 +8,9 @@ class Xen_VirtualSystemManagementService
[Description("HG revision number of the providers")]
string Revision;
+
+ [Description("LibVirt Version")]
+ string LibvirtVersion;
};
[Provider("cmpi::Virt_VirtualSystemManagementService")]
Index: libvirt-cim-0.5.1/src/Virt_VirtualSystemManagementService.c
===================================================================
--- libvirt-cim-0.5.1.orig/src/Virt_VirtualSystemManagementService.c
+++ libvirt-cim-0.5.1/src/Virt_VirtualSystemManagementService.c
@@ -1875,8 +1875,10 @@ CMPIStatus get_vsms(const CMPIObjectPath
const char *ccname = NULL;
virConnectPtr conn = NULL;
unsigned long hv_version = 0;
+ unsigned long lv_version = 0;
const char * hv_type = NULL;
char *caption = NULL;
+ char *lv_version_string = NULL;
*_inst = NULL;
conn = connect_by_classname(broker, CLASSNAME(reference), &s);
@@ -1951,7 +1953,26 @@ CMPIStatus get_vsms(const CMPIObjectPath
(CMPIValue *)LIBVIRT_CIM_CS, CMPI_chars);
CMSetProperty(inst, "Revision",
- (CMPIValue *)LIBVIRT_CIM_RV, CMPI_chars);
+ (CMPIValue *)PACKAGE_VERSION, CMPI_chars);
+
+ if (virGetVersion(&lv_version, "Xen", &hv_version) < 0) {
+ CU_DEBUG("Unable to get libvirt version");
+ lv_version= 0;
+ hv_version= 0;
+ }
+
+ if (asprintf(&lv_version_string, "%lu.%lu.%lu",
+ lv_version / 1000000,
+ (lv_version % 1000000) / 1000,
+ (lv_version % 1000000) % 1000) == -1)
+ lv_version_string = NULL;
+
+ if (lv_version_string != NULL)
+ CMSetProperty(inst, "LibvirtVersion",
+ (CMPIValue *)lv_version_string, CMPI_chars);
+ else
+ CMSetProperty(inst, "LibvirtVersion",
+ (CMPIValue *)"Unknown Libvirt", CMPI_chars);
if (is_get_inst) {
s = cu_validate_ref(broker, reference, inst);
@@ -1964,6 +1985,7 @@ CMPIStatus get_vsms(const CMPIObjectPath
"");
out:
free(caption);
+ free(lv_version_string);
virConnectClose(conn);
*_inst = inst;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
