From patchwork Tue Sep 19 00:32:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 9957837 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 E49DB60568 for ; Tue, 19 Sep 2017 00:35:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1B3728DD4 for ; Tue, 19 Sep 2017 00:35:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3A7628DD6; Tue, 19 Sep 2017 00:35:08 +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, UNPARSEABLE_RELAY 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 EB68228DD4 for ; Tue, 19 Sep 2017 00:35:07 +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 1du6Sj-0007EY-LK; Tue, 19 Sep 2017 00:32:29 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1du6Si-0007ES-J4 for xen-devel@lists.xenproject.org; Tue, 19 Sep 2017 00:32:28 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 71/E7-03414-B9560C95; Tue, 19 Sep 2017 00:32:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRWlGSWpSXmKPExsUyZ7p8oO6s1AO RBidnGll83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmvbzexFpwXqjj56CRjA+NSgS5GTg4hgYlM Ep0fAiHs34wS2/skuxi5gOyNjBK/Ol6wQzhdjBLvv/5hB6liEVCV+DX/E2MXIwcHm4CJxJtVj iBhEQF1iT8XJjCC1DML7GOUWPviGzNIQligQOLkwR9gNq+AmcSZhYeYIbbNYJSYviYPIi4ocX LmExYQm1lAS+LGv5dMIPOZBaQllv/jAAlzClhLPLjWC3aCqICyxLx9q9hAbAkBQ4nPG5cyT2A UnIVk0iwkk2YhTFrAyLyKUaM4tagstUjX0FgvqSgzPaMkNzEzR9fQwEwvN7W4ODE9NScxqVgv OT93EyMwaBmAYAfjl2UBhxglOZiURHlFI/dHCvEl5adUZiQWZ8QXleakFh9ilOHgUJLg9dsBl BMsSk1PrUjLzAHGD0xagoNHSYQ3HiTNW1yQmFucmQ6ROsWoKCXOmwSSEABJZJTmwbXBYvYSo6 yUMC8j0CFCPAWpRbmZJajyrxjFORiVhHlDQKbwZOaVwE1/BbSYCWhxy449IItLEhFSUg2MIRv TU6MeWybX7pr0sTDK6sR8yfCo01c4WXvz1tQuMnPe4yzAc+i2YJljhuCeJl3x9w5PdkWVt9Tp PbpgztfquEm6eke8wOZU/1PHT4qlVW4QFvPbKHdf061Ee/I9K2aPrvweya4DzsyNh0KnKdgbP l4rKL/8a8KPxM37uubEPLWeteXo1ddKLMUZiYZazEXFiQCXy9m/1AIAAA== X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1505781145!77598694!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10732 invoked from network); 19 Sep 2017 00:32:26 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Sep 2017 00:32:26 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v8J0WEn9024723 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Sep 2017 00:32:14 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v8J0WDhL022680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Sep 2017 00:32:13 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v8J0WDft023314; Tue, 19 Sep 2017 00:32:13 GMT Received: from x230.dumpdata.com (/10.154.108.142) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 18 Sep 2017 17:32:12 -0700 Date: Mon, 18 Sep 2017 20:32:10 -0400 From: Konrad Rzeszutek Wilk To: Julien Grall Message-ID: <20170919003207.GA24480@x230.dumpdata.com> References: <20170912003726.368-1-konrad.wilk@oracle.com> <20170912003726.368-7-konrad.wilk@oracle.com> <7c682452-e781-3576-e63b-a579f7515942@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <7c682452-e781-3576-e63b-a579f7515942@arm.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: sstabellini@kernel.org, ross.lagerwall@citrix.com, andrew.cooper3@citrix.com, jbeulich@suse.com, xen-devel@lists.xenproject.org Subject: Re: [Xen-devel] [PATCH v3 06/17] xen/livepatch/x86/arm32: Force .livepatch.depends section to be uint32_t aligned. 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 > > +.PHONY: livepatch_depends.h > > +livepatch_depends.h: note.bin > > + $(shell (../../../tools/firmware/hvmloader/mkhex $(NOTE_DEPENDS) $^ > $@)) > > It looks quite odd to use a file in firmware/hvmloader for livepatch. Would > it be possible to move mkhex to a generic place? Like so? diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 7c4c0ce535..a5b4c32c1a 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -91,23 +91,23 @@ roms.inc: $(ROMS) ifneq ($(ROMBIOS_ROM),) echo "#ifdef ROM_INCLUDE_ROMBIOS" >> $@.new - sh ./mkhex rombios $(ROMBIOS_ROM) >> $@.new + sh ../../misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(STDVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new + sh ../../misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(CIRRUSVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new + sh ../../misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(ETHERBOOT_ROMS),) echo "#ifdef ROM_INCLUDE_ETHERBOOT" >> $@.new - sh ./mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new + sh ../../misc/mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new echo "#endif" >> $@.new endif diff --git a/tools/firmware/hvmloader/mkhex b/tools/misc/mkhex similarity index 100% rename from tools/firmware/hvmloader/mkhex rename to tools/misc/mkhex diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile index 8ac9f5e426..f0365305ba 100644 --- a/xen/test/livepatch/Makefile +++ b/xen/test/livepatch/Makefile @@ -73,7 +73,7 @@ note.bin: .PHONY: livepatch_depends.h livepatch_depends.h: note.bin - $(shell (../../../tools/firmware/hvmloader/mkhex $(NOTE_DEPENDS) $^ > $@)) + $(shell (../../../tools/misc/mkhex $(NOTE_DEPENDS) $^ > $@)) # # Extract the build-id of the xen_hello_world.livepatch @@ -85,7 +85,7 @@ hello_world_note.bin: $(LIVEPATCH) .PHONY: hello_world_livepatch_depends.h hello_world_livepatch_depends.h: hello_world_note.bin - $(shell (../../../tools/firmware/hvmloader/mkhex $(NOTE_DEPENDS) $^ > $@)) + $(shell (../../../tools/misc/mkhex $(NOTE_DEPENDS) $^ > $@)) xen_bye_world.o: config.h hello_world_livepatch_depends.h