From patchwork Fri Feb 23 21:58:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 10239903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5ECC56056E for ; Fri, 23 Feb 2018 22:00:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D7E929A12 for ; Fri, 23 Feb 2018 22:00:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4219029A14; Fri, 23 Feb 2018 22:00:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B750C29A12 for ; Fri, 23 Feb 2018 22:00:23 +0000 (UTC) Received: from localhost ([::1]:47297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLOA-0002Xl-4D for patchwork-qemu-devel@patchwork.kernel.org; Fri, 23 Feb 2018 17:00:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epLN5-0001Zz-AV for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epLN2-0007YB-6T for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58340 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epLN2-0007Ww-1a for qemu-devel@nongnu.org; Fri, 23 Feb 2018 16:59:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D191A84221; Fri, 23 Feb 2018 21:59:06 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-241.rdu2.redhat.com [10.10.125.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73441213AEED; Fri, 23 Feb 2018 21:59:06 +0000 (UTC) From: Wei Huang To: qemu-devel@nongnu.org Date: Fri, 23 Feb 2018 15:58:57 -0600 Message-Id: <20180223215858.16987-4-wei@redhat.com> In-Reply-To: <20180223215858.16987-1-wei@redhat.com> References: <20180223215858.16987-1-wei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 21:59:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 21:59:06 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'wei@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH V5 3/4] tests/migration: Add migration-test header file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch moves the settings related migration-test from the migration-test.c file to a seperate header file. It also renames the x86-a-b-bootblock.s file extension from .s to .S, allowing gcc pre-processor to include the C-style header file correctly. Signed-off-by: Wei Huang Reviewed-by: Andrew Jones --- tests/migration-test.c | 28 +++++++++++----------- tests/migration/Makefile | 4 ++-- tests/migration/migration-test.h | 18 ++++++++++++++ .../{x86-a-b-bootblock.s => 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 $@ diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h new file mode 100644 index 0000000000..48b59b3281 --- /dev/null +++ b/tests/migration/migration-test.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2018 Red Hat, Inc. and/or its affiliates + * + * This work is licensed under the terms of the GNU GPL, version 2 or 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. */