summaryrefslogtreecommitdiffstats
path: root/tests/migration-test.c
diff options
context:
space:
mode:
authorPeter Maydell2018-09-25 19:09:52 +0200
committerPeter Maydell2018-09-25 19:09:52 +0200
commit866ba8385466a1a74ea4729e2a247c4c75584166 (patch)
tree77bd2970de195cd53ff15c70ba3b08626bae788f /tests/migration-test.c
parentMerge remote-tracking branch 'remotes/xanclic/tags/pull-block-2018-09-25' int... (diff)
parentRevert "check: Move VMXNET3 test to common" (diff)
downloadqemu-866ba8385466a1a74ea4729e2a247c4c75584166.tar.gz
qemu-866ba8385466a1a74ea4729e2a247c4c75584166.tar.xz
qemu-866ba8385466a1a74ea4729e2a247c4c75584166.zip
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-09-25' into staging
- Deprecate the usage of a network backend via "name" instead of "id" - Deprecate the "enforce-config-section" machine parameter - Re-enable the wdt_ib700, endianness and vmxnet3 qtests - Some trivial fixes and doc update patches that crossed my way # gpg: Signature made Tue 25 Sep 2018 16:58:42 BST # gpg: using RSA key 2ED9D774FE702DB5 # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" # gpg: aka "Thomas Huth <thuth@redhat.com>" # gpg: aka "Thomas Huth <huth@tuxfamily.org>" # gpg: aka "Thomas Huth <th.huth@posteo.de>" # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2018-09-25: Revert "check: Move VMXNET3 test to common" Revert "check: Move endianess test to common" Revert "check: Move wdt_ib700 test to common" tests/migration: Speed up the test on ppc64 hw/qdev-core: Fix description of instance_init qdev: fix a typo in comment docs: Fix some typos (most found by codespell) trivial: Make bios files and source files non-executable memfd: fix possible usage of the uninitialized file descriptor hw/core/machine: Officially deprecate the enforce-config-section parameter net/slirp: Deprecate the [hub_id name] parameter tuple net: Deprecate the "name" parameter of -net Makefile: Add missing dependency for qemu-deprecated.texi Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/migration-test.c')
-rw-r--r--tests/migration-test.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 0e687b7512..967e3d0856 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -438,11 +438,11 @@ static int test_migrate_start(QTestState **from, QTestState **to,
" -incoming %s",
accel, tmpfs, bootpath, uri);
} else if (strcmp(arch, "ppc64") == 0) {
- cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
+ cmd_src = g_strdup_printf("-machine accel=%s -m 256M -nodefaults"
" -name source,debug-threads=on"
" -serial file:%s/src_serial"
- " -prom-env '"
- "boot-command=hex .\" _\" begin %x %x "
+ " -prom-env 'use-nvramrc?=true' -prom-env "
+ "'nvramrc=hex .\" _\" begin %x %x "
"do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
"until'", accel, tmpfs, end_address,
start_address);