diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 583bc11f166cf11e252fea8d780a9b090ac5c100..5bfbf62648d8832b988adb304c9189d25d9707f7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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 qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2478ad7eef4e69b8494e43487827297359d4a250..fa8229ffcdb926fb5c0c290bc8f1bc6f9a0b3b94 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3078,3 +3078,22 @@ qemuFindAgentConfig(virDomainDefPtr def) 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")); +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index bc426834f55cfe752a0b56b71be47394ba240411..3162f84e169ebd6088f5e4f27bb30cc12adf811e 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -438,4 +438,7 @@ void qemuDomainMemoryDeviceAlignSize(virDomainMemoryDefPtr mem); virDomainChrSourceDefPtr qemuFindAgentConfig(virDomainDefPtr def); +bool qemuDomainMachineIsQ35(const virDomainDef *def); +bool qemuDomainMachineIsI440FX(const virDomainDef *def); + #endif /* __QEMU_DOMAIN_H__ */