From patchwork Wed Sep 5 19:15:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 10589311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AED6B174C for ; Wed, 5 Sep 2018 19:17:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A8DB2A2D8 for ; Wed, 5 Sep 2018 19:17:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F1F22A3A7; Wed, 5 Sep 2018 19:17:16 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EED7D2A2D8 for ; Wed, 5 Sep 2018 19:17:15 +0000 (UTC) Received: from localhost ([::1]:57800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdIh-0006Xc-9q for patchwork-qemu-devel@patchwork.kernel.org; Wed, 05 Sep 2018 15:17:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxdHE-0006Ui-NI for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxdHB-000860-Ht for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43578) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxdHB-00084I-7b for qemu-devel@nongnu.org; Wed, 05 Sep 2018 15:15:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A415308212D; Wed, 5 Sep 2018 19:15:40 +0000 (UTC) Received: from amd-seattle-08.khw.lab.eng.bos.redhat.com (amd-seattle-08.khw.lab.eng.bos.redhat.com [10.16.184.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id A270260BE5; Wed, 5 Sep 2018 19:15:39 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:15:32 -0400 Message-Id: <1536174934-26022-3-git-send-email-wei@redhat.com> In-Reply-To: <1536174934-26022-1-git-send-email-wei@redhat.com> References: <1536174934-26022-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 05 Sep 2018 19:15:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V9 2/4] tests/migration: Support cross compilation in generating boot header file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, wei@redhat.com, quintela@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Recently a new configure option, CROSS_CC_GUEST, was added to $(TARGET)-softmmu/config-target.mak to support TCG-related tests. This patch tries to leverage this option to support cross compilation when the migration boot block file is being re-generated: * The x86 related files are moved to a new sub-dir (named ./i386). * A new top-layer Makefile is created in tests/migration/ directory. This Makefile searches and parses CROSS_CC_GUEST to generate CROSS_PREFIX. The CROSS_PREFIX, if available, is then passed to migration/$ARCH/Makefile. Reviewed-by: Juan Quintela Signed-off-by: Wei Huang --- tests/migration-test.c | 2 +- tests/migration/Makefile | 44 ++++++++++++---------- tests/migration/i386/Makefile | 22 +++++++++++ .../{x86-a-b-bootblock.S => i386/a-b-bootblock.S} | 4 -- .../{x86-a-b-bootblock.h => i386/a-b-bootblock.h} | 8 ++-- 5 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 tests/migration/i386/Makefile rename tests/migration/{x86-a-b-bootblock.S => i386/a-b-bootblock.S} (93%) rename tests/migration/{x86-a-b-bootblock.h => i386/a-b-bootblock.h} (92%) diff --git a/tests/migration-test.c b/tests/migration-test.c index 0e687b7..fe6b41a 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -83,7 +83,7 @@ static const char *tmpfs; /* A simple PC boot sector that modifies memory (1-100MB) quickly * outputting a 'B' every so often if it's still running. */ -#include "tests/migration/x86-a-b-bootblock.h" +#include "tests/migration/i386/a-b-bootblock.h" static void init_bootfile_x86(const char *bootpath) { diff --git a/tests/migration/Makefile b/tests/migration/Makefile index c0824b4..a9ed875 100644 --- a/tests/migration/Makefile +++ b/tests/migration/Makefile @@ -1,31 +1,35 @@ -# To specify cross compiler prefix, use CROSS_PREFIX= -# $ make CROSS_PREFIX=x86_64-linux-gnu- +# +# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# + +TARGET_LIST = i386 + +SRC_PATH = ../.. override define __note -/* This file is automatically generated from - * tests/migration/x86-a-b-bootblock.S, edit that and then run - * tests/migration/rebuild-x86-bootblock.sh to update, - * and then remember to send both in your patch submission. +/* This file is automatically generated from the assembly file in + * tests/migration/$@. Edit that file and then run "make all" + * inside tests/migration to update, and then remember to send both + * the header and the assembler differences in your patch submission. */ endef export __note -.PHONY: all clean -all: x86-a-b-bootblock.h - -x86-a-b-bootblock.h: x86.bootsect - echo "$$__note" > header.tmp - xxd -i $< | sed -e 's/.*int.*//' >> header.tmp - mv header.tmp $@ +find-arch-cross-cc = $(lastword $(shell grep -h "CROSS_CC_GUEST=" $(wildcard $(SRC_PATH)/$(patsubst i386,*86*,$(1))-softmmu/config-target.mak))) +parse-cross-prefix = $(subst gcc,,$(patsubst cc,gcc,$(patsubst CROSS_CC_GUEST="%",%,$(call find-arch-cross-cc,$(1))))) +gen-cross-prefix = $(patsubst %-,CROSS_PREFIX=%-,$(call parse-cross-prefix,$(1))) -x86.bootsect: x86.boot - dd if=$< of=$@ bs=256 count=2 skip=124 +.PHONY: all $(TARGET_LIST) -x86.boot: x86.o - $(CROSS_PREFIX)objcopy -O binary $< $@ +all: $(TARGET_LIST) -x86.o: x86-a-b-bootblock.S - $(CROSS_PREFIX)gcc -m32 -march=i486 -c $< -o $@ +$(TARGET_LIST): + $(MAKE) -C $@ $(call gen-cross-prefix,$@) clean: - @rm -rf *.boot *.o *.bootsect + for target in $(TARGET_LIST); do \ + $(MAKE) -C $$target clean; \ + done diff --git a/tests/migration/i386/Makefile b/tests/migration/i386/Makefile new file mode 100644 index 0000000..5c03241 --- /dev/null +++ b/tests/migration/i386/Makefile @@ -0,0 +1,22 @@ +# To specify cross compiler prefix, use CROSS_PREFIX= +# $ make CROSS_PREFIX=x86_64-linux-gnu- + +.PHONY: all clean +all: a-b-bootblock.h + +a-b-bootblock.h: x86.bootsect + echo "$$__note" > header.tmp + xxd -i $< | sed -e 's/.*int.*//' >> header.tmp + mv header.tmp $@ + +x86.bootsect: x86.boot + dd if=$< of=$@ bs=256 count=2 skip=124 + +x86.boot: x86.o + $(CROSS_PREFIX)objcopy -O binary $< $@ + +x86.o: a-b-bootblock.S + $(CROSS_PREFIX)gcc -m32 -march=i486 -c $< -o $@ + +clean: + @rm -rf *.boot *.o *.bootsect diff --git a/tests/migration/x86-a-b-bootblock.S b/tests/migration/i386/a-b-bootblock.S similarity index 93% rename from tests/migration/x86-a-b-bootblock.S rename to tests/migration/i386/a-b-bootblock.S index b164264..3f97f28 100644 --- a/tests/migration/x86-a-b-bootblock.S +++ b/tests/migration/i386/a-b-bootblock.S @@ -3,10 +3,6 @@ # range. # Outputs an initial 'A' on serial followed by repeated 'B's # -# run tests/migration/rebuild-x86-bootblock.sh -# to regenerate the hex, and remember to include both the .h and .s -# in any patches. -# # Copyright (c) 2016 Red Hat, Inc. and/or its affiliates # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/i386/a-b-bootblock.h similarity index 92% rename from tests/migration/x86-a-b-bootblock.h rename to tests/migration/i386/a-b-bootblock.h index 78a151f..7d459d4 100644 --- a/tests/migration/x86-a-b-bootblock.h +++ b/tests/migration/i386/a-b-bootblock.h @@ -1,7 +1,7 @@ -/* This file is automatically generated from - * tests/migration/x86-a-b-bootblock.s, edit that and then run - * tests/migration/rebuild-x86-bootblock.sh to update, - * and then remember to send both in your patch submission. +/* This file is automatically generated from the assembly file in + * tests/migration/i386. Edit that file and then run "make all" + * inside tests/migration to update, and then remember to send both + * the header and the assembler differences in your patch submission. */ unsigned char x86_bootsect[] = { 0xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00,