[PATCH] Remove value 4 from VSSD ValueMap
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1222113882 25200 # Node ID 8d683acf0587201617d65d8da41818a00165b398 # Parent 1dcb9b94763bc92ad33e0ff2d2483e771253102c Remove value 4 from VSSD ValueMap. libvirt treats "Turn Off" and "Shutdown" in the same manner. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 1dcb9b94763b -r 8d683acf0587 schema/VSSD.mof --- a/schema/VSSD.mof Fri Sep 19 11:30:54 2008 -0700 +++ b/schema/VSSD.mof Mon Sep 22 13:04:42 2008 -0700 @@ -29,6 +29,10 @@ "One of hd,fd,cdrom.")] string BootDevice; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; [Description ( @@ -41,6 +45,10 @@ [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; }; @@ -55,4 +63,8 @@ [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 1dcb9b94763b -r 8d683acf0587 src/Virt_KVMRedirectionSAP.c --- a/src/Virt_KVMRedirectionSAP.c Fri Sep 19 11:30:54 2008 -0700 +++ b/src/Virt_KVMRedirectionSAP.c Mon Sep 22 13:04:42 2008 -0700 @@ -194,17 +194,25 @@ CU_DEBUG("calling get_console_sap"); inst = get_console_sap(_BROKER, ref, conn, dominfo, &s); +CU_DEBUG("after get_console"); virDomainFree(list[i]); cleanup_dominfo(&dominfo); - if (inst == NULL) + if (inst == NULL) { +CU_DEBUG("instance is null, continuing"); continue; + } - if (names_only) +CU_DEBUG("returning inst"); + if (names_only) { +CU_DEBUG("names_only"); cu_return_instance_name(results, inst); - else + } + else { +CU_DEBUG("no names"); CMReturnInstance(results, inst); + } } out:
KR> diff -r 1dcb9b94763b -r 8d683acf0587 schema/VSSD.mof KR> --- a/schema/VSSD.mof Fri Sep 19 11:30:54 2008 -0700 KR> +++ b/schema/VSSD.mof Mon Sep 22 13:04:42 2008 -0700 KR> @@ -29,6 +29,10 @@ KR> "One of hd,fd,cdrom.")] KR> string BootDevice; KR> + [Override, ValueMap { "2", "3", ".." }, KR> + Values { "Turn Off", "Save state", "DMTF Reserved" }] KR> + uint16 AutomaticShutdownAction; KR> + KR> }; KR> [Description ( KR> @@ -41,6 +45,10 @@ KR> [Description ("The device to boot from. One of hd,fd,cdrom.")] KR> string BootDevice; KR> + KR> + [Override, ValueMap { "2", "3", ".." }, KR> + Values { "Turn Off", "Save state", "DMTF Reserved" }] KR> + uint16 AutomaticShutdownAction; KR> }; KR> @@ -55,4 +63,8 @@ KR> [Description ("Path to the init process for the container")] KR> string InitPath; KR> + [Override, ValueMap { "2", "3", ".." }, KR> + Values { "Turn Off", "Save state", "DMTF Reserved" }] KR> + uint16 AutomaticShutdownAction; KR> + KR> }; This bit looks good. KR> diff -r 1dcb9b94763b -r 8d683acf0587 src/Virt_KVMRedirectionSAP.c KR> --- a/src/Virt_KVMRedirectionSAP.c Fri Sep 19 11:30:54 2008 -0700 KR> +++ b/src/Virt_KVMRedirectionSAP.c Mon Sep 22 13:04:42 2008 -0700 KR> @@ -194,17 +194,25 @@ KR> CU_DEBUG("calling get_console_sap"); KR> inst = get_console_sap(_BROKER, ref, conn, dominfo, &s); KR> +CU_DEBUG("after get_console"); KR> virDomainFree(list[i]); KR> cleanup_dominfo(&dominfo); KR> - if (inst == NULL) KR> + if (inst == NULL) { KR> +CU_DEBUG("instance is null, continuing"); KR> continue; KR> + } KR> - if (names_only) KR> +CU_DEBUG("returning inst"); KR> + if (names_only) { KR> +CU_DEBUG("names_only"); KR> cu_return_instance_name(results, inst); KR> - else KR> + } KR> + else { KR> +CU_DEBUG("no names"); KR> CMReturnInstance(results, inst); KR> + } KR> } KR> out: I'm not so sure about this bit :) -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
KR> - if (names_only) KR> +CU_DEBUG("returning inst"); KR> + if (names_only) { KR> +CU_DEBUG("names_only"); KR> cu_return_instance_name(results, inst); KR> - else KR> + } KR> + else { KR> +CU_DEBUG("no names"); KR> CMReturnInstance(results, inst); KR> + } KR> }
KR> out:
I'm not so sure about this bit :)
Oops.. that's embarrassing. =) -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
participants (2)
-
danms＠us.ibm.com -
Kaitlin Rupert