Series comparison

-[Qemu-devel] [PATCH V7 0/4] tests: Add migration test for aarch64
+[Qemu-devel] [PATCH V8 0/4] tests: Add migration test for aarch64
 This patchset adds a migration test for aarch64. It leverages
-Dave Gilbert's recent patch "tests/migration: Add source to PC boot block"
+Dave Gilbert's migration boot block patches to create a new test case
-to create a new test case for aarch64.
+for aarch64.
 V7->V8:
  * Support cross compilation by searching for CROSS_CC_GUEST option,
    instead of using the find-cross-prefix defined in roms/Makefile
  * Use the "max" options for ARM guest VM's CPU and GIC types
  * $(TARGET)/Makefile rules are rewritten based on Laurent Vivier's comment
  * NOTE: because Patch 1/2 is re-written, I remove the "Reviewed-by" for
    reviewers to take a look again. Thanks.
 V6->V7:
  * Define test memory start/end addresses for all architectures
  * Check aarch64 kernel binary size, limit under 512KB
 ...
 Thanks,
 -Wei
 Wei Huang (4):
-  rules: Move cross compilation auto detection functions to rules.mak
+  tests/migration: Convert x86 boot block compilation script into
   tests/migration: Convert the boot block compilation script into
     Makefile
+  tests/migration: Support cross compiler in generating boot block
+    header file
   tests/migration: Add migration-test header file
   tests: Add migration test for aarch64
- roms/Makefile                                      | 24 ++-----
- rules.mak                                          | 15 +++++
  tests/Makefile.include                             |  1 +
- tests/migration-test.c                             | 78 +++++++++++++++++-----
+ tests/migration-test.c                             | 68 +++++++++++++++-----
- tests/migration/Makefile                           | 44 ++++++++++++
+ tests/migration/Makefile                           | 34 ++++++++++
- tests/migration/aarch64-a-b-kernel.S               | 75 +++++++++++++++++++++
+ tests/migration/aarch64/Makefile                   | 20 ++++++
- tests/migration/aarch64-a-b-kernel.h               | 19 ++++++
+ tests/migration/aarch64/aarch64-a-b-kernel.S       | 75 ++++++++++++++++++++++
- tests/migration/migration-test.h                   | 31 +++++++++
+ tests/migration/aarch64/aarch64-a-b-kernel.h       | 19 ++++++
- tests/migration/rebuild-x86-bootblock.sh           | 33 ---------
+ tests/migration/migration-test.h                   | 30 +++++++++
- .../{x86-a-b-bootblock.s => x86-a-b-bootblock.S}   | 12 ++--
+ tests/migration/rebuild-x86-bootblock.sh           | 33 ----------
- tests/migration/x86-a-b-bootblock.h                |  4 +-
+ tests/migration/x86_64/Makefile                    | 22 +++++++
-files changed, 260 insertions(+), 76 deletions(-)
+ .../x86-a-b-bootblock.S}                           |  0
  tests/migration/{ => x86_64}/x86-a-b-bootblock.h   |  8 +--
 files changed, 258 insertions(+), 52 deletions(-)
  create mode 100644 tests/migration/Makefile
- create mode 100644 tests/migration/aarch64-a-b-kernel.S
+ create mode 100644 tests/migration/aarch64/Makefile
- create mode 100644 tests/migration/aarch64-a-b-kernel.h
+ create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.S
  create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.h
  create mode 100644 tests/migration/migration-test.h
  delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
- rename tests/migration/{x86-a-b-bootblock.s => x86-a-b-bootblock.S} (88%)
+ create mode 100644 tests/migration/x86_64/Makefile
  rename tests/migration/{x86-a-b-bootblock.s => x86_64/x86-a-b-bootblock.S} (100%)
  rename tests/migration/{ => x86_64}/x86-a-b-bootblock.h (93%)
 --
-.14.3
+.8.3.1

-[Qemu-devel] [PATCH V7 2/4] tests/migration: Convert the boot block compilation script into Makefile
+[Qemu-devel] [PATCH V8 1/4] tests/migration: Convert x86 boot block compilation script into Makefile
 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.
+Note that, in the new design, the cross compiler prefix can be specified by
+setting the CROSS_PREFIX in "make" command. Also to allow gcc pre-processor
+to include the C-style file correctly, it also renames the
+x86-a-b-bootblock.s file extension from .s to .S.
 Signed-off-by: Wei Huang <wei@redhat.com>
-Reviewed-by: Andrew Jones <drjones@redhat.com>
 ---
- tests/migration/Makefile                 | 36 ++++++++++++++++++++++++++++++++
+ tests/migration/Makefile                           | 31 ++++++++++++++++++++
- tests/migration/rebuild-x86-bootblock.sh | 33 -----------------------------
+ tests/migration/rebuild-x86-bootblock.sh           | 33 ----------------------
- tests/migration/x86-a-b-bootblock.h      |  2 +-
+ .../{x86-a-b-bootblock.s => x86-a-b-bootblock.S}   |  0
- tests/migration/x86-a-b-bootblock.s      |  5 ++---
+files changed, 31 insertions(+), 33 deletions(-)
 files changed, 39 insertions(+), 37 deletions(-)
  create mode 100644 tests/migration/Makefile
  delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
+ rename tests/migration/{x86-a-b-bootblock.s => x86-a-b-bootblock.S} (100%)
 diff --git a/tests/migration/Makefile b/tests/migration/Makefile
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/Makefile
 @@ -XXX,XX +XXX,XX @@
-+#
++# To specify cross compiler prefix, use CROSS_PREFIX=
-+# Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates
++#   > make CROSS_PREFIX=x86_64-linux-gnu-
-+#
++
 +# Authors:
 +#   Dave Gilbert <dgilbert@redhat.com>
 +#
 +# 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
++ * tests/migration/x86-a-b-bootblock.s, edit that and then run
-+ * "make $@" inside tests/migration to update,
++ * tests/migration/rebuild-x86-bootblock.sh to update,
 + * and then remember to send both in your patch submission.
 + */
 +endef
++export __note
 +
++.PHONY: all clean
 +all: x86-a-b-bootblock.h
-+# Dummy command so that make thinks it has done something
-+    @true
 +
-+SRC_PATH=../..
++x86-a-b-bootblock.h: x86.bootsect
-+include $(SRC_PATH)/rules.mak
++    echo "$$__note" > header.tmp
 +    xxd -i $< | sed -e 's/.*int.*//' >> header.tmp
 +    mv header.tmp $@
 +
-+x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
++x86.bootsect: x86.boot
 +    dd if=$< of=$@ bs=256 count=2 skip=124
 +
