Mailinglist Archive: opensuse-commit (817 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package libvirt-cim for openSUSE:Factory
checked in at Fri Dec 5 15:42:36 CET 2008.


--------
--- libvirt-cim/libvirt-cim.changes     2008-12-03 20:37:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/libvirt-cim/libvirt-cim.changes        
2008-12-05 00:47:02.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Dec  4 16:40:55 MST 2008 - jfehlig@xxxxxxxxxx
+
+- Fix _diskpool_is_member() to return correct pool
+  bnc#456587
+- Return job on snapshot create/apply operations
+  bnc#456630
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  776-snap-service-job.patch
  777-diskpool-fix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libvirt-cim.spec ++++++
--- /var/tmp/diff_new_pack.G28363/_old  2008-12-05 15:41:21.000000000 +0100
+++ /var/tmp/diff_new_pack.G28363/_new  2008-12-05 15:41:21.000000000 +0100
@@ -26,7 +26,7 @@
 Group:          System/Management
 AutoReqProv:    yes
 Version:        0.5.2
-Release:        5
+Release:        6
 Summary:        CMPI-based CIM provider implementing DMTF SVPC model
 Source:         %{name}-%{version}.tar.bz2
 Source1:        libvirt-cim-rpmlintrc
@@ -48,6 +48,8 @@
 Patch15:        default-net-source.patch
 Patch16:        emulator-device.patch
 Patch17:        774-maxvcpu.patch
+Patch18:        776-snap-service-job.patch
+Patch19:        777-diskpool-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       cim-server
 Requires:       libxml2 >= 2.6.0
@@ -94,6 +96,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 chmod -x src/* libxkutil/* schema/* README doc/* base_schema/README*
 chmod +X src/* libxkutil/* schema/*
 
@@ -157,6 +161,11 @@
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/cim
 
 %changelog
+* Thu Dec 04 2008 jfehlig@xxxxxxxxxx
+- Fix _diskpool_is_member() to return correct pool
+  bnc#456587
+- Return job on snapshot create/apply operations
+  bnc#456630
 * Wed Dec 03 2008 jfehlig@xxxxxxxxxx
 - Catch unimplemented sentinel of GetMaxVcpus
   bnc#455803

++++++ 776-snap-service-job.patch ++++++
Index: libvirt-cim-0.5.2/src/Virt_VirtualSystemSnapshotService.c
===================================================================
--- libvirt-cim-0.5.2.orig/src/Virt_VirtualSystemSnapshotService.c
+++ libvirt-cim-0.5.2/src/Virt_VirtualSystemSnapshotService.c
@@ -382,7 +382,8 @@ static struct snap_context *new_context(
 static CMPIStatus start_snapshot_job(const CMPIObjectPath *ref,
                                      const CMPIContext *context,
                                      const char *name,
-                                     uint16_t type)
+                                     uint16_t type,
+                                     CMPIArgs *argsout)
 {
         struct snap_context *ctx;
         CMPIStatus s;
@@ -400,6 +401,7 @@ static CMPIStatus start_snapshot_job(con
         ctx->restore = (type != VIR_VSSS_SNAPSHOT_MEMT);
 
         s = create_job(context, ref, ctx, &job);
+        CMAddArg(argsout, "Job", (CMPIValue *)&job, CMPI_ref);
 
  out:
         return s;
@@ -457,7 +459,7 @@ static CMPIStatus create_snapshot(CMPIMe
                 goto out;
         }
 
-        s = start_snapshot_job(reference, context, name, type);
+        s = start_snapshot_job(reference, context, name, type, argsout);
 
         retcode = CIM_RETURN_COMPLETED;
  out:
@@ -556,7 +558,7 @@ static CMPIStatus apply_snapshot(CMPIMet
                 goto out;
         }
 
-        s = start_snapshot_job(reference, context, name, 0);
+        s = start_snapshot_job(reference, context, name, 0, argsout);
 
         retcode = CIM_RETURN_COMPLETED;
 
++++++ 777-diskpool-fix.patch ++++++
# HG changeset patch
# User Kaitlin Rupert <karupert@xxxxxxxxxx>
# Date 1228424277 28800
# Node ID 328c706a5b9ec825d054097fc412342abbb2a2dc
# Parent  ef03ffafe2dd00f3e2a78a2bce1cb9b4836b5d2b
(#2) Fix _diskpool_is_member() to return correct pool.

Verifying the volume exists isn't enough to prove the disk_pool struct is the
proper pool.  We need to verify the volume is in the pool of a given pool
struct.

Updates from 1 to 2:
  -Move the virStorageVolLookupByPath() call back to _diskpool_is_member() so
   that this fix is compatible with systems running libvirtd < 0.4.0.

Signed-off-by: Kaitlin Rupert <karupert@xxxxxxxxxx>

diff -r ef03ffafe2dd -r 328c706a5b9e src/Virt_DevicePool.c
--- a/src/Virt_DevicePool.c     Thu Dec 04 09:41:51 2008 -0700
+++ b/src/Virt_DevicePool.c     Thu Dec 04 12:57:57 2008 -0800
@@ -144,17 +144,28 @@ static bool _diskpool_is_member(virConne
 {
         virStorageVolPtr vol = NULL;
         bool result = false;
+        virStoragePoolPtr pool_vol = NULL;
+        const char *pool_name = NULL;
 
         vol = virStorageVolLookupByPath(conn, file);
-        if (vol != NULL)
-                result = true;
-
+        if (vol == NULL)
+                goto out;
+
+        pool_vol = virStoragePoolLookupByVolume(vol);
+        if (vol != NULL) {
+                pool_name = virStoragePoolGetName(pool_vol);                
+                if ((pool_name != NULL) && (STREQC(pool_name, pool->tag)))
+                        result = true;
+        }
+        
+ out:
         CU_DEBUG("Image %s in pool %s: %s",
                  file,
                  pool->tag,
                  result ? "YES": "NO");
 
         virStorageVolFree(vol);
+        virStoragePoolFree(pool_vol);
 
         return result;
 }

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx