From 17dff3584855e9469bd14925fe655ff2e930ab0f Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 9 Aug 2018 12:35:41 +0200 Subject: [PATCH] qemu: domain: Fix machine type version check for 'isa-fdc' usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting from pc-q35-2.4 the floppy controller is not enabled by default. Fix the version check so that it does not match 2.11 as being 2.1. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 8 ++++---- .../disk-floppy-q35-2_11.x86_64-latest.args | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a5d81f863b..e5f055f203 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9427,10 +9427,10 @@ qemuDomainMachineNeedsFDC(const char *machine) if (p) { if (STRPREFIX(p, "1.") || - STRPREFIX(p, "2.0") || - STRPREFIX(p, "2.1") || - STRPREFIX(p, "2.2") || - STRPREFIX(p, "2.3")) + STREQ(p, "2.0") || + STREQ(p, "2.1") || + STREQ(p, "2.2") || + STREQ(p, "2.3")) return false; return true; } diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index e38f7040ec..17abe9a989 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -29,9 +29,7 @@ addr=0x1 \ -device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \ -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \ -drive file=/tmp/data.img,format=qcow2,if=none,id=drive-fdc0-0-1 \ --global isa-fdc.driveA=drive-fdc0-0-0 \ --global isa-fdc.bootindexA=1 \ --global isa-fdc.driveB=drive-fdc0-0-1 \ +-device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1,driveB=drive-fdc0-0-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on