-+x86-a-b-bootblock.h: x86-a-b-bootblock.s
++x86.boot: x86.o
-+    $(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
++    $(CROSS_PREFIX)objcopy -O binary $< $@
-+    $(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot
++
-+    dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124
++x86.o: x86-a-b-bootblock.S
-+    echo "$$__note" > $@
++    $(CROSS_PREFIX)gcc -m32 -march=i486 -c $< -o $@
 +    xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@
 +
 +clean:
-+    rm -f *.bootsect *.boot *.o
++    @rm -rf *.boot *.o *.bootsect
 diff --git a/tests/migration/rebuild-x86-bootblock.sh b/tests/migration/rebuild-x86-bootblock.sh
 deleted file mode 100755
 index XXXXXXX..XXXXXXX
 --- a/tests/migration/rebuild-x86-bootblock.sh
 +++ /dev/null
 ...
 - */
 -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
+diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-bootblock.S
-index XXXXXXX..XXXXXXX 100644
+similarity index 100%
---- a/tests/migration/x86-a-b-bootblock.h
+rename from tests/migration/x86-a-b-bootblock.s
-+++ b/tests/migration/x86-a-b-bootblock.h
+rename to tests/migration/x86-a-b-bootblock.S
@@ -XXX,XX +XXX,XX @@
  /* 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[] = {
 diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-bootblock.s
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration/x86-a-b-bootblock.s
 +++ b/tests/migration/x86-a-b-bootblock.s
@@ -XXX,XX +XXX,XX @@
  #  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.
 --
-.14.3
+.8.3.1

-[Qemu-devel] [PATCH V7 1/4] rules: Move cross compilation auto detection functions to rules.mak
+[Qemu-devel] [PATCH V8 2/4] tests/migration: Support cross compilation in generating boot header file
-This patch moves the auto detection functions for cross compilation from
+Recently a new configure option, CROSS_CC_GUEST, was added to
-roms/Makefile to rules.mak. So the functions can be shared among Makefiles
+$(TARGET)-softmmu/config-target.mak to support TCG-related tests. This
-in QEMU.
+patch tries to leverage this option to support cross compilation when the
 migration boot block file is being re-generated:
  * The x86_64 related files are moved to a new sub-dir (named ./x86_64).
  * 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.
 Signed-off-by: Wei Huang <wei@redhat.com>
-Reviewed-by: Andrew Jones <drjones@redhat.com>
 ---
- roms/Makefile | 24 +++++++-----------------
+ tests/migration-test.c                           |  2 +-
- rules.mak     | 15 +++++++++++++++
+ tests/migration/Makefile                         | 43 +++++++++++++-----------
-files changed, 22 insertions(+), 17 deletions(-)
+ tests/migration/x86_64/Makefile                  | 22 ++++++++++++
  tests/migration/{ => x86_64}/x86-a-b-bootblock.S |  0
  tests/migration/{ => x86_64}/x86-a-b-bootblock.h |  8 ++---
 files changed, 50 insertions(+), 25 deletions(-)
  create mode 100644 tests/migration/x86_64/Makefile
  rename tests/migration/{ => x86_64}/x86-a-b-bootblock.S (100%)
  rename tests/migration/{ => x86_64}/x86-a-b-bootblock.h (93%)
-diff --git a/roms/Makefile b/roms/Makefile
+diff --git a/tests/migration-test.c b/tests/migration-test.c
 index XXXXXXX..XXXXXXX 100644
---- a/roms/Makefile
+--- a/tests/migration-test.c
-+++ b/roms/Makefile
++++ b/tests/migration-test.c
-@@ -XXX,XX +XXX,XX @@ pxe-rom-virtio   efi-rom-virtio   : DID := 1000
+@@ -XXX,XX +XXX,XX @@ static const char *tmpfs;
- pxe-rom-vmxnet3  efi-rom-vmxnet3  : VID := 15ad
+ /* A simple PC boot sector that modifies memory (1-100MB) quickly
- pxe-rom-vmxnet3  efi-rom-vmxnet3  : DID := 07b0
+  * outputting a 'B' every so often if it's still running.
+  */
--#
+-#include "tests/migration/x86-a-b-bootblock.h"
--# cross compiler auto detection
++#include "tests/migration/x86_64/x86-a-b-bootblock.h"
--#
--path := $(subst :, ,$(PATH))
+ static void init_bootfile_x86(const char *bootpath)
--system := $(shell uname -s | tr "A-Z" "a-z")
+ {
 diff --git a/tests/migration/Makefile b/tests/migration/Makefile
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration/Makefile
 +++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@
 -# 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 = x86_64
 +
 +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 and then run "make all"
 + * inside tests/migration to update, and then remember to send both
 + * in your patch submission.
   */
  endef
  export __note
 -.PHONY: all clean
 -all: x86-a-b-bootblock.h
 -
--# first find cross binutils in path
+-x86-a-b-bootblock.h: x86.bootsect
--find-cross-ld = $(firstword $(wildcard $(patsubst %,%/$(1)-*$(system)*-ld,$(path))))
+-    echo "$$__note" > header.tmp
--# then check we have cross gcc too
+-    xxd -i $< | sed -e 's/.*int.*//' >> header.tmp
--find-cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-cross-ld,$(1)))))
+-    mv header.tmp $@
--# finally strip off path + toolname so we get the prefix
++parse-cross-prefix = $(subst gcc,,$(patsubst cc,gcc,$(patsubst CROSS_CC_GUEST="%",%,$(shell grep "CROSS_CC_GUEST=" $(SRC_PATH)/$(1)-softmmu/config-target.mak))))
--find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1))))
++gen-cross-prefix = $(patsubst %-,CROSS_PREFIX=%-,$(call parse-cross-prefix,$(1)))
--
--powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
+-x86.bootsect: x86.boot
--powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
+-    dd if=$< of=$@ bs=256 count=2 skip=124
--x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
++.PHONY: all $(TARGET_LIST)
--
- # tag our seabios builds
+-x86.boot: x86.o
- SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
+-    $(CROSS_PREFIX)objcopy -O binary $< $@
++all: $(TARGET_LIST)
-@@ -XXX,XX +XXX,XX @@ default:
-     @echo "  skiboot        -- update skiboot.lid"
+-x86.o: x86-a-b-bootblock.S
-     @echo "  u-boot.e500    -- update u-boot.e500"
+-    $(CROSS_PREFIX)gcc -m32 -march=i486 -c $< -o $@
++$(TARGET_LIST):
-+SRC_PATH=..
++    $(MAKE) -C $@ $(call gen-cross-prefix,$@)
-+include $(SRC_PATH)/rules.mak
  clean:
 -    @rm -rf *.boot *.o *.bootsect
 +    for target in $(TARGET_LIST); do \
 +        $(MAKE) -C $$target clean; \
 +    done
 diff --git a/tests/migration/x86_64/Makefile b/tests/migration/x86_64/Makefile
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/x86_64/Makefile
@@ -XXX,XX +XXX,XX @@
 +# To specify cross compiler prefix, use CROSS_PREFIX=
 +#   > make CROSS_PREFIX=x86_64-linux-gnu-
 +
-+powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
++.PHONY: all clean
-+powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
++all: x86-a-b-bootblock.h
 +x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
 +
- bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
++x86-a-b-bootblock.h: x86.bootsect
-     cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
++    echo "$$__note" > header.tmp
-     cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin
++    xxd -i $< | sed -e 's/.*int.*//' >> header.tmp
-diff --git a/rules.mak b/rules.mak
++    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: x86-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/x86_64/x86-a-b-bootblock.S
 similarity index 100%
 rename from tests/migration/x86-a-b-bootblock.S
 rename to tests/migration/x86_64/x86-a-b-bootblock.S
 diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86_64/x86-a-b-bootblock.h
 similarity index 93%
 rename from tests/migration/x86-a-b-bootblock.h
 rename to tests/migration/x86_64/x86-a-b-bootblock.h
 index XXXXXXX..XXXXXXX 100644
---- a/rules.mak
+--- a/tests/migration/x86-a-b-bootblock.h
-+++ b/rules.mak
++++ b/tests/migration/x86_64/x86-a-b-bootblock.h
-@@ -XXX,XX +XXX,XX @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
+@@ -XXX,XX +XXX,XX @@
-                   $(foreach o,$(filter %.mo,$1),$($o-objs)) \
+-/* This file is automatically generated from
-                   $(filter-out %.o %.mo,$1))
+- * tests/migration/x86-a-b-bootblock.s, edit that and then run
+- * tests/migration/rebuild-x86-bootblock.sh to update,
-+# Cross compilation auto detection. Use find-cross-prefix to detect the
+- * and then remember to send both in your patch submission.
-+# target archtecture's prefix, and then append it to the build tool or pass
++/* This file is automatically generated from the assembly file in
-+# it to CROSS_COMPILE directly. Here is one example:
++ * tests/migration/x86_64, edit that and then run "make all"
-+#      x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
++ * inside tests/migration to update, and then remember to send both
-+#      $(x86_64_cross_prefix)gcc -c test.c -o test.o
++ * in your patch submission.
-+#      make -C testdir CROSS_COMPILE=$(x86_64_cross_prefix)
+  */
-+cross-search-path := $(subst :, ,$(PATH))
+ unsigned char x86_bootsect[] = {
-+cross-host-system := $(shell uname -s | tr "A-Z" "a-z")
+xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00,
 +
 +find-cross-ld = $(firstword $(wildcard $(patsubst \
 +                    %,%/$(1)-*$(cross-host-system)*-ld,$(cross-search-path))))
 +find-cross-gcc = $(firstword $(wildcard \
 +                    $(patsubst %ld,%gcc,$(call find-cross-ld,$(1)))))
 +find-cross-prefix = $(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) \
 --
-.14.3
+.8.3.1

-[Qemu-devel] [PATCH V7 3/4] tests/migration: Add migration-test header file
+[Qemu-devel] [PATCH V8 3/4] tests/migration: Add migration-test header file
 This patch moves the settings related migration-test from the
-migration-test.c file to a seperate header file. It also renames the
+migration-test.c file to a new header file.
 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 <wei@redhat.com>
 ---
- tests/migration-test.c                             | 34 +++++++++++++---------
+ tests/migration-test.c           | 28 ++++++++++++++++++----------
- tests/migration/Makefile                           |  4 +--
+ tests/migration/migration-test.h | 21 +++++++++++++++++++++
- tests/migration/migration-test.h                   | 22 ++++++++++++++
+files changed, 39 insertions(+), 10 deletions(-)
  .../{x86-a-b-bootblock.s => x86-a-b-bootblock.S}   |  7 +++--
  tests/migration/x86-a-b-bootblock.h                |  2 +-
 files changed, 49 insertions(+), 20 deletions(-)
  create mode 100644 tests/migration/migration-test.h
- rename tests/migration/{x86-a-b-bootblock.s => x86-a-b-bootblock.S} (94%)
 diff --git a/tests/migration-test.c b/tests/migration-test.c
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration-test.c
 +++ b/tests/migration-test.c
 @@ -XXX,XX +XXX,XX @@
+ #include "chardev/char.h"
  #include "sysemu/sysemu.h"
- #include "hw/nvram/chrp_nvram.h"
 -#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
 +#include "migration/migration-test.h"
++
+ /* TODO actually test the results and get rid of this */
+ #define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS__))
 -const unsigned start_address = 1024 * 1024;
 -const unsigned end_address = 100 * 1024 * 1024;
 +unsigned start_address;
 +unsigned end_address;
  bool got_stop;
+ static bool uffd_feature_thread_id;
- #if defined(__linux__)
 @@ -XXX,XX +XXX,XX @@ static bool ufd_version_check(void)
  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.
 +/* 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"
+ #include "tests/migration/x86_64/x86-a-b-bootblock.h"
@@ -XXX,XX +XXX,XX @@ static void init_bootfile_ppc(const char *bootpath)
      memcpy(header->name, "common", 6);
      chrp_nvram_finish_partition(header, MIN_NVRAM_SIZE);
 -    /* 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 modify
 +     * memory between start_address and end_address like PC bootsector does.
       */
      sprintf(buf + 16,
 @@ -XXX,XX +XXX,XX @@ 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 from
 -     * 1MB to <100MB in order.
 ...
 +    for (address = start_address + TEST_MEM_PAGE_SIZE; address < end_address;
 +         address += TEST_MEM_PAGE_SIZE)
      {
          uint8_t b;
          qtest_memread(who, address, &b, 1);
-@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
+@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
                                    " -drive file=%s,format=raw"
                                    " -incoming %s",
                                    accel, tmpfs, bootpath, uri);
-+
 +        start_address = X86_TEST_MEM_START;
 +        end_address = X86_TEST_MEM_END;
      } else if (strcmp(arch, "ppc64") == 0) {
+         cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
-         /* On ppc64, the test only works with kvm-hv, but not with kvm-pr */
+                                   " -name source,debug-threads=on"
-@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
+@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
                                    " -serial file:%s/dest_serial"
                                    " -incoming %s",
                                    accel, tmpfs, uri);
 +
 +        start_address = PPC_TEST_MEM_START;
 +        end_address = PPC_TEST_MEM_END;
      } else {
          g_assert_not_reached();
      }
