Re: [Qemu-devel] [PATCH V5 3/4] tests/migration: Add migration-test header file

[Andrew Jones]

On Fri, Feb 23, 2018 at 03:58:57PM -0600, Wei Huang wrote:
> 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 
> ---
>  tests/migration-test.c | 28 
> +++---
>  tests/migration/Makefile   |  4 ++--
>  tests/migration/migration-test.h   | 18 ++
>  .../{x86-a-b-bootblock.s => 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 => 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"
>  
> -#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;
> +const unsigned start_address = TEST_MEM_START;
> +const unsigned end_address = TEST_MEM_END;
>  bool got_stop;
>  
>  #if defined(__linux__)
> @@ -77,8 +77,8 @@ 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"
>  
> @@ -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);
>  
> -/* 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,
> @@ -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 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  + * 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;
> @@ -278,7 +277,8 @@ static void check_guests_ram(QTestState *who)
>  qtest_memread(who, start_address, _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, , 1);
> diff --git a/tests/migration/Makefile b/tests/migration/Makefile
> index 8fbedaa8b8..013b8d1f44 100644
> --- a/tests/migration/Makefile
> +++ b/tests/migration/Makefile
> @@ -25,8 +25,8 @@ 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 00..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 later.
> + * See the COPYING file in the top-level directory.
> + */
> +#ifndef _TEST_MIGRATION_H_
> +#define _TEST_MIGRATION_H_
> +
> +/* Common */
> 

Re: [Qemu-devel] [PATCH V5 3/4] tests/migration: Add migration-test header file

[Andrew Jones]

On Fri, Feb 23, 2018 at 03:58:57PM -0600, Wei Huang wrote:
> 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 
> ---
>  tests/migration-test.c | 28 
> +++---
>  tests/migration/Makefile   |  4 ++--
>  tests/migration/migration-test.h   | 18 ++
>  .../{x86-a-b-bootblock.s => 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 => x86-a-b-bootblock.S} (94%)
>

I gave this my r-b last review. Do I have to review it again?