diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2018-10-13 02:40:30 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2018-10-26 22:03:21 +0800 |
| commit | 31719c37f500a62aeb739ddeea87db89e8c2fcb1 (patch) | |
| tree | 8b07c98031cbe20f67eada2779b34848674646f5 /tests/vm/basevm.py | |
| parent | f5d3d21847c2bd5840404f77e5d2463917d5a4ba (diff) | |
| download | focaccia-qemu-31719c37f500a62aeb739ddeea87db89e8c2fcb1.tar.gz focaccia-qemu-31719c37f500a62aeb739ddeea87db89e8c2fcb1.zip | |
tests/vm: Add a BaseVM::arch property
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é <f4bug@amsat.org> Message-Id: <20181013004034.6968-6-f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/vm/basevm.py')
| -rwxr-xr-x | tests/vm/basevm.py | 4 |
1 files changed, 3 insertions, 1 deletions
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() |