-diff --git a/tests/migration/Makefile b/tests/migration/Makefile
-index XXXXXXX..XXXXXXX 100644
---- a/tests/migration/Makefile
-+++ b/tests/migration/Makefile
-@@ -XXX,XX +XXX,XX @@ include $(SRC_PATH)/rules.mak
- x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
--x86-a-b-bootblock.h: x86-a-b-bootblock.s
--    $(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
-+x86-a-b-bootblock.h: x86-a-b-bootblock.S
-+    $(x86_64_cross_prefix)gcc -m32 -march=i486 -c $< -o x86.o
-     $(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot
-     dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124
-     echo "$$__note" > $@
 diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/migration-test.h
 ...
 +#define X86_TEST_MEM_END   (100 * 1024 * 1024)
 +
 +/* PPC */
 +#define PPC_TEST_MEM_START (1 * 1024 * 1024)
 +#define PPC_TEST_MEM_END   (100 * 1024 * 1024)
-+#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 XXXXXXX..XXXXXXX 100644
---- a/tests/migration/x86-a-b-bootblock.s
-+++ b/tests/migration/x86-a-b-bootblock.S
-@@ -XXX,XX +XXX,XX @@
- #
- # Author: dgilbert@redhat.com
-+#include "migration-test.h"
- .code16
- .org 0x7c00
-@@ -XXX,XX +XXX,XX @@ start:             # at 0x7c00 ?
-         mov $0, %bl
- mainloop:
-         # Start from 1MB
--        mov $(1024*1024),%eax
-+        mov $X86_TEST_MEM_START,%eax
- innerloop:
-         incb (%eax)
--        add $4096,%eax
--        cmp $(100*1024*1024),%eax
-+        add $TEST_MEM_PAGE_SIZE,%eax
-+        cmp $X86_TEST_MEM_END,%eax
-         jl innerloop
-         inc %bl
-diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86-a-b-bootblock.h
-index XXXXXXX..XXXXXXX 100644
---- a/tests/migration/x86-a-b-bootblock.h
-+++ b/tests/migration/x86-a-b-bootblock.h
-@@ -XXX,XX +XXX,XX @@
- /* 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.
-  */
 --
-.14.3
+.8.3.1

-[Qemu-devel] [PATCH V7 4/4] tests: Add migration test for aarch64
+[Qemu-devel] [PATCH V8 4/4] tests: Add migration test 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
+code and the build script in tests/migration/aarch64. So users can change
-source and/or re-compile the binary as they wish.
+the source and/or re-compile the binary as they wish.
 Signed-off-by: Wei Huang <wei@redhat.com>
 ---
- tests/Makefile.include               |  1 +
+ tests/Makefile.include                       |  1 +
- tests/migration-test.c               | 44 +++++++++++++++++++--
+ tests/migration-test.c                       | 38 ++++++++++++--
- tests/migration/Makefile             | 12 +++++-
+ tests/migration/Makefile                     |  2 +-
- tests/migration/aarch64-a-b-kernel.S | 75 ++++++++++++++++++++++++++++++++++++
+ tests/migration/aarch64/Makefile             | 20 ++++++++
- tests/migration/aarch64-a-b-kernel.h | 19 +++++++++
+ tests/migration/aarch64/aarch64-a-b-kernel.S | 75 ++++++++++++++++++++++++++++
- tests/migration/migration-test.h     |  9 +++++
+ tests/migration/aarch64/aarch64-a-b-kernel.h | 19 +++++++
-files changed, 154 insertions(+), 6 deletions(-)
+ tests/migration/migration-test.h             |  9 ++++
- create mode 100644 tests/migration/aarch64-a-b-kernel.S
+files changed, 159 insertions(+), 5 deletions(-)
- create mode 100644 tests/migration/aarch64-a-b-kernel.h
+ create mode 100644 tests/migration/aarch64/Makefile
  create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.S
  create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.h
 diff --git a/tests/Makefile.include b/tests/Makefile.include
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
-@@ -XXX,XX +XXX,XX @@ check-qtest-arm-y += tests/sdhci-test$(EXESUF)
+@@ -XXX,XX +XXX,XX @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
  check-qtest-aarch64-y = tests/numa-test$(EXESUF)
- check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
+ check-qtest-aarch64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
  check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
 +check-qtest-aarch64-y += tests/migration-test$(EXESUF)
  check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
 diff --git a/tests/migration-test.c b/tests/migration-test.c
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration-test.c
 +++ b/tests/migration-test.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static bool uffd_feature_thread_id;
-  */
+ #if defined(__linux__)
+ #include <sys/syscall.h>
- #include "qemu/osdep.h"
+ #include <sys/vfs.h>
 +#include <sys/utsname.h>
+ #endif
- #include "libqtest.h"
- #include "qapi/qmp/qdict.h"
+ #if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
 @@ -XXX,XX +XXX,XX @@ 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/x86_64/x86-a-b-bootblock.h"
-+#include "tests/migration/aarch64-a-b-kernel.h"
++#include "tests/migration/aarch64/aarch64-a-b-kernel.h"
 -static void init_bootfile_x86(const char *bootpath)
 +static void init_bootfile(const char *bootpath, void *content)
  {
      FILE *bootfile = fopen(bootpath, "wb");
 -    g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), ==, 1);
 +    g_assert_cmpint(fwrite(content, 512, 1, bootfile), ==, 1);
      fclose(bootfile);
  }
-@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
+@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
      got_stop = false;
      if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
 -        init_bootfile_x86(bootpath);
 +        init_bootfile(bootpath, x86_bootsect);
          cmd_src = g_strdup_printf("-machine accel=%s -m 150M"
                                    " -name source,debug-threads=on"
                                    " -serial file:%s/src_serial"
-@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
+@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
          start_address = PPC_TEST_MEM_START;
          end_address = PPC_TEST_MEM_END;
 +    } else if (strcmp(arch, "aarch64") == 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) == 0 && uname(&utsname) == 0 &&
 +            strcmp(utsname.machine, "aarch64") == 0) {
 +            accel = "kvm";
-+            cpu = "host";
-+            gic_ver = "host";
 +        } else {
 +            accel = "tcg";
-+            cpu = "cortex-a57";
-+            gic_ver = "2";
 +        }
 +
 +        init_bootfile(bootpath, aarch64_kernel);
