Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski...

[linux-2.6-block.git] / tools / lguest / lguest.c

diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c
index 80159e6811c2944ec4749561fb8c83f2b908a7b2..d9836c5eb694c48c30a6d07827ee36ed086b4309 100644 (file)
--- a/tools/lguest/lguest.c
+++ b/tools/lguest/lguest.c
@@ -3351,12 +3351,18 @@ int main(int argc, char *argv[])
        /* Boot protocol version: 2.07 supports the fields for lguest. */
        boot->hdr.version = 0x207;
 
-       /* The hardware_subarch value of "1" tells the Guest it's an lguest. */
-       boot->hdr.hardware_subarch = 1;
+       /* X86_SUBARCH_LGUEST tells the Guest it's an lguest. */
+       boot->hdr.hardware_subarch = X86_SUBARCH_LGUEST;
 
        /* Tell the entry path not to try to reload segment registers. */
        boot->hdr.loadflags |= KEEP_SEGMENTS;
 
+       /* We don't support tboot: */
+       boot->tboot_addr = 0;
+
+       /* Ensure this is 0 to prevent APM from loading: */
+       boot->apm_bios_info.version = 0;
+
        /* We tell the kernel to initialize the Guest. */
        tell_kernel(start);