From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v5 07/14] tools/lguest: force disable tboot and apm Date: Fri, 8 Apr 2016 16:40:18 -0700 Message-ID: <1460158825-13117-8-git-send-email-mcgrof@kernel.org> References: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: kozerkov@parallels.com, matt@codeblueprint.co.uk, lv.zheng@intel.com, xen-devel@lists.xensource.com, joro@8bytes.org, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.com, lenb@kernel.org, josh@joshtriplett.org, jlee@suse.com, lguest@lists.ozlabs.org, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com, toshi.kani@hp.com, andrew.cooper3@citrix.com, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, luto@amacapital.net, "Luis R. Rodriguez" , david.vrabel@citrix.com, tiwai@suse.de List-Id: linux-acpi@vger.kernel.org VGhlIHBhcmF2aXJ0X2VuYWJsZWQoKSBjaGVjayBpcyBnb2luZyBhd2F5LCB0aGUgYXJlYSB0b3Nz ZWQgdG8KdGhlIGtlcm5lbCBvbiBsZ3Vlc3QgaXMgbm90IHplcm9yZWQgb3V0LCBzbyBlbnN1cmUg bGd1ZXN0IGZvcmNlCmRpc2FibGVzIHRib290IGFuZCBhcG0ganVzdCBpbiBjYXNlIHRoZSBrZXJu ZWwgZmlsZSBiZWluZyByZWFkIG1pZ2h0CmhhdmUgdGhpcyBzZXQgZm9yIHdoYXRldmVyIHJlYXNv bi4KClNpZ25lZC1vZmYtYnk6IEx1aXMgUi4gUm9kcmlndWV6IDxtY2dyb2ZAa2VybmVsLm9yZz4K LS0tCiB0b29scy9sZ3Vlc3QvbGd1ZXN0LmMgfCA2ICsrKysrKwogMSBmaWxlIGNoYW5nZWQsIDYg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xndWVzdC9sZ3Vlc3QuYyBiL3Rvb2xz L2xndWVzdC9sZ3Vlc3QuYwppbmRleCBmZjBhYTU4MGM2ZTEuLjBhYTc1YWY2ZTg2MiAxMDA2NDQK LS0tIGEvdG9vbHMvbGd1ZXN0L2xndWVzdC5jCisrKyBiL3Rvb2xzL2xndWVzdC9sZ3Vlc3QuYwpA QCAtMzM1Nyw2ICszMzU3LDEyIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJ LyogVGVsbCB0aGUgZW50cnkgcGF0aCBub3QgdG8gdHJ5IHRvIHJlbG9hZCBzZWdtZW50IHJlZ2lz dGVycy4gKi8KIAlib290LT5oZHIubG9hZGZsYWdzIHw9IEtFRVBfU0VHTUVOVFM7CiAKKwkvKiBX ZSBkb24ndCBzdXBwb3J0IHRib290ICovCisJYm9vdC0+dGJvb3RfYWRkciA9IDA7CisKKwkvKiBF bnN1cmUgdGhpcyBpcyAwIHRvIHByZXZlbnQgYXBtIGZyb20gbG9hZGluZyAqLworCWJvb3QtPmFw bV9iaW9zX2luZm8udmVyc2lvbiA9IDA7CisKIAkvKiBXZSB0ZWxsIHRoZSBrZXJuZWwgdG8gaW5p dGlhbGl6ZSB0aGUgR3Vlc3QuICovCiAJdGVsbF9rZXJuZWwoc3RhcnQpOwogCi0tIAoyLjcuMgoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZl bCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933059AbcDHXnc (ORCPT ); Fri, 8 Apr 2016 19:43:32 -0400 Received: from mail.kernel.org ([198.145.29.136]:39912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932899AbcDHXlC (ORCPT ); Fri, 8 Apr 2016 19:41:02 -0400 From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Cc: x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, boris.ostrovsky@oracle.com, david.vrabel@citrix.com, konrad.wilk@oracle.com, xen-devel@lists.xensource.com, lguest@lists.ozlabs.org, andriy.shevchenko@linux.intel.com, jlee@suse.com, glin@suse.com, matt@codeblueprint.co.uk, andrew.cooper3@citrix.com, rjw@rjwysocki.net, lenb@kernel.org, robert.moore@intel.com, lv.zheng@intel.com, toshi.kani@hp.com, linux-acpi@vger.kernel.org, kozerkov@parallels.com, josh@joshtriplett.org, joro@8bytes.org, tiwai@suse.de, "Luis R. Rodriguez" Subject: [PATCH v5 07/14] tools/lguest: force disable tboot and apm Date: Fri, 8 Apr 2016 16:40:18 -0700 Message-Id: <1460158825-13117-8-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> References: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- tools/lguest/lguest.c | 6 ++++++ 1 file changed, 6 insertions(+) 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); -- 2.7.2