-+        cmd_src = g_strdup_printf("-machine virt,accel=%s,gic-version=%s "
++        cmd_src = g_strdup_printf("-machine virt,accel=%s,gic-version=max "
-+                                  "-name vmsource,debug-threads=on -cpu %s "
++                                  "-name vmsource,debug-threads=on -cpu max "
 +                                  "-m 150M -serial file:%s/src_serial "
 +                                  "-kernel %s ",
-+                                  accel, gic_ver, cpu, tmpfs, bootpath);
++                                  accel, tmpfs, bootpath);
-+        cmd_dst = g_strdup_printf("-machine virt,accel=%s,gic-version=%s "
++        cmd_dst = g_strdup_printf("-machine virt,accel=%s,gic-version=max "
-+                                  "-name vmdest,debug-threads=on -cpu %s "
++                                  "-name vmdest,debug-threads=on -cpu max "
 +                                  "-m 150M -serial file:%s/dest_serial "
 +                                  "-kernel %s "
 +                                  "-incoming %s ",
-+                                  accel, gic_ver, cpu, tmpfs, bootpath, uri);
++                                  accel, tmpfs, bootpath, uri);
 +
 +        start_address = ARM_TEST_MEM_START;
 +        end_address = ARM_TEST_MEM_END;
 +
 +        g_assert(sizeof(aarch64_kernel) <= ARM_TEST_MAX_KERNEL_SIZE);
 ...
 -    from = qtest_start("");
 +    from = qtest_start("-machine none");
      deprecated_set_downtime(from, 0.12345);
-     deprecated_set_speed(from, "12345");
+     deprecated_set_speed(from, 12345);
 diff --git a/tests/migration/Makefile b/tests/migration/Makefile
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration/Makefile
 +++ b/tests/migration/Makefile
-@@ -XXX,XX +XXX,XX @@ override define __note
+@@ -XXX,XX +XXX,XX @@
-  */
+ # See the COPYING file in the top-level directory.
- endef
+ #
--all: x86-a-b-bootblock.h
+-TARGET_LIST = x86_64
-+all: x86-a-b-bootblock.h aarch64-a-b-kernel.h
++TARGET_LIST = x86_64 aarch64
- # Dummy command so that make thinks it has done something
-     @true
+ SRC_PATH = ../..
-@@ -XXX,XX +XXX,XX @@ SRC_PATH=../..
+diff --git a/tests/migration/aarch64/Makefile b/tests/migration/aarch64/Makefile
  include $(SRC_PATH)/rules.mak
  x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
 +aarch64_cross_prefix := $(call find-cross-prefix,aarch64)
  x86-a-b-bootblock.h: x86-a-b-bootblock.S
      $(x86_64_cross_prefix)gcc -m32 -march=i486 -c $< -o x86.o
@@ -XXX,XX +XXX,XX @@ x86-a-b-bootblock.h: x86-a-b-bootblock.S
      echo "$$__note" > $@
      xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@
 +aarch64-a-b-kernel.h: aarch64-a-b-kernel.S
 +    $(aarch64_cross_prefix)gcc -o aarch64.elf -nostdlib \
 +        -Wl,--build-id=none $<
 +    $(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 XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/tests/migration/aarch64-a-b-kernel.S
++++ b/tests/migration/aarch64/Makefile
@@ -XXX,XX +XXX,XX @@
 +# To specify cross compiler prefix, use CROSS_PREFIX=
 +#   > make CROSS_PREFIX=aarch64-linux-gnu-
 +
 +.PHONY: all clean
 +all: aarch64-a-b-kernel.h
 +
 +aarch64-a-b-kernel.h: aarch64.kernel
 +    echo "$$__note" > header.tmp
 +    xxd -i $< | sed -e 's/.*int.*//' >> header.tmp
 +    mv header.tmp $@
 +
 +aarch64.kernel: aarch64.elf
 +    $(CROSS_PREFIX)objcopy -O binary $< $@
 +
 +aarch64.elf: aarch64-a-b-kernel.S
 +    $(CROSS_PREFIX)gcc -o $@ -nostdlib -Wl,--build-id=none $<
 +
 +clean:
 +    @rm -rf *.kernel *.elf
 +
 diff --git a/tests/migration/aarch64/aarch64-a-b-kernel.S b/tests/migration/aarch64/aarch64-a-b-kernel.S
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/migration/aarch64/aarch64-a-b-kernel.S
 @@ -XXX,XX +XXX,XX @@
 +#
 +# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates
 +#
 +# Author:
 ...
 +#
 +# Note: Please make sure the compiler compiles the assembly code below with
 +# pc-relative address. Also the branch instructions should use relative
 +# addresses only.
 +
-+#include "migration-test.h"
++#include "../migration-test.h"
 +
 +.section .text
 +
 +        .globl  _start
 +
 ...
 +        /* 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
+diff --git a/tests/migration/aarch64/aarch64-a-b-kernel.h b/tests/migration/aarch64/aarch64-a-b-kernel.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/tests/migration/aarch64-a-b-kernel.h
++++ b/tests/migration/aarch64/aarch64-a-b-kernel.h
 @@ -XXX,XX +XXX,XX @@
-+/* This file is automatically generated from
++/* This file is automatically generated from the assembly file in
-+ * tests/migration/aarch64-a-b-kernel.S, edit that and then run
++ * tests/migration/aarch64, edit that and then run "make all"
-+ * "make aarch64-a-b-kernel.h" inside tests/migration to update,
++ * inside tests/migration to update, and then remember to send both
-+ * and then remember to send both in your patch submission.
++ * in your patch submission.
 + */
 +unsigned char aarch64_kernel[] = {
 +  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,
 ...
 diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/migration/migration-test.h
 +++ b/tests/migration/migration-test.h
 @@ -XXX,XX +XXX,XX @@
+ #define PPC_TEST_MEM_START (1 * 1024 * 1024)
  #define PPC_TEST_MEM_END   (100 * 1024 * 1024)
- #define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
 +/* ARM */
 +#define ARM_TEST_MEM_START (0x40000000 + 1 * 1024 * 1024)
 +#define ARM_TEST_MEM_END   (0x40000000 + 100 * 1024 * 1024)
 +#define ARM_MACH_VIRT_UART 0x09000000
 ...
 + */
 +#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)
 +
  #endif /* _TEST_MIGRATION_H_ */
 --
-.14.3
+.8.3.1

This patchset adds a migration test for aarch64. It leverages
Dave Gilbert's recent patch "tests/migration: Add source to PC boot block"
to create a new test case for aarch64.

V6->V7:
 * Define test memory start/end addresses for all architectures
 * Check aarch64 kernel binary size, limit under 512KB

V5->V6:
 * Add Reviewed-by to patch 1-3
 * Add more design notes in patch 4 (aarch64 assembly compilation, bin space)

V4->V5:
 * Extract cross compilation detection code into rules.mak for sharing
 * Minor comment and code revision in migration-test.c & aarch64-a-b-kernel.S
 
V3->V4:
 * Rename .s to .S, allowing assembly to include C-style header file
 * Move test defines into a new migration-test.h file
 * Use different cpu & gic settings for kvm and tcg modes on aarch64
 * Clean up aarch64-a-b-kernel.S based on Andrew Jones' comments
 
V2->V3:
 * Convert build script to Makefile
 * Add cross-compilation support
 * Fix CPU type for "tcg" machine type
 * Revise asm code and the compilation process from asm to header file

V1->V2:
 * Similar to Dave Gilbert's recent changes to migration-test, we
   provide the test source and a build script in V2.
 * aarch64 kernel blob is defined as "unsigned char" because the source
   is now provided in V2.
 * Add "-machine none" to test_deprecated() because aarch64 doesn't have
   a default machine type.

RFC->V1:
 * aarch64 kernel blob is defined as an uint32_t array
 * The test code is re-written to address a data caching issue under KVM.
   Tests passed under both x86 and aarch64.
 * Re-use init_bootfile_x86() for both x86 and aarch64
 * Other minor fixes

Thanks,
-Wei

Wei Huang (4):
  rules: Move cross compilation auto detection functions to rules.mak
  tests/migration: Convert the boot block compilation script into
    Makefile
  tests/migration: Add migration-test header file
  tests: Add migration test for aarch64

roms/Makefile                                      | 24 ++-----
 rules.mak                                          | 15 +++++
 tests/Makefile.include                             |  1 +
 tests/migration-test.c                             | 78 +++++++++++++++++-----
 tests/migration/Makefile                           | 44 ++++++++++++
 tests/migration/aarch64-a-b-kernel.S               | 75 +++++++++++++++++++++
 tests/migration/aarch64-a-b-kernel.h               | 19 ++++++
 tests/migration/migration-test.h                   | 31 +++++++++
 tests/migration/rebuild-x86-bootblock.sh           | 33 ---------
 .../{x86-a-b-bootblock.s => x86-a-b-bootblock.S}   | 12 ++--
 tests/migration/x86-a-b-bootblock.h                |  4 +-
 11 files changed, 260 insertions(+), 76 deletions(-)
 create mode 100644 tests/migration/Makefile
 create mode 100644 tests/migration/aarch64-a-b-kernel.S
 create mode 100644 tests/migration/aarch64-a-b-kernel.h
 create mode 100644 tests/migration/migration-test.h
 delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
 rename tests/migration/{x86-a-b-bootblock.s => x86-a-b-bootblock.S} (88%)

-- 
2.14.3

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 <wei@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
---
 roms/Makefile | 24 +++++++-----------------
 rules.mak     | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/roms/Makefile b/roms/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -XXX,XX +XXX,XX @@ pxe-rom-virtio   efi-rom-virtio   : DID := 1000
 pxe-rom-vmxnet3  efi-rom-vmxnet3  : VID := 15ad
 pxe-rom-vmxnet3  efi-rom-vmxnet3  : DID := 07b0
 
-#
-# cross compiler auto detection
-#
-path := $(subst :, ,$(PATH))
-system := $(shell uname -s | tr "A-Z" "a-z")
-
-# first find cross binutils in path
-find-cross-ld = $(firstword $(wildcard $(patsubst %,%/$(1)-*$(system)*-ld,$(path))))
-# then check we have cross gcc too
-find-cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-cross-ld,$(1)))))
-# finally strip off path + toolname so we get the prefix
-find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1))))
-
-powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
-powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
-x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
-
 # tag our seabios builds
 SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
 
