From 0bb10b95f1f2baa363eda2f675cb347502617aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Thu, 23 Nov 2017 16:06:54 +0100 Subject: [PATCH] Use correct device in balloon_hotplug test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On s390x the balloon device is virtio-balloon-ccw and not -pci. Signed-off-by: Lukáš Doktor --- qemu/tests/balloon_hotplug.py | 3 ++- qemu/tests/cfg/balloon_hotplug.cfg | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/qemu/tests/balloon_hotplug.py b/qemu/tests/balloon_hotplug.py index f26e661e..6781201c 100644 --- a/qemu/tests/balloon_hotplug.py +++ b/qemu/tests/balloon_hotplug.py @@ -44,12 +44,13 @@ def run(test, params, env): err = "" vm = env.get_vm(params["main_vm"]) vm.verify_alive() + balloon_device = params.get("ballon_device", "virtio-balloon-pci") error_context.context("Hotplug and unplug balloon device in a loop", logging.info) for i in xrange(int(params.get("balloon_repeats", 3))): vm.devices.set_dirty() - new_dev = qdevices.QDevice("virtio-balloon-pci", + new_dev = qdevices.QDevice(balloon_device, {'id': 'balloon%d' % idx}, parent_bus={'aobject': 'pci.0'}) diff --git a/qemu/tests/cfg/balloon_hotplug.cfg b/qemu/tests/cfg/balloon_hotplug.cfg index e55fefd3..1dfce90e 100644 --- a/qemu/tests/cfg/balloon_hotplug.cfg +++ b/qemu/tests/cfg/balloon_hotplug.cfg @@ -16,6 +16,9 @@ test_tags = "evict enlarge" balloon_type_evict = evict balloon_type_enlarge = enlarge + balloon_device = virtio-balloon-pci + s390x: + balloon_device = virtio-balloon-ccw variants: - @default: balloon_repeats = 100 -- GitLab