From nobody Wed Oct 22 13:05:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519423260995353.9643635645406; Fri, 23 Feb 2018 14:01:00 -0800 (PST) Received: from localhost ([::1]:47299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLOj-0002Zm-L2 for importer@patchew.org; Fri, 23 Feb 2018 17:00:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLN5-0001Zy-AG for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epLN2-0007YC-6M for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47796 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epLN2-0007Wv-1Y for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDEFE40FB646; Fri, 23 Feb 2018 21:59:05 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-241.rdu2.redhat.com [10.10.125.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83363213AEED; Fri, 23 Feb 2018 21:59:03 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Fri, 23 Feb 2018 15:58:55 -0600 Message-Id: <20180223215858.16987-2-wei@redhat.com> In-Reply-To: <20180223215858.16987-1-wei@redhat.com> References: <20180223215858.16987-1-wei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 21:59:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 21:59:05 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'wei@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH V5 1/4] rules: Move cross compilation auto detection functions to rules.mak 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: peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch moves the auto detection functions for cross compilation from roms/Makefile to rules.mak. So the functions can be shared among Makefiles in QEMU. Signed-off-by: Wei Huang Reviewed-by: Andrew Jones --- roms/Makefile | 24 +++++++----------------- rules.mak | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index b5e5a69e91..e972c65333 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -21,23 +21,6 @@ pxe-rom-virtio efi-rom-virtio : DID :=3D 1000 pxe-rom-vmxnet3 efi-rom-vmxnet3 : VID :=3D 15ad pxe-rom-vmxnet3 efi-rom-vmxnet3 : DID :=3D 07b0 =20 -# -# cross compiler auto detection -# -path :=3D $(subst :, ,$(PATH)) -system :=3D $(shell uname -s | tr "A-Z" "a-z") - -# first find cross binutils in path -find-cross-ld =3D $(firstword $(wildcard $(patsubst %,%/$(1)-*$(system)*-l= d,$(path)))) -# then check we have cross gcc too -find-cross-gcc =3D $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-= cross-ld,$(1))))) -# finally strip off path + toolname so we get the prefix -find-cross-prefix =3D $(subst gcc,,$(notdir $(call find-cross-gcc,$(1)))) - -powerpc64_cross_prefix :=3D $(call find-cross-prefix,powerpc64) -powerpc_cross_prefix :=3D $(call find-cross-prefix,powerpc) -x86_64_cross_prefix :=3D $(call find-cross-prefix,x86_64) - # tag our seabios builds SEABIOS_EXTRAVERSION=3D"-prebuilt.qemu-project.org" =20 @@ -66,6 +49,13 @@ default: @echo " skiboot -- update skiboot.lid" @echo " u-boot.e500 -- update u-boot.e500" =20 +SRC_PATH=3D.. +include $(SRC_PATH)/rules.mak + +powerpc64_cross_prefix :=3D $(call find-cross-prefix,powerpc64) +powerpc_cross_prefix :=3D $(call find-cross-prefix,powerpc) +x86_64_cross_prefix :=3D $(call find-cross-prefix,x86_64) + bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin diff --git a/rules.mak b/rules.mak index 6e943335f3..ef8adee3f8 100644 --- a/rules.mak +++ b/rules.mak @@ -62,6 +62,21 @@ expand-objs =3D $(strip $(sort $(filter %.o,$1)) \ $(foreach o,$(filter %.mo,$1),$($o-objs)) \ $(filter-out %.o %.mo,$1)) =20 +# Cross compilation auto detection. Use find-cross-prefix to detect the +# target archtecture's prefix, and then append it to the build tool or pass +# it to CROSS_COMPILE directly. Here is one example: +# x86_64_cross_prefix :=3D $(call find-cross-prefix,x86_64) +# $(x86_64_cross_prefix)gcc -c test.c -o test.o +# make -C testdir CROSS_COMPILE=3D$(x86_64_cross_prefix) +cross-search-path :=3D $(subst :, ,$(PATH)) +cross-host-system :=3D $(shell uname -s | tr "A-Z" "a-z") + +find-cross-ld =3D $(firstword $(wildcard $(patsubst \ + %,%/$(1)-*$(cross-host-system)*-ld,$(cross-search-path= )))) +find-cross-gcc =3D $(firstword $(wildcard \ + $(patsubst %ld,%gcc,$(call find-cross-ld,$(1))))) +find-cross-prefix =3D $(subst gcc,,$(notdir $(call find-cross-gcc,$(1)))) + %.o: %.c $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ --=20 2.14.3 From nobody Wed Oct 22 13:05:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519423381847343.7172709741701; Fri, 23 Feb 2018 14:03:01 -0800 (PST) Received: from localhost ([::1]:47309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLQj-0004Dg-4v for importer@patchew.org; Fri, 23 Feb 2018 17:03:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLN5-0001Zx-9C for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epLN2-0007YL-79 for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47798 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epLN2-0007Wt-1V for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E77140FB64A; Fri, 23 Feb 2018 21:59:06 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-241.rdu2.redhat.com [10.10.125.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2369213AEED; Fri, 23 Feb 2018 21:59:05 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Fri, 23 Feb 2018 15:58:56 -0600 Message-Id: <20180223215858.16987-3-wei@redhat.com> In-Reply-To: <20180223215858.16987-1-wei@redhat.com> References: <20180223215858.16987-1-wei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 21:59:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 21:59:06 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'wei@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH V5 2/4] tests/migration: Convert the boot block compilation script into Makefile 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: peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The x86 boot block header currently is generated with a shell script. To better support other CPUs (e.g. aarch64), we convert the script into Makefile. This allows us to 1) support cross-compilation easily, and 2) avoid creating a script file for every architecture. Signed-off-by: Wei Huang Reviewed-by: Andrew Jones Reviewed-by: Dr. David Alan Gilbert --- tests/migration/Makefile | 36 ++++++++++++++++++++++++++++= ++++ tests/migration/rebuild-x86-bootblock.sh | 33 ----------------------------- tests/migration/x86-a-b-bootblock.h | 2 +- tests/migration/x86-a-b-bootblock.s | 5 ++--- 4 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 tests/migration/Makefile delete mode 100755 tests/migration/rebuild-x86-bootblock.sh diff --git a/tests/migration/Makefile b/tests/migration/Makefile new file mode 100644 index 0000000000..8fbedaa8b8 --- /dev/null +++ b/tests/migration/Makefile @@ -0,0 +1,36 @@ +# +# Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates +# +# Authors: +# Dave Gilbert +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +export __note +override define __note +/* This file is automatically generated from + * tests/migration/$<, edit that and then run + * "make $@" inside tests/migration to update, + * and then remember to send both in your patch submission. + */ +endef + +all: x86-a-b-bootblock.h +# Dummy command so that make thinks it has done something + @true + +SRC_PATH=3D../.. +include $(SRC_PATH)/rules.mak + +x86_64_cross_prefix :=3D $(call find-cross-prefix,x86_64) + +x86-a-b-bootblock.h: x86-a-b-bootblock.s + $(x86_64_cross_prefix)as --32 -march=3Di486 $< -o x86.o + $(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot + dd if=3Dx86.boot of=3Dx86.bootsect bs=3D256 count=3D2 skip=3D124 + echo "$$__note" > $@ + xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@ + +clean: + rm -f *.bootsect *.boot *.o diff --git a/tests/migration/rebuild-x86-bootblock.sh b/tests/migration/reb= uild-x86-bootblock.sh deleted file mode 100755 index 86cec5d284..0000000000 --- a/tests/migration/rebuild-x86-bootblock.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Copyright (c) 2016-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. -# -# Author: dgilbert@redhat.com - -ASMFILE=3D$PWD/tests/migration/x86-a-b-bootblock.s -HEADER=3D$PWD/tests/migration/x86-a-b-bootblock.h - -if [ ! -e "$ASMFILE" ] -then - echo "Couldn't find $ASMFILE" >&2 - exit 1 -fi - -ASM_WORK_DIR=3D$(mktemp -d --tmpdir X86BB.XXXXXX) -cd "$ASM_WORK_DIR" && -as --32 -march=3Di486 "$ASMFILE" -o x86.o && -objcopy -O binary x86.o x86.boot && -dd if=3Dx86.boot of=3Dx86.bootsect bs=3D256 count=3D2 skip=3D124 && -xxd -i x86.bootsect | -sed -e 's/.*int.*//' > x86.hex && -cat - x86.hex < "$HEADER" -/* 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. - */ -HERE - -rm x86.hex x86.bootsect x86.boot x86.o -cd .. && rmdir "$ASM_WORK_DIR" diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86-a-b-= bootblock.h index 78a151fe2a..9e8e2e028b 100644 --- a/tests/migration/x86-a-b-bootblock.h +++ b/tests/migration/x86-a-b-bootblock.h @@ -1,6 +1,6 @@ /* 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, + * "make x86-a-b-bootblock.h" inside tests/migration to update, * and then remember to send both in your patch submission. */ unsigned char x86_bootsect[] =3D { diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-= bootblock.s index b1642641a7..98dbfab084 100644 --- a/tests/migration/x86-a-b-bootblock.s +++ b/tests/migration/x86-a-b-bootblock.s @@ -3,9 +3,8 @@ # 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. +# In tests/migration dir, run 'make x86-a-b-bootblock.h' 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. --=20 2.14.3 From nobody Wed Oct 22 13:05:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151942326463758.95008283309198; Fri, 23 Feb 2018 14:01:04 -0800 (PST) Received: from localhost ([::1]:47297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLOg-0002Xl-OS for importer@patchew.org; Fri, 23 Feb 2018 17:00:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLN5-0001Zz-AV for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epLN2-0007YB-6T for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58340 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epLN2-0007Ww-1a for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D191A84221; Fri, 23 Feb 2018 21:59:06 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-241.rdu2.redhat.com [10.10.125.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73441213AEED; Fri, 23 Feb 2018 21:59:06 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Fri, 23 Feb 2018 15:58:57 -0600 Message-Id: <20180223215858.16987-4-wei@redhat.com> In-Reply-To: <20180223215858.16987-1-wei@redhat.com> References: <20180223215858.16987-1-wei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 21:59:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 21:59:06 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'wei@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH V5 3/4] tests/migration: Add migration-test 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: peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch moves the settings related migration-test from the migration-test.c file to a seperate header file. It also renames the x86-a-b-bootblock.s file extension from .s to .S, allowing gcc pre-processor to include the C-style header file correctly. Signed-off-by: Wei Huang Reviewed-by: Andrew Jones --- tests/migration-test.c | 28 +++++++++++-------= ---- tests/migration/Makefile | 4 ++-- tests/migration/migration-test.h | 18 ++++++++++++++ .../{x86-a-b-bootblock.s =3D> x86-a-b-bootblock.S} | 7 +++--- tests/migration/x86-a-b-bootblock.h | 2 +- 5 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 tests/migration/migration-test.h rename tests/migration/{x86-a-b-bootblock.s =3D> x86-a-b-bootblock.S} (94%) diff --git a/tests/migration-test.c b/tests/migration-test.c index 74f9361bdd..ce2922df6a 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -21,10 +21,10 @@ #include "sysemu/sysemu.h" #include "hw/nvram/chrp_nvram.h" =20 -#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */ +#include "migration/migration-test.h" =20 -const unsigned start_address =3D 1024 * 1024; -const unsigned end_address =3D 100 * 1024 * 1024; +const unsigned start_address =3D TEST_MEM_START; +const unsigned end_address =3D TEST_MEM_END; bool got_stop; =20 #if defined(__linux__) @@ -77,8 +77,8 @@ static bool ufd_version_check(void) =20 static const char *tmpfs; =20 -/* A simple PC boot sector that modifies memory (1-100MB) quickly - * outputting a 'B' every so often if it's still running. +/* The boot file modifies memory area in [start_address, end_address) + * repeatedly. It outputs a 'B' at a fixed rate while it's still running. */ #include "tests/migration/x86-a-b-bootblock.h" =20 @@ -104,9 +104,8 @@ static void init_bootfile_ppc(const char *bootpath) memcpy(header->name, "common", 6); chrp_nvram_finish_partition(header, MIN_NVRAM_SIZE); =20 - /* FW_MAX_SIZE is 4MB, but slof.bin is only 900KB, - * so let's modify memory between 1MB and 100MB - * to do like PC bootsector + /* FW_MAX_SIZE is 4MB, but slof.bin is only 900KB. So it is OK to modi= fy + * memory between start_address and end_address like PC bootsector doe= s. */ =20 sprintf(buf + 16, @@ -263,11 +262,11 @@ static void wait_for_migration_pass(QTestState *who) static void check_guests_ram(QTestState *who) { /* Our ASM test will have been incrementing one byte from each page fr= om - * 1MB to <100MB in order. - * This gives us a constraint that any page's byte should be equal or = less - * than the previous pages byte (mod 256); and they should all be equal - * except for one transition at the point where we meet the incremente= r. - * (We're running this with the guest stopped). + * start_address to $@ diff --git a/tests/migration/migration-test.h b/tests/migration/migration-t= est.h new file mode 100644 index 0000000000..48b59b3281 --- /dev/null +++ b/tests/migration/migration-test.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2018 Red Hat, Inc. and/or its affiliates + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#ifndef _TEST_MIGRATION_H_ +#define _TEST_MIGRATION_H_ + +/* Common */ +#define TEST_MEM_START (1 * 1024 * 1024) +#define TEST_MEM_END (100 * 1024 * 1024) +#define TEST_MEM_PAGE_SIZE 4096 + +/* PPC */ +#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */ + +#endif /* _TEST_MIGRATION_H_ */ diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-= bootblock.S similarity index 94% rename from tests/migration/x86-a-b-bootblock.s rename to tests/migration/x86-a-b-bootblock.S index 98dbfab084..08b51f9e7f 100644 --- a/tests/migration/x86-a-b-bootblock.s +++ b/tests/migration/x86-a-b-bootblock.S @@ -12,6 +12,7 @@ # # Author: dgilbert@redhat.com =20 +#include "migration-test.h" =20 .code16 .org 0x7c00 @@ -45,11 +46,11 @@ start: # at 0x7c00 ? mov $0, %bl mainloop: # Start from 1MB - mov $(1024*1024),%eax + mov $TEST_MEM_START,%eax innerloop: incb (%eax) - add $4096,%eax - cmp $(100*1024*1024),%eax + add $TEST_MEM_PAGE_SIZE,%eax + cmp $TEST_MEM_END,%eax jl innerloop =20 inc %bl diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86-a-b-= bootblock.h index 9e8e2e028b..44e4b99506 100644 --- a/tests/migration/x86-a-b-bootblock.h +++ b/tests/migration/x86-a-b-bootblock.h @@ -1,5 +1,5 @@ /* This file is automatically generated from - * tests/migration/x86-a-b-bootblock.s, edit that and then run + * tests/migration/x86-a-b-bootblock.S, edit that and then run * "make x86-a-b-bootblock.h" inside tests/migration to update, * and then remember to send both in your patch submission. */ --=20 2.14.3 From nobody Wed Oct 22 13:05:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519423384077848.0428750424927; Fri, 23 Feb 2018 14:03:04 -0800 (PST) Received: from localhost ([::1]:47310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLQl-0004FA-9U for importer@patchew.org; Fri, 23 Feb 2018 17:03:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLN5-0001a0-AU for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epLN2-0007YR-7v for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47800 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epLN2-0007Wr-1E for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F8ED40FB64F; Fri, 23 Feb 2018 21:59:07 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-241.rdu2.redhat.com [10.10.125.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7057213AEED; Fri, 23 Feb 2018 21:59:06 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Fri, 23 Feb 2018 15:58:58 -0600 Message-Id: <20180223215858.16987-5-wei@redhat.com> In-Reply-To: <20180223215858.16987-1-wei@redhat.com> References: <20180223215858.16987-1-wei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 21:59:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 21:59:07 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'wei@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH V5 4/4] tests: Add migration test for aarch64 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: peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds migration test support for aarch64. The test code, which implements the same functionality as x86, is booted as a kernel in qemu. Here are the design choices we make for aarch64: * We choose this -kernel approach because aarch64 QEMU doesn't provide a built-in fw like x86 does. So instead of relying on a boot loader, we use -kernel approach for aarch64. * The serial output is sent to PL011 directly. * The physical memory base for mach-virt machine is 0x40000000. We change the start_address and end_address for aarch64. In addition to providing the binary, this patch also includes the source code and the build script in tests/migration/. So users can change the source and/or re-compile the binary as they wish. Signed-off-by: Wei Huang --- tests/Makefile.include | 1 + tests/migration-test.c | 50 ++++++++++++++++++++++--- tests/migration/Makefile | 12 +++++- tests/migration/aarch64-a-b-kernel.S | 71 ++++++++++++++++++++++++++++++++= ++++ tests/migration/aarch64-a-b-kernel.h | 19 ++++++++++ tests/migration/migration-test.h | 5 +++ 6 files changed, 150 insertions(+), 8 deletions(-) create mode 100644 tests/migration/aarch64-a-b-kernel.S create mode 100644 tests/migration/aarch64-a-b-kernel.h diff --git a/tests/Makefile.include b/tests/Makefile.include index a1bcbffe12..df9f64438f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -372,6 +372,7 @@ check-qtest-arm-y +=3D tests/sdhci-test$(EXESUF) check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-y +=3D tests/sdhci-test$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-aarch64-y +=3D tests/migration-test$(EXESUF) =20 check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) =20 diff --git a/tests/migration-test.c b/tests/migration-test.c index ce2922df6a..d60e34c82d 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -11,6 +11,7 @@ */ =20 #include "qemu/osdep.h" +#include =20 #include "libqtest.h" #include "qapi/qmp/qdict.h" @@ -23,8 +24,8 @@ =20 #include "migration/migration-test.h" =20 -const unsigned start_address =3D TEST_MEM_START; -const unsigned end_address =3D TEST_MEM_END; +unsigned start_address =3D TEST_MEM_START; +unsigned end_address =3D TEST_MEM_END; bool got_stop; =20 #if defined(__linux__) @@ -81,12 +82,13 @@ static const char *tmpfs; * repeatedly. It outputs a 'B' at a fixed rate while it's still running. */ #include "tests/migration/x86-a-b-bootblock.h" +#include "tests/migration/aarch64-a-b-kernel.h" =20 -static void init_bootfile_x86(const char *bootpath) +static void init_bootfile(const char *bootpath, void *content) { FILE *bootfile =3D fopen(bootpath, "wb"); =20 - g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), =3D=3D, 1); + g_assert_cmpint(fwrite(content, 512, 1, bootfile), =3D=3D, 1); fclose(bootfile); } =20 @@ -392,7 +394,7 @@ static void test_migrate_start(QTestState **from, QTest= State **to, got_stop =3D false; =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - init_bootfile_x86(bootpath); + init_bootfile(bootpath, x86_bootsect); cmd_src =3D g_strdup_printf("-machine accel=3D%s -m 150M" " -name source,debug-threads=3Don" " -serial file:%s/src_serial" @@ -421,6 +423,42 @@ static void test_migrate_start(QTestState **from, QTes= tState **to, " -serial file:%s/dest_serial" " -incoming %s", accel, tmpfs, uri); + } else if (strcmp(arch, "aarch64") =3D=3D 0) { + const char *cpu; + const char *gic_ver; + struct utsname utsname; + + /* kvm and tcg need different cpu and gic-version configs */ + if (access("/dev/kvm", F_OK) =3D=3D 0 && uname(&utsname) =3D=3D 0 = && + strcmp(utsname.machine, "aarch64") =3D=3D 0) { + accel =3D "kvm"; + cpu =3D "host"; + gic_ver =3D "host"; + } else { + accel =3D "tcg"; + cpu =3D "cortex-a57"; + gic_ver =3D "2"; + } + + init_bootfile(bootpath, aarch64_kernel); + cmd_src =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3D%s " + "-name vmsource,debug-threads=3Don -cpu = %s " + "-m 150M -serial file:%s/src_serial " + "-kernel %s ", + accel, gic_ver, cpu, tmpfs, bootpath); + cmd_dst =3D g_strdup_printf("-machine virt,accel=3D%s,gic-version= =3D%s " + "-name vmdest,debug-threads=3Don -cpu %s= " + "-m 150M -serial file:%s/dest_serial " + "-kernel %s " + "-incoming %s ", + accel, gic_ver, cpu, tmpfs, bootpath, ur= i); + + /* aarch64 virt machine physical memory starts at 0x40000000, which + * is also the kernel loader base address. It should be fine to + * allocate & modify the test memory 1MB away. + */ + start_address =3D ARM_TEST_MEM_START; + end_address =3D ARM_TEST_MEM_END; } else { g_assert_not_reached(); } @@ -505,7 +543,7 @@ static void test_deprecated(void) { QTestState *from; =20 - from =3D qtest_start(""); + from =3D qtest_start("-machine none"); =20 deprecated_set_downtime(from, 0.12345); deprecated_set_speed(from, "12345"); diff --git a/tests/migration/Makefile b/tests/migration/Makefile index 013b8d1f44..1324427a93 100644 --- a/tests/migration/Makefile +++ b/tests/migration/Makefile @@ -16,7 +16,7 @@ override define __note */ endef =20 -all: x86-a-b-bootblock.h +all: x86-a-b-bootblock.h aarch64-a-b-kernel.h # Dummy command so that make thinks it has done something @true =20 @@ -24,6 +24,7 @@ SRC_PATH=3D../.. include $(SRC_PATH)/rules.mak =20 x86_64_cross_prefix :=3D $(call find-cross-prefix,x86_64) +aarch64_cross_prefix :=3D $(call find-cross-prefix,aarch64) =20 x86-a-b-bootblock.h: x86-a-b-bootblock.S $(x86_64_cross_prefix)gcc -m32 -march=3Di486 -c $< -o x86.o @@ -32,5 +33,12 @@ x86-a-b-bootblock.h: x86-a-b-bootblock.S echo "$$__note" > $@ xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@ =20 +aarch64-a-b-kernel.h: aarch64-a-b-kernel.S + $(aarch64_cross_prefix)gcc -o aarch64.elf -nostdlib \ + -Wl,--build-id=3Dnone $< + $(aarch64_cross_prefix)objcopy -O binary aarch64.elf aarch64.kernel + echo "$$__note" > $@ + xxd -i aarch64.kernel | sed -e 's/.*int.*//' >> $@ + clean: - rm -f *.bootsect *.boot *.o + rm -f *.bootsect *.boot *.o *.elf *.kernel diff --git a/tests/migration/aarch64-a-b-kernel.S b/tests/migration/aarch64= -a-b-kernel.S new file mode 100644 index 0000000000..6640c906cf --- /dev/null +++ b/tests/migration/aarch64-a-b-kernel.S @@ -0,0 +1,71 @@ +# +# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates +# +# Author: +# Wei Huang +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. + +#include "migration-test.h" + +.section .text + + .globl _start + +_start: + /* disable MMU to use phys mem address */ + mrs x0, sctlr_el1 + bic x0, x0, #(1<<0) + msr sctlr_el1, x0 + isb + + /* traverse test memory region */ + mov x0, #ARM_TEST_MEM_START + mov x1, #ARM_TEST_MEM_END + + /* output char 'A' to PL011 */ + mov w3, 'A' + mov x2, #ARM_MACH_VIRT_UART + strb w3, [x2] + + /* clean up memory */ + mov w3, #0 + mov x4, x0 +clean: + strb w3, [x4] + add x4, x4, #TEST_MEM_PAGE_SIZE + cmp x4, x1 + ble clean + + /* w5 keeps a counter so we can limit the output speed */ + mov w5, #0 + + /* main body */ +mainloop: + mov x4, x0 + +innerloop: + /* clean cache because el2 might still cache guest data under KVM = */ + dc civac, x4 + + /* increment the first byte of each page by 1 */ + ldrb w3, [x4] + add w3, w3, #1 + and w3, w3, #0xff + strb w3, [x4] + + add x4, x4, #TEST_MEM_PAGE_SIZE + cmp x4, x1 + blt innerloop + + add w5, w5, #1 + and w5, w5, #0xff + cmp w5, #0 + bne mainloop + + /* output char 'B' to PL011 */ + mov w3, 'B' + strb w3, [x2] + + b mainloop diff --git a/tests/migration/aarch64-a-b-kernel.h b/tests/migration/aarch64= -a-b-kernel.h new file mode 100644 index 0000000000..53b44d3e99 --- /dev/null +++ b/tests/migration/aarch64-a-b-kernel.h @@ -0,0 +1,19 @@ +/* This file is automatically generated from + * tests/migration/aarch64-a-b-kernel.S, edit that and then run + * "make aarch64-a-b-kernel.h" inside tests/migration to update, + * and then remember to send both in your patch submission. + */ +unsigned char aarch64_kernel[] =3D { + 0x00, 0x10, 0x38, 0xd5, 0x00, 0xf8, 0x7f, 0x92, 0x00, 0x10, 0x18, 0xd5, + 0xdf, 0x3f, 0x03, 0xd5, 0x00, 0x02, 0xa8, 0xd2, 0x01, 0xc8, 0xa8, 0xd2, + 0x23, 0x08, 0x80, 0x52, 0x02, 0x20, 0xa1, 0xd2, 0x43, 0x00, 0x00, 0x39, + 0x03, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x00, 0x39, + 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0xad, 0xff, 0xff, 0x54, + 0x05, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x24, 0x7e, 0x0b, 0xd5, + 0x83, 0x00, 0x40, 0x39, 0x63, 0x04, 0x00, 0x11, 0x63, 0x1c, 0x00, 0x12, + 0x83, 0x00, 0x00, 0x39, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, + 0x2b, 0xff, 0xff, 0x54, 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x1c, 0x00, 0x12, + 0xbf, 0x00, 0x00, 0x71, 0x81, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, + 0x43, 0x00, 0x00, 0x39, 0xf1, 0xff, 0xff, 0x17 +}; + diff --git a/tests/migration/migration-test.h b/tests/migration/migration-t= est.h index 48b59b3281..be0771b35e 100644 --- a/tests/migration/migration-test.h +++ b/tests/migration/migration-test.h @@ -15,4 +15,9 @@ /* PPC */ #define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */ =20 +/* AArch64 */ +#define ARM_MACH_VIRT_UART 0x09000000 +#define ARM_TEST_MEM_START (0x40000000 + TEST_MEM_START) +#define ARM_TEST_MEM_END (0x40000000 + TEST_MEM_END) + #endif /* _TEST_MIGRATION_H_ */ --=20 2.14.3