From nobody Mon Feb 9 00:20:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578347943; cv=none; d=zohomail.com; s=zohoarc; b=f2xSG4Lqly83KkWgnBGd+suFK46vHGs2RnD40Pd9n1S6ilgxGj/M/b52rzb6kk+iYSS4FtqzUmY/sn83LtFRYq5myhnb5wqpfQjOyuRZDyb4+JM39i5PTutYlRYehq69IuEm/6HlfoQp6D8R89G2O1toloi0RTMsG89nfNoX6SM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347943; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G+7Ko2ymc+4OtQtrEfdbi2XVRwtd+RAT49BDCWSzIlw=; b=VrLGMLB/ToiO47dpS7Ic+8u4tUlmpLoGNu4KIkJpVOX4daI+rue7+JlzOEnm4GJgeVRD1XwoQEdJSk1/8NV1uRn4DNRSDl6ZqbQ0cZ4C+koRisAIxX/OUtX4x4Lk/hvMRoDQF00mDmst+do5UxqAM9opEJfZY0SZvSSCcJ5WT3Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157834794324723.19420472452873; Mon, 6 Jan 2020 13:59:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-DMkwSrK7MA2TL93nOQjxrg-1; Mon, 06 Jan 2020 16:59:00 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F022D800D5A; Mon, 6 Jan 2020 21:58:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C05B35C557; Mon, 6 Jan 2020 21:58:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7A39881C96; Mon, 6 Jan 2020 21:58:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006LwNVx007299 for ; Mon, 6 Jan 2020 16:58:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id CF4EF2166B2A; Mon, 6 Jan 2020 21:58:23 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CAA8D2166B29 for ; Mon, 6 Jan 2020 21:58:23 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A65B4801E7B for ; Mon, 6 Jan 2020 21:58:23 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-262-fSZ9gD6ROICVavDf8H8KTA-1; Mon, 06 Jan 2020 16:58:21 -0500 Received: by mail-qk1-f196.google.com with SMTP id d71so33058046qkc.0 for ; Mon, 06 Jan 2020 13:58:21 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id x34sm23898440qtd.20.2020.01.06.13.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347942; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G+7Ko2ymc+4OtQtrEfdbi2XVRwtd+RAT49BDCWSzIlw=; b=D83cmAIcSX3lF5oa4zkMWXn+oyWKy3duOTrW1kTmSGh++4mxINe7KckSOG4HE6HG2SdIJW 4emsdcNJpilta+BiyH5qNytO6NAvP+DE7QA+60qDPuFLBJzYt7seIV9t01ogUS399oTJT+ YZeFKEu02KlPsroFsicQyDqvuMLqSXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MzoR0unflTylpcP9ME+EwzsPipWr3Ke97h2HVepvqC0=; b=gNSptSHpbxGfLT08SR0Y+vRcgc5MKeShx7Abe1uyo0kqoNtgdF6ORJhb9aHc4VwpWx P33c97pLQAZLlFROnn503jO0ctZTk3Mdaeh5AHs5J+lTPJD0wl2wMhh5ORSZlMolEYPG kQ+GFrEuOUq4QKqDp7ZajyF/4+s1w3aqz90jam8+IGWo57exVx7sbFu6wBTBJwhsXa/4 KZNwkBHX0uTa67Wsy8AGw0mukUeKi0Wockt1lmShoYXZNFC7HIn1PJAqMhC+/bf/mfjt EzfW6lcf1xlxvVz9aX9RY4xjjAwjqzVJy4etKmCo4HyRkBDgkw6iYDkrJ36nzM0P++eL H2Uw== X-Gm-Message-State: APjAAAX348Hw/vdPZtUu7UV55Jcg3M9aJc1pzHB/zhsNvx94T0KeE5jr 5OXJcJz0/4sBRg4Qx5OiiJhihE8w X-Google-Smtp-Source: APXvYqxI0OOBjVjjEglOVuIXt6m9Mh3Bu+bs1oxycg7VJutYLhNTDsh1yIE8Uc4E78vbXRbEHjWgOA== X-Received: by 2002:a37:4a0d:: with SMTP id x13mr85765520qka.332.1578347901178; Mon, 06 Jan 2020 13:58:21 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:40 -0300 Message-Id: <20200106215750.361615-17-danielhb413@gmail.com> In-Reply-To: <20200106215750.361615-1-danielhb413@gmail.com> References: <20200106215750.361615-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: fSZ9gD6ROICVavDf8H8KTA-1 X-MC-Unique: DMkwSrK7MA2TL93nOQjxrg-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006LwNVx007299 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 16/26] qemu: remove unneeded labels X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This patch remove unneeded labels for the following files: qemu_capabilities.c qemu_domain_address.c qemu_hostdev.c qemu_hotplug.c qemu_migration_cookie.c qemu_migration_params.c Next patch will handle the remaining QEMU files that can be cleaned up. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_capabilities.c | 15 +++------ src/qemu/qemu_domain_address.c | 52 +++++++++++++++----------------- src/qemu/qemu_hostdev.c | 11 +++---- src/qemu/qemu_hotplug.c | 15 ++++----- src/qemu/qemu_migration_cookie.c | 10 +++--- src/qemu/qemu_migration_params.c | 11 +++---- 6 files changed, 47 insertions(+), 67 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0929fd3e28..da0c7a257f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -781,23 +781,22 @@ virQEMUCapsFindBinaryForArch(virArch hostarch, if (hostarch =3D=3D VIR_ARCH_AARCH64 && guestarch =3D=3D VIR_ARCH_ARMV= 7L) { archstr =3D virQEMUCapsArchToString(hostarch); if ((ret =3D virQEMUCapsFindBinary("qemu-system-%s", archstr)) != =3D NULL) - goto out; + return ret; } =20 /* First attempt: try the guest architecture as it is */ archstr =3D virQEMUCapsArchToString(guestarch); if ((ret =3D virQEMUCapsFindBinary("qemu-system-%s", archstr)) !=3D NU= LL) - goto out; + return ret; =20 /* Second attempt: try looking up by target instead */ target =3D virQEMUCapsFindTarget(hostarch, guestarch); if (target !=3D guestarch) { archstr =3D virQEMUCapsArchToString(target); if ((ret =3D virQEMUCapsFindBinary("qemu-system-%s", archstr)) != =3D NULL) - goto out; + return ret; } =20 - out: return ret; } =20 @@ -5013,13 +5012,11 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, qemuCaps->kvmSupportsNesting =3D virQEMUCapsKVMSupportsNesting(); } =20 - cleanup: return qemuCaps; =20 error: virObjectUnref(qemuCaps); - qemuCaps =3D NULL; - goto cleanup; + return NULL; } =20 static void * @@ -5052,13 +5049,11 @@ virQEMUCapsLoadFile(const char *filename, if (virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename) < 0) goto error; =20 - cleanup: return qemuCaps; =20 error: virObjectUnref(qemuCaps); - qemuCaps =3D NULL; - goto cleanup; + return NULL; } =20 =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b077240899..0e28ecf1d5 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1257,7 +1257,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, /* Only PCI host devices are subject to isolation */ if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP= E_PCI) { - goto skip; + return 0; } =20 hostAddr =3D &hostdev->source.subsys.u.pci.addr; @@ -1265,7 +1265,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, /* If a non-default isolation has already been assigned to the * device, we can avoid looking up the information again */ if (info->isolationGroup > 0) - goto skip; + return 0; =20 /* The isolation group depends on the IOMMU group assigned by the = host */ tmp =3D virPCIDeviceAddressGetIOMMUGroupNum(hostAddr); @@ -1275,7 +1275,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, "%04x:%02x:%02x.%x, device won't be isolated", hostAddr->domain, hostAddr->bus, hostAddr->slot, hostAddr->function); - goto skip; + return 0; } =20 /* The isolation group for a host device is its IOMMU group, @@ -1301,13 +1301,13 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr = def, * require us to isolate the guest device, so we can skip them */ if (iface->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK || virDomainNetResolveActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_= HOSTDEV) { - goto skip; + return 0; } =20 /* If a non-default isolation has already been assigned to the * device, we can avoid looking up the information again */ if (info->isolationGroup > 0) - goto skip; + return 0; =20 /* Obtain a synthetic isolation group for the device, since at this * point in time we don't have access to the IOMMU group of the ho= st @@ -1319,7 +1319,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, "configured to use hostdev-backed network '%s', " "device won't be isolated", iface->data.network.name); - goto skip; + return 0; } =20 info->isolationGroup =3D tmp; @@ -1329,7 +1329,6 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, iface->data.network.name, info->isolationGroup); } =20 - skip: return 0; } =20 @@ -2131,7 +2130,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < = 0) - goto error; + return -1; } } =20 @@ -2142,7 +2141,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* Only support VirtIO-9p-pci so far. If that changes, * we might need to skip devices here */ if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->fss[i]->info)= < 0) - goto error; + return -1; } =20 /* Network interfaces */ @@ -2159,7 +2158,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &net->info) < 0) - goto error; + return -1; } =20 /* Sound cards */ @@ -2177,7 +2176,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &sound->info) < 0) - goto error; + return -1; } =20 /* Device controllers (SCSI, USB, but not IDE, FDC or CCID) */ @@ -2246,7 +2245,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveAddr(addrs, &addr, cont->info.pciConnectFl= ags, cont->info.isolationGro= up) < 0) { - goto error; + return -1; } =20 cont->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; @@ -2257,14 +2256,14 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (virDomainPCIAddressReserveNextAddr(addrs, &cont->info, cont->info.pciConne= ctFlags, addr.function) < 0)= { - goto error; + return -1; } =20 cont->info.addr.pci.multi =3D addr.multi; } } else { if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < = 0) - goto error; + return -1; } } =20 @@ -2292,11 +2291,11 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '= %s'"), virDomainDeviceAddressTypeToString(def->disks[i= ]->info.type)); - goto error; + return -1; } =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->inf= o) < 0) - goto error; + return -1; } =20 /* Host PCI devices */ @@ -2320,7 +2319,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, def->hostdevs[i]->info) < = 0) - goto error; + return -1; } =20 /* memballoon. the qemu driver only accepts virtio memballoon devices = */ @@ -2328,7 +2327,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, virDeviceInfoPCIAddressIsWanted(&def->memballoon->info)) { if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->memballoon->info) < = 0) - goto error; + return -1; } =20 /* the qemu driver only accepts virtio rng devices */ @@ -2337,7 +2336,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->rngs[i]->info= ) < 0) - goto error; + return -1; } =20 /* A watchdog - check if it is a PCI device */ @@ -2345,7 +2344,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, def->watchdog->model =3D=3D VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB && virDeviceInfoPCIAddressIsWanted(&def->watchdog->info)) { if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->watchdog->inf= o) < 0) - goto error; + return -1; } =20 /* Video devices */ @@ -2358,7 +2357,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[i]->in= fo) < 0) - goto error; + return -1; } =20 /* Shared Memory */ @@ -2367,7 +2366,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->shmems[i]->in= fo) < 0) - goto error; + return -1; } for (i =3D 0; i < def->ninputs; i++) { if (def->inputs[i]->bus !=3D VIR_DOMAIN_INPUT_BUS_VIRTIO || @@ -2375,7 +2374,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->inputs[i]->in= fo) < 0) - goto error; + return -1; } for (i =3D 0; i < def->nparallels; i++) { /* Nada - none are PCI based (yet) */ @@ -2388,7 +2387,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &chr->info) < 0) - goto error; + return -1; } for (i =3D 0; i < def->nchannels; i++) { /* Nada - none are PCI based (yet) */ @@ -2402,13 +2401,10 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->vsock->info) < 0) - goto error; + return -1; } =20 return 0; - - error: - return -1; } =20 =20 diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6ab052724a..1774850640 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -243,17 +243,14 @@ qemuHostdevPreparePCIDevices(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, unsigned int flags) { - int ret =3D -1; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; =20 if (!qemuHostdevPreparePCIDevicesCheckSupport(hostdevs, nhostdevs, qem= uCaps)) - goto out; + return -1; =20 - ret =3D virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, - name, uuid, hostdevs, - nhostdevs, flags); - out: - return ret; + return virHostdevPreparePCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, + name, uuid, hostdevs, + nhostdevs, flags); } =20 int diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f2a9386433..31d455505b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2894,41 +2894,38 @@ qemuDomainAttachHostDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (qemuDomainAttachHostPCIDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: if (qemuDomainAttachHostUSBDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: if (qemuDomainAttachHostSCSIDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: if (qemuDomainAttachSCSIVHostDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: if (qemuDomainAttachMediatedDevice(driver, vm, hostdev) < 0) - goto error; + return -1; break; =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hotplug is not supported for hostdev subsys type= '%s'"), virDomainHostdevSubsysTypeToString(hostdev->source.= subsys.type)); - goto error; + return -1; } =20 return 0; - - error: - return -1; } =20 =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 9cfb08951c..299bf17c9e 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -971,14 +971,12 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr= ctxt) =20 VIR_FREE(interfaces); =20 - cleanup: return optr; =20 error: VIR_FREE(interfaces); qemuMigrationCookieNetworkFree(optr); - optr =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -1053,10 +1051,10 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathConte= xtPtr ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt); =20 if (!(ctxt->node =3D virXPathNode("./statistics", ctxt))) - goto cleanup; + return NULL; =20 if (VIR_ALLOC(jobInfo) < 0) - goto cleanup; + return NULL; =20 stats =3D &jobInfo->stats.mig; jobInfo->status =3D QEMU_DOMAIN_JOB_STATUS_COMPLETED; @@ -1127,7 +1125,7 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContext= Ptr ctxt) =20 virXPathInt("string(./" VIR_DOMAIN_JOB_AUTO_CONVERGE_THROTTLE "[1])", ctxt, &stats->cpu_throttle_percentage); - cleanup: + return jobInfo; } =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index e6cf6b4b0b..9430ce1d00 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -480,14 +480,14 @@ qemuMigrationParamsSetCompression(virTypedParameterPt= r params, virReportError(VIR_ERR_INVALID_ARG, _("Unsupported compression method '%s'"), params[i].value.s); - goto error; + return -1; } =20 if (migParams->compMethods & (1ULL << method)) { virReportError(VIR_ERR_INVALID_ARG, _("Compression method '%s' is specified twice"), params[i].value.s); - goto error; + return -1; } =20 migParams->compMethods |=3D 1ULL << method; @@ -514,14 +514,14 @@ qemuMigrationParamsSetCompression(virTypedParameterPt= r params, !(migParams->compMethods & (1ULL << QEMU_MIGRATION_COMPRESS_MT))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Turn multithread compression on to tune it")); - goto error; + return -1; } =20 if (migParams->params[QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE].set && !(migParams->compMethods & (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE= ))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Turn xbzrle compression on to tune it")); - goto error; + return -1; } =20 if (!migParams->compMethods && (flags & VIR_MIGRATE_COMPRESSED)) { @@ -531,9 +531,6 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr = params, } =20 return 0; - - error: - return -1; } =20 =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list