openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Remove local emulator 

Remove the local variable 'emulator' and just use def->emulator

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-02-15 16:23:28 -05:00
parent d46eb9e5ea
commit 71eb431c63
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_command.c
View File

@ -4775,7 +4775,6 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
static int static int
qemuBuildCpuArgStr(virQEMUDriverPtr driver, qemuBuildCpuArgStr(virQEMUDriverPtr driver,
const virDomainDef *def, const virDomainDef *def,
const char *emulator,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virArch hostarch, virArch hostarch,
char **opt, char **opt,
@ -4816,8 +4815,8 @@ qemuBuildCpuArgStr(virQEMUDriverPtr driver,
*/ */
if (def->os.arch == VIR_ARCH_I686 && if (def->os.arch == VIR_ARCH_I686 &&
((hostarch == VIR_ARCH_X86_64 && ((hostarch == VIR_ARCH_X86_64 &&
strstr(emulator, "kvm")) || strstr(def->emulator, "kvm")) ||
strstr(emulator, "x86_64"))) { strstr(def->emulator, "x86_64"))) {
virBufferAdd(&buf, default_model, -1); virBufferAdd(&buf, default_model, -1);
have_cpu = true; have_cpu = true;
} }
@ -6639,7 +6638,6 @@ qemuBuildCommandLine(virConnectPtr conn,
{ {
virErrorPtr originalError = NULL; virErrorPtr originalError = NULL;
size_t i, j; size_t i, j;
const char *emulator;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
char *cpu; char *cpu;
char *smp; char *smp;
@ -6694,8 +6692,6 @@ qemuBuildCommandLine(virConnectPtr conn,
virUUIDFormat(def->uuid, uuid); virUUIDFormat(def->uuid, uuid);
emulator = def->emulator;
if (!virQEMUDriverIsPrivileged(driver)) { if (!virQEMUDriverIsPrivileged(driver)) {
/* If we have no cgroups then we can have no tunings that /* If we have no cgroups then we can have no tunings that
* require them */ * require them */
@ -6746,7 +6742,7 @@ qemuBuildCommandLine(virConnectPtr conn,
(def->virtType == VIR_DOMAIN_VIRT_QEMU)) (def->virtType == VIR_DOMAIN_VIRT_QEMU))
virQEMUCapsClear(qemuCaps, QEMU_CAPS_DRIVE_BOOT); virQEMUCapsClear(qemuCaps, QEMU_CAPS_DRIVE_BOOT);
cmd = virCommandNew(emulator); cmd = virCommandNew(def->emulator);
virCommandAddEnvPassCommon(cmd); virCommandAddEnvPassCommon(cmd);
@ -6768,7 +6764,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0) if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0)
goto error; goto error;
if (qemuBuildCpuArgStr(driver, def, emulator, qemuCaps, if (qemuBuildCpuArgStr(driver, def, qemuCaps,
hostarch, &cpu, &hasHwVirt, !!migrateURI) < 0) hostarch, &cpu, &hasHwVirt, !!migrateURI) < 0)
goto error; goto error;
@ -6893,7 +6889,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("the QEMU binary %s does not support smbios settings"), _("the QEMU binary %s does not support smbios settings"),
emulator); def->emulator);
goto error; goto error;
} }
@ -8018,7 +8014,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
if (def->tpm) { if (def->tpm) {
if (qemuBuildTPMCommandLine(def, cmd, qemuCaps, emulator) < 0) if (qemuBuildTPMCommandLine(def, cmd, qemuCaps, def->emulator) < 0)
goto error; goto error;
} }