From: Wei Huang <wei@redhat.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, peter.maydell@linaro.org,
quintela@redhat.com, drjones@redhat.com, wei@redhat.com
Subject: [Qemu-devel] [PATCH V4 2/3] tests/migration: Add migration-test header file
Date: Wed, 21 Feb 2018 22:44:16 -0600 [thread overview]
Message-ID: <20180222044417.15561-3-wei@redhat.com> (raw)
In-Reply-To: <20180222044417.15561-1-wei@redhat.com>
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 | 9 +++++----
tests/migration/Makefile | 4 ++--
tests/migration/migration-test.h | 19 +++++++++++++++++++
.../{x86-a-b-bootblock.s => x86-a-b-bootblock.S} | 7 ++++---
tests/migration/x86-a-b-bootblock.h | 2 +-
5 files changed, 31 insertions(+), 10 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..e2e06ed337 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__)
@@ -278,7 +278,8 @@ 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);
diff --git a/tests/migration/Makefile b/tests/migration/Makefile
index 1c07dd7be9..b768d0729d 100644
--- a/tests/migration/Makefile
+++ b/tests/migration/Makefile
@@ -27,8 +27,8 @@ endef
all: x86-a-b-bootblock.h
-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 0000000000..a618fe069e
--- /dev/null
+++ b/tests/migration/migration-test.h
@@ -0,0 +1,19 @@
+/*
+ * 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_START (1 * 1024 * 1024)
+#define TEST_MEM_END (100 * 1024 * 1024)
+#define TEST_MEM_PAGE_SIZE 4096
+
+/* PPC */
+#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
+
+#endif /* _TEST_MIGRATION_H_ */
+
diff --git a/tests/migration/x86-a-b-bootblock.s b/tests/migration/x86-a-b-bootblock.S
similarity index 94%
rename from tests/migration/x86-a-b-bootblock.s
rename to tests/migration/x86-a-b-bootblock.S
index 98dbfab084..08b51f9e7f 100644
--- a/tests/migration/x86-a-b-bootblock.s
+++ b/tests/migration/x86-a-b-bootblock.S
@@ -12,6 +12,7 @@
#
# Author: dgilbert@redhat.com
+#include "migration-test.h"
.code16
.org 0x7c00
@@ -45,11 +46,11 @@ start: # at 0x7c00 ?
mov $0, %bl
mainloop:
# Start from 1MB
- mov $(1024*1024),%eax
+ mov $TEST_MEM_START,%eax
innerloop:
incb (%eax)
- add $4096,%eax
- cmp $(100*1024*1024),%eax
+ add $TEST_MEM_PAGE_SIZE,%eax
+ cmp $TEST_MEM_END,%eax
jl innerloop
inc %bl
diff --git a/tests/migration/x86-a-b-bootblock.h b/tests/migration/x86-a-b-bootblock.h
index 9e8e2e028b..44e4b99506 100644
--- a/tests/migration/x86-a-b-bootblock.h
+++ b/tests/migration/x86-a-b-bootblock.h
@@ -1,5 +1,5 @@
/* This file is automatically generated from
- * tests/migration/x86-a-b-bootblock.s, edit that and then run
+ * tests/migration/x86-a-b-bootblock.S, edit that and then run
* "make x86-a-b-bootblock.h" inside tests/migration to update,
* and then remember to send both in your patch submission.
*/
--
2.14.3
next prev parent reply other threads:[~2018-02-22 4:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 4:44 [Qemu-devel] [PATCH V4 0/3] tests: Add migration test for aarch64 Wei Huang
2018-02-22 4:44 ` [Qemu-devel] [PATCH V4 1/3] tests/migration: Convert the boot block compilation script into Makefile Wei Huang
2018-02-22 9:15 ` Andrew Jones
2018-02-22 4:44 ` Wei Huang [this message]
2018-02-22 9:07 ` [Qemu-devel] [PATCH V4 2/3] tests/migration: Add migration-test header file Andrew Jones
2018-02-22 4:44 ` [Qemu-devel] [PATCH V4 3/3] tests: Add migration test for aarch64 Wei Huang
2018-02-22 9:00 ` Andrew Jones
2018-02-23 22:13 ` Wei Huang
2018-02-26 9:03 ` Andrew Jones
2018-02-26 18:22 ` Wei Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180222044417.15561-3-wei@redhat.com \
--to=wei@redhat.com \
--cc=dgilbert@redhat.com \
--cc=drjones@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.