[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/41] tests: Migration ppc now inlines its program
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 04/41] tests: Migration ppc now inlines its program |
Date: |
Wed, 9 May 2018 13:23:29 +0200 |
No need to write it to a file. Just need a proper firmware O:-)
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
tests/migration-test.c | 41 +++++------------------------------------
1 file changed, 5 insertions(+), 36 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 70a565ea2d..994ba86e3b 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -19,9 +19,6 @@
#include "qemu/sockets.h"
#include "chardev/char.h"
#include "sysemu/sysemu.h"
-#include "hw/nvram/chrp_nvram.h"
-
-#define MIN_NVRAM_SIZE 8192 /* from spapr_nvram.c */
const unsigned start_address = 1024 * 1024;
const unsigned end_address = 100 * 1024 * 1024;
@@ -92,36 +89,6 @@ static void init_bootfile_x86(const char *bootpath)
fclose(bootfile);
}
-static void init_bootfile_ppc(const char *bootpath)
-{
- FILE *bootfile;
- char buf[MIN_NVRAM_SIZE];
- ChrpNvramPartHdr *header = (ChrpNvramPartHdr *)buf;
-
- memset(buf, 0, MIN_NVRAM_SIZE);
-
- /* Create a "common" partition in nvram to store boot-command property */
-
- header->signature = CHRP_NVPART_SYSTEM;
- 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
- */
-
- sprintf(buf + 16,
- "boot-command=hex .\" _\" begin %x %x do i c@ 1 + i c! 1000 +loop "
- ".\" B\" 0 until", end_address, start_address);
-
- /* Write partition to the NVRAM file */
-
- bootfile = fopen(bootpath, "wb");
- g_assert_cmpint(fwrite(buf, MIN_NVRAM_SIZE, 1, bootfile), ==, 1);
- fclose(bootfile);
-}
-
/*
* Wait for some output in the serial output file,
* we get an 'A' followed by an endless string of 'B's
@@ -422,12 +389,14 @@ static void test_migrate_start(QTestState **from,
QTestState **to,
if (access("/sys/module/kvm_hv", F_OK)) {
accel = "tcg";
}
- init_bootfile_ppc(bootpath);
cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
" -name source,debug-threads=on"
" -serial file:%s/src_serial"
- " -drive file=%s,if=pflash,format=raw",
- accel, tmpfs, bootpath);
+ " -prom-env '"
+ "boot-command=hex .\" _\" begin %x %x "
+ "do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
+ "until'", accel, tmpfs, end_address,
+ start_address);
cmd_dst = g_strdup_printf("-machine accel=%s -m 256M"
" -name target,debug-threads=on"
" -serial file:%s/dest_serial"
--
2.17.0
- [Qemu-devel] [PULL 00/41] Migration queue, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 01/41] migration: fix saving normal page even if it's been compressed, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 02/41] tests: Add migration precopy test, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 03/41] tests: Add migration xbzrle test, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 04/41] tests: Migration ppc now inlines its program,
Juan Quintela <=
- [Qemu-devel] [PULL 06/41] migration: Introduce multifd_recv_new_channel(), Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 05/41] migration: Set error state in case of error, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 07/41] migration: terminate_* can be called for other threads, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 08/41] migration: Be sure all recv channels are created, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 09/41] migration: Export functions to create send channels, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 10/41] migration: Create multifd channels, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 11/41] migration: Delay start of migration main routines, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 12/41] migration: Transmit initial package through the multifd channels, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 13/41] migration: Define MultifdRecvParams sooner, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 15/41] migration: new postcopy-pause state, Juan Quintela, 2018/05/09