[libvirt] [PATCH 09/12] qemu: Use ARCH_IS_X86 in qemuMonitorJSONGetGuestCPU
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_monitor_json.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 3a29f1aa7..733daf096 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6741,22 +6741,19 @@ qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
{
int rc;
- switch (arch) {
- case VIR_ARCH_X86_64:
- case VIR_ARCH_I686:
+ if (ARCH_IS_X86(arch)) {
if ((rc = qemuMonitorJSONCheckCPUx86(mon)) < 0)
return -1;
else if (!rc)
return -2;
return qemuMonitorJSONGetCPUx86Data(mon, "feature-words", data);
-
- default:
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("CPU definition retrieval isn't supported for
'%s'"),
- virArchToString(arch));
- return -1;
}
+
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("CPU definition retrieval isn't supported for
'%s'"),
+ virArchToString(arch));
+ return -1;
}
int
--
2.12.0