[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/8] tests/vm: Add a BaseVM::arch property
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 5/8] tests/vm: Add a BaseVM::arch property |
Date: |
Sat, 13 Oct 2018 02:40:30 +0200 |
The 'arch' property gives a hint on which architecture the guest image runs.
This can be use to select the correct QEMU binary path.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/vm/basevm.py | 4 +++-
tests/vm/centos | 1 +
tests/vm/freebsd | 1 +
tests/vm/netbsd | 1 +
tests/vm/openbsd | 1 +
tests/vm/ubuntu.i386 | 1 +
6 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 81a1cb05dd..b2e0de2022 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -42,6 +42,8 @@ class BaseVM(object):
BUILD_SCRIPT = ""
# The guest name, to be overridden by subclasses
name = "#base"
+ # The guest architecture, to be overridden by subclasses
+ arch = "#arch"
def __init__(self, debug=False, vcpus=None):
self._guest = None
self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
@@ -151,7 +153,7 @@ class BaseVM(object):
"-device", "virtio-blk,drive=drive0,bootindex=0"]
args += self._data_args + extra_args
logging.debug("QEMU args: %s", " ".join(args))
- qemu_bin = os.environ.get("QEMU", "qemu-system-x86_64")
+ qemu_bin = os.environ.get("QEMU", "qemu-system-" + self.arch)
guest = QEMUMachine(binary=qemu_bin, args=args)
try:
guest.launch()
diff --git a/tests/vm/centos b/tests/vm/centos
index afd560c564..daa2dbca03 100755
--- a/tests/vm/centos
+++ b/tests/vm/centos
@@ -19,6 +19,7 @@ import time
class CentosVM(basevm.BaseVM):
name = "centos"
+ arch = "x86_64"
BUILD_SCRIPT = """
set -e;
cd $(mktemp -d);
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index b6983127d0..19a3729172 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -18,6 +18,7 @@ import basevm
class FreeBSDVM(basevm.BaseVM):
name = "freebsd"
+ arch = "x86_64"
BUILD_SCRIPT = """
set -e;
rm -rf /var/tmp/qemu-test.*
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index a4e25820d5..fac6a7ce51 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -18,6 +18,7 @@ import basevm
class NetBSDVM(basevm.BaseVM):
name = "netbsd"
+ arch = "x86_64"
BUILD_SCRIPT = """
set -e;
rm -rf /var/tmp/qemu-test.*
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 52500ee52b..cfe0572c59 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -18,6 +18,7 @@ import basevm
class OpenBSDVM(basevm.BaseVM):
name = "openbsd"
+ arch = "x86_64"
BUILD_SCRIPT = """
set -e;
rm -rf /var/tmp/qemu-test.*
diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386
index 3f6ed48b74..1b7e1ab8f0 100755
--- a/tests/vm/ubuntu.i386
+++ b/tests/vm/ubuntu.i386
@@ -19,6 +19,7 @@ import time
class UbuntuX86VM(basevm.BaseVM):
name = "ubuntu.i386"
+ arch = "i386"
BUILD_SCRIPT = """
set -e;
cd $(mktemp -d);
--
2.19.1
- [Qemu-devel] [PATCH v3 0/8] tests/vm: Improvements when KVM is not available, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 1/8] tests/vm: Extract the kvm_available() handy function, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 2/8] tests/vm: Do not abuse parallelism when KVM is not available, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 5/8] tests/vm: Add a BaseVM::arch property,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 3/8] tests/vm: Do not use the -smp option with a single cpu, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 4/8] tests/vm: Display remaining seconds to wait for a VM to start, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 6/8] tests/vm: Let kvm_available() work in cross environments, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 7/8] tests/vm: Do not use -enable-kvm if HOST != TARGET architecture, Philippe Mathieu-Daudé, 2018/10/12
- [Qemu-devel] [PATCH v3 8/8] tests/vm: Do not abuse parallelism when HOST != TARGET architecture, Philippe Mathieu-Daudé, 2018/10/12
- Re: [Qemu-devel] [PATCH v3 0/8] tests/vm: Improvements when KVM is not available, Richard Henderson, 2018/10/15
- Re: [Qemu-devel] [PATCH v3 0/8] tests/vm: Improvements when KVM is not available, Fam Zheng, 2018/10/22