From 26cf847b3eadf23f4d556437f219e39eb31d2626 Mon Sep 17 00:00:00 2001 From: Till Maas Date: May 28 2019 06:30:10 +0000 Subject: qcow2 inventory: Disable vga only on PPC platforms Adding `-vga none` to qemu breaks using the inventory script with RHEL 6 images. It was added to fix something on PPC platforms, therefore add it only for these platforms. --- diff --git a/inventory/standard-inventory-qcow2 b/inventory/standard-inventory-qcow2 index 7a7859f..966c6dc 100755 --- a/inventory/standard-inventory-qcow2 +++ b/inventory/standard-inventory-qcow2 @@ -305,11 +305,14 @@ def start_qemu(image, cloudinit, portrange=(2222, 5555)): "-enable-kvm", # Do not display video output "-display", "none", - # Disable VGA card to avoid crash on ppc with PR - # https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg07070.html - "-vga", "none" ] + # Add platform specific settings: + if "ppc" in platform.machine(): + # Disable VGA card to avoid crash on ppc with PR + # https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg07070.html + qemu_common_params += ["-vga", "none"] + if platform.machine() == "aarch64": # Emulate the same generic interrupt controller as the host system has qemu_M_param = ["-M", "virt,gic_version=host"]