NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use qemuDomainMachineIs helpers when adding default devices

Browse Source 
Do not duplicate the string comparisons by writing them twice.
This commit is contained in:
Ján Tomko 2016-05-03 10:33:56 +02:00
parent 6ee78d334a
commit 90f27f07ed
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_domain.c
View File

@ -1740,8 +1740,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
addDefaultUSB = false; addDefaultUSB = false;
break; break;
} }
if (STRPREFIX(def->os.machine, "pc-q35") || if (qemuDomainMachineIsQ35(def)) {
STREQ(def->os.machine, "q35")) {
addPCIeRoot = true; addPCIeRoot = true;
addImplicitSATA = true; addImplicitSATA = true;
@ -1754,11 +1753,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
addDefaultUSB = false; addDefaultUSB = false;
break; break;
} }
if (!STRPREFIX(def->os.machine, "pc-0.") && if (!qemuDomainMachineIsI440FX(def))
!STRPREFIX(def->os.machine, "pc-1.") &&
!STRPREFIX(def->os.machine, "pc-i440") &&
STRNEQ(def->os.machine, "pc") &&
!STRPREFIX(def->os.machine, "rhel"))
break; break;
addPCIRoot = true; addPCIRoot = true;
break; break;