Hello community, here is the log from the commit of package libvirt-cim checked in at Sun Aug 10 01:34:09 CEST 2008. -------- --- arch/i386/libvirt-cim/libvirt-cim.changes 2008-08-07 01:32:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/libvirt-cim/libvirt-cim.changes 2008-08-09 20:12:27.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 9 12:10:09 MDT 2008 - jfehlig@novell.com + +- Another snapshot of libvirt-cim head. + + Fix SnapshotService + + Package directory /etc/libvirt/cim + +------------------------------------------------------------------- @@ -6 +12,0 @@ - - switch from wbem to sfcb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-cim.spec ++++++ --- /var/tmp/diff_new_pack.Z30023/_old 2008-08-10 01:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Z30023/_new 2008-08-10 01:34:01.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Management AutoReqProv: yes Version: 0.5.1 -Release: 1 +Release: 4 Summary: CMPI-based CIM provider implementing DMTF SVPC model Source: %{name}-%{version}.tar.bz2 Source1: libvirt-cim-rpmlintrc @@ -80,6 +80,7 @@ %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cimv216-interop_mof %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cimv216Experimental-MOFs.zip %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fix_schema.patch +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/cim %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -121,12 +122,16 @@ %{_datadir}/%{name}/*.sh %{_datadir}/%{name}/*.mof %{_datadir}/%{name}/*.registration +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/cim %changelog +* Sat Aug 09 2008 jfehlig@novell.com +- Another snapshot of libvirt-cim head. + + Fix SnapshotService + + Package directory /etc/libvirt/cim * Mon Aug 04 2008 jfehlig@novell.com - Another snapshot of libvirt-cim head. Version is 0.5.1 instead of incorrect 0.6 pre-release as previously noted. - - switch from wbem to sfcb * Mon Jul 28 2008 jfehlig@novell.com - Updated to libvirt-cim head, pre-release of 0.6 * Fri Jul 18 2008 jfehlig@novell.com ++++++ libvirt-cim-0.5.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libvirt-cim-0.5.1/libxkutil/infostore.c new/libvirt-cim-0.5.1/libxkutil/infostore.c --- old/libvirt-cim-0.5.1/libxkutil/infostore.c 2008-08-04 20:57:27.000000000 +0200 +++ new/libvirt-cim-0.5.1/libxkutil/infostore.c 2008-08-09 08:38:59.000000000 +0200 @@ -151,6 +151,9 @@ lseek(ctx->fd, 0, SEEK_SET); + if (ftruncate(ctx->fd, 0) != 0) + CU_DEBUG("Unable to truncate infostore"); + save = xmlSaveToFd(ctx->fd, NULL, 0); if (save == NULL) { CU_DEBUG("Failed to allocate save context"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libvirt-cim-0.5.1/schema/VirtualSystemSnapshotService.mof new/libvirt-cim-0.5.1/schema/VirtualSystemSnapshotService.mof --- old/libvirt-cim-0.5.1/schema/VirtualSystemSnapshotService.mof 2008-08-04 20:57:27.000000000 +0200 +++ new/libvirt-cim-0.5.1/schema/VirtualSystemSnapshotService.mof 2008-08-09 08:38:59.000000000 +0200 @@ -1,8 +1,59 @@ // Copyright IBM Corp. 2008 -[Description ( "Snapshot types are as follows: " - "32768: Memory-only snapshot (suspend, resume, keep image)" - "32769: Memory-only, terminal (domain is offline after op)")] -class Xen_VirtualSystemSnapshotService : CIM_VirtualSystemSnapshotService { }; -class KVM_VirtualSystemSnapshotService : CIM_VirtualSystemSnapshotService { }; -class LXC_VirtualSystemSnapshotService : CIM_VirtualSystemSnapshotService { }; +[Description ( + "Service to create, apply and destroy snapshots of virtual systems." + )] +class Virt_VirtualSystemSnapshotService: CIM_VirtualSystemSnapshotService { + [Override, Description ( "Creates a snapshot of a virtual system." ), + ValueMap { "0", "1", "2", "3", "4", "5", "6", "..", "4096", + "4097..32767", "32768..65535" }, + Values { "Completed with No Error", "Not Supported", + "Failed", "Timeout", "Invalid Parameter", "Invalid State", + "Invalid Type", "DMTF Reserved", + "Method Parameters Checked - Job Started", + "Method Reserved", "Vendor Specific" }] + uint32 CreateSnapshot( + [In, Description ( + "Reference to the affected virtual system." )] + CIM_ComputerSystem REF AffectedSystem, + [In, Description ( "Parameter settings." ), + EmbeddedInstance ( "CIM_SettingData" )] + string SnapshotSettings, + [In, Description ( + "Requested snapshot type:\n" + "Full Snapshot: Complete snapshot of the virtual system.\n" + "Disk Snapshot: Snapshot of virtual system disks.\n" + "Memory Snapshot: Snapshot of virtual system memory only. " + "The virtual system remains active after memory snapshot " + "is complete.\n" + "Memory Snapshot Terminal: Snapshot of virtual system " + "memory only. The virtual system is transitioned to " + "disabled state after the memory snapshot is complete.\n" ), + ValueMap { "2", "3", "..", "32768", "32769", "32770..65535" }, + Values { "Full Snapshot", "Disk Snapshot", + "DMTF Reserved", "Memory Snapshot", "Memory Snapshot Terminal", + "Vendor Specific" }, + ModelCorrespondence { + "CIM_VirtualSystemSnapshotCapabilities.SnapshotTypesEnabled", + "CIM_VirtualSystemSnapshotServiceCapabilities.SnapshotTypesSupported" }] + uint16 SnapshotType, + [In, Out, Description ( + "Resulting virtual system snapshot" )] + CIM_VirtualSystemSettingData REF ResultingSnapshot, + [In, Out, Description ( + "If the operation is long running, then optionally " + "a job may be returned. In this case, the instance " + "of the CIM_VirtualSystemSettingData class " + "representing the new virtual system snapshot is " + "presented via the CIM_AffectedJobElement " + "association with the value of the AffectedElement " + "property referring to the new instance of the " + "CIM_VirtualSystemSettingData class representing " + "the virtual system snapshot and and the value of " + "the ElementEffects set to 5 (Create)." )] + CIM_ConcreteJob REF Job); +}; + +class Xen_VirtualSystemSnapshotService : Virt_VirtualSystemSnapshotService { }; +class KVM_VirtualSystemSnapshotService : Virt_VirtualSystemSnapshotService { }; +class LXC_VirtualSystemSnapshotService : Virt_VirtualSystemSnapshotService { }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libvirt-cim-0.5.1/src/Virt_ComputerSystem.c new/libvirt-cim-0.5.1/src/Virt_ComputerSystem.c --- old/libvirt-cim-0.5.1/src/Virt_ComputerSystem.c 2008-08-04 20:57:27.000000000 +0200 +++ new/libvirt-cim-0.5.1/src/Virt_ComputerSystem.c 2008-08-09 08:39:00.000000000 +0200 @@ -230,6 +230,22 @@ } } +static unsigned char adjust_state_xen(virDomainPtr dom, + unsigned char state) +{ + virConnectPtr conn; + + if (state != VIR_DOMAIN_NOSTATE) + return state; + + conn = virDomainGetConnect(dom); + + if (STREQC(virConnectGetType(conn), "Xen")) + return VIR_DOMAIN_RUNNING; + + return state; +} + static uint16_t adjust_state_if_saved(const char *name, uint16_t state) { @@ -260,6 +276,8 @@ if (ret != 0) return 0; + info.state = adjust_state_xen(dom, info.state); + cim_state = state_lv_to_cim((const int)info.state); cim_state = adjust_state_if_saved(virDomainGetName(dom), cim_state); CMSetProperty(instance, "EnabledState", @@ -812,6 +830,8 @@ CMPIStatus s = {CMPI_RC_OK, NULL}; int ret = 0; + info->state = adjust_state_xen(dom, info->state); + switch (info->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_BLOCKED: @@ -837,9 +857,12 @@ CMPIStatus s = {CMPI_RC_OK, NULL}; int ret = 0; + info->state = adjust_state_xen(dom, info->state); + switch (info->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_BLOCKED: + case VIR_DOMAIN_PAUSED: CU_DEBUG("Reboot domain"); ret = virDomainReboot(dom, 0); break; @@ -862,9 +885,12 @@ CMPIStatus s = {CMPI_RC_OK, NULL}; int ret = 0; + info->state = adjust_state_xen(dom, info->state); + switch (info->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_BLOCKED: + case VIR_DOMAIN_PAUSED: CU_DEBUG("Reset domain"); ret = domain_reset(dom); break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libvirt-cim-0.5.1/src/Virt_VirtualSystemSnapshotService.c new/libvirt-cim-0.5.1/src/Virt_VirtualSystemSnapshotService.c --- old/libvirt-cim-0.5.1/src/Virt_VirtualSystemSnapshotService.c 2008-08-04 20:57:27.000000000 +0200 +++ new/libvirt-cim-0.5.1/src/Virt_VirtualSystemSnapshotService.c 2008-08-09 08:39:00.000000000 +0200 @@ -397,7 +397,7 @@ } ctx->save = (type != 0); - ctx->restore = (type != VIR_VSSS_SNAPSHOT_MEM); + ctx->restore = (type != VIR_VSSS_SNAPSHOT_MEMT); s = create_job(context, ref, ctx, &job); @@ -542,7 +542,7 @@ char *name = NULL; uint32_t retcode = CIM_RETURN_FAILED; - if (cu_get_ref_arg(argsin, "AffectedSnapshot", &snap) != CMPI_RC_OK) { + if (cu_get_ref_arg(argsin, "Snapshot", &snap) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_INVALID_PARAMETER, "Missing Snapshot"); @@ -587,7 +587,7 @@ static struct method_handler ApplySnapshot = { .name = "ApplySnapshot", .handler = apply_snapshot, - .args = {{"AffectedSnapshot", CMPI_ref, false}, + .args = {{"Snapshot", CMPI_ref, false}, ARG_END} }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org