Hello community,
here is the log from the commit of package libvirt-cim for openSUSE:Factory
checked in at Mon Dec 15 14:50:59 CET 2008.
--------
--- libvirt-cim/libvirt-cim.changes 2008-12-05 00:47:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/libvirt-cim/libvirt-cim.changes 2008-12-09 19:49:38.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Dec 9 11:18:50 MST 2008 - jfehlig@novell.com
+
+- Add support for clock offset. Required for Windows guests.
+ bnc#457706
+
+-------------------------------------------------------------------
+Mon Dec 8 11:40:46 MST 2008 - jfehlig@novell.com
+
+- Do not default vnclisten
+ bnc#456912
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
automake.patch
clock1.patch
clock2.patch
clock3.patch
clock4.patch
gdev-listen.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt-cim.spec ++++++
--- /var/tmp/diff_new_pack.y11674/_old 2008-12-15 14:49:55.000000000 +0100
+++ /var/tmp/diff_new_pack.y11674/_new 2008-12-15 14:49:55.000000000 +0100
@@ -26,7 +26,7 @@
Group: System/Management
AutoReqProv: yes
Version: 0.5.2
-Release: 6
+Release: 7
Summary: CMPI-based CIM provider implementing DMTF SVPC model
Source: %{name}-%{version}.tar.bz2
Source1: libvirt-cim-rpmlintrc
@@ -50,6 +50,12 @@
Patch17: 774-maxvcpu.patch
Patch18: 776-snap-service-job.patch
Patch19: 777-diskpool-fix.patch
+Patch20: gdev-listen.patch
+Patch21: clock1.patch
+Patch22: clock2.patch
+Patch23: clock3.patch
+Patch24: clock4.patch
+Patch25: automake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: cim-server
Requires: libxml2 >= 2.6.0
@@ -98,10 +104,17 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
chmod -x src/* libxkutil/* schema/* README doc/* base_schema/README*
chmod +X src/* libxkutil/* schema/*
%build
+autoreconf -i -f
export CFLAGS="$RPM_OPT_FLAGS"
%configure --disable-werror
make DOCS_DIR=%{_docdir}/%{name} HTML_DIR=%{_docdir}/%{name}
@@ -161,6 +174,12 @@
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/cim
%changelog
+* Tue Dec 09 2008 jfehlig@novell.com
+- Add support for clock offset. Required for Windows guests.
+ bnc#457706
+* Mon Dec 08 2008 jfehlig@novell.com
+- Do not default vnclisten
+ bnc#456912
* Thu Dec 04 2008 jfehlig@novell.com
- Fix _diskpool_is_member() to return correct pool
bnc#456587
++++++ automake.patch ++++++
Index: libvirt-cim-0.5.2/AUTHORS
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.2/AUTHORS
@@ -0,0 +1 @@
+Dan Smith
Index: libvirt-cim-0.5.2/ChangeLog
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.2/ChangeLog
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/
Index: libvirt-cim-0.5.2/INSTALL
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.2/INSTALL
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/
Index: libvirt-cim-0.5.2/NEWS
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.2/NEWS
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/
++++++ clock1.patch ++++++
# HG changeset patch
# User Dan Smith
# Date 1228836552 28800
# Node ID 212d2497ad6e17cdbf3cc19ee91e8e5bbb5e7fc4
# Parent ee41039956a0224ca7700e99153d79abe8060d5a
(#2) Add ClockOffset to VSSD
To do this, add an intermediate Virt_VSSD class to parent all of our platform
implementations (per recent discussion on this as a strategy for the future).
- Move the common AutomaticShutdownAction property to the parent class
Signed-off-by: Dan Smith
diff -r ee41039956a0 -r 212d2497ad6e Makefile.am
--- a/Makefile.am Tue Dec 02 18:07:02 2008 -0200
+++ b/Makefile.am Tue Dec 09 07:29:12 2008 -0800
@@ -10,6 +10,7 @@
schema/Memory.mof \
schema/Processor.mof \
schema/SystemDevice.mof \
+ schema/Virt_VSSD.mof \
schema/VSSD.mof \
schema/HostSystem.mof \
schema/HostedDependency.mof \
diff -r ee41039956a0 -r 212d2497ad6e schema/VSSD.mof
--- a/schema/VSSD.mof Tue Dec 02 18:07:02 2008 -0200
+++ b/schema/VSSD.mof Tue Dec 09 07:29:12 2008 -0800
@@ -1,11 +1,11 @@
// Copyright IBM Corp. 2007
[Description (
- "A class derived from CIM_VirtualSystemSettingData to represent "
+ "A class derived from Virt_VirtualSystemSettingData to represent "
"the config of Xen virtual machines/domains running on the system."),
Provider("cmpi::Virt_VSSD")
]
-class Xen_VirtualSystemSettingData : CIM_VirtualSystemSettingData
+class Xen_VirtualSystemSettingData : Virt_VirtualSystemSettingData
{
[Description ("Flag to determine whether this guest is fully-virtualized")]
@@ -29,42 +29,30 @@
"One of hd,fd,cdrom.")]
string BootDevice;
- [Override, ValueMap { "2", "3", ".." },
- Values { "Turn Off", "Save state", "DMTF Reserved" }]
- uint16 AutomaticShutdownAction;
-
};
[Description (
- "A class derived from CIM_VirtualSystemSettingData to represent "
+ "A class derived from Virt_VirtualSystemSettingData to represent "
"the config of KVM virtual machines/domains running on the system."),
Provider("cmpi::Virt_VSSD")
]
-class KVM_VirtualSystemSettingData : CIM_VirtualSystemSettingData
+class KVM_VirtualSystemSettingData : Virt_VirtualSystemSettingData
{
[Description ("The device to boot from. One of hd,fd,cdrom.")]
string BootDevice;
- [Override, ValueMap { "2", "3", ".." },
- Values { "Turn Off", "Save state", "DMTF Reserved" }]
- uint16 AutomaticShutdownAction;
-
};
[Description (
- "A class derived from CIM_VirtualSystemSettingData to represent "
+ "A class derived from Virt_VirtualSystemSettingData to represent "
"the config of LXC containers running on the system."),
Provider("cmpi::Virt_VSSD")
]
-class LXC_VirtualSystemSettingData : CIM_VirtualSystemSettingData
+class LXC_VirtualSystemSettingData : Virt_VirtualSystemSettingData
{
[Description ("Path to the init process for the container")]
string InitPath;
- [Override, ValueMap { "2", "3", ".." },
- Values { "Turn Off", "Save state", "DMTF Reserved" }]
- uint16 AutomaticShutdownAction;
-
};
diff -r ee41039956a0 -r 212d2497ad6e schema/Virt_VSSD.mof
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/Virt_VSSD.mof Tue Dec 09 07:29:12 2008 -0800
@@ -0,0 +1,15 @@
+// Copyright IBM Corp. 2007
+
+class Virt_VirtualSystemSettingData : CIM_VirtualSystemSettingData
+{
+
+ [Description ("Clock offset control"),
+ ValueMap { "0", "1" },
+ Values { "UTC", "Local" }]
+ uint16 ClockOffset;
+
+ [Override, ValueMap { "2", "3", ".." },
+ Values { "Turn Off", "Save state", "DMTF Reserved" }]
+ uint16 AutomaticShutdownAction;
+
+};
++++++ clock2.patch ++++++
# HG changeset patch
# User Dan Smith
# Date 1228767394 28800
# Node ID 780ad920644642f2fa54006b67942d1cfb2992c3
# Parent 18cd726e564ae8bffc518dbb5b27671548b97de1
Add <clock> support to device_parsing and xmlgen
Signed-off-by: Dan Smith
Index: libvirt-cim-0.5.2/libxkutil/device_parsing.c
===================================================================
--- libvirt-cim-0.5.2.orig/libxkutil/device_parsing.c
+++ libvirt-cim-0.5.2/libxkutil/device_parsing.c
@@ -820,6 +820,8 @@ static int parse_domain(xmlNodeSet *nsv,
set_action(&dominfo->on_reboot, child);
else if (XSTREQ(child->name, "on_crash"))
set_action(&dominfo->on_crash, child);
+ else if (XSTREQ(child->name, "clock"))
+ dominfo->clock = get_attr_value(child, "offset");
}
return 1;
Index: libvirt-cim-0.5.2/libxkutil/device_parsing.h
===================================================================
--- libvirt-cim-0.5.2.orig/libxkutil/device_parsing.h
+++ libvirt-cim-0.5.2/libxkutil/device_parsing.h
@@ -107,6 +107,7 @@ struct domain {
char *uuid;
char *bootloader;
char *bootloader_args;
+ char *clock;
union {
struct pv_os_info pv;
Index: libvirt-cim-0.5.2/libxkutil/xmlgen.c
===================================================================
--- libvirt-cim-0.5.2.orig/libxkutil/xmlgen.c
+++ libvirt-cim-0.5.2/libxkutil/xmlgen.c
@@ -463,6 +463,7 @@ static char *system_xml(struct domain *d
int ret;
char *bl = NULL;
char *bl_args = NULL;
+ char *clock = NULL;
char *xml;
if (domain->bootloader)
@@ -476,15 +477,22 @@ static char *system_xml(struct domain *d
NULL,
0);
+ if (domain->clock)
+ if (asprintf(&clock, "<clock sync='%s' />",
+ domain->clock) == -1)
+ clock = NULL;
+
ret = asprintf(&xml,
"<name>%s</name>\n"
"%s\n"
"%s\n"
+ "%s\n"
"%s\n"
"%s\n",
domain->name,
bl ? bl : "",
bl_args ? bl_args : "",
+ clock ? clock : "",
vssd_recovery_action_str(domain->on_poweroff),
vssd_recovery_action_str(domain->on_crash));
if (ret == -1)
@@ -492,7 +500,8 @@ static char *system_xml(struct domain *d
free(bl);
free(bl_args);
-
+ free(clock);
+
return xml;
}
++++++ clock3.patch ++++++
# HG changeset patch
# User Dan Smith
# Date 1228767402 28800
# Node ID 205d33ceaa23a3a116e790590b0109c77c5683aa
# Parent 780ad920644642f2fa54006b67942d1cfb2992c3
Make VSSD provider expose ClockOffset property
Signed-off-by: Dan Smith
diff -r 780ad9206446 -r 205d33ceaa23 src/Virt_VSSD.c
--- a/src/Virt_VSSD.c Mon Dec 08 12:16:34 2008 -0800
+++ b/src/Virt_VSSD.c Mon Dec 08 12:16:42 2008 -0800
@@ -124,6 +124,16 @@
CMSetProperty(inst, "AutomaticRecoveryAction",
(CMPIValue *)&dominfo->on_crash, CMPI_uint16);
+
+ if (dominfo->clock != NULL) {
+ uint16_t clock = VSSD_CLOCK_UTC;
+
+ if (STREQC(dominfo->clock, "localtime"))
+ clock = VSSD_CLOCK_LOC;
+
+ CMSetProperty(inst, "ClockOffset",
+ (CMPIValue *)&clock, CMPI_uint16);
+ }
if ((dominfo->type == DOMAIN_XENFV) ||
(dominfo->type == DOMAIN_KVM))
diff -r 780ad9206446 -r 205d33ceaa23 src/Virt_VSSD.h
--- a/src/Virt_VSSD.h Mon Dec 08 12:16:34 2008 -0800
+++ b/src/Virt_VSSD.h Mon Dec 08 12:16:42 2008 -0800
@@ -21,6 +21,9 @@
#ifndef __VIRT_VSSD_H
#define __VIRT_VSSD_H
+#define VSSD_CLOCK_UTC 0
+#define VSSD_CLOCK_LOC 1
+
CMPIStatus get_vssd_by_ref(const CMPIBroker *broker,
const CMPIObjectPath *reference,
CMPIInstance **_inst);
++++++ clock4.patch ++++++
# HG changeset patch
# User Dan Smith
# Date 1228771586 28800
# Node ID 1eed258563ade2a9f2193d018a7f410eec6d043c
# Parent 205d33ceaa23a3a116e790590b0109c77c5683aa
(#2) Add clock offset support to VSMS
- Fixed inverted error return if clock offset value is incorrect
Signed-off-by: Dan Smith
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"))
++++++ gdev-listen.patch ++++++
Index: libvirt-cim-0.5.2/libxkutil/device_parsing.c
===================================================================
--- libvirt-cim-0.5.2.orig/libxkutil/device_parsing.c
+++ libvirt-cim-0.5.2/libxkutil/device_parsing.c
@@ -434,9 +434,6 @@ static int parse_graphics_device(xmlNode
if ((gdev->type == NULL) || (gdev->port == NULL))
goto err;
- if (gdev->host == NULL)
- gdev->host = strdup("127.0.0.1");
-
vdev->type = CIM_RES_TYPE_GRAPHICS;
*vdevs = vdev;
Index: libvirt-cim-0.5.2/libxkutil/xmlgen.c
===================================================================
--- libvirt-cim-0.5.2.orig/libxkutil/xmlgen.c
+++ libvirt-cim-0.5.2/libxkutil/xmlgen.c
@@ -368,13 +368,26 @@ static bool graphics_to_xml(char **xml,
char *_xml;
struct graphics_device *graphics = &dev->dev.graphics;
- ret = asprintf(&_xml,
- "\n",
- graphics->type,
- graphics->port,
- graphics->host != NULL ? graphics->host : "127.0.0.1",
- graphics->keymap != NULL ? graphics->keymap : "en-us");
+ if (graphics->host) {
+ ret = asprintf(&_xml,
+ "\n",
+ graphics->type,
+ graphics->port,
+ graphics->host,
+ graphics->keymap != NULL ?
+ graphics->keymap : "en-us");
+ }
+ else {
+ ret = asprintf(&_xml,
+ "\n",
+ graphics->type,
+ graphics->port,
+ graphics->keymap != NULL ?
+ graphics->keymap : "en-us");
+ }
+
if (ret == -1)
return false;
else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org