openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: move qemuDomainMachineIs{I440FX,Q35} 

Move common functions being used by the following
virQEMUCapsSupportsVmport commit.
This commit is contained in:
Marc-André Lureau 2015-04-28 11:21:52 +02:00
parent 384a06f5f2
commit 46ae6b7fc7
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_command.c
View File

@ -1955,25 +1955,6 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
} }
static bool
qemuDomainMachineIsQ35(virDomainDefPtr def)
{
return (STRPREFIX(def->os.machine, "pc-q35") ||
STREQ(def->os.machine, "q35"));
}
static bool
qemuDomainMachineIsI440FX(virDomainDefPtr def)
{
return (STREQ(def->os.machine, "pc") ||
STRPREFIX(def->os.machine, "pc-0.") ||
STRPREFIX(def->os.machine, "pc-1.") ||
STRPREFIX(def->os.machine, "pc-i440") ||
STRPREFIX(def->os.machine, "rhel"));
}
static int static int
qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,

19
src/qemu/qemu_domain.c
View File

@ -3078,3 +3078,22 @@ qemuFindAgentConfig(virDomainDefPtr def)
return config; return config;
} }
bool
qemuDomainMachineIsQ35(const virDomainDef *def)
{
return (STRPREFIX(def->os.machine, "pc-q35") ||
STREQ(def->os.machine, "q35"));
}
bool
qemuDomainMachineIsI440FX(const virDomainDef *def)
{
return (STREQ(def->os.machine, "pc") ||
STRPREFIX(def->os.machine, "pc-0.") ||
STRPREFIX(def->os.machine, "pc-1.") ||
STRPREFIX(def->os.machine, "pc-i440") ||
STRPREFIX(def->os.machine, "rhel"));
}

3
src/qemu/qemu_domain.h
View File

@ -438,4 +438,7 @@ void qemuDomainMemoryDeviceAlignSize(virDomainMemoryDefPtr mem);
virDomainChrSourceDefPtr qemuFindAgentConfig(virDomainDefPtr def); virDomainChrSourceDefPtr qemuFindAgentConfig(virDomainDefPtr def);
bool qemuDomainMachineIsQ35(const virDomainDef *def);
bool qemuDomainMachineIsI440FX(const virDomainDef *def);
#endif /* __QEMU_DOMAIN_H__ */ #endif /* __QEMU_DOMAIN_H__ */