Commit-ID: 46504590321dc62a11065f8d00e1b12037c37018 Gitweb: http://git.kernel.org/tip/46504590321dc62a11065f8d00e1b12037c37018 Author: Luis R. Rodriguez <mcgrof@xxxxxxxxxx> AuthorDate: Wed, 13 Apr 2016 17:04:37 -0700 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Fri, 22 Apr 2016 10:29:03 +0200 tools/lguest: Force disable tboot and APM The paravirt_enabled() check is going away, the area tossed to the kernel on lguest is not zeroed out, so ensure lguest force disables tboot and APM just in case the kernel file being read might have this set for whatever reason. Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxx> Acked-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Brian Gerst <brgerst@xxxxxxxxx> Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: andrew.cooper3@xxxxxxxxxx Cc: andriy.shevchenko@xxxxxxxxxxxxxxx Cc: bigeasy@xxxxxxxxxxxxx Cc: boris.ostrovsky@xxxxxxxxxx Cc: david.vrabel@xxxxxxxxxx Cc: ffainelli@xxxxxxxxxx Cc: george.dunlap@xxxxxxxxxx Cc: glin@xxxxxxxx Cc: jgross@xxxxxxxx Cc: jlee@xxxxxxxx Cc: josh@xxxxxxxxxxxxxxxx Cc: julien.grall@xxxxxxxxxx Cc: konrad.wilk@xxxxxxxxxx Cc: kozerkov@xxxxxxxxxxxxx Cc: lenb@xxxxxxxxxx Cc: lguest@xxxxxxxxxxxxxxxx Cc: linux-acpi@xxxxxxxxxxxxxxx Cc: lv.zheng@xxxxxxxxx Cc: matt@xxxxxxxxxxxxxxxxxxx Cc: mbizon@xxxxxxxxxx Cc: rjw@xxxxxxxxxxxxx Cc: robert.moore@xxxxxxxxx Cc: tiwai@xxxxxxx Cc: toshi.kani@xxxxxx Cc: xen-devel@xxxxxxxxxxxxxxxxxxx Link: http://lkml.kernel.org/r/1460592286-300-8-git-send-email-mcgrof@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- tools/lguest/lguest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c index ff0aa580..d9836c5 100644 --- a/tools/lguest/lguest.c +++ b/tools/lguest/lguest.c @@ -3357,6 +3357,12 @@ int main(int argc, char *argv[]) /* 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|