From patchwork Thu Apr 14 00:04:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8829881 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 887C9C0553 for ; Thu, 14 Apr 2016 00:07:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B18DD20274 for ; Thu, 14 Apr 2016 00:07:03 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3E2220173 for ; Thu, 14 Apr 2016 00:07:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqUmW-0007S4-Ck; Thu, 14 Apr 2016 00:05:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqUmU-0007Qm-F2 for xen-devel@lists.xensource.com; Thu, 14 Apr 2016 00:05:10 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id F4/27-02914-5BEDE075; Thu, 14 Apr 2016 00:05:09 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmplkeJIrShJLcpLzFFi42I5NlG2Q3frPb5 wg+vz2CzuTXnP7sDosb1vF3sAYxRrZl5SfkUCa8aS88IF+9krDk1czt7AuJiti5GLQ0hgKqPE 1gvTGbsYOYGcGUwSB/bHdjFycLAJ6ErcvC0BEhYRSJC4+/QbM0g9s8AxVol5q+aygiSEBZwlD jfvYwGxWQRUJdY3HWAHsXkF7CWePj0JNlNCQE6i5cdusHpOAQeJBTtXsELsspfov30AqiZDYl 7PHFYI20ti0Y1LULaaxNVzm5gnMPItYGRYxahRnFpUllqka2igl1SUmZ5RkpuYmaNraGiil5t aXJyYnpqTmFSsl5yfu4kRGCQMQLCD8dwy50OMkhxMSqK8Jqv4woX4kvJTKjMSizPii0pzUosP McpwcChJ8B6+C5QTLEpNT61Iy8wBhitMWoKDR0mEdztImre4IDG3ODMdInWKUZdjwY/ba5mEW PLy81KlxHlngBQJgBRllObBjYDFziVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ854BmcKTmV cCt+kV0BFMQEeUveMFOaIkESEl1cAoXvwrT3CT1dFcx4K/Pxb6n/YQiFpYey55VeTKqexrnU/ vkxPhUjly5o6IvVPUtDczJC26WBbVWPEaXWzZOIHtP8sBhs6uh8dO3TkjLb3i4R5nlz7R6vW2 8zx0ojTXln45d0Fk+8/Xx66cLHh4pvvwxa8pQomHNxzZ8IQv5+37p35/K3aHpt1qUmIpzkg01 GIuKk4EANeYgMyYAgAA X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1460592307!35469284!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35858 invoked from network); 14 Apr 2016 00:05:08 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Apr 2016 00:05:08 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 049642037C; Thu, 14 Apr 2016 00:05:07 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 429F32027D; Thu, 14 Apr 2016 00:05:05 +0000 (UTC) From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au Date: Wed, 13 Apr 2016 17:04:37 -0700 Message-Id: <1460592286-300-8-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460592286-300-1-git-send-email-mcgrof@kernel.org> References: <1460592286-300-1-git-send-email-mcgrof@kernel.org> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: kozerkov@parallels.com, matt@codeblueprint.co.uk, bigeasy@linutronix.de, lv.zheng@intel.com, ffainelli@freebox.fr, mbizon@freebox.fr, xen-devel@lists.xensource.com, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.com, lenb@kernel.org, julien.grall@linaro.org, josh@joshtriplett.org, george.dunlap@citrix.com, jlee@suse.com, lguest@lists.ozlabs.org, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com, jgross@suse.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 Subject: [Xen-devel] [PATCH v6 07/16] tools/lguest: force disable tboot and apm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Acked-by: Rusty Russell 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);