[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/13] tests/prom-env: Make test independent of globa
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 09/13] tests/prom-env: Make test independent of global_qtest |
Date: |
Mon, 17 Dec 2018 17:21:26 +0100 |
global_qtest is only needed here for one readl(). Let's replace it
with qtest_readl() and we can remove the global_qtest variable here.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
tests/prom-env-test.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c
index 198d007..4821254 100644
--- a/tests/prom-env-test.c
+++ b/tests/prom-env-test.c
@@ -25,14 +25,14 @@
#define MAGIC 0xcafec0de
#define ADDRESS 0x4000
-static void check_guest_memory(void)
+static void check_guest_memory(QTestState *qts)
{
uint32_t signature;
int i;
/* Poll until code has run and modified memory. Wait at most 600 seconds */
for (i = 0; i < 60000; ++i) {
- signature = readl(ADDRESS);
+ signature = qtest_readl(qts, ADDRESS);
if (signature == MAGIC) {
break;
}
@@ -45,17 +45,16 @@ static void check_guest_memory(void)
static void test_machine(const void *machine)
{
const char *extra_args;
+ QTestState *qts;
/* The pseries firmware boots much faster without the default devices */
extra_args = strcmp(machine, "pseries") == 0 ? "-nodefaults" : "";
- global_qtest = qtest_initf("-M %s,accel=tcg %s "
- "-prom-env 'use-nvramrc?=true' "
- "-prom-env 'nvramrc=%x %x l!' ",
- (const char *)machine, extra_args,
- MAGIC, ADDRESS);
- check_guest_memory();
- qtest_quit(global_qtest);
+ qts = qtest_initf("-M %s,accel=tcg %s -prom-env 'use-nvramrc?=true' "
+ "-prom-env 'nvramrc=%x %x l!' ", (const char *)machine,
+ extra_args, MAGIC, ADDRESS);
+ check_guest_memory(qts);
+ qtest_quit(qts);
}
static void add_tests(const char *machines[])
--
1.8.3.1
- [Qemu-devel] [PULL 00/13] qtest patches, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 01/13] tests/libqos/pci: Make PCI access functions independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 02/13] ivshmem-test: Drop dependence on global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 04/13] tests/vmgenid: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 03/13] tests/acpi-utils: Drop dependence on global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 05/13] tests/pvpanic: Make the pvpanic test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 06/13] tests/boot-serial: Get rid of global_qtest variable, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 08/13] tests/machine-none: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 09/13] tests/prom-env: Make test independent of global_qtest,
Thomas Huth <=
- [Qemu-devel] [PULL 07/13] tests/test-filter: Make tests independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 10/13] tests/pxe: Make test independent of global_qtest, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 12/13] tests: acpi: remove not used ACPI_READ_GENERIC_ADDRESS macro, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 11/13] tests: Exit boot-serial-test loop if child dies, Thomas Huth, 2018/12/17
- [Qemu-devel] [PULL 13/13] tests/bios-tables-test: Sanitize test verbose output, Thomas Huth, 2018/12/17
- Re: [Qemu-devel] [PULL 00/13] qtest patches, Peter Maydell, 2018/12/18