From patchwork Fri Apr 8 23:40:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8787051 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 E45D7C0553 for ; Fri, 8 Apr 2016 23:43:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2548E20256 for ; Fri, 8 Apr 2016 23:43:00 +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 5D662202E9 for ; Fri, 8 Apr 2016 23:42:59 +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 1aog1Q-00008l-Nd; Fri, 08 Apr 2016 23:41:04 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aog1P-0008Us-4H for xen-devel@lists.xensource.com; Fri, 08 Apr 2016 23:41:03 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 40/EB-09532-E8148075; Fri, 08 Apr 2016 23:41:02 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjkeJIrShJLcpLzFFi42I5NlG2Q7fPkSP c4PIbYYt7U96zOzB6bO/bxR7AGMWamZeUX5HAmtHUOoulYAJ7xZPXR1kbGH+wdjFycQgJTGWU 2Df9FQuEM4NJ4u/Vu0xdjBwcbAK6EjdvS3QxcnKICCRI3H36jRmkhlngHIvEhkvz2UASwgLOE jP+bWQHsVkEVCUmtJ1mAbF5BRwl3nxpAKuREJCTaPmxmxXE5hRwkji47w8ziC0EVHP1zBsWiJ oMiXk9c1ghbC+JRTcuQdlqElfPbWKewMi3gJFhFaN6cWpRWWqRrrFeUlFmekZJbmJmjq6hgZl ebmpxcWJ6ak5iUrFecn7uJkZgmDAAwQ7Gjn9OhxglOZiURHm3PWQPF+JLyk+pzEgszogvKs1J LT7EKMPBoSTBW+jAES4kWJSanlqRlpkDDFiYtAQHj5II736QNG9xQWJucWY6ROoUoy7Hgh+31 zIJseTl56VKifO6gRQJgBRllObBjYBFzyVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ8+4Fmc KTmVcCt+kV0BFMQEdc4GcDOaIkESEl1cBYL+uurbmr6p/0zu+208s/lx154HyeUeXB3sTJ7Vd tvdqlbBWfWG+O2LPF4vnpnPB5q1efro0PPmP1u1Hj6/zNAUFfftxs1705ZWprxBTuBD8GQbuX L+ZuzFeM6fGQtNtkl8XsaJpgss3tu6sq56G1EsUOr5OKWKZ5X7GeMl/FPjrlVmi17hQlluKMR EMt5qLiRADWFjfwmQIAAA== X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1460158859!8319975!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 39393 invoked from network); 8 Apr 2016 23:41:02 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-6.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Apr 2016 23:41:02 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D2552034B; Fri, 8 Apr 2016 23:40:55 +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 1E6682034F; Fri, 8 Apr 2016 23:40:54 +0000 (UTC) From: "Luis R. Rodriguez" To: bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au 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> 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, 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 Subject: [Xen-devel] [PATCH v5 07/14] 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 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);