diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-12 11:00:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-12 11:00:07 +0100 |
| commit | 05b656dcaa62bd91c97bcfd335a2802f2a2d678d (patch) | |
| tree | 66e05da35ffb20d3229130fb7ec3ade8bbb55c86 /tests/migration/migration-test.h | |
| parent | 75e50c80e051423a6f55a34ee4a1eec842444a5b (diff) | |
| parent | 36bd9e3c8b049cb9124e04ed8bf8f9451d63de03 (diff) | |
| download | focaccia-qemu-05b656dcaa62bd91c97bcfd335a2802f2a2d678d.tar.gz focaccia-qemu-05b656dcaa62bd91c97bcfd335a2802f2a2d678d.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181011a' into staging
Migration pull 2018-10-11 With one bonus HMP fix. # gpg: Signature made Thu 11 Oct 2018 20:23:12 BST # gpg: using RSA key 0516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-migration-20181011a: migration-test: Only generate a single target architecture qmp, hmp: make subsystem/system-vendor identities optional vhost-user: Don't ask for reply on postcopy mem table set vhost-user: Fix userfaultfd leak migration: Stop postcopy fault thread before notifying tests/migration: Enable the migration test on s390x, too tests: Add migration test for aarch64 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/migration/migration-test.h')
| -rw-r--r-- | tests/migration/migration-test.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/migration/migration-test.h b/tests/migration/migration-test.h index c4c0c526b6..03c252368a 100644 --- a/tests/migration/migration-test.h +++ b/tests/migration/migration-test.h @@ -14,8 +14,21 @@ #define X86_TEST_MEM_START (1 * 1024 * 1024) #define X86_TEST_MEM_END (100 * 1024 * 1024) +/* S390 */ +#define S390_TEST_MEM_START (1 * 1024 * 1024) +#define S390_TEST_MEM_END (100 * 1024 * 1024) + /* PPC */ #define PPC_TEST_MEM_START (1 * 1024 * 1024) #define PPC_TEST_MEM_END (100 * 1024 * 1024) +/* ARM */ +#define ARM_TEST_MEM_START (0x40000000 + 1 * 1024 * 1024) +#define ARM_TEST_MEM_END (0x40000000 + 100 * 1024 * 1024) +#define ARM_MACH_VIRT_UART 0x09000000 +/* AArch64 kernel load address is 0x40080000, and the test memory starts at + * 0x40100000. So the maximum allowable kernel size is 512KB. + */ +#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024) + #endif /* _TEST_MIGRATION_H_ */ |