diff mbox

[v5,07/14] tools/lguest: force disable tboot and apm

Message ID 1460159886-13344-1-git-send-email-mcgrof@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Luis Chamberlain April 8, 2016, 11:58 p.m. UTC
The paravirt_enabled() check is going away, the area tossed to
the kernel on lguest is not zerored 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@kernel.org>
---
 tools/lguest/lguest.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Ingo Molnar April 13, 2016, 8:44 a.m. UTC | #1
* Luis R. Rodriguez <mcgrof@kernel.org> wrote:

> The paravirt_enabled() check is going away, the area tossed to
> the kernel on lguest is not zerored 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@kernel.org>
> ---
>  tools/lguest/lguest.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Yeah, so the v4 patch was acked by Rusty:

  Acked-by: Rusty Russell <rusty@rustcorp.com.au>

... but you didn't add his ack to the v5 patch :-(

Please don't do this! Also please double check all past replies to make sure no 
acks got lost. I noticed this one, but there might be more.

Thanks,

	Ingo
Luis Chamberlain April 13, 2016, 3:45 p.m. UTC | #2
On Wed, Apr 13, 2016 at 10:44:46AM +0200, Ingo Molnar wrote:
> 
> * Luis R. Rodriguez <mcgrof@kernel.org> wrote:
> 
> > The paravirt_enabled() check is going away, the area tossed to
> > the kernel on lguest is not zerored 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@kernel.org>
> > ---
> >  tools/lguest/lguest.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> 
> Yeah, so the v4 patch was acked by Rusty:
> 
>   Acked-by: Rusty Russell <rusty@rustcorp.com.au>
> 
> ... but you didn't add his ack to the v5 patch :-(

Sorry about that. Added.

> Please don't do this! Also please double check all past replies to make sure no 
> acks got lost. I noticed this one, but there might be more.

I thought I had only left out the Acks for patches I later modified
significantly. Sorry. Will revise.

  Luis
diff mbox

Patch

diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c
index ff0aa580c6e1..0aa75af6e862 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);