@@ -XXX,XX +XXX,XX @@ default:
 	@echo "  skiboot        -- update skiboot.lid"
 	@echo "  u-boot.e500    -- update u-boot.e500"
 
+SRC_PATH=..
+include $(SRC_PATH)/rules.mak
+
+powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
+powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
+x86_64_cross_prefix := $(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 XXXXXXX..XXXXXXX 100644
--- a/rules.mak
+++ b/rules.mak
@@ -XXX,XX +XXX,XX @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
                   $(foreach o,$(filter %.mo,$1),$($o-objs)) \
                   $(filter-out %.o %.mo,$1))
 
+# 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 := $(call find-cross-prefix,x86_64)
+#      $(x86_64_cross_prefix)gcc -c test.c -o test.o
+#      make -C testdir CROSS_COMPILE=$(x86_64_cross_prefix)
+cross-search-path := $(subst :, ,$(PATH))
+cross-host-system := $(shell uname -s | tr "A-Z" "a-z")
+
+find-cross-ld = $(firstword $(wildcard $(patsubst \
+                    %,%/$(1)-*$(cross-host-system)*-ld,$(cross-search-path))))
+find-cross-gcc = $(firstword $(wildcard \
+                    $(patsubst %ld,%gcc,$(call find-cross-ld,$(1)))))
+find-cross-prefix = $(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) \
-- 
2.14.3

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 <wei@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
---
 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 XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@
