os-cmpi-xen

changeset 91:315d491aec5f

Updated Console classes to use Xen APIs Console.location property.
xen-unstable c/s 14021 was backported for SLES10 SP1. This c/s
renames Console.uri to Console.location.

Needed to build providers against xen-unstable as well.

Signed-off-by: Jim Fehlig <jfehlig@novell.com>
author Jim Fehlig <jfehlig@novell.com>
date Wed Mar 07 19:28:29 2007 -0700 (2007-03-07)
parents 585665e1a296
children 66600aae1e53
files ChangeLog src/Xen_ConsoleSettingData_Resource.c src/Xen_Console_Resource.c
line diff
     1.1 --- a/ChangeLog	Fri Mar 02 12:00:37 2007 -0700
     1.2 +++ b/ChangeLog	Wed Mar 07 19:28:29 2007 -0700
     1.3 @@ -1,3 +1,12 @@
     1.4 +-------------------------------------------------------------------
     1.5 +Wed Mar  7 19:24:17 MST 2007 - jfehlig@novell.com
     1.6 +
     1.7 +        - Updated Console classes to use Xen APIs Console.location
     1.8 +          property.  xen-unstable c/s 14021 was backported for
     1.9 +          SLES10 SP1.  This c/s renames Console.uri to
    1.10 +          Console.location.  Needed to build providers against
    1.11 +          xen-unstable as well.
    1.12 +
    1.13  -------------------------------------------------------------------
    1.14  Fri Mar  2 11:58:24 MST 2007 - jfehlig@novell.com
    1.15  
     2.1 --- a/src/Xen_ConsoleSettingData_Resource.c	Fri Mar 02 12:00:37 2007 -0700
     2.2 +++ b/src/Xen_ConsoleSettingData_Resource.c	Wed Mar 07 19:28:29 2007 -0700
     2.3 @@ -250,8 +250,8 @@ int Xen_ConsoleSettingData_setInstanceFr
     2.4     CMSetProperty(instance, "AutomaticAllocation" , (CMPIValue *)&alloctype, CMPI_boolean);
     2.5     CMSetProperty(instance, "AutomaticDeallocation" , (CMPIValue *)&alloctype, CMPI_boolean);
     2.6  
     2.7 -   if (resource->uri)
     2.8 -      CMSetProperty(instance, "URI", (CMPIValue *)resource->uri, CMPI_chars);
     2.9 +   if (resource->location)
    2.10 +      CMSetProperty(instance, "URI", (CMPIValue *)resource->location, CMPI_chars);
    2.11  
    2.12     int protocol = -1;
    2.13     if (resource->protocol == XEN_CONSOLE_PROTOCOL_VT100)
     3.1 --- a/src/Xen_Console_Resource.c	Fri Mar 02 12:00:37 2007 -0700
     3.2 +++ b/src/Xen_Console_Resource.c	Wed Mar 07 19:28:29 2007 -0700
     3.3 @@ -241,8 +241,8 @@ int Xen_Console_setInstanceFromResource(
     3.4     CMSetProperty(instance, "Caption",(CMPIValue *)"Console", CMPI_chars);
     3.5     CMSetProperty(instance, "Description",(CMPIValue *)"Console", CMPI_chars);
     3.6  
     3.7 -   if (resource->uri)
     3.8 -      CMSetProperty(instance, "URI", (CMPIValue *)resource->uri, CMPI_chars);
     3.9 +   if (resource->location)
    3.10 +      CMSetProperty(instance, "URI", (CMPIValue *)resource->location, CMPI_chars);
    3.11  
    3.12     int protocol = -1;
    3.13     if (resource->protocol == XEN_CONSOLE_PROTOCOL_VT100)