External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Add arch checks to qemuDomainMachine*()

Browse Source 
There is very little overlap in the machine types available
on different architectures, so broadly speaking checking the
machine type is usually enough; regardless, it's better to
check the architecture as well.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-11-28 16:56:35 +01:00
parent 9a5ce5cb29
commit aa2da99ee8
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_domain.c
View File

@ -9877,8 +9877,11 @@ qemuFindAgentConfig(virDomainDefPtr def)
bool
qemuDomainMachineIsQ35(const char *machine,
const virArch arch ATTRIBUTE_UNUSED)
const virArch arch)
{
if (!ARCH_IS_X86(arch))
return false;
return (STRPREFIX(machine, "pc-q35-") ||
STREQ(machine, "q35"));
}
@ -9886,8 +9889,11 @@ qemuDomainMachineIsQ35(const char *machine,
bool
qemuDomainMachineIsI440FX(const char *machine,
const virArch arch ATTRIBUTE_UNUSED)
const virArch arch)
{
if (!ARCH_IS_X86(arch))
return false;
return (STREQ(machine, "pc") ||
STRPREFIX(machine, "pc-0.") ||
STRPREFIX(machine, "pc-1.") ||
@ -9898,8 +9904,11 @@ qemuDomainMachineIsI440FX(const char *machine,
bool
qemuDomainMachineIsS390CCW(const char *machine,
const virArch arch ATTRIBUTE_UNUSED)
const virArch arch)
{
if (!ARCH_IS_S390(arch))
return false;
return STRPREFIX(machine, "s390-ccw");
}
@ -9964,10 +9973,13 @@ qemuDomainMachineHasBuiltinIDE(const char *machine,
bool
qemuDomainMachineNeedsFDC(const char *machine,
const virArch arch ATTRIBUTE_UNUSED)
const virArch arch)
{
const char *p = STRSKIP(machine, "pc-q35-");
if (!ARCH_IS_X86(arch))
return false;
if (p) {
if (STRPREFIX(p, "1.") ||
STREQ(p, "2.0") ||