From nobody Sat Feb 7 15:11:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1573591696; cv=none; d=zoho.com; s=zohoarc; b=S2/y/q3zCVqpBpjrmeaUPu2meEBcqt/rjs0evm7WiSYrAN84OKDFufVs+1KFwPurdvLUSdU0iZ+6tehiKl4TpOlmSpicKT/09KctgoLAKQCkf6FnCTVuMpqDKShFJV/JikA//PMNjdsJO9bNy/9k/xIlg+5LZNEuCVbF/DsVuk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573591696; 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=EbFHWKfK1OIJYeR5gquUn0PuZ0YoVhk5S5baWsXX17o=; b=X+aDcEpyJAOfcFD8XsAAX7Il/Rer998zwhwZHT5t1qPGJu7XKYvdAjPbUzIbTzfRbQQ7KyIVJQld9qZZxeSiPtDuwTpxt7w8BabLxaTPhbHFxj8VJop1Fd4wjH4LEL6UZWlcAtbKDSMVY6OTyykDC+Th2SMYRBjKgxPFRJxJNRI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 157359169690334.14326655060688; Tue, 12 Nov 2019 12:48:16 -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-267-WazHXa2wNpKRCLpSau8-ZQ-1; Tue, 12 Nov 2019 15:48:13 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35D5A1013CA9; Tue, 12 Nov 2019 20:48:08 +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 C779B60556; Tue, 12 Nov 2019 20:48:06 +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 4F8594BB78; Tue, 12 Nov 2019 20:48:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xACKkmEb023157 for ; Tue, 12 Nov 2019 15:46:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7061D2022EB8; Tue, 12 Nov 2019 20:46:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 69842202DDEA for ; Tue, 12 Nov 2019 20:46:46 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 288381065053 for ; Tue, 12 Nov 2019 20:46:46 +0000 (UTC) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-GArEDIkbO9GdoBjqeNTCkA-1; Tue, 12 Nov 2019 15:46:44 -0500 Received: by mail-qk1-f178.google.com with SMTP id q70so15732078qke.12; Tue, 12 Nov 2019 12:46:44 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:e216:f6fd:7c94:6ada:e1fe]) by smtp.gmail.com with ESMTPSA id q4sm10609970qtj.41.2019.11.12.12.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 12:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573591695; 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=EbFHWKfK1OIJYeR5gquUn0PuZ0YoVhk5S5baWsXX17o=; b=dRtfWireqIcFH9xfj3PmG/kGhokaCuQg2oIbs4xtpJIh2Iz6BwiTTT+bN3XOJbl8VHdv0a Zktw2YwSEdKt9KyLhPBqhZ6wOk3Rb97CAI3I1h04JVTLfurOk4vDlhABNVNGJz9ILLHTpN H76Xi567hj68N3YT/FIsT1JvgtX+fUM= 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=ExPgPGEC+nkriCZWCnccLO3vBQTzkrvYCD76YKxiH4k=; b=GXhN9jovspafgncEvYxGFY6Xb7lBzbo+hDa6j1Nq0tyjf5zj+xcEN+RJb3Wtz6y+Ca COLDCWf+4o14qf8rhzl49Zbw10MtuJPNg4UO2SyWOCcbI9k733q0mNYPDD3uQ3YXUVkM u9SDtMO2mBj9872CAr67bILaVQvD8iB62oEx56t9cIvGv4Owus8xqK+Mm0YgaQDlJ8pi aCi/VS2jCm/MLpKNSfsSG05hdKkarkEt3pegvpBsqmsqpBbXVVD8dM7qD9pgWVp1fRQT UzpYJoBeTDBKA0u0/KsjdpYEREtHCcZq5ssgU0hjqK0uAAZjp5Bu5Ylc98roLdSzl2j0 GYJg== X-Gm-Message-State: APjAAAXhVTTBhvLpxID6e2T6r3UpO/C20RGeRsIGjgWa7lSX/bFUQv0u Lu1kAEsYv7YJIiO5WFKuO2FB+nk/skU= X-Google-Smtp-Source: APXvYqyN5CdYARVPtmPVJZCUfzWs3Fyu18IYUL87usFuIUSlcZXMcSzCDIBGXWlL3WM8H8EV9zmxWg== X-Received: by 2002:ae9:ef0b:: with SMTP id d11mr16947999qkg.68.1573591602973; Tue, 12 Nov 2019 12:46:42 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 12 Nov 2019 17:46:27 -0300 Message-Id: <20191112204629.7850-2-danielhb413@gmail.com> In-Reply-To: <20191112204629.7850-1-danielhb413@gmail.com> References: <20191112204629.7850-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: GArEDIkbO9GdoBjqeNTCkA-1 X-MC-Unique: WazHXa2wNpKRCLpSau8-ZQ-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xACKkmEb023157 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , jtomko@redhat.com Subject: [libvirt] [PATCH v2 1/3] qemu: remove unneeded cleanup 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.11 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_cgroup.c | 15 ++-- src/qemu/qemu_domain.c | 84 +++++++------------ src/qemu/qemu_domain_address.c | 31 +++---- src/qemu/qemu_driver.c | 145 ++++++++++++--------------------- src/qemu/qemu_hotplug.c | 75 +++++++---------- src/qemu/qemu_interface.c | 26 +++--- src/qemu/qemu_migration.c | 38 +++------ src/qemu/qemu_process.c | 69 +++++----------- src/qemu/qemu_tpm.c | 18 ++-- 9 files changed, 176 insertions(+), 325 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 131cdd1134..31cf71146b 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1076,7 +1076,6 @@ qemuSetupCgroup(virDomainObjPtr vm, int *nicindexes) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; =20 if (!vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1091,23 +1090,21 @@ qemuSetupCgroup(virDomainObjPtr vm, return 0; =20 if (qemuSetupDevicesCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupBlkioCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupMemoryCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupCpuCgroup(vm) < 0) - goto cleanup; + return -1; =20 if (qemuSetupCpusetCgroup(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 int diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1d1683a038..355d53eee1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2291,7 +2291,6 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePt= r src, { g_auto(virBuffer) tmp =3D VIR_BUFFER_INITIALIZER; qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); - int ret =3D -1; =20 if (src->nodestorage || src->nodeformat) { virBufferAddLit(buf, "\n"); @@ -2306,7 +2305,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePt= r src, virBufferAsprintf(buf, "\n", src->p= r->mgralias); =20 if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) - goto cleanup; + return -1; =20 virBufferSetChildIndent(&tmp, buf); =20 @@ -2320,10 +2319,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSourceP= tr src, =20 virXMLFormatElement(buf, "objects", NULL, &tmp); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2605,7 +2601,6 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBu= fferPtr buf, { g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -2615,14 +2610,11 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(vir= BufferPtr buf, =20 if (virDomainDiskSourceFormat(&childBuf, src, "source", 0, false, VIR_DOMAIN_DEF_FORMAT_STATUS, xmlopt) < = 0) - goto cleanup; + return -1; =20 virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2636,7 +2628,6 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPt= r buf, size_t i; virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; - int ret =3D -1; =20 for (i =3D 0; i < vm->def->ndisks; i++) { disk =3D vm->def->disks[i]; @@ -2651,15 +2642,12 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBuffer= Ptr buf, qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, diskPriv->migr= Source, priv->driver->= xmlopt) < 0) - goto cleanup; + return -1; =20 virXMLFormatElement(buf, "disk", &attrBuf, &childBuf); } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -2671,7 +2659,6 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; qemuDomainJob job =3D priv->job.active; - int ret =3D -1; =20 if (!qemuDomainTrackJob(job)) job =3D QEMU_JOB_NONE; @@ -2697,17 +2684,14 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, =20 if (priv->job.asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_OUT && qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) - goto cleanup; + return -1; =20 if (priv->job.migParams) qemuMigrationParamsFormat(&childBuf, priv->job.migParams); =20 virXMLFormatElement(buf, "job", &attrBuf, &childBuf); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -4018,11 +4002,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, bool addDefaultUSBKBD =3D false; bool addDefaultUSBMouse =3D false; bool addPanicDevice =3D false; - int ret =3D -1; =20 /* add implicit input devices */ if (qemuDomainDefAddImplicitInputDevice(def) < 0) - goto cleanup; + return -1; =20 /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { @@ -4135,12 +4118,12 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, if (addDefaultUSB && virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < = 0 && virDomainDefAddUSBController(def, 0, usbModel) < 0) - goto cleanup; + return -1; =20 if (addImplicitSATA && virDomainDefMaybeAddController( def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, 0, -1) < 0) - goto cleanup; + return -1; =20 pciRoot =3D virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PC= I, 0); =20 @@ -4155,11 +4138,11 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, "model=3D'pci-root' for this machine type= , " "but model=3D'%s' was found instead"), virDomainControllerModelPCITypeToString(def= ->controllers[pciRoot]->model)); - goto cleanup; + return -1; } } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_T= YPE_PCI, 0, VIR_DOMAIN_CONTROLLER_MODEL_= PCI_ROOT)) { - goto cleanup; + return -1; } } =20 @@ -4178,18 +4161,18 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, "model=3D'pcie-root' for this machine typ= e, " "but model=3D'%s' was found instead"), virDomainControllerModelPCITypeToString(def= ->controllers[pciRoot]->model)); - goto cleanup; + return -1; } } else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_T= YPE_PCI, 0, VIR_DOMAIN_CONTROLLER_MODEL_P= CIE_ROOT)) { - goto cleanup; + return -1; } } =20 if (addDefaultMemballoon && !def->memballoon) { virDomainMemballoonDefPtr memballoon; if (VIR_ALLOC(memballoon) < 0) - goto cleanup; + return -1; =20 memballoon->model =3D VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; def->memballoon =3D memballoon; @@ -4224,14 +4207,14 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_BUS_USB) < 0) - goto cleanup; + return -1; =20 if (addDefaultUSBMouse && def->ngraphics > 0 && virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_BUS_USB) < 0) - goto cleanup; + return -1; =20 if (addPanicDevice) { size_t j; @@ -4250,14 +4233,12 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, VIR_APPEND_ELEMENT_COPY(def->panics, def->npanics, panic) < 0) { VIR_FREE(panic); - goto cleanup; + return -1; } } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -13348,19 +13329,16 @@ qemuDomainPopulateDevices(virQEMUDriverConfigPtr = cfg, { const char *const *devices =3D (const char *const *) cfg->cgroupDevice= ACL; size_t i; - int ret =3D -1; =20 if (!devices) devices =3D defaultDeviceACL; =20 for (i =3D 0; devices[i]; i++) { if (qemuDomainCreateDevice(devices[i], data, true) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -13709,7 +13687,6 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, const struct qemuDomainCreateDeviceData *data) { virDomainLoaderDefPtr loader =3D vm->def->os.loader; - int ret =3D -1; =20 VIR_DEBUG("Setting up loader"); =20 @@ -13717,16 +13694,16 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg = G_GNUC_UNUSED, switch ((virDomainLoader) loader->type) { case VIR_DOMAIN_LOADER_TYPE_ROM: if (qemuDomainCreateDevice(loader->path, data, false) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_LOADER_TYPE_PFLASH: if (qemuDomainCreateDevice(loader->path, data, false) < 0) - goto cleanup; + return -1; =20 if (loader->nvram && qemuDomainCreateDevice(loader->nvram, data, false) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_LOADER_TYPE_NONE: @@ -13736,9 +13713,7 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_= GNUC_UNUSED, } =20 VIR_DEBUG("Setup loader"); - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -14327,7 +14302,6 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr drive= r G_GNUC_UNUSED, char * const *devMountsPath, size_t ndevMountsPath) { - int ret =3D -1; size_t i; =20 if (STRPREFIX(file, QEMU_DEVPREFIX)) { @@ -14342,13 +14316,11 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr dri= ver G_GNUC_UNUSED, if (virProcessRunInMountNamespace(vm->pid, qemuDomainDetachDeviceUnlink= Helper, (void *)file) < 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 82db62e988..605984f80f 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -223,7 +223,6 @@ static int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) { size_t i; - int ret =3D -1; =20 /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ =20 @@ -234,7 +233,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; =20 if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET)= < 0) - goto cleanup; + return -1; } =20 for (i =3D 0; i < def->ncontrollers; i++) { @@ -246,7 +245,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } if (qemuDomainAssignSpaprVIOAddress(def, &cont->info, VIO_ADDR_SCSI) < 0) { - goto cleanup; + return -1; } } =20 @@ -257,7 +256,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) } if (qemuDomainAssignSpaprVIOAddress(def, &def->serials[i]->info, VIO_ADDR_SERIAL) < 0) - goto cleanup; + return -1; } =20 if (def->nvram) { @@ -265,15 +264,12 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def) def->nvram->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPR= VIO; if (qemuDomainAssignSpaprVIOAddress(def, &def->nvram->info, VIO_ADDR_NVRAM) < 0) - goto cleanup; + return -1; } =20 /* No other devices are currently supported on spapr-vio */ =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1376,7 +1372,6 @@ static int qemuDomainSetupIsolationGroups(virDomainDefPtr def) { int idx; - int ret =3D -1; =20 /* Only pSeries guests care about isolation groups at the moment */ if (!qemuDomainIsPSeries(def)) @@ -1384,7 +1379,7 @@ qemuDomainSetupIsolationGroups(virDomainDefPtr def) =20 idx =3D virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0= ); if (idx < 0) - goto cleanup; + return -1; =20 /* We want to prevent hostdevs from being plugged into the default PHB: * we can make sure that doesn't happen by locking its isolation group= */ @@ -1394,13 +1389,10 @@ qemuDomainSetupIsolationGroups(virDomainDefPtr def) if (virDomainDeviceInfoIterate(def, qemuDomainFillDeviceIsolationGroupIter, NULL) < 0) { - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -1500,7 +1492,6 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_GNU= C_UNUSED, void *opaque) { virDomainPCIAddressSetPtr addrs =3D opaque; - int ret =3D -1; virPCIDeviceAddressPtr addr =3D &info->addr.pci; =20 if (!virDeviceInfoPCIAddressIsPresent(info) || @@ -1577,12 +1568,10 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def G_G= NUC_UNUSED, if (virDomainPCIAddressReserveAddr(addrs, addr, info->pciConnectFlags, info->isolationGroup) < 0) { - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f4ff2ba292..9316ab309d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3662,7 +3662,6 @@ static int qemuDumpWaitForCompletion(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; =20 VIR_DEBUG("Waiting for dump completion"); while (!priv->job.dumpCompleted && !priv->job.abortJob) { @@ -3679,14 +3678,11 @@ qemuDumpWaitForCompletion(virDomainObjPtr vm) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("memory-only dump failed for unknown reason")= ); =20 - goto cleanup; + return -1; } qemuDomainJobInfoUpdateTime(priv->job.current); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3728,21 +3724,19 @@ qemuDumpToFd(virQEMUDriverPtr driver, _("unsupported dumpformat '%s' " "for this QEMU binary"), dumpformat); - ret =3D -1; ignore_value(qemuDomainObjExitMonitor(driver, vm)); - goto cleanup; + return -1; } } =20 ret =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); =20 if ((qemuDomainObjExitMonitor(driver, vm) < 0) || ret < 0) - goto cleanup; + return -1; =20 if (detach) ret =3D qemuDumpWaitForCompletion(vm); =20 - cleanup: return ret; } =20 @@ -7405,13 +7399,12 @@ static int qemuConnectListDefinedDomains(virConnect= Ptr conn, int ret =3D -1; =20 if (virConnectListDefinedDomainsEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 ret =3D virDomainObjListGetInactiveNames(driver->domains, names, nname= s, virConnectListDefinedDomainsChe= ckACL, conn); =20 - cleanup: return ret; } =20 @@ -7421,13 +7414,12 @@ static int qemuConnectNumOfDefinedDomains(virConnec= tPtr conn) int ret =3D -1; =20 if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 ret =3D virDomainObjListNumOfDomains(driver->domains, false, virConnectNumOfDefinedDomainsCheckA= CL, conn); =20 - cleanup: return ret; } =20 @@ -7963,22 +7955,21 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, virDomainDiskDefPtr disk =3D dev->data.disk; virDomainDiskDefPtr orig_disk =3D NULL; virDomainDeviceDef oldDev =3D { .type =3D dev->type }; - int ret =3D -1; =20 if (!(orig_disk =3D virDomainDiskByTarget(vm->def, disk->dst))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("disk '%s' not found"), disk->dst); - goto cleanup; + return -1; } =20 oldDev.data.disk =3D orig_disk; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, true) < 0) - goto cleanup; + return -1; =20 if (!qemuDomainDiskChangeSupported(disk, orig_disk)) - goto cleanup; + return -1; =20 if (!virStorageSourceIsSameLocation(disk->src, orig_disk->src)) { /* Disk source can be changed only for removable devices */ @@ -7987,12 +7978,12 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk source can be changed only in removable= " "drives")); - goto cleanup; + return -1; } =20 if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, dev->data.disk->src, force) < 0) - goto cleanup; + return -1; =20 dev->data.disk->src =3D NULL; } @@ -8000,9 +7991,7 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, orig_disk->startupPolicy =3D dev->data.disk->startupPolicy; orig_disk->snapshot =3D dev->data.disk->snapshot; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -12321,20 +12310,16 @@ qemuConnectDomainEventRegister(virConnectPtr conn, virFreeCallback freecb) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainEventRegisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainEventStateRegister(conn, driver->domainEventState, callback, opaque, freecb) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -12343,20 +12328,16 @@ qemuConnectDomainEventDeregister(virConnectPtr co= nn, virConnectDomainEventCallback callback) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainEventDeregisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainEventStateDeregister(conn, driver->domainEventState, callback) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -12372,7 +12353,7 @@ qemuConnectDomainEventRegisterAny(virConnectPtr con= n, int ret =3D -1; =20 if (virConnectDomainEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainEventStateRegisterID(conn, driver->domainEventState, @@ -12380,7 +12361,6 @@ qemuConnectDomainEventRegisterAny(virConnectPtr con= n, callback, opaque, freecb, &ret) < 0) ret =3D -1; =20 - cleanup: return ret; } =20 @@ -12390,20 +12370,16 @@ qemuConnectDomainEventDeregisterAny(virConnectPtr= conn, int callbackID) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->domainEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -15012,7 +14988,6 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); - int ret =3D -1; size_t i; bool active =3D virDomainObjIsActive(vm); bool reuse =3D (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; @@ -15026,7 +15001,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, =20 if (disk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && qemuDomainDiskBlockJobIsActive(dom_disk)) - goto cleanup; + return -1; =20 switch ((virDomainSnapshotLocation) disk->snapshot) { case VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL: @@ -15037,12 +15012,12 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, _("active qemu domains require external dis= k " "snapshots; disk %s requested internal"), disk->name); - goto cleanup; + return -1; } =20 if (qemuDomainSnapshotPrepareDiskInternal(dom_disk, active) < 0) - goto cleanup; + return -1; =20 if (vm->def->disks[i]->src->format > 0 && vm->def->disks[i]->src->format !=3D VIR_STORAGE_FILE_QCOW2= ) { @@ -15052,7 +15027,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, disk->name, virStorageFileFormatTypeToString( vm->def->disks[i]->src->format)); - goto cleanup; + return -1; } break; =20 @@ -15066,12 +15041,12 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, "is unsupported: %s"), disk->name, virStorageFileFormatTypeToString(disk->src-= >format)); - goto cleanup; + return -1; } =20 if (qemuDomainSnapshotPrepareDiskExternal(dom_disk, disk, active, reuse, block= dev) < 0) - goto cleanup; + return -1; =20 external++; break; @@ -15087,7 +15062,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, case VIR_DOMAIN_SNAPSHOT_LOCATION_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected code path")); - goto cleanup; + return -1; } } =20 @@ -15095,7 +15070,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nothing selected for snapshot")); - goto cleanup; + return -1; } =20 /* internal snapshot requires a disk image to store the memory image t= o, and @@ -15105,7 +15080,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("internal and full system snapshots require all " "disks to be selected for snapshot")); - goto cleanup; + return -1; } =20 /* disk snapshot requires at least one disk */ @@ -15113,7 +15088,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk-only snapshots require at least " "one disk to be selected for snapshot")); - goto cleanup; + return -1; } =20 /* For now, we don't allow mixing internal and external disks. @@ -15125,7 +15100,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("mixing internal and external targets for a snaps= hot " "is not yet supported")); - goto cleanup; + return -1; } =20 /* internal snapshots + pflash based loader have the following problem= s: @@ -15142,17 +15117,14 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("internal snapshots of a VM with pflash based " "firmware are not supported")); - goto cleanup; + return -1; } =20 /* Alter flags to let later users know what we learned. */ if (external && !active) *flags |=3D VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -17423,7 +17395,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, case QEMU_BLOCKJOB_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid job type '%d'"), job->type); - goto cleanup; + return -1; =20 case QEMU_BLOCKJOB_TYPE_PULL: case QEMU_BLOCKJOB_TYPE_COMMIT: @@ -17432,7 +17404,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_INVALID, _("job type '%s' does not support pivot"), qemuBlockjobTypeToString(job->type)); - goto cleanup; + return -1; =20 case QEMU_BLOCKJOB_TYPE_COPY: case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: @@ -17443,7 +17415,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, _("block job '%s' not ready for pivot yet"), job->name); - goto cleanup; + return -1; } =20 qemuDomainObjEnterMonitor(driver, vm); @@ -17451,20 +17423,17 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, ret =3D qemuMonitorJobComplete(priv->mon, job->name); else ret =3D qemuMonitorDrivePivot(priv->mon, job->name); - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - ret =3D -1; - goto cleanup; - } + if (qemuDomainObjExitMonitor(driver, vm) < 0) + return -1; =20 /* The pivot failed. The block job in QEMU remains in the synchronised= state */ if (ret < 0) - goto cleanup; + return -1; =20 if (disk && disk->mirror) disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT; job->state =3D QEMU_BLOCKJOB_STATE_PIVOTING; =20 - cleanup: return ret; } =20 @@ -19809,18 +19778,14 @@ qemuConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 if (virConnectListAllDomainsEnsureACL(conn) < 0) - goto cleanup; - - ret =3D virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); + return -1; =20 - cleanup: - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } =20 static char * @@ -19882,7 +19847,7 @@ qemuConnectDomainQemuMonitorEventRegister(virConnec= tPtr conn, int ret =3D -1; =20 if (virConnectDomainQemuMonitorEventRegisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virDomainQemuMonitorEventStateRegisterID(conn, driver->domainEventState, @@ -19891,7 +19856,6 @@ qemuConnectDomainQemuMonitorEventRegister(virConnec= tPtr conn, &ret) < 0) ret =3D -1; =20 - cleanup: return ret; } =20 @@ -19901,19 +19865,15 @@ qemuConnectDomainQemuMonitorEventDeregister(virCo= nnectPtr conn, int callbackID) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; =20 if (virConnectDomainQemuMonitorEventDeregisterEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->domainEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -20795,13 +20755,12 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driv= er G_GNUC_UNUSED, { size_t i; struct _virDomainInterfaceStats tmp; - int ret =3D -1; =20 if (!virDomainObjIsActive(dom)) return 0; =20 if (virTypedParamListAddUInt(params, dom->def->nnets, "net.count") < 0) - goto cleanup; + return -1; =20 /* Check the path is one of the domain's network interfaces. */ for (i =3D 0; i < dom->def->nnets; i++) { @@ -20816,7 +20775,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver= G_GNUC_UNUSED, actualType =3D virDomainNetGetActualType(net); =20 if (virTypedParamListAddString(params, net->ifname, "net.%zu.name"= , i) < 0) - goto cleanup; + return -1; =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0)= { @@ -20849,9 +20808,7 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver= G_GNUC_UNUSED, "tx.drop", tmp.tx_drop); } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 #undef QEMU_ADD_NET_PARAM diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 811ad952c5..b2fceec582 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3298,23 +3298,19 @@ qemuDomainAttachLease(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainLeaseDefPtr lease) { - int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virDomainLeaseInsertPreAlloc(vm->def) < 0) - goto cleanup; + return -1; =20 if (virDomainLockLeaseAttach(driver->lockManager, cfg->uri, vm, lease) < 0) { virDomainLeaseInsertPreAlloced(vm->def, NULL); - goto cleanup; + return -1; } =20 virDomainLeaseInsertPreAlloced(vm->def, lease); - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -3329,7 +3325,7 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, =20 if (!oldbridge || !newbridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge nam= e")); - goto cleanup; + return -1; } =20 VIR_DEBUG("Change bridge for interface %s: %s -> %s", @@ -3338,7 +3334,7 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, if (virNetDevExists(newbridge) !=3D 1) { virReportError(VIR_ERR_OPERATION_FAILED, _("bridge %s doesn't exist"), newbridge); - goto cleanup; + return -1; } =20 ret =3D virNetDevBridgeRemovePort(oldbridge, olddev->ifname); @@ -3362,12 +3358,10 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, _("unable to recover former state by adding por= t " "to bridge %s"), oldbridge); } - goto cleanup; + return ret; } /* caller will replace entire olddev with newdev in domain nets list */ - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -4010,20 +4004,19 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *type =3D virDomainGraphicsTypeToString(dev->type); size_t i; - int ret =3D -1; =20 if (!olddev) { virReportError(VIR_ERR_DEVICE_MISSING, _("cannot find existing graphics device to modify o= f " "type '%s'"), type); - goto cleanup; + return -1; } =20 if (dev->nListens !=3D olddev->nListens) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change the number of listen addresses " "on '%s' graphics"), type); - goto cleanup; + return -1; } =20 for (i =3D 0; i < dev->nListens; i++) { @@ -4034,7 +4027,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change the type of listen address " "on '%s' graphics"), type); - goto cleanup; + return -1; } =20 switch (newlisten->type) { @@ -4043,7 +4036,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen address setting " "on '%s' graphics"), type); - goto cleanup; + return -1; } =20 break; @@ -4053,7 +4046,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen address setting " "on '%s' graphics"), type); - goto cleanup; + return -1; } =20 break; @@ -4063,7 +4056,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot change listen socket setting " "on '%s' graphics"), type); - goto cleanup; + return -1; } break; =20 @@ -4081,12 +4074,12 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, (olddev->data.vnc.port !=3D dev->data.vnc.port))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on vnc graphics"= )); - goto cleanup; + return -1; } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)= ) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change keymap setting on vnc graphics= ")); - goto cleanup; + return -1; } =20 /* If a password lifetime was, or is set, or action if connected h= as @@ -4099,13 +4092,13 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, dev->data.vnc.auth.passwd)) { VIR_DEBUG("Updating password on VNC server %p %p", dev->data.vnc.auth.passwd, cfg->vncPassword); - ret =3D qemuDomainChangeGraphicsPasswords(driver, vm, - VIR_DOMAIN_GRAPHICS_TY= PE_VNC, - &dev->data.vnc.auth, - cfg->vncPassword, - QEMU_ASYNC_JOB_NONE); - if (ret < 0) - goto cleanup; + + if (qemuDomainChangeGraphicsPasswords(driver, vm, + VIR_DOMAIN_GRAPHICS_TYPE= _VNC, + &dev->data.vnc.auth, + cfg->vncPassword, + QEMU_ASYNC_JOB_NONE) < 0) + return -1; =20 /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.vnc.auth.passwd); @@ -4114,8 +4107,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, olddev->data.vnc.auth.validTo =3D dev->data.vnc.auth.validTo; olddev->data.vnc.auth.expires =3D dev->data.vnc.auth.expires; olddev->data.vnc.auth.connected =3D dev->data.vnc.auth.connect= ed; - } else { - ret =3D 0; } break; =20 @@ -4127,13 +4118,13 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, (olddev->data.spice.tlsPort !=3D dev->data.spice.tlsPort))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on spice graphic= s")); - goto cleanup; + return -1; } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change keymap setting on spice graph= ics")); - goto cleanup; + return -1; } =20 /* We must reset the password if it has changed but also if: @@ -4150,14 +4141,12 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", dev->data.spice.auth.passwd, cfg->spicePassword); - ret =3D qemuDomainChangeGraphicsPasswords(driver, vm, - VIR_DOMAIN_GRAPHICS_TY= PE_SPICE, - &dev->data.spice.auth, - cfg->spicePassword, - QEMU_ASYNC_JOB_NONE); - - if (ret < 0) - goto cleanup; + if (qemuDomainChangeGraphicsPasswords(driver, vm, + VIR_DOMAIN_GRAPHICS_TYPE= _SPICE, + &dev->data.spice.auth, + cfg->spicePassword, + QEMU_ASYNC_JOB_NONE) < 0) + return -1; =20 /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.spice.auth.passwd); @@ -4168,7 +4157,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, olddev->data.spice.auth.connected =3D dev->data.spice.auth.con= nected; } else { VIR_DEBUG("Not updating since password didn't change"); - ret =3D 0; } break; =20 @@ -4185,8 +4173,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; } =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index dff4b3d76d..bb62b53c04 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -53,7 +53,6 @@ VIR_LOG_INIT("qemu.qemu_interface"); int qemuInterfaceStartDevice(virDomainNetDefPtr net) { - int ret =3D -1; virDomainNetType actualType =3D virDomainNetGetActualType(net); =20 switch (actualType) { @@ -71,7 +70,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) if (virNetDevBridgeFDBAdd(&net->mac, net->ifname, VIR_NETDEVBRIDGE_FDB_FLAG_MASTER | VIR_NETDEVBRIDGE_FDB_FLAG_TEMP) < 0) - goto cleanup; + return -1; } break; =20 @@ -84,9 +83,9 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) * some sort of "blip" in the physdev's status. */ if (physdev && virNetDevGetOnline(physdev, &isOnline) < 0) - goto cleanup; + return -1; if (!isOnline && virNetDevSetOnline(physdev, true) < 0) - goto cleanup; + return -1; =20 /* macvtap devices share their MAC address with the guest * domain, and if they are set online prior to the domain CPUs @@ -101,13 +100,13 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) * we are starting the domain CPUs. */ if (virNetDevSetOnline(net->ifname, true) < 0) - goto cleanup; + return -1; break; } =20 case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevIPInfoAddToDev(net->ifname, &net->hostIP) < 0) - goto cleanup; + return -1; =20 break; =20 @@ -124,9 +123,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) break; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 /** @@ -159,7 +156,6 @@ qemuInterfaceStartDevices(virDomainDefPtr def) int qemuInterfaceStopDevice(virDomainNetDefPtr net) { - int ret =3D -1; virDomainNetType actualType =3D virDomainNetGetActualType(net); =20 switch (actualType) { @@ -173,7 +169,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) if (virNetDevBridgeFDBDel(&net->mac, net->ifname, VIR_NETDEVBRIDGE_FDB_FLAG_MASTER | VIR_NETDEVBRIDGE_FDB_FLAG_TEMP) < 0) - goto cleanup; + return -1; } break; =20 @@ -186,7 +182,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) * on this network. */ if (virNetDevSetOnline(net->ifname, false) < 0) - goto cleanup; + return -1; =20 /* also mark the physdev down for passthrough macvtap, as the * physdev has the same MAC address as the macvtap device. @@ -194,7 +190,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) if (virDomainNetGetActualDirectMode(net) =3D=3D VIR_NETDEV_MACVLAN_MODE_PASSTHRU && physdev && virNetDevSetOnline(physdev, false) < 0) - goto cleanup; + return -1; break; } =20 @@ -212,9 +208,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) break; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 /** diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0447aa73bf..487ed03d9f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1768,7 +1768,6 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G= _GNUC_UNUSED, qemuMigrationCookiePtr cookie) { virDomainNetDefPtr netptr; - int ret =3D -1; size_t i; =20 for (i =3D 0; i < cookie->network->nnets; i++) { @@ -1785,7 +1784,7 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G= _GNUC_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to run command to set OVS port da= ta for " "interface %s"), netptr->ifname); - goto cleanup; + return -1; } break; default: @@ -1793,9 +1792,7 @@ qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G= _GNUC_UNUSED, } } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -1846,7 +1843,6 @@ qemuMigrationDstRun(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; int rv; =20 VIR_DEBUG("Setting up incoming migration with URI %s", uri); @@ -1857,21 +1853,16 @@ qemuMigrationDstRun(virQEMUDriverPtr driver, rv =3D qemuMonitorMigrateIncoming(priv->mon, uri); =20 if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) - goto cleanup; + return -1; =20 - if (asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_IN) { + if (asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_IN) /* qemuMigrationDstWaitForCompletion is called from the Finish pha= se */ - ret =3D 0; - goto cleanup; - } + return 0; =20 if (qemuMigrationDstWaitForCompletion(driver, vm, asyncJob, false) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -4657,9 +4648,9 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, if (!(flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, flags) < 0) - goto cleanup; + return ret; } else if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)= ) { - goto cleanup; + return ret; } =20 qemuMigrationJobStartPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); @@ -4694,7 +4685,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, if (!virDomainObjIsActive(vm)) qemuDomainRemoveInactiveJob(driver, vm); =20 - cleanup: return ret; } =20 @@ -5318,7 +5308,6 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; bool storage =3D false; size_t i; - int ret =3D -1; =20 VIR_DEBUG("Canceling unfinished outgoing migration of domain %s", vm->def->name); @@ -5326,7 +5315,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; @@ -5348,12 +5337,9 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, if (storage && qemuMigrationSrcNBDCopyCancel(driver, vm, false, QEMU_ASYNC_JOB_NONE, NULL) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4cf4069d50..797fe849e3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2243,24 +2243,21 @@ qemuProcessRefreshPRManagerState(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuMonitorPRManagerInfoPtr prManagerInfo; const char *managedAlias =3D qemuDomainGetManagedPRAlias(); - int ret =3D -1; =20 if (!(prManagerInfo =3D virHashLookup(info, managedAlias))) { virReportError(VIR_ERR_OPERATION_FAILED, _("missing info on pr-manager %s"), managedAlias); - goto cleanup; + return -1; } =20 priv->prDaemonRunning =3D prManagerInfo->connected; =20 if (!priv->prDaemonRunning && qemuProcessStartManagedPRDaemon(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -4978,16 +4975,15 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr graphics; bool allocate =3D !(flags & VIR_QEMU_PROCESS_START_PRETEND); size_t i; - int ret =3D -1; =20 for (i =3D 0; i < vm->def->ngraphics; i++) { graphics =3D vm->def->graphics[i]; =20 if (qemuProcessGraphicsSetupRenderNode(graphics, qemuCaps) < 0) - goto cleanup; + return -1; =20 if (qemuProcessGraphicsSetupListen(driver, graphics, vm) < 0) - goto cleanup; + return -1; } =20 if (allocate) { @@ -4995,7 +4991,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, graphics =3D vm->def->graphics[i]; =20 if (qemuProcessGraphicsReservePorts(graphics, false) < 0) - goto cleanup; + return -1; } } =20 @@ -5003,13 +4999,10 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, graphics =3D vm->def->graphics[i]; =20 if (qemuProcessGraphicsAllocatePorts(driver, graphics, allocate) <= 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -5110,20 +5103,15 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *path) { - int ret =3D -1; - if (virFileMakePathWithMode(path, 0750) < 0) { virReportSystemError(errno, _("Cannot create directory '%s'"), pat= h); - goto cleanup; + return -1; } =20 if (qemuSecurityDomainSetPathLabel(driver, vm, path, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -8502,7 +8490,6 @@ static int qemuProcessQMPInit(qemuProcessQMPPtr proc) { char *template =3D NULL; - int ret =3D -1; =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 @@ -8513,11 +8500,11 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) _("Failed to create unique directory with " "template '%s' for probing QEMU"), template); - goto cleanup; + return -1; } =20 if (qemuProcessQEMULabelUniqPath(proc) < 0) - goto cleanup; + return -1; =20 proc->monpath =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.monitor= "); =20 @@ -8530,10 +8517,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) */ proc->pidfile =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.pid"); =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -8542,7 +8526,6 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) { const char *machine; int status =3D 0; - int ret =3D -1; int rc; =20 if (proc->forceTCG) @@ -8586,7 +8569,7 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) virCommandSetErrorBuffer(proc->cmd, &(proc->stdErr)); =20 if (virCommandRun(proc->cmd, &status) < 0) - goto cleanup; + return -1; =20 if (status !=3D 0) { VIR_DEBUG("QEMU %s exited with status %d", proc->binary, status); @@ -8594,18 +8577,15 @@ qemuProcessQMPLaunch(qemuProcessQMPPtr proc) _("Failed to start QEMU binary %s for probing: %s"), proc->binary, proc->stdErr ? proc->stdErr : _("unknown error")); - goto cleanup; + return -1; } =20 if ((rc =3D virPidFileReadPath(proc->pidfile, &proc->pid)) < 0) { virReportSystemError(-rc, _("Failed to read pidfile %s"), proc->pi= dfile); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -8678,21 +8658,16 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) int qemuProcessQMPStart(qemuProcessQMPPtr proc) { - int ret =3D -1; - VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 if (qemuProcessQMPInit(proc) < 0) - goto cleanup; + return -1; =20 if (qemuProcessQMPLaunch(proc) < 0) - goto cleanup; + return -1; =20 if (qemuProcessQMPConnectMonitor(proc) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 62b9f803bd..b435fc0bf0 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -316,8 +316,6 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, uid_t qemu_user, const char *shortName) { - int ret =3D -1; - if (virTPMEmulatorInit() < 0) return -1; =20 @@ -328,7 +326,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, /* ... and adjust ownership */ if (virDirCreate(logDir, 0730, swtpm_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) - goto cleanup; + return -1; =20 /* create logfile name ... */ if (!tpm->data.emulator.logfile) @@ -336,7 +334,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, =20 if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { - goto cleanup; + return -1; } =20 /* ... and make sure it can be accessed by swtpm_user */ @@ -344,7 +342,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, virReportSystemError(errno, _("Could not chown on swtpm logfile %s"), tpm->data.emulator.logfile); - goto cleanup; + return -1; } =20 /* @@ -356,20 +354,16 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, */ if (virDirCreate(swtpmStateDir, 0770, qemu_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) - goto cleanup; + return -1; =20 /* create the socket filename */ if (!tpm->data.emulator.source.data.nix.path && !(tpm->data.emulator.source.data.nix.path =3D qemuTPMCreateEmulatorSocket(swtpmStateDir, shortName))) - goto cleanup; + return -1; tpm->data.emulator.source.type =3D VIR_DOMAIN_CHR_TYPE_UNIX; =20 - ret =3D 0; - - cleanup: - - return ret; + return 0; } =20 /* --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list