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

qemu_process: Drop cleanup label from qemuProcessUpdateGuestCPU 

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-06-06 12:33:43 +02:00
parent b12865260a
commit 955fd6e7a2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_process.c
View File

@ -5893,8 +5893,6 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
virCapsPtr caps, virCapsPtr caps,
unsigned int flags) unsigned int flags)
{ {
int ret = -1;
if (!def->cpu) if (!def->cpu)
return 0; return 0;
@ -5943,17 +5941,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
if (virCPUUpdate(def->os.arch, def->cpu, if (virCPUUpdate(def->os.arch, def->cpu,
virQEMUCapsGetHostModel(qemuCaps, def->virtType, virQEMUCapsGetHostModel(qemuCaps, def->virtType,
VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0) VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0)
goto cleanup; return -1;
if (virCPUTranslate(def->os.arch, def->cpu, if (virCPUTranslate(def->os.arch, def->cpu,
virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType)) < 0) virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType)) < 0)
goto cleanup; return -1;
def->cpu->fallback = VIR_CPU_FALLBACK_FORBID; def->cpu->fallback = VIR_CPU_FALLBACK_FORBID;
ret = 0; return 0;
cleanup:
return ret;
} }