From patchwork Thu Apr 14 00:13:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8830231 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 237BB9F3A0 for ; Thu, 14 Apr 2016 00:15:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BF4020274 for ; Thu, 14 Apr 2016 00:14:59 +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 69A6F2020F for ; Thu, 14 Apr 2016 00:14:58 +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 1aqUum-0001az-FM; Thu, 14 Apr 2016 00:13:44 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqUul-0001am-4A for xen-devel@lists.xensource.com; Thu, 14 Apr 2016 00:13:43 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id D4/51-09532-6B0EE075; Thu, 14 Apr 2016 00:13:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42I5NlG2Q3frA75 wg6WzjS3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa8aS88IF+9krDk1czt7AuJiti5GLQ0hgKqPE vtXLmSGcGUwSK5dvZ+pi5OBgE9CVuHlboouRk0NEIEHi7tNvYDXMAsdYJeatmssKkhAWcJY43 LyPBaSeRUBV4sACY5Awr4C9xLnd69hAbAkBOYmWH7vByjkFHCQW7FwBZgsB1fTfPsAIUZMhMa 9nDiuE7SWx6MYlKFtN4uq5TcwTGPkWMDKsYlQvTi0qSy3SNdJLKspMzyjJTczM0TU0MNPLTS0 uTkxPzUlMKtZLzs/dxAgMEQYg2MG47K/TIUZJDiYlUV6TVXzhQnxJ+SmVGYnFGfFFpTmpxYcY ZTg4lCR4798HygkWpaanVqRl5gCDFSYtwcGjJMI7HSTNW1yQmFucmQ6ROsWoy7Hgx+21TEIse fl5qVLivL9BigRAijJK8+BGwCLnEqOslDAvI9BRQjwFqUW5mSWo8q8YxTkYlYR5X4NM4cnMK4 Hb9AroCCagI8re8YIcUZKIkJJqYNS8Ix5yNFdxUs59dr0bZzqWysx3fnRpxtEcQwmr0LP+jZm r6m4t/Fj5TNv3pFgw170jJS9ErHnXqJcy3F71hiXMZ+Ms3wLeJw1Pp0RHui3mX2V21uds6k2Z w6c3NRraq557ceLT+3UyfJ7nmv//7vlvVP9y/v05WlWBxbrtnuq+uW7PggKkm5VYijMSDbWYi 4oTAY/tbMaXAgAA X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1460592818!9172294!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 54498 invoked from network); 14 Apr 2016 00:13:41 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Apr 2016 00:13:41 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B78BA2024F; Thu, 14 Apr 2016 00:13:37 +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 7DE192020F; Thu, 14 Apr 2016 00:13:35 +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:13:33 -0700 Message-Id: <1460592813-402-1-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);