+#
+# Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates
+#
+# Authors:
+#   Dave Gilbert <dgilbert@redhat.com>
+#
+# 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=../..
+include $(SRC_PATH)/rules.mak
+
+x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
+
+x86-a-b-bootblock.h: x86-a-b-bootblock.s
+	$(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
+	$(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot
+	dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124
+	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/rebuild-x86-bootblock.sh
deleted file mode 100755
index XXXXXXX..XXXXXXX
--- a/tests/migration/rebuild-x86-bootblock.sh
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-#!/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=$PWD/tests/migration/x86-a-b-bootblock.s
-HEADER=$PWD/tests/migration/x86-a-b-bootblock.h
-
-if [ ! -e "$ASMFILE" ]
-then
-  echo "Couldn't find $ASMFILE" >&2
-  exit 1
-fi
-
-ASM_WORK_DIR=$(mktemp -d --tmpdir X86BB.XXXXXX)
-cd "$ASM_WORK_DIR" &&
-as --32 -march=i486 "$ASMFILE" -o x86.o &&
-objcopy -O binary x86.o x86.boot &&
-dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124 &&
-xxd -i x86.bootsect |
-sed -e 's/.*int.*//' > x86.hex &&
-cat - x86.hex <<HERE > "$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 XXXXXXX..XXXXXXX 100644
--- a/tests/migration/x86-a-b-bootblock.h
+++ b/tests/migration/x86-a-b-bootblock.h
@@ -XXX,XX +XXX,XX @@
 /* 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[] = {
diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-bootblock.s
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/x86-a-b-bootblock.s
+++ b/tests/migration/x86-a-b-bootblock.s
@@ -XXX,XX +XXX,XX @@
 #  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.
-- 
2.14.3

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 <wei@redhat.com>
---
 tests/migration-test.c                             | 34 +++++++++++++---------
 tests/migration/Makefile                           |  4 +--
 tests/migration/migration-test.h                   | 22 ++++++++++++++
 .../{x86-a-b-bootblock.s => x86-a-b-bootblock.S}   |  7 +++--
 tests/migration/x86-a-b-bootblock.h                |  2 +-
 5 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 tests/migration/migration-test.h
 rename tests/migration/{x86-a-b-bootblock.s => x86-a-b-bootblock.S} (94%)

diff --git a/tests/migration-test.c b/tests/migration-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -XXX,XX +XXX,XX @@
 #include "sysemu/sysemu.h"
 #include "hw/nvram/chrp_nvram.h"
 
-#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
+#include "migration/migration-test.h"
 
-const unsigned start_address = 1024 * 1024;
-const unsigned end_address = 100 * 1024 * 1024;
+unsigned start_address;
+unsigned end_address;
 bool got_stop;
 
 #if defined(__linux__)
@@ -XXX,XX +XXX,XX @@ static bool ufd_version_check(void)
 
 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.
+/* 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"
 
@@ -XXX,XX +XXX,XX @@ static void init_bootfile_ppc(const char *bootpath)
     memcpy(header->name, "common", 6);
     chrp_nvram_finish_partition(header, MIN_NVRAM_SIZE);
 
-    /* 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 modify
+     * memory between start_address and end_address like PC bootsector does.
      */
 
     sprintf(buf + 16,
@@ -XXX,XX +XXX,XX @@ 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 from
-     * 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 incrementer.
-     * (We're running this with the guest stopped).
+     * start_address to < end_address 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 incrementer. (We're running this with
+     * the guest stopped).
      */
     unsigned address;
     uint8_t first_byte;
@@ -XXX,XX +XXX,XX @@ static void check_guests_ram(QTestState *who)
     qtest_memread(who, start_address, &first_byte, 1);
     last_byte = first_byte;
 
-    for (address = start_address + 4096; address < end_address; address += 4096)
+    for (address = start_address + TEST_MEM_PAGE_SIZE; address < end_address;
+         address += TEST_MEM_PAGE_SIZE)
     {
         uint8_t b;
         qtest_memread(who, address, &b, 1);
@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
                                   " -drive file=%s,format=raw"
                                   " -incoming %s",
                                   accel, tmpfs, bootpath, uri);
+
+        start_address = X86_TEST_MEM_START;
+        end_address = X86_TEST_MEM_END;
     } else if (strcmp(arch, "ppc64") == 0) {
 
         /* On ppc64, the test only works with kvm-hv, but not with kvm-pr */
@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
                                   " -serial file:%s/dest_serial"
                                   " -incoming %s",
                                   accel, tmpfs, uri);
+
+        start_address = PPC_TEST_MEM_START;
+        end_address = PPC_TEST_MEM_END;
     } else {
         g_assert_not_reached();
     }
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@ include $(SRC_PATH)/rules.mak
 
 x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
 
-x86-a-b-bootblock.h: x86-a-b-bootblock.s
-	$(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o
+x86-a-b-bootblock.h: x86-a-b-bootblock.S
+	$(x86_64_cross_prefix)gcc -m32 -march=i486 -c $< -o x86.o
 	$(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot
 	dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124
 	echo "$$__note" > $@
diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/migration-test.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * 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.
+ */
+#ifndef _TEST_MIGRATION_H_
+#define _TEST_MIGRATION_H_
+
+/* Common */
+#define TEST_MEM_PAGE_SIZE 4096
+
+/* x86 */
+#define X86_TEST_MEM_START (1 * 1024 * 1024)
+#define X86_TEST_MEM_END   (100 * 1024 * 1024)
+
+/* PPC */
+#define PPC_TEST_MEM_START (1 * 1024 * 1024)
+#define PPC_TEST_MEM_END   (100 * 1024 * 1024)
+#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 XXXXXXX..XXXXXXX 100644
--- a/tests/migration/x86-a-b-bootblock.s
+++ b/tests/migration/x86-a-b-bootblock.S
@@ -XXX,XX +XXX,XX @@
 #
 # Author: dgilbert@redhat.com
 
+#include "migration-test.h"
 
 .code16
 .org 0x7c00
@@ -XXX,XX +XXX,XX @@ start:             # at 0x7c00 ?
         mov $0, %bl
 mainloop:
         # Start from 1MB
-        mov $(1024*1024),%eax
+        mov $X86_TEST_MEM_START,%eax
 innerloop:
         incb (%eax)
-        add $4096,%eax
-        cmp $(100*1024*1024),%eax
+        add $TEST_MEM_PAGE_SIZE,%eax
+        cmp $X86_TEST_MEM_END,%eax
         jl innerloop
 
         inc %bl
diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86-a-b-bootblock.h
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/x86-a-b-bootblock.h
+++ b/tests/migration/x86-a-b-bootblock.h
@@ -XXX,XX +XXX,XX @@
 /* 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.
  */
-- 
2.14.3

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 <wei@redhat.com>
---
 tests/Makefile.include               |  1 +
 tests/migration-test.c               | 44 +++++++++++++++++++--
 tests/migration/Makefile             | 12 +++++-
 tests/migration/aarch64-a-b-kernel.S | 75 ++++++++++++++++++++++++++++++++++++
 tests/migration/aarch64-a-b-kernel.h | 19 +++++++++
 tests/migration/migration-test.h     |  9 +++++
 6 files changed, 154 insertions(+), 6 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 XXXXXXX..XXXXXXX 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -XXX,XX +XXX,XX @@ check-qtest-arm-y += tests/sdhci-test$(EXESUF)
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
 check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
+check-qtest-aarch64-y += tests/migration-test$(EXESUF)
 
 check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
 
diff --git a/tests/migration-test.c b/tests/migration-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -XXX,XX +XXX,XX @@
  */
 
 #include "qemu/osdep.h"
+#include <sys/utsname.h>
 
 #include "libqtest.h"
 #include "qapi/qmp/qdict.h"
@@ -XXX,XX +XXX,XX @@ 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"
 
-static void init_bootfile_x86(const char *bootpath)
+static void init_bootfile(const char *bootpath, void *content)
 {
     FILE *bootfile = fopen(bootpath, "wb");
 
-    g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), ==, 1);
+    g_assert_cmpint(fwrite(content, 512, 1, bootfile), ==, 1);
     fclose(bootfile);
 }
 
@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
     got_stop = false;
 
     if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
-        init_bootfile_x86(bootpath);
+        init_bootfile(bootpath, x86_bootsect);
         cmd_src = g_strdup_printf("-machine accel=%s -m 150M"
                                   " -name source,debug-threads=on"
                                   " -serial file:%s/src_serial"
@@ -XXX,XX +XXX,XX @@ static void test_migrate_start(QTestState **from, QTestState **to,
 
         start_address = PPC_TEST_MEM_START;
         end_address = PPC_TEST_MEM_END;
+    } else if (strcmp(arch, "aarch64") == 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) == 0 && uname(&utsname) == 0 &&
+            strcmp(utsname.machine, "aarch64") == 0) {
+            accel = "kvm";
+            cpu = "host";
+            gic_ver = "host";
+        } else {
+            accel = "tcg";
+            cpu = "cortex-a57";
+            gic_ver = "2";
+        }
+
+        init_bootfile(bootpath, aarch64_kernel);
+        cmd_src = g_strdup_printf("-machine virt,accel=%s,gic-version=%s "
+                                  "-name vmsource,debug-threads=on -cpu %s "
+                                  "-m 150M -serial file:%s/src_serial "
+                                  "-kernel %s ",
+                                  accel, gic_ver, cpu, tmpfs, bootpath);
+        cmd_dst = g_strdup_printf("-machine virt,accel=%s,gic-version=%s "
+                                  "-name vmdest,debug-threads=on -cpu %s "
+                                  "-m 150M -serial file:%s/dest_serial "
+                                  "-kernel %s "
+                                  "-incoming %s ",
+                                  accel, gic_ver, cpu, tmpfs, bootpath, uri);
+
+        start_address = ARM_TEST_MEM_START;
+        end_address = ARM_TEST_MEM_END;
+
+        g_assert(sizeof(aarch64_kernel) <= ARM_TEST_MAX_KERNEL_SIZE);
     } else {
         g_assert_not_reached();
     }
@@ -XXX,XX +XXX,XX @@ static void test_deprecated(void)
 {
     QTestState *from;
 
-    from = qtest_start("");
+    from = qtest_start("-machine none");
 
     deprecated_set_downtime(from, 0.12345);
     deprecated_set_speed(from, "12345");
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@ override define __note
  */
 endef
 
-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
 
@@ -XXX,XX +XXX,XX @@ SRC_PATH=../..
 include $(SRC_PATH)/rules.mak
 
 x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
+aarch64_cross_prefix := $(call find-cross-prefix,aarch64)
 
 x86-a-b-bootblock.h: x86-a-b-bootblock.S
 	$(x86_64_cross_prefix)gcc -m32 -march=i486 -c $< -o x86.o
@@ -XXX,XX +XXX,XX @@ x86-a-b-bootblock.h: x86-a-b-bootblock.S
 	echo "$$__note" > $@
 	xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@
 
+aarch64-a-b-kernel.h: aarch64-a-b-kernel.S
+	$(aarch64_cross_prefix)gcc -o aarch64.elf -nostdlib \
+		-Wl,--build-id=none $<
+	$(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 XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/aarch64-a-b-kernel.S
@@ -XXX,XX +XXX,XX @@
+#
+# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates
+#
+# Author:
+#   Wei Huang <wei@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+#
+# Note: Please make sure the compiler compiles the assembly code below with
+# pc-relative address. Also the branch instructions should use relative
+# addresses only.
+
+#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 XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/aarch64-a-b-kernel.h
@@ -XXX,XX +XXX,XX @@
+/* 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[] = {
+  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-test.h
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/migration-test.h
+++ b/tests/migration/migration-test.h
@@ -XXX,XX +XXX,XX @@
 #define PPC_TEST_MEM_END   (100 * 1024 * 1024)
 #define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
 
+/* ARM */
+#define ARM_TEST_MEM_START (0x40000000 + 1 * 1024 * 1024)
+#define ARM_TEST_MEM_END   (0x40000000 + 100 * 1024 * 1024)
+#define ARM_MACH_VIRT_UART 0x09000000
+/* AArch64 kernel load address is 0x40080000, and the test memory starts at
+ * 0x40100000. So the maximum allowable kernel size is 512KB.
+ */
+#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)
+
 #endif /* _TEST_MIGRATION_H_ */
-- 
2.14.3

This patchset adds a migration test for aarch64. It leverages
Dave Gilbert's migration boot block patches to create a new test case
for aarch64.

V7->V8:
 * Support cross compilation by searching for CROSS_CC_GUEST option,
   instead of using the find-cross-prefix defined in roms/Makefile
 * Use the "max" options for ARM guest VM's CPU and GIC types
 * $(TARGET)/Makefile rules are rewritten based on Laurent Vivier's comment
 * NOTE: because Patch 1/2 is re-written, I remove the "Reviewed-by" for
   reviewers to take a look again. Thanks.

V6->V7:
 * Define test memory start/end addresses for all architectures
 * Check aarch64 kernel binary size, limit under 512KB

V5->V6:
 * Add Reviewed-by to patch 1-3
 * Add more design notes in patch 4 (aarch64 assembly compilation, bin space)

Thanks,
-Wei

Wei Huang (4):
  tests/migration: Convert x86 boot block compilation script into
    Makefile
  tests/migration: Support cross compiler in generating boot block
    header file
  tests/migration: Add migration-test header file
  tests: Add migration test for aarch64

tests/Makefile.include                             |  1 +
 tests/migration-test.c                             | 68 +++++++++++++++-----
 tests/migration/Makefile                           | 34 ++++++++++
 tests/migration/aarch64/Makefile                   | 20 ++++++
 tests/migration/aarch64/aarch64-a-b-kernel.S       | 75 ++++++++++++++++++++++
 tests/migration/aarch64/aarch64-a-b-kernel.h       | 19 ++++++
 tests/migration/migration-test.h                   | 30 +++++++++
 tests/migration/rebuild-x86-bootblock.sh           | 33 ----------
 tests/migration/x86_64/Makefile                    | 22 +++++++
 .../x86-a-b-bootblock.S}                           |  0
 tests/migration/{ => x86_64}/x86-a-b-bootblock.h   |  8 +--
 11 files changed, 258 insertions(+), 52 deletions(-)
 create mode 100644 tests/migration/Makefile
 create mode 100644 tests/migration/aarch64/Makefile
 create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.S
 create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.h
 create mode 100644 tests/migration/migration-test.h
 delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
 create mode 100644 tests/migration/x86_64/Makefile
 rename tests/migration/{x86-a-b-bootblock.s => x86_64/x86-a-b-bootblock.S} (100%)
 rename tests/migration/{ => x86_64}/x86-a-b-bootblock.h (93%)

-- 
1.8.3.1

Note that, in the new design, the cross compiler prefix can be specified by
setting the CROSS_PREFIX in "make" command. Also to allow gcc pre-processor
to include the C-style file correctly, it also renames the
x86-a-b-bootblock.s file extension from .s to .S.

Signed-off-by: Wei Huang <wei@redhat.com>
---
 tests/migration/Makefile                           | 31 ++++++++++++++++++++
 tests/migration/rebuild-x86-bootblock.sh           | 33 ----------------------
 .../{x86-a-b-bootblock.s => x86-a-b-bootblock.S}   |  0
 3 files changed, 31 insertions(+), 33 deletions(-)
 create mode 100644 tests/migration/Makefile
 delete mode 100755 tests/migration/rebuild-x86-bootblock.sh
 rename tests/migration/{x86-a-b-bootblock.s => x86-a-b-bootblock.S} (100%)

diff --git a/tests/migration/Makefile b/tests/migration/Makefile
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@
+# To specify cross compiler prefix, use CROSS_PREFIX=
+#   > make CROSS_PREFIX=x86_64-linux-gnu-
+
+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.
+ */
+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 $@
+
+x86.bootsect: x86.boot
+	dd if=$< of=$@ bs=256 count=2 skip=124
+
+x86.boot: x86.o
+	$(CROSS_PREFIX)objcopy -O binary $< $@
+
+x86.o: x86-a-b-bootblock.S
+	$(CROSS_PREFIX)gcc -m32 -march=i486 -c $< -o $@
+
+clean:
+	@rm -rf *.boot *.o *.bootsect
diff --git a/tests/migration/rebuild-x86-bootblock.sh b/tests/migration/rebuild-x86-bootblock.sh
deleted file mode 100755
index XXXXXXX..XXXXXXX
--- a/tests/migration/rebuild-x86-bootblock.sh
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-#!/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=$PWD/tests/migration/x86-a-b-bootblock.s
-HEADER=$PWD/tests/migration/x86-a-b-bootblock.h
-
-if [ ! -e "$ASMFILE" ]
-then
-  echo "Couldn't find $ASMFILE" >&2
-  exit 1
-fi
-
-ASM_WORK_DIR=$(mktemp -d --tmpdir X86BB.XXXXXX)
-cd "$ASM_WORK_DIR" &&
-as --32 -march=i486 "$ASMFILE" -o x86.o &&
-objcopy -O binary x86.o x86.boot &&
-dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124 &&
-xxd -i x86.bootsect |
-sed -e 's/.*int.*//' > x86.hex &&
-cat - x86.hex <<HERE > "$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.s b/tests/migration/x86-a-b-bootblock.S
similarity index 100%
rename from tests/migration/x86-a-b-bootblock.s
rename to tests/migration/x86-a-b-bootblock.S
-- 
1.8.3.1

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_64 related files are moved to a new sub-dir (named ./x86_64).
 * 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.

Signed-off-by: Wei Huang <wei@redhat.com>
---
 tests/migration-test.c                           |  2 +-
 tests/migration/Makefile                         | 43 +++++++++++++-----------
 tests/migration/x86_64/Makefile                  | 22 ++++++++++++
 tests/migration/{ => x86_64}/x86-a-b-bootblock.S |  0
 tests/migration/{ => x86_64}/x86-a-b-bootblock.h |  8 ++---
 5 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 tests/migration/x86_64/Makefile
 rename tests/migration/{ => x86_64}/x86-a-b-bootblock.S (100%)
 rename tests/migration/{ => x86_64}/x86-a-b-bootblock.h (93%)

diff --git a/tests/migration-test.c b/tests/migration-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -XXX,XX +XXX,XX @@ 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/x86_64/x86-a-b-bootblock.h"
 
 static void init_bootfile_x86(const char *bootpath)
 {
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@
-# 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 = x86_64
+
+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 and then run "make all"
+ * inside tests/migration to update, and then remember to send both
+ * 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 $@
+parse-cross-prefix = $(subst gcc,,$(patsubst cc,gcc,$(patsubst CROSS_CC_GUEST="%",%,$(shell grep "CROSS_CC_GUEST=" $(SRC_PATH)/$(1)-softmmu/config-target.mak))))
+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/x86_64/Makefile b/tests/migration/x86_64/Makefile
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/x86_64/Makefile
@@ -XXX,XX +XXX,XX @@
+# To specify cross compiler prefix, use CROSS_PREFIX=
+#   > make CROSS_PREFIX=x86_64-linux-gnu-
+
+.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 $@
+
+x86.bootsect: x86.boot
+	dd if=$< of=$@ bs=256 count=2 skip=124
+
+x86.boot: x86.o
+	$(CROSS_PREFIX)objcopy -O binary $< $@
+
+x86.o: x86-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/x86_64/x86-a-b-bootblock.S
similarity index 100%
rename from tests/migration/x86-a-b-bootblock.S
rename to tests/migration/x86_64/x86-a-b-bootblock.S
diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86_64/x86-a-b-bootblock.h
similarity index 93%
rename from tests/migration/x86-a-b-bootblock.h
rename to tests/migration/x86_64/x86-a-b-bootblock.h
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/x86-a-b-bootblock.h
+++ b/tests/migration/x86_64/x86-a-b-bootblock.h
@@ -XXX,XX +XXX,XX @@
-/* 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/x86_64, edit that and then run "make all"
+ * inside tests/migration to update, and then remember to send both
+ * in your patch submission.
  */
 unsigned char x86_bootsect[] = {
   0xfa, 0x0f, 0x01, 0x16, 0x74, 0x7c, 0x66, 0xb8, 0x01, 0x00, 0x00, 0x00,
-- 
1.8.3.1

This patch moves the settings related migration-test from the
migration-test.c file to a new header file.

Signed-off-by: Wei Huang <wei@redhat.com>
---
 tests/migration-test.c           | 28 ++++++++++++++++++----------
 tests/migration/migration-test.h | 21 +++++++++++++++++++++
 2 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 tests/migration/migration-test.h

diff --git a/tests/migration-test.c b/tests/migration-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -XXX,XX +XXX,XX @@
 #include "chardev/char.h"
 #include "sysemu/sysemu.h"
 
+#include "migration/migration-test.h"
+
 /* TODO actually test the results and get rid of this */
 #define qtest_qmp_discard_response(...) qobject_unref(qtest_qmp(__VA_ARGS__))
 
-const unsigned start_address = 1024 * 1024;
-const unsigned end_address = 100 * 1024 * 1024;
+unsigned start_address;
+unsigned end_address;
 bool got_stop;
 static bool uffd_feature_thread_id;
 
@@ -XXX,XX +XXX,XX @@ static bool ufd_version_check(void)
 
 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.
+/* 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_64/x86-a-b-bootblock.h"
 
@@ -XXX,XX +XXX,XX @@ 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 from
-     * 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 incrementer.
-     * (We're running this with the guest stopped).
+     * start_address to < end_address 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 incrementer. (We're running this with
+     * the guest stopped).
      */
     unsigned address;
     uint8_t first_byte;
@@ -XXX,XX +XXX,XX @@ static void check_guests_ram(QTestState *who)
     qtest_memread(who, start_address, &first_byte, 1);
     last_byte = first_byte;
 
-    for (address = start_address + 4096; address < end_address; address += 4096)
+    for (address = start_address + TEST_MEM_PAGE_SIZE; address < end_address;
+         address += TEST_MEM_PAGE_SIZE)
     {
         uint8_t b;
         qtest_memread(who, address, &b, 1);
@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
                                   " -drive file=%s,format=raw"
                                   " -incoming %s",
                                   accel, tmpfs, bootpath, uri);
+        start_address = X86_TEST_MEM_START;
+        end_address = X86_TEST_MEM_END;
     } else if (strcmp(arch, "ppc64") == 0) {
         cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
                                   " -name source,debug-threads=on"
@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
                                   " -serial file:%s/dest_serial"
                                   " -incoming %s",
                                   accel, tmpfs, uri);
+
+        start_address = PPC_TEST_MEM_START;
+        end_address = PPC_TEST_MEM_END;
     } else {
         g_assert_not_reached();
     }
diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/migration-test.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * 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.
+ */
+#ifndef _TEST_MIGRATION_H_
+#define _TEST_MIGRATION_H_
+
+/* Common */
+#define TEST_MEM_PAGE_SIZE 4096
+
+/* x86 */
+#define X86_TEST_MEM_START (1 * 1024 * 1024)
+#define X86_TEST_MEM_END   (100 * 1024 * 1024)
+
+/* PPC */
+#define PPC_TEST_MEM_START (1 * 1024 * 1024)
+#define PPC_TEST_MEM_END   (100 * 1024 * 1024)
+
+#endif /* _TEST_MIGRATION_H_ */
-- 
1.8.3.1

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:

In addition to providing the binary, this patch also includes the source
code and the build script in tests/migration/aarch64. So users can change
the source and/or re-compile the binary as they wish.

Signed-off-by: Wei Huang <wei@redhat.com>
---
 tests/Makefile.include                       |  1 +
 tests/migration-test.c                       | 38 ++++++++++++--
 tests/migration/Makefile                     |  2 +-
 tests/migration/aarch64/Makefile             | 20 ++++++++
 tests/migration/aarch64/aarch64-a-b-kernel.S | 75 ++++++++++++++++++++++++++++
 tests/migration/aarch64/aarch64-a-b-kernel.h | 19 +++++++
 tests/migration/migration-test.h             |  9 ++++
 7 files changed, 159 insertions(+), 5 deletions(-)
 create mode 100644 tests/migration/aarch64/Makefile
 create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.S
 create mode 100644 tests/migration/aarch64/aarch64-a-b-kernel.h

diff --git a/tests/Makefile.include b/tests/Makefile.include
index XXXXXXX..XXXXXXX 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -XXX,XX +XXX,XX @@ check-qtest-arm-y += tests/hexloader-test$(EXESUF)
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
 check-qtest-aarch64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
+check-qtest-aarch64-y += tests/migration-test$(EXESUF)
 
 check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
 
diff --git a/tests/migration-test.c b/tests/migration-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -XXX,XX +XXX,XX @@ static bool uffd_feature_thread_id;
 #if defined(__linux__)
 #include <sys/syscall.h>
 #include <sys/vfs.h>
+#include <sys/utsname.h>
 #endif
 
 #if defined(__linux__) && defined(__NR_userfaultfd) && defined(CONFIG_EVENTFD)
@@ -XXX,XX +XXX,XX @@ static const char *tmpfs;
  * repeatedly. It outputs a 'B' at a fixed rate while it's still running.
  */
 #include "tests/migration/x86_64/x86-a-b-bootblock.h"
+#include "tests/migration/aarch64/aarch64-a-b-kernel.h"
 
-static void init_bootfile_x86(const char *bootpath)
+static void init_bootfile(const char *bootpath, void *content)
 {
     FILE *bootfile = fopen(bootpath, "wb");
 
-    g_assert_cmpint(fwrite(x86_bootsect, 512, 1, bootfile), ==, 1);
+    g_assert_cmpint(fwrite(content, 512, 1, bootfile), ==, 1);
     fclose(bootfile);
 }
 
@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
     got_stop = false;
 
     if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
-        init_bootfile_x86(bootpath);
+        init_bootfile(bootpath, x86_bootsect);
         cmd_src = g_strdup_printf("-machine accel=%s -m 150M"
                                   " -name source,debug-threads=on"
                                   " -serial file:%s/src_serial"
@@ -XXX,XX +XXX,XX @@ static int test_migrate_start(QTestState **from, QTestState **to,
 
         start_address = PPC_TEST_MEM_START;
         end_address = PPC_TEST_MEM_END;
+    } else if (strcmp(arch, "aarch64") == 0) {
+        struct utsname utsname;
+
+        /* kvm and tcg need different cpu and gic-version configs */
+        if (access("/dev/kvm", F_OK) == 0 && uname(&utsname) == 0 &&
+            strcmp(utsname.machine, "aarch64") == 0) {
+            accel = "kvm";
+        } else {
+            accel = "tcg";
+        }
+
+        init_bootfile(bootpath, aarch64_kernel);
+        cmd_src = g_strdup_printf("-machine virt,accel=%s,gic-version=max "
+                                  "-name vmsource,debug-threads=on -cpu max "
+                                  "-m 150M -serial file:%s/src_serial "
+                                  "-kernel %s ",
+                                  accel, tmpfs, bootpath);
+        cmd_dst = g_strdup_printf("-machine virt,accel=%s,gic-version=max "
+                                  "-name vmdest,debug-threads=on -cpu max "
+                                  "-m 150M -serial file:%s/dest_serial "
+                                  "-kernel %s "
+                                  "-incoming %s ",
+                                  accel, tmpfs, bootpath, uri);
+
+        start_address = ARM_TEST_MEM_START;
+        end_address = ARM_TEST_MEM_END;
+
+        g_assert(sizeof(aarch64_kernel) <= ARM_TEST_MAX_KERNEL_SIZE);
     } else {
         g_assert_not_reached();
     }
@@ -XXX,XX +XXX,XX @@ static void test_deprecated(void)
 {
     QTestState *from;
 
-    from = qtest_start("");
+    from = qtest_start("-machine none");
 
     deprecated_set_downtime(from, 0.12345);
     deprecated_set_speed(from, 12345);
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -XXX,XX +XXX,XX @@
 # See the COPYING file in the top-level directory.
 #
 
-TARGET_LIST = x86_64
+TARGET_LIST = x86_64 aarch64
 
 SRC_PATH = ../..
 
diff --git a/tests/migration/aarch64/Makefile b/tests/migration/aarch64/Makefile
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/aarch64/Makefile
@@ -XXX,XX +XXX,XX @@
+# To specify cross compiler prefix, use CROSS_PREFIX=
+#   > make CROSS_PREFIX=aarch64-linux-gnu-
+
+.PHONY: all clean
+all: aarch64-a-b-kernel.h
+
+aarch64-a-b-kernel.h: aarch64.kernel
+	echo "$$__note" > header.tmp
+	xxd -i $< | sed -e 's/.*int.*//' >> header.tmp
+	mv header.tmp $@
+
+aarch64.kernel: aarch64.elf
+	$(CROSS_PREFIX)objcopy -O binary $< $@
+
+aarch64.elf: aarch64-a-b-kernel.S
+	$(CROSS_PREFIX)gcc -o $@ -nostdlib -Wl,--build-id=none $<
+
+clean:
+	@rm -rf *.kernel *.elf
+
diff --git a/tests/migration/aarch64/aarch64-a-b-kernel.S b/tests/migration/aarch64/aarch64-a-b-kernel.S
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/aarch64/aarch64-a-b-kernel.S
@@ -XXX,XX +XXX,XX @@
+#
+# Copyright (c) 2018 Red Hat, Inc. and/or its affiliates
+#
+# Author:
+#   Wei Huang <wei@redhat.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+#
+# Note: Please make sure the compiler compiles the assembly code below with
+# pc-relative address. Also the branch instructions should use relative
+# addresses only.
+
+#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/aarch64-a-b-kernel.h b/tests/migration/aarch64/aarch64-a-b-kernel.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/migration/aarch64/aarch64-a-b-kernel.h
@@ -XXX,XX +XXX,XX @@
+/* This file is automatically generated from the assembly file in
+ * tests/migration/aarch64, edit that and then run "make all"
+ * inside tests/migration to update, and then remember to send both
+ * in your patch submission.
+ */
+unsigned char aarch64_kernel[] = {
+  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-test.h
index XXXXXXX..XXXXXXX 100644
--- a/tests/migration/migration-test.h
+++ b/tests/migration/migration-test.h
@@ -XXX,XX +XXX,XX @@
 #define PPC_TEST_MEM_START (1 * 1024 * 1024)
 #define PPC_TEST_MEM_END   (100 * 1024 * 1024)
 
+/* ARM */
+#define ARM_TEST_MEM_START (0x40000000 + 1 * 1024 * 1024)
+#define ARM_TEST_MEM_END   (0x40000000 + 100 * 1024 * 1024)
+#define ARM_MACH_VIRT_UART 0x09000000
+/* AArch64 kernel load address is 0x40080000, and the test memory starts at
+ * 0x40100000. So the maximum allowable kernel size is 512KB.
+ */
+#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)
+
 #endif /* _TEST_MIGRATION_H_ */
-- 
1.8.3.1