From nobody Sun Feb 8 19:39:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1578347950; cv=none; d=zohomail.com; s=zohoarc; b=V8buQD0nbAR4UrSmVuber9SSC73zktDw74U76i+35SPVz2RPiaaGNtmbOUcJSoYYX8MdhyyNZQGeMvAGF1Z0tujy740eBOM7TbWn68YLYwqKgExh3cMEVo7x7SPDqL//3of09RVUlR3DgjfwMmlkOlkCHmr6LiFRf8jEEM1b2b4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347950; 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=H+9B44xnJxsyxaxckThsRdloMGu8od4Szf/pGfLhBxc=; b=HtNtf3cTm3LKfIDhGITQM2zmp9HniBldwnOeBYOylqip/XgRMd/IrX5j0Jjh4HCczhpH3UCMShfjCbqr4MJo9541+j7aODuYgTjk7jVhkAfGygbL4Zo7O+N5MAoRnYyGg8nAfywUQwf3ERg27zZEbwuConWKyFPD9y3/8r8uBQE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1578347950174597.5418370381145; Mon, 6 Jan 2020 13:59:10 -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-353-ovpCDiHDOs-EL2O0JcMwhg-1; Mon, 06 Jan 2020 16:59:07 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7DBD80058F; Mon, 6 Jan 2020 21:59:00 +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 A03AA5D9E1; Mon, 6 Jan 2020 21:59:00 +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 5B18581C9B; Mon, 6 Jan 2020 21:59:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006LwSjq007331 for ; Mon, 6 Jan 2020 16:58:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6418410166FF; Mon, 6 Jan 2020 21:58:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CB0910EE799 for ; Mon, 6 Jan 2020 21:58:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 161C680207A for ; Mon, 6 Jan 2020 21:58:26 +0000 (UTC) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-Jkt_KQU0MRCXJVEpZj2gSA-1; Mon, 06 Jan 2020 16:58:23 -0500 Received: by mail-qk1-f177.google.com with SMTP id k6so40909360qki.5 for ; Mon, 06 Jan 2020 13:58:23 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347949; 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=H+9B44xnJxsyxaxckThsRdloMGu8od4Szf/pGfLhBxc=; b=dHVnVdU+SXYZa64ULYa5mTbaJGZH7RQvHmqMhoe/gkMFvLPRCeUVH+QksduIY86hhlWLWk lac2ykpLfAEbHBrdtyZOnE6mmaswAFjkptMHMXedZZ0R1TwiWHK93RlxZXrWtcm1KgDjf8 M2tQQHU1sa6RfrGXsRP6yay4xu2gba4= 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=6lKzcnADsRVo5R8/AmBgx+HsdKI2G4SdTehiLt+ZeAg=; b=gt8zEUXfdJyOKTTJ5H3Z2qZodWXV6uCQAf0MJcHoGlheB8GBdpUkY6kEA+FflQq0WZ SW0b1Mo2Yjkrgi2+bupTSyvnaaL6pk1zdav3wZlMKHMaQgDyvD+fVmvy0zP7Wjnu/0lC VOemzfKQHt1oeox+OVedYRoMj8JwkQBRAF8SLNMADO3b9ARDyzfogvQTjdzUClAAkAgr +C/b283g9p7CgvdtDdCYmNUp+6MdKWBRwsHZ0Up62uOmPOMIYxM4NkmV0TBOw+MT+Hyh GFZ7HXYsYEOzRqt4ohF8l8SH7bC0ERW3A/EDIdbDxdY8rdQ00Z0iha+xbIihgE8BERaR YEHg== X-Gm-Message-State: APjAAAUeUIyMZWxa+t0cFPCKpBO2LDRqz51dWf6QemnyscaUNIxAaciZ n2qqadH1WDOXA4XbLKT9KGG0fm2n X-Google-Smtp-Source: APXvYqze5VoUqJI3dHKLQmsF1u2kQgV8jUNY9X/zY7az9meacz3dRmPXoNTUfNhOHmhumWRcGgLPSQ== X-Received: by 2002:a37:aa11:: with SMTP id t17mr81627648qke.69.1578347902713; Mon, 06 Jan 2020 13:58:22 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:41 -0300 Message-Id: <20200106215750.361615-18-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: Jkt_KQU0MRCXJVEpZj2gSA-1 X-MC-Unique: ovpCDiHDOs-EL2O0JcMwhg-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006LwSjq007331 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 17/26] qemu: remove remaining 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.14 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 finishes cleaning up unneeded labels on the QEMU files. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 93 +++++++++++++++++++---------------------- src/qemu/qemu_domain.c | 11 ++--- src/qemu/qemu_driver.c | 32 +++++--------- 3 files changed, 55 insertions(+), 81 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 11d3c29297..d0b1f34058 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1776,12 +1776,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, disk->detect_zero= es); =20 if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0) - goto error; + return NULL; =20 if (!qemuDiskBusNeedsDriveArg(disk->bus)) { g_autofree char *drivealias =3D qemuAliasDiskDriveFromDisk(disk); if (!drivealias) - goto error; + return NULL; =20 virBufferAddLit(&opt, "if=3Dnone"); virBufferAsprintf(&opt, ",id=3D%s", drivealias); @@ -1791,12 +1791,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported disk type '%s'"), disk->dst); - goto error; + return NULL; } =20 /* if we are using -device this will be checked elsewhere */ if (qemuCheckDiskConfig(disk, qemuCaps) < 0) - goto error; + return NULL; =20 virBufferAsprintf(&opt, "if=3D%s", virDomainDiskQEMUBusTypeToString(disk->bus)); @@ -1849,9 +1849,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, qemuBuildDiskThrottling(disk, &opt); =20 return virBufferContentAndReset(&opt); - - error: - return NULL; } =20 =20 @@ -1941,20 +1938,20 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, int controllerModel; =20 if (qemuCheckDiskConfig(disk, qemuCaps) < 0) - goto error; + return NULL; =20 if (!qemuDomainCheckCCWS390AddressSupport(def, &disk->info, qemuCaps, = disk->dst)) - goto error; + return NULL; =20 if (disk->iothread && !qemuCheckIOThreads(def, disk)) - goto error; + return NULL; =20 switch ((virDomainDiskBus) disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: if (disk->info.addr.drive.target !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for ide controller")); - goto error; + return NULL; } =20 if (disk->wwn && @@ -1962,7 +1959,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting wwn for ide disk is not supported " "by this QEMU")); - goto error; + return NULL; } =20 if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) @@ -1979,7 +1976,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (!(contAlias =3D virDomainControllerAliasFind(def, VIR_DOMAIN_CONT= ROLLER_TYPE_IDE, disk->info.addr= .drive.controller))) - goto error; + return NULL; } virBufferAsprintf(&opt, ",bus=3D%s.%d,unit=3D%d", contAlias, @@ -1993,7 +1990,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support scsi-block for= " "lun passthrough")); - goto error; + return NULL; } } =20 @@ -2002,7 +1999,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting wwn for scsi disk is not supported " "by this QEMU")); - goto error; + return NULL; } =20 /* Properties wwn, vendor and product were introduced in the @@ -2013,12 +2010,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting vendor or product for scsi disk is n= ot " "supported by this QEMU")); - goto error; + return NULL; } =20 controllerModel =3D qemuDomainFindSCSIControllerModel(def, &disk->= info); if (controllerModel < 0) - goto error; + return NULL; =20 if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); @@ -2038,21 +2035,21 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, scsiVPDDeviceId =3D g_strdup(disk->serial); } else { if (!(scsiVPDDeviceId =3D qemuAliasDiskDriveFromDisk(d= isk))) - goto error; + return NULL; } } } =20 if (!(contAlias =3D virDomainControllerAliasFind(def, VIR_DOMAIN_C= ONTROLLER_TYPE_SCSI, disk->info.addr.dri= ve.controller))) - goto error; + return NULL; =20 if (controllerModel =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOG= IC) { if (disk->info.addr.drive.target !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for controller " "model 'lsilogic'")); - goto error; + return NULL; } =20 virBufferAsprintf(&opt, ",bus=3D%s.%d,scsi-id=3D%d", @@ -2065,7 +2062,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support target " "greater than 7")); - goto error; + return NULL; } =20 if (disk->info.addr.drive.bus !=3D 0 && @@ -2073,7 +2070,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU only supports both bus and= " "unit equal to 0")); - goto error; + return NULL; } } =20 @@ -2093,12 +2090,12 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (disk->info.addr.drive.bus !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("bus must be 0 for ide controller")); - goto error; + return NULL; } if (disk->info.addr.drive.target !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("target must be 0 for ide controller")); - goto error; + return NULL; } =20 if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) @@ -2116,7 +2113,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (!(contAlias =3D virDomainControllerAliasFind(def, VIR_DOMAIN_CONT= ROLLER_TYPE_SATA, disk->info.addr= .drive.controller))) - goto error; + return NULL; } virBufferAsprintf(&opt, ",bus=3D%s.%d", contAlias, @@ -2126,7 +2123,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_VIRTIO: if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps, VIR_DOMAIN_DEVICE_DISK, disk) < 0) { - goto error; + return NULL; } =20 if (disk->iothread) @@ -2152,17 +2149,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("num-queues property isn't supported by t= his " "QEMU binary")); - goto error; + return NULL; } =20 virBufferAsprintf(&opt, ",num-queues=3D%u", disk->queues); } =20 if (qemuBuildVirtioOptionsStr(&opt, disk->virtio, qemuCaps) < 0) - goto error; + return NULL; =20 if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < = 0) - goto error; + return NULL; break; =20 case VIR_DOMAIN_DISK_BUS_USB: @@ -2170,19 +2167,19 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected address type for usb disk")); - goto error; + return NULL; } if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support '-device " "usb-storage'")); - goto error; + return NULL; =20 } virBufferAddLit(&opt, "usb-storage"); =20 if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < = 0) - goto error; + return NULL; break; =20 case VIR_DOMAIN_DISK_BUS_FDC: @@ -2196,7 +2193,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported disk bus '%s' with device setup"), b= us); - goto error; + return NULL; } =20 if (disk->src->shared && @@ -2204,7 +2201,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAddLit(&opt, ",share-rw=3Don"); =20 if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0) - goto error; + return NULL; =20 if (backendAlias) virBufferAsprintf(&opt, ",drive=3D%s", backendAlias); @@ -2249,13 +2246,13 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support setting the " "removable flag of USB storage devices")); - goto error; + return NULL; } } } =20 if (qemuBuildDriveDevCacheStr(disk, &opt, qemuCaps) < 0) - goto error; + return NULL; =20 qemuBuildDiskFrontendAttributes(disk, &opt); =20 @@ -2263,9 +2260,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); =20 return virBufferContentAndReset(&opt); - - error: - return NULL; } =20 char * @@ -3693,7 +3687,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (virDomainNetIsVirtioModel(net)) { if (qemuBuildVirtioDevStr(&buf, "virtio-net", qemuCaps, VIR_DOMAIN_DEVICE_NET, net) < 0) { - goto error; + return NULL; } =20 usingVirtio =3D true; @@ -3723,12 +3717,12 @@ qemuBuildNicDevStr(virDomainDefPtr def, */ virReportEnumRangeError(virDomainNetVirtioTxModeType, net->driver.virtio.txmode); - goto error; + return NULL; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio-net-pci 'tx' option not supported in = this QEMU binary")); - goto error; + return NULL; } } if (usingVirtio) { @@ -3804,7 +3798,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE))= { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio rx_queue_size option is not supported= with this QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, ",rx_queue_size=3D%u", net->driver.virtio.= rx_queue_size); } @@ -3812,7 +3806,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE))= { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio tx_queue_size option is not supported= with this QEMU binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, ",tx_queue_size=3D%u", net->driver.virtio.= tx_queue_size); } @@ -3821,7 +3815,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("setting MTU is not supported with this QEMU = binary")); - goto error; + return NULL; } virBufferAsprintf(&buf, ",host_mtu=3D%u", net->mtu); } @@ -3832,19 +3826,16 @@ qemuBuildNicDevStr(virDomainDefPtr def, virMacAddrFormat(&net->mac, macaddr)); =20 if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0) - goto error; + return NULL; if (qemuBuildRomStr(&buf, &net->info) < 0) - goto error; + return NULL; if (bootindex) virBufferAsprintf(&buf, ",bootindex=3D%u", bootindex); if (usingVirtio && qemuBuildVirtioOptionsStr(&buf, net->virtio, qemuCaps) < 0) - goto error; + return NULL; =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 065c9e97a9..a4793ea51a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13113,7 +13113,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def, /* prefer the hard limit */ if (virMemoryLimitIsSet(def->mem.hard_limit)) { memKB =3D def->mem.hard_limit; - goto done; + return memKB << 10; } =20 /* If the guest wants its memory to be locked, we need to raise the me= mory @@ -13161,7 +13161,6 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def, if (usesVFIO || forceVFIO) memKB =3D virDomainDefGetMemoryTotal(def) + 1024 * 1024; =20 - done: return memKB << 10; } =20 @@ -13188,7 +13187,6 @@ qemuDomainAdjustMaxMemLock(virDomainObjPtr vm, bool forceVFIO) { unsigned long long bytes =3D 0; - int ret =3D -1; =20 bytes =3D qemuDomainGetMemLockLimitBytes(vm->def, forceVFIO); =20 @@ -13210,12 +13208,9 @@ qemuDomainAdjustMaxMemLock(virDomainObjPtr vm, =20 /* Trying to set the memory locking limit to zero is a no-op */ if (virProcessSetMaxMemLock(vm->pid, bytes) < 0) - goto out; - - ret =3D 0; + return -1; =20 - out: - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae54c00239..398258fe0c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1916,7 +1916,7 @@ qemuDomainShutdownFlagsAgent(virQEMUDriverPtr driver, =20 if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0) - goto cleanup; + return -1; =20 if (virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -1934,8 +1934,6 @@ qemuDomainShutdownFlagsAgent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndAgentJob(vm); - - cleanup: return ret; } =20 @@ -1951,7 +1949,7 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriverPtr drive= r, priv =3D vm->privateData; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; =20 if (virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -1967,8 +1965,6 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriverPtr drive= r, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: return ret; } =20 @@ -6784,14 +6780,13 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_def =3D def; *ret_data =3D data; =20 - cleanup: return fd; =20 error: virDomainDefFree(def); virQEMUSaveDataFree(data); VIR_FORCE_CLOSE(fd); - goto cleanup; + return -1; } =20 static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) @@ -12620,7 +12615,6 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, { virQEMUDriverPtr driver =3D dconn->privateData; virDomainObjPtr vm; - virDomainPtr dom =3D NULL; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); =20 @@ -12629,24 +12623,21 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching name '%s'"), dname); qemuMigrationDstErrorReport(driver, dname); - goto cleanup; + return NULL; } =20 if (virDomainMigrateFinish2EnsureACL(dconn, vm->def) < 0) { virDomainObjEndAPI(&vm); - goto cleanup; + return NULL; } =20 /* Do not use cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - dom =3D qemuMigrationDstFinish(driver, dconn, vm, - NULL, 0, NULL, NULL, /* No cookies */ - flags, retcode, false); - - cleanup: - return dom; + return qemuMigrationDstFinish(driver, dconn, vm, + NULL, 0, NULL, NULL, /* No cookies */ + flags, retcode, false); } =20 =20 @@ -13260,7 +13251,6 @@ qemuNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, unsigned *function) { virNodeDevCapsDefPtr cap; - int ret =3D -1; =20 cap =3D def->caps; while (cap) { @@ -13278,12 +13268,10 @@ qemuNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, if (!cap) { virReportError(VIR_ERR_INVALID_ARG, _("device %s is not a PCI device"), def->name); - goto out; + return -1; } =20 - ret =3D 0; - out: - return ret; + return 0; } =20 static int --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list