From patchwork Wed Jun 15 16:21:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 9178941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 74D08604DB for ; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66F1420223 for ; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BD8A27DA4; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 6F0EE27DCE for ; Wed, 15 Jun 2016 16:25:26 +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 1bDDb4-0007wm-B7; Wed, 15 Jun 2016 16:23:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDDb2-0007wG-G6 for xen-devel@lists.xenproject.org; Wed, 15 Jun 2016 16:23:16 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id D8/68-18769-3F081675; Wed, 15 Jun 2016 16:23:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRWlGSWpSXmKPExsXitHSDve7nhsR wg4sfRSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oymxsvMBVd4K4603GRuYHzG3cXIwSEh4C/x ZnZJFyMnB5uAnsS8419ZQMIiAioSt/cagISZBaIkJvc0MIGEhQXcJe48VAEJswioStyd8IERx OYV8JB427sLzJYQkJM4f/wnM4jNKeApsfP6WVYQWwioZv6tuywQ9YISJ2c+YYEYrynRuv03O4 QtL9G8dTYzRL2qxOIHR9khZnJL3D49lXkCI/8sJO2zkLTPQtK+gJF5FaN6cWpRWWqRroVeUlF mekZJbmJmjq6hgbFebmpxcWJ6ak5iUrFecn7uJkZg8DEAwQ7GC+3OhxglOZiURHlFKxPDhfiS 8lMqMxKLM+KLSnNSiw8xynBwKEnwzqgHygkWpaanVqRl5gDjACYtwcGjJMKbCZLmLS5IzC3OT IdInWLU5Zg3adcxJiGWvPy8VClx3j0gRQIgRRmleXAjYDF5iVFWSpiXEegoIZ6C1KLczBJU+V eM4hyMSsK8F0Gm8GTmlcBtegV0BBPQETbT40GOKElESEk1MBoE+pT4aDL7XCrcNvXWyvCD9rn pW4+/b3ve6JHP9Nyib847lU0n1S9e/DPz29uTbWeeGu5Z/3W/sezyk9EzPhXWbV107tOOffJP DHl4c2/xvrOXYi1eUpb8n0f9+hWNzkeRK74vKN4fdG75H30mpZf7ThqbKlq23xQMP6z4+Zlmj lK+5B2tppdKLMUZiYZazEXFiQBaF6wAxAIAAA== X-Env-Sender: prvs=96798de7a=George.Dunlap@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1466007793!44990000!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11746 invoked from network); 15 Jun 2016 16:23:14 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jun 2016 16:23:14 -0000 X-IronPort-AV: E=Sophos;i="5.26,476,1459814400"; d="scan'208";a="367518096" From: George Dunlap To: Date: Wed, 15 Jun 2016 17:21:47 +0100 Message-ID: <1466007710-28934-2-git-send-email-george.dunlap@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466007710-28934-1-git-send-email-george.dunlap@citrix.com> References: <1466007710-28934-1-git-send-email-george.dunlap@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Stefano Stabellini , George Dunlap Subject: [Xen-devel] [PATCH raisin v2 1/4] components/xen: Actually disable rombios 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 5fe3855 meant to disable rombios, but didn't. This causes the following build failure: gcc -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Wno-unused-but-set-variable -Wno-unused-local-typedefs -D__XEN_TOOLS__ -MMD -MF .rombios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -mno-tls-direct-seg-refs -DNDEBUG -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/usr/local/src/xenboil/raisin/xen-dir-remote/tools/firmware/hvmloader/../../../tools/include -U__XEN_TOOLS__ -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__ -DENABLE_OVMF -DENABLE_ROMBIOS -DENABLE_SEABIOS -c -o rombios.o rombios.c rombios.c: In function ‘rombios_load_roms’: rombios.c:103:39: error: ‘etherboot’ undeclared (first use in this function) etherboot); Disable rombios instead. Reported-by: Holger Schramm Signed-off-by: George Dunlap Acked-by: Stefano Stabellini --- CC: Stefano Stabellini --- components/xen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/xen b/components/xen index 894d119..ea290aa 100644 --- a/components/xen +++ b/components/xen @@ -45,7 +45,7 @@ function xen_build() { export ETHERBOOT_NICS="" ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \ --disable-stubdom --disable-qemu-traditional \ - --enable-rombios $seabios_opt $ovmf_opt + --disable-rombios $seabios_opt $ovmf_opt $RAISIN_MAKE $RAISIN_MAKE install DESTDIR="$INST_DIR" unset ETHERBOOT_NICS