[libvirt] [PATCH 3/3] qemu: command: explicitly error for non-x86 default CPU
The code only currently handles writing an x86 default -cpu
argument, and doesn't know anything about other architectures.
Let's make this explicit rather than leaving ex. qemu ppc64 to
throw an error about -cpu qemu64
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/qemu/qemu_command.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index aa12479f7..f727e3d30 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6716,17 +6716,11 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
virArch hostarch = virArchFromHost();
char *cpu = NULL, *cpu_flags = NULL;
bool hasHwVirt = false;
- const char *default_model;
int ret = -1;
virBuffer cpu_buf = VIR_BUFFER_INITIALIZER;
virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t i;
- if (def->os.arch == VIR_ARCH_I686)
- default_model = "qemu32";
- else
- default_model = "qemu64";
-
if (def->cpu &&
(def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) {
if (qemuBuildCpuModelArgStr(driver, def, &cpu_buf, qemuCaps) < 0)
@@ -6768,7 +6762,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
((hostarch == VIR_ARCH_X86_64 &&
strstr(def->emulator, "kvm")) ||
strstr(def->emulator, "x86_64"))) {
- virBufferAdd(&cpu_buf, default_model, -1);
+ virBufferAddLit(&cpu_buf, "qemu32");
}
}
@@ -6915,6 +6909,23 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
cpu_flags = virBufferContentAndReset(&buf);
if (cpu_flags && !cpu) {
+ const char *default_model;
+
+ switch (def->os.arch) {
+ case VIR_ARCH_I686:
+ default_model = "qemu32";
+ break;
+ case VIR_ARCH_X86_64:
+ default_model = "qemu64";
+ break;
+ default:
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("CPU flags requested but can't determine "
+ "default CPU for arch %s"),
+ virArchToString(def->os.arch));
+ goto cleanup;
+ }
+
if (VIR_STRDUP(cpu, default_model) < 0)
goto cleanup;
}
--
2.13.3