External/libvirt
1
0
Fork 0
Code

qemu: Use -nodefconfig when probing for CPU models

Browse Source 
In case qemu supports -nodefconfig, libvirt adds uses it when launching
new guests. Since this option may affect CPU models supported by qemu,
we need to use it when probing for available models.
This commit is contained in:
Jiri Denemark 2010-07-12 09:58:43 +02:00
parent 2d14615a75
commit 4677b06428
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_conf.c
View File

@ -718,11 +718,17 @@ error:
int int
qemudProbeCPUModels(const char *qemu, qemudProbeCPUModels(const char *qemu,
unsigned long long qemuCmdFlags,
const char *arch, const char *arch,
unsigned int *count, unsigned int *count,
const char ***cpus) const char ***cpus)
{ {
const char *const qemuarg[] = { qemu, "-cpu", "?", NULL }; const char *const qemuarg[] = {
qemu,
"-cpu", "?",
(qemuCmdFlags & QEMUD_CMD_FLAG_NODEFCONFIG) ? "-nodefconfig" : NULL,
NULL
};
const char *const qemuenv[] = { "LC_ALL=C", NULL }; const char *const qemuenv[] = { "LC_ALL=C", NULL };
enum { MAX_MACHINES_OUTPUT_SIZE = 1024*4 }; enum { MAX_MACHINES_OUTPUT_SIZE = 1024*4 };
char *output = NULL; char *output = NULL;
@ -916,7 +922,7 @@ qemudCapsInitGuest(virCapsPtr caps,
guest->arch.defaultInfo.emulator_mtime = binary_mtime; guest->arch.defaultInfo.emulator_mtime = binary_mtime;
if (caps->host.cpu && if (caps->host.cpu &&
qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0 && qemudProbeCPUModels(binary, 0, info->arch, &ncpus, NULL) == 0 &&
ncpus > 0 && ncpus > 0 &&
!virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
goto error; goto error;
@ -3365,6 +3371,7 @@ static int
qemuBuildCpuArgStr(const struct qemud_driver *driver, qemuBuildCpuArgStr(const struct qemud_driver *driver,
const virDomainDefPtr def, const virDomainDefPtr def,
const char *emulator, const char *emulator,
unsigned long long qemuCmdFlags,
const struct utsname *ut, const struct utsname *ut,
char **opt) char **opt)
{ {
@ -3378,7 +3385,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver,
int i; int i;
if (def->cpu && def->cpu->model) { if (def->cpu && def->cpu->model) {
if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0) if (qemudProbeCPUModels(emulator, qemuCmdFlags, ut->machine,
&ncpus, &cpus) < 0)
goto cleanup; goto cleanup;
if (!ncpus || !host) { if (!ncpus || !host) {
@ -3706,7 +3714,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
ADD_ARG_LIT(def->os.machine); ADD_ARG_LIT(def->os.machine);
} }
if (qemuBuildCpuArgStr(driver, def, emulator, &ut, &cpu) < 0) if (qemuBuildCpuArgStr(driver, def, emulator, qemuCmdFlags, &ut, &cpu) < 0)
goto error; goto error;
if (cpu) { if (cpu) {

1
src/qemu/qemu_conf.h
View File

@ -289,6 +289,7 @@ int qemudProbeMachineTypes (const char *binary,
int *nmachines); int *nmachines);
int qemudProbeCPUModels (const char *qemu, int qemudProbeCPUModels (const char *qemu,
unsigned long long qemuCmdFlags,
const char *arch, const char *arch,
unsigned int *count, unsigned int *count,
const char ***cpus); const char ***cpus);