File clock4.patch of Package libvirt-cim

# HG changeset patch
# User Dan Smith <danms@us.ibm.com>
# Date 1228771586 28800
# Node ID 1eed258563ade2a9f2193d018a7f410eec6d043c
# Parent  205d33ceaa23a3a116e790590b0109c77c5683aa
(#2) Add clock offset support to VSMS

Changes:
 - Fixed inverted error return if clock offset value is incorrect

Signed-off-by: Dan Smith <danms@us.ibm.com>

Index: libvirt-cim-0.5.2/src/Makefile.am
===================================================================
--- libvirt-cim-0.5.2.orig/src/Makefile.am
+++ libvirt-cim-0.5.2/src/Makefile.am
@@ -84,9 +84,9 @@ libVirt_ComputerSystemMigrationIndicatio
 libVirt_ComputerSystemMigrationIndication_la_SOURCES = Virt_ComputerSystemMigrationIndication.c
 libVirt_ComputerSystemMigrationIndication_la_LIBADD = -lVirt_ComputerSystem
 
-libVirt_VirtualSystemManagementService_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_ComputerSystemIndication.la libVirt_RASD.la libVirt_HostSystem.la libVirt_DevicePool.la
+libVirt_VirtualSystemManagementService_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_ComputerSystemIndication.la libVirt_RASD.la libVirt_HostSystem.la libVirt_DevicePool.la libVirt_VSSD.la
 libVirt_VirtualSystemManagementService_la_SOURCES = Virt_VirtualSystemManagementService.c
-libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem -lVirt_ComputerSystemIndication -lVirt_RASD -lVirt_HostSystem -lVirt_DevicePool
+libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem -lVirt_ComputerSystemIndication -lVirt_RASD -lVirt_HostSystem -lVirt_DevicePool -lVirt_VSSD
 
 libVirt_VirtualSystemManagementCapabilities_la_DEPENDENCIES = libVirt_HostSystem.la
 libVirt_VirtualSystemManagementCapabilities_la_SOURCES = Virt_VirtualSystemManagementCapabilities.c
Index: libvirt-cim-0.5.2/src/Virt_VirtualSystemManagementService.c
===================================================================
--- libvirt-cim-0.5.2.orig/src/Virt_VirtualSystemManagementService.c
+++ libvirt-cim-0.5.2/src/Virt_VirtualSystemManagementService.c
@@ -47,6 +47,7 @@
 #include "Virt_VirtualSystemManagementService.h"
 #include "Virt_ComputerSystem.h"
 #include "Virt_ComputerSystemIndication.h"
+#include "Virt_VSSD.h"
 #include "Virt_RASD.h"
 #include "Virt_HostSystem.h"
 #include "Virt_DevicePool.h"
@@ -266,6 +267,18 @@ static int vssd_to_domain(CMPIInstance *
         if (cu_get_bool_prop(inst, "IsFullVirt", &fullvirt) != CMPI_RC_OK)
                 fullvirt = false;
 
+        if (cu_get_u16_prop(inst, "ClockOffset", &tmp) == CMPI_RC_OK) {
+                if (tmp == VSSD_CLOCK_UTC)
+                        domain->clock = strdup("utc");
+                else if (tmp == VSSD_CLOCK_LOC)
+                        domain->clock = strdup("localtime");
+                else {
+                        CU_DEBUG("Unknown clock offset value %hi", tmp);
+                        ret = 0;
+                        goto out;
+                }
+        }
+
         if (fullvirt || STREQC(pfx, "KVM"))
                 ret = fv_vssd_to_domain(inst, domain, pfx);
         else if (STREQC(pfx, "Xen"))