[Xen-changelog] [xen-unstable] x86, cmdline: Fix setting skip_realmode boolean on no-real-mode and tboot options

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1345730524 -3600
# Node ID b7e66cabb70f9d9d94dba6a82ae3419d7b292f9e
# Parent  b02ac80ff6899e98b4089842843104fd8572a7cd
x86,cmdline: Fix setting skip_realmode boolean on no-real-mode and tboot options
...effect should be cumulative.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r b02ac80ff689 -r b7e66cabb70f xen/arch/x86/boot/cmdline.S
--- a/xen/arch/x86/boot/cmdline.S       Wed Aug 22 22:29:06 2012 +0100
+++ b/xen/arch/x86/boot/cmdline.S       Thu Aug 23 15:02:04 2012 +0100
@@ -164,13 +164,15 @@ cmdline_parse_early:
         pushl   MB_cmdline(%ebx)
         call    .Lfind_option
         test    %eax,%eax
-        setnz   sym_phys(skip_realmode)
+        setnz   %al
+        or      %al,sym_phys(skip_realmode)
 
         /* Check for 'tboot=' command-line option. */
         movl    $sym_phys(.Ltboot_opt),4(%esp)
         call    .Lfind_option
         test    %eax,%eax
-        setnz   sym_phys(skip_realmode) /* tboot= implies no-real-mode */
+        setnz   %al
+        or      %al,sym_phys(skip_realmode) /* tboot= implies no-real-mode */
 
 .Lparse_edd:
         /* Check for 'edd=' command-line option. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog