提交 68e26a9e 编写于 作者: A Andrea Bolognani

qemu: Make most qemuDomainMachine*() functions static

Ideally we'd make all of them static, but there are a few
cases where we don't have a virDomainDef instance handy and
so they are the only option.

For the few ones we're forced to keep exporting, document
through comments that the alternative is preferred.
Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
上级 8a8b1471
...@@ -9875,7 +9875,7 @@ qemuFindAgentConfig(virDomainDefPtr def) ...@@ -9875,7 +9875,7 @@ qemuFindAgentConfig(virDomainDefPtr def)
} }
bool static bool
qemuDomainMachineIsQ35(const char *machine, qemuDomainMachineIsQ35(const char *machine,
const virArch arch) const virArch arch)
{ {
...@@ -9887,7 +9887,7 @@ qemuDomainMachineIsQ35(const char *machine, ...@@ -9887,7 +9887,7 @@ qemuDomainMachineIsQ35(const char *machine,
} }
bool static bool
qemuDomainMachineIsI440FX(const char *machine, qemuDomainMachineIsI440FX(const char *machine,
const virArch arch) const virArch arch)
{ {
...@@ -9902,7 +9902,7 @@ qemuDomainMachineIsI440FX(const char *machine, ...@@ -9902,7 +9902,7 @@ qemuDomainMachineIsI440FX(const char *machine,
} }
bool static bool
qemuDomainMachineIsS390CCW(const char *machine, qemuDomainMachineIsS390CCW(const char *machine,
const virArch arch) const virArch arch)
{ {
...@@ -9913,6 +9913,8 @@ qemuDomainMachineIsS390CCW(const char *machine, ...@@ -9913,6 +9913,8 @@ qemuDomainMachineIsS390CCW(const char *machine,
} }
/* You should normally avoid this function and use
* qemuDomainIsARMVirt() instead. */
bool bool
qemuDomainMachineIsARMVirt(const char *machine, qemuDomainMachineIsARMVirt(const char *machine,
const virArch arch) const virArch arch)
...@@ -9930,7 +9932,7 @@ qemuDomainMachineIsARMVirt(const char *machine, ...@@ -9930,7 +9932,7 @@ qemuDomainMachineIsARMVirt(const char *machine,
} }
bool static bool
qemuDomainMachineIsRISCVVirt(const char *machine, qemuDomainMachineIsRISCVVirt(const char *machine,
const virArch arch) const virArch arch)
{ {
...@@ -9945,6 +9947,8 @@ qemuDomainMachineIsRISCVVirt(const char *machine, ...@@ -9945,6 +9947,8 @@ qemuDomainMachineIsRISCVVirt(const char *machine,
} }
/* You should normally avoid this function and use
* qemuDomainIsPSeries() instead. */
bool bool
qemuDomainMachineIsPSeries(const char *machine, qemuDomainMachineIsPSeries(const char *machine,
const virArch arch) const virArch arch)
...@@ -9960,6 +9964,8 @@ qemuDomainMachineIsPSeries(const char *machine, ...@@ -9960,6 +9964,8 @@ qemuDomainMachineIsPSeries(const char *machine,
} }
/* You should normally avoid this function and use
* qemuDomainHasBuiltinIDE() instead. */
bool bool
qemuDomainMachineHasBuiltinIDE(const char *machine, qemuDomainMachineHasBuiltinIDE(const char *machine,
const virArch arch) const virArch arch)
...@@ -9971,7 +9977,7 @@ qemuDomainMachineHasBuiltinIDE(const char *machine, ...@@ -9971,7 +9977,7 @@ qemuDomainMachineHasBuiltinIDE(const char *machine,
} }
bool static bool
qemuDomainMachineNeedsFDC(const char *machine, qemuDomainMachineNeedsFDC(const char *machine,
const virArch arch) const virArch arch)
{ {
......
...@@ -828,22 +828,14 @@ void qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def, ...@@ -828,22 +828,14 @@ void qemuDomainMemoryDeviceAlignSize(virDomainDefPtr def,
virDomainChrDefPtr qemuFindAgentConfig(virDomainDefPtr def); virDomainChrDefPtr qemuFindAgentConfig(virDomainDefPtr def);
bool qemuDomainMachineIsQ35(const char *machine, /* You should normally avoid these functions and use the variant that
const virArch arch); * doesn't have "Machine" in the name instead. */
bool qemuDomainMachineIsI440FX(const char *machine,
const virArch arch);
bool qemuDomainMachineIsS390CCW(const char *machine,
const virArch arch);
bool qemuDomainMachineIsARMVirt(const char *machine, bool qemuDomainMachineIsARMVirt(const char *machine,
const virArch arch); const virArch arch);
bool qemuDomainMachineIsRISCVVirt(const char *machine,
const virArch arch);
bool qemuDomainMachineIsPSeries(const char *machine, bool qemuDomainMachineIsPSeries(const char *machine,
const virArch arch); const virArch arch);
bool qemuDomainMachineHasBuiltinIDE(const char *machine, bool qemuDomainMachineHasBuiltinIDE(const char *machine,
const virArch arch); const virArch arch);
bool qemuDomainMachineNeedsFDC(const char *machine,
const virArch arch);
bool qemuDomainIsQ35(const virDomainDef *def); bool qemuDomainIsQ35(const virDomainDef *def);
bool qemuDomainIsI440FX(const virDomainDef *def); bool qemuDomainIsI440FX(const virDomainDef *def);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册