External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Fix machine type version check for 'isa-fdc' usage

Browse Source 
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 <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-08-09 12:35:41 +02:00
parent b8936d2655
commit 17dff35848
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_domain.c
View File

@ -9427,10 +9427,10 @@ qemuDomainMachineNeedsFDC(const char *machine)
if (p) { if (p) {
if (STRPREFIX(p, "1.") || if (STRPREFIX(p, "1.") ||
STRPREFIX(p, "2.0") || STREQ(p, "2.0") ||
STRPREFIX(p, "2.1") || STREQ(p, "2.1") ||
STRPREFIX(p, "2.2") || STREQ(p, "2.2") ||
STRPREFIX(p, "2.3")) STREQ(p, "2.3"))
return false; return false;
return true; return true;
} }

4
tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
View File

@ -29,9 +29,7 @@ addr=0x1 \
-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \ -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/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 \ -drive file=/tmp/data.img,format=qcow2,if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveA=drive-fdc0-0-0 \ -device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1,driveB=drive-fdc0-0-1 \
-global isa-fdc.bootindexA=1 \
-global isa-fdc.driveB=drive-fdc0-0-1 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \ resourcecontrol=deny \
-msg timestamp=on -msg timestamp=on