From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1605217754; cv=none; d=zohomail.com; s=zohoarc; b=k3/7YFTBYoXSI58MOR+nKNdRp1LRCbwbNqQN68hO/O1AY8W3gQqPwT5qgJwMHZUbFe2bZglIzQcj+S7jtFChW2solYfQY7GkWuASN6qkf7k3K4ckoHF76/e8CiphFRB0CHgY7Md0Ph9KUohCQoqxLc3jEvKfdKSRJ89/4Dl7oI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217754; 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=TqBEDebxVK28nO4MtX4BzN17xU7A4lVVEcj+yezZvWI=; b=cbkiXTAW7L7fZGWh2kpZIZFa9aZyBD22GMKH5hRsMfLB9cKY+ouBvgVceU8yzdDQopSidd7PCzxh0Yi/v+7ZZCxHncOFsU/iiWVM/yEJ+PZfItFLn7Cugi7oAPivuIdTwLWKjjJ0VL/vvH5MzokfH1xtRWHftqgq7cqZftx+d10= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605217754109196.5326225643388; Thu, 12 Nov 2020 13:49:14 -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-378-RClqlc7CPOKH85f1saExHA-1; Thu, 12 Nov 2020 16:49:10 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A19F1074647; Thu, 12 Nov 2020 21:49:05 +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 695081C4; Thu, 12 Nov 2020 21:49:05 +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 350915810C; Thu, 12 Nov 2020 21:49:05 +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 0ACLmvHF005437 for ; Thu, 12 Nov 2020 16:48:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6DEF92023451; Thu, 12 Nov 2020 21:48:57 +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 68CB42017E93 for ; Thu, 12 Nov 2020 21:48:54 +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 1F84E1021F87 for ; Thu, 12 Nov 2020 21:48:54 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-110-yUqMzQOQNE-S2-MRe5KNEg-1; Thu, 12 Nov 2020 16:48:51 -0500 Received: by mail-qk1-f193.google.com with SMTP id 11so6999746qkd.5 for ; Thu, 12 Nov 2020 13:48:50 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:49 -0800 (PST) X-MC-Unique: RClqlc7CPOKH85f1saExHA-1 X-MC-Unique: yUqMzQOQNE-S2-MRe5KNEg-1 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=TqBEDebxVK28nO4MtX4BzN17xU7A4lVVEcj+yezZvWI=; b=k1FrNCfX5gilpIlmvsMbTLhU7i4HY0naVMPpEAQt0BKsTRoO7TCQ2saxl+e8fHq4Ce Krc2i6hav1AWoVooqynJqlnpYRKhLtAgoSdwQpzbn+zAbATe41Sdv3TiQuQGHEzgynAG VL07NFDy65VPKNaWAkAdI54RUn1VMO8+XtMihoD7DDkL65wz3tTraNVFPjlTttwuDtt8 7x5wWiffQ/rPMtoIssh++ArEXKFZydHKxy7fTGlBgjpTjDlI+WPf9nQvs7hDF/dun4Yx L4T7pMBGS2ZGOrCOlqebAphU+o67VNEOsHGEYQOuyVuG3aV5CxUXT0DfPrV8ARb3+DOA PCYA== X-Gm-Message-State: AOAM532BTP9qhhff7lINkdrRoH91zZwRXwACftozFVQwAHyxOLGSTbtD LIVpj1FyLCJNJaRx+aI/h+n+1JI9CGo= X-Google-Smtp-Source: ABdhPJzONWQlB1QVdWcRL/JLZVVHg/z3jcNfaeuyALTA9pCxwFbUudBWYsT7DU60oYQJXPVUmrbqkQ== X-Received: by 2002:ae9:dc45:: with SMTP id q66mr1866129qkf.407.1605217730112; Thu, 12 Nov 2020 13:48:50 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 01/10] qemu_driver.c: use g_autoptr() with virDomainDef pointers Date: Thu, 12 Nov 2020 18:48:31 -0300 Message-Id: <20201112214840.636909-2-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_driver.c | 54 ++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 05f8eb2cb7..fdbac9d21d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1737,7 +1737,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; @@ -1810,7 +1810,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, qemuProcessEndJob(driver, vm); =20 cleanup: - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); @@ -5997,7 +5996,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, { virQEMUDriverPtr driver =3D conn->privateData; qemuDomainObjPrivatePtr priv =3D NULL; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObjPtr vm =3D NULL; g_autofree char *xmlout =3D NULL; const char *newxml =3D dxml; @@ -6078,7 +6077,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, qemuProcessEndJob(driver, vm); =20 cleanup: - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) ret =3D -1; @@ -6104,7 +6102,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, con= st char *path, { virQEMUDriverPtr driver =3D conn->privateData; char *ret =3D NULL; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; int fd =3D -1; virQEMUSaveDataPtr data =3D NULL; =20 @@ -6123,7 +6121,6 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, con= st char *path, =20 cleanup: virQEMUSaveDataFree(data); - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); return ret; } @@ -6134,8 +6131,8 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, cons= t char *path, { virQEMUDriverPtr driver =3D conn->privateData; int ret =3D -1; - virDomainDefPtr def =3D NULL; - virDomainDefPtr newdef =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; + g_autoptr(virDomainDef) newdef =3D NULL; int fd =3D -1; virQEMUSaveDataPtr data =3D NULL; int state =3D -1; @@ -6194,8 +6191,6 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, cons= t char *path, ret =3D 0; =20 cleanup: - virDomainDefFree(def); - virDomainDefFree(newdef); VIR_FORCE_CLOSE(fd); virQEMUSaveDataFree(data); return ret; @@ -6208,7 +6203,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) virDomainObjPtr vm; g_autofree char *path =3D NULL; char *ret =3D NULL; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; int fd =3D -1; virQEMUSaveDataPtr data =3D NULL; qemuDomainObjPrivatePtr priv; @@ -6240,7 +6235,6 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, uns= igned int flags) =20 cleanup: virQEMUSaveDataFree(data); - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&vm); return ret; @@ -6289,7 +6283,7 @@ qemuDomainObjRestore(virConnectPtr conn, bool bypass_cache, qemuDomainAsyncJob asyncJob) { - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; int fd =3D -1; int ret =3D -1; @@ -6350,7 +6344,6 @@ qemuDomainObjRestore(virConnectPtr conn, =20 cleanup: virQEMUSaveDataFree(data); - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); if (virFileWrapperFdClose(wrapperFd) < 0) ret =3D -1; @@ -6689,8 +6682,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - virDomainDefPtr def =3D NULL; - virDomainDefPtr oldDef =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; @@ -6751,8 +6744,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virDomainDefFree(oldDef); - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); return dom; @@ -7755,7 +7746,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virDomainDefPtr vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDef devConfSave =3D { 0 }; @@ -7845,7 +7836,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, =20 ret =3D 0; cleanup: - virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); =20 @@ -7903,7 +7893,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm =3D NULL; qemuDomainObjPrivatePtr priv; - virDomainDefPtr vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; @@ -7998,7 +7988,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(vmdef); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -8017,7 +8006,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; - virDomainDefPtr vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -8092,7 +8081,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - virDomainDefFree(vmdef); return ret; } =20 @@ -8107,7 +8095,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; - virDomainDefPtr vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; int ret =3D -1; =20 @@ -8161,7 +8149,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, =20 ret =3D 0; cleanup: - virDomainDefFree(vmdef); return ret; } =20 @@ -9281,7 +9268,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, virDomainObjPtr vm =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; - virDomainDefPtr persistentDefCopy =3D NULL; + g_autoptr(virDomainDef) persistentDefCopy =3D NULL; unsigned long long value_ul; long long value_l; int ret =3D -1; @@ -9569,7 +9556,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(persistentDefCopy); virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); @@ -11168,7 +11154,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; @@ -11204,7 +11190,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } =20 @@ -11224,7 +11209,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; @@ -11270,7 +11255,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } =20 @@ -11612,7 +11596,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; qemuMigrationParamsPtr migParams =3D NULL; int ret =3D -1; @@ -11642,7 +11626,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } =20 @@ -11658,7 +11641,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, unsigned int flags) { virQEMUDriverPtr driver =3D dconn->privateData; - virDomainDefPtr def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; g_autofree char *origname =3D NULL; @@ -11700,7 +11683,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 cleanup: qemuMigrationParamsFree(migParams); - virDomainDefFree(def); return ret; } =20 --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1605217747; cv=none; d=zohomail.com; s=zohoarc; b=Py0PEq4PxFUd2YhL/GGlB0JM0FnRyrtx5JNBgNWDvZOyufv+6mRZgyoEfM/1/udNjlNeMPxdhcEWyK2UR0cinHlFwOvFCyRKYw2qc5vI6D8X4N8oAbnCBdrnuPM/59p5CoywW33U3PpDH+vZvj6XJMIMrEGD36wFngvWKeHRxfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217747; 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=NWfAWc2FHewIwSxwn+XiGqZQINa5k1/sBJ1wdaPK9C4=; b=DiAAtgJlu69V0igL4+9EO67g/kffAsSF+LEIa6JOdrW2Ypuoacu16rfL0Dtct9UhU8VXciDQoQhiI+7vo+7H63nb1pCIb12G+C0Gj8Swhv0HWe1Ql9RUPR2a39cpOZpIlUDRm+8ObbOrm88fjKPYsePsxO0ihQ0nr2WUj/NHgQw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605217747236719.0614565289469; Thu, 12 Nov 2020 13:49:07 -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-464-xVc_CgcuOfejToWeKmUYew-1; Thu, 12 Nov 2020 16:49:04 -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 D5F83803F60; Thu, 12 Nov 2020 21:48:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F02C5B4D8; Thu, 12 Nov 2020 21:48:58 +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 D6AA4180B658; Thu, 12 Nov 2020 21:48:56 +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 0ACLmtTN005411 for ; Thu, 12 Nov 2020 16:48:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id DEE212156A50; Thu, 12 Nov 2020 21:48:54 +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 D96702156A49 for ; Thu, 12 Nov 2020 21:48:54 +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 BB7CF1021F88 for ; Thu, 12 Nov 2020 21:48:54 +0000 (UTC) Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-433-YSnUCphbPXqHi-mE8lnqTw-1; Thu, 12 Nov 2020 16:48:52 -0500 Received: by mail-qk1-f194.google.com with SMTP id q22so6991326qkq.6 for ; Thu, 12 Nov 2020 13:48:52 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:51 -0800 (PST) X-MC-Unique: xVc_CgcuOfejToWeKmUYew-1 X-MC-Unique: YSnUCphbPXqHi-mE8lnqTw-1 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=NWfAWc2FHewIwSxwn+XiGqZQINa5k1/sBJ1wdaPK9C4=; b=bzsZ3TREyrbwCqQKMMgBUzvsvSFqiPCaaZdO8zHnC2BTx/1kOv5fnAh6llpkTlRuxJ tLgJ1D8Y6Q70XA3FPOrxR9+37H7Gwca8uuOsVMZIdM6bI/VosUDiP8XjXPLlAoH13MQ4 QvPdaVjnafZk6DvGyhqURh4lLsmqi4n8HUpSY6jEbpoGgVb/DmoMoMHEtPA2pFjgixUC WtvVVW7yleP4yVRZ/gr5ZbiFIR8Q06Fap1tVzoqrvIbSHc3uCy/LhbImFJmFOlM1jC/W h98Ux8/Kom9EG95dShFrnVK6OM/1thwvPG2vraHHvbLSKcM1XY0UOX5Emh6vXicIz4Ra qkiQ== X-Gm-Message-State: AOAM532iAEgxnUsJPNDrPurqQpSPg1HsF9kJvyThNCszodBNU2TTJ2oD UArJB6nuLjMKuIYTBtElDEJVjXUSPGA= X-Google-Smtp-Source: ABdhPJxdsOhCRSgZA6ZqC/FqTZJwl56Sh8WmtMb+AcFcbXlhvPNfj3rqCdVd8b8JIVR6182R4dy4Lg== X-Received: by 2002:a37:9d04:: with SMTP id g4mr2071149qke.358.1605217731705; Thu, 12 Nov 2020 13:48:51 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 02/10] qemu_driver.c: use g_autoptr() with qemuMigrationParams pointers Date: Thu, 12 Nov 2020 18:48:32 -0300 Message-Id: <20201112214840.636909-3-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_driver.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fdbac9d21d..2198e7f1e9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11156,7 +11156,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, virQEMUDriverPtr driver =3D dconn->privateData; g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11189,7 +11189,6 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, st, &def, origname, migParams, fla= gs); =20 cleanup: - qemuMigrationParamsFree(migParams); return ret; } =20 @@ -11211,7 +11210,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, virQEMUDriverPtr driver =3D dconn->privateData; g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11254,7 +11253,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, migParams, flags); =20 cleanup: - qemuMigrationParamsFree(migParams); return ret; } =20 @@ -11273,7 +11271,7 @@ qemuDomainMigratePerform(virDomainPtr dom, virDomainObjPtr vm =3D NULL; int ret =3D -1; const char *dconnuri =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); =20 @@ -11312,7 +11310,6 @@ qemuDomainMigratePerform(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - qemuMigrationParamsFree(migParams); return ret; } =20 @@ -11598,7 +11595,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, virQEMUDriverPtr driver =3D dconn->privateData; g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11625,7 +11622,6 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, st, &def, origname, migParams, fla= gs); =20 cleanup: - qemuMigrationParamsFree(migParams); return ret; } =20 @@ -11645,7 +11641,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, const char *dom_xml =3D NULL; const char *dname =3D NULL; g_autofree char *origname =3D NULL; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -11682,7 +11678,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, st, &def, origname, migParams, fla= gs); =20 cleanup: - qemuMigrationParamsFree(migParams); return ret; } =20 @@ -12988,7 +12983,7 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - qemuMigrationParamsPtr migParams =3D NULL; + g_autoptr(qemuMigrationParams) migParams =3D NULL; int ret =3D -1; int rc; =20 @@ -13029,7 +13024,6 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - qemuMigrationParamsFree(migParams); virDomainObjEndAPI(&vm); return ret; } --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1605217755; cv=none; d=zohomail.com; s=zohoarc; b=YtZAiqAWfov6JpLT7KFvBDMHwvuEqwi09Apt2hLxAhFIZSoo0UyzJCJyD4xA0Amq4PaLhY6fxxgIhmx7vjV/goMKLww/fnCQIbf0QHSPyienul57wd5OWhxKkdVz7OUlC2/Md8HTqxn26ZmbQSzGZNdLbqeBypeMSK/n/Bw2aaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217755; 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=1a3VoKWb6pAYePIKzKyOsHDUtsdBvUYTQg2xmBsQrtc=; b=UTEeYuUUEKmeOiJGHWDlklmwPEBqg13uOBpis2XiF/koSfmBHAQntqzwXKDClCFKmUw/TBlyosnohOe0mgZdm75YdlRhfWDS2GlCb2/TTciXAp+2ew0dgQmoj3z9BdeVDYTJ3FWw+B3Nm66yji+INh7L+a8CbX2vBnZ1RUplP18= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605217755650183.0191870051632; Thu, 12 Nov 2020 13:49:15 -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-118-reBvgX3AMrWtDpAEzXByLw-1; Thu, 12 Nov 2020 16:49:12 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05E3C1009E35; Thu, 12 Nov 2020 21:49:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D84786EF5F; Thu, 12 Nov 2020 21:49: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 A525B18037C6; Thu, 12 Nov 2020 21:49:06 +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 0ACLmwXs005448 for ; Thu, 12 Nov 2020 16:48:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 63CF01006512; Thu, 12 Nov 2020 21:48:58 +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 5F9711007A21 for ; Thu, 12 Nov 2020 21:48:56 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 15F4990E422 for ; Thu, 12 Nov 2020 21:48:56 +0000 (UTC) Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-581-4bInBSfLONqGdap6GLBnBg-1; Thu, 12 Nov 2020 16:48:53 -0500 Received: by mail-qk1-f194.google.com with SMTP id l2so7018065qkf.0 for ; Thu, 12 Nov 2020 13:48:53 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:52 -0800 (PST) X-MC-Unique: reBvgX3AMrWtDpAEzXByLw-1 X-MC-Unique: 4bInBSfLONqGdap6GLBnBg-1 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=1a3VoKWb6pAYePIKzKyOsHDUtsdBvUYTQg2xmBsQrtc=; b=WIc4caNmlYXVno7EAw72dr5PBdW5z6TXBnCZtrake0qY4xAGlnmwZY6EnUpT9nQ7X3 X9N2jst2BubnhscQc4xnz8jYAom2Wz3cENDtmL/vMtSwWXIszfdz7P8G/7GpS2xrPR7D Upi6uIQKXBIcLrfx32ZMyCavn21k41/WJIsoL9pIcBiV22mWBqU9jXzHAjhGuCuXij5H RMRMsv5K9kfD5esLtaefjWUi5cEpFrelTEfmBUA5ZixBRTY0XelucyJwVwnoP5Rq/i23 AooQCchHEOqNzpemON1AcME9nqbZiu7T0A+3Bypljwrr2WxSLUHvDuPKS+XCiM0fyIEJ y7Bg== X-Gm-Message-State: AOAM531o5bmwByB+v9amTC4FQkvzwSQedR3gi9ZM0J4hAfXVhI/6in21 aLPJxnNXgXrFOxYl/K5dtATPPhEHTqA= X-Google-Smtp-Source: ABdhPJzI7sJwBbjCY0FpuYVuqgGP/ahVNcURMDvLl4TAfEaBKtGimVJykWh4mM39IkKkoS7WFfHykA== X-Received: by 2002:a37:f706:: with SMTP id q6mr2063192qkj.234.1605217733301; Thu, 12 Nov 2020 13:48:53 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 03/10] qemu_driver.c: use g_autoptr() with virDomainDeviceDefPtr Date: Thu, 12 Nov 2020 18:48:33 -0300 Message-Id: <20201112214840.636909-4-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_driver.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2198e7f1e9..6ff7289fd1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7748,9 +7748,9 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virDomainDef) vmdef =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; - virDomainDeviceDefPtr devConf =3D NULL; + g_autoptr(virDomainDeviceDef) devConf =3D NULL; virDomainDeviceDef devConfSave =3D { 0 }; - virDomainDeviceDefPtr devLive =3D NULL; + g_autoptr(virDomainDeviceDef) devLive =3D NULL; int ret =3D -1; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -7836,9 +7836,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, =20 ret =3D 0; cleanup: - virDomainDeviceDefFree(devConf); - virDomainDeviceDefFree(devLive); - return ret; } =20 @@ -7894,7 +7891,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainObjPtr vm =3D NULL; qemuDomainObjPrivatePtr priv; g_autoptr(virDomainDef) vmdef =3D NULL; - virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; + g_autoptr(virDomainDeviceDef) dev =3D NULL; + virDomainDeviceDefPtr dev_copy =3D NULL; bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; @@ -7990,7 +7988,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, cleanup: if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); - virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virNWFilterUnlockFilterUpdates(); return ret; @@ -8004,7 +8001,8 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; - virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; + g_autoptr(virDomainDeviceDef) dev =3D NULL; + virDomainDeviceDefPtr dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; g_autoptr(virDomainDef) vmdef =3D NULL; int ret =3D -1; @@ -8080,7 +8078,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, cleanup: if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); - virDomainDeviceDefFree(dev); return ret; } =20 --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1605217758; cv=none; d=zohomail.com; s=zohoarc; b=E7qTKn3hQjm+PTwdsvJIus/SD/f89zzC70hGUc5JtkoQX0GOrOkdATQmFUivkr8pLpqH10T3HVu7PTV67IdqIG48QvO0T7AUO9Pg1dx4/NmwvLd1Apr3t0ftLlSruZrdH3DXQhwG1v9l5buHe3KccJSc44lgsBaPeu9dSVxilBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217758; 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=fFvn88jKxCTnryrU21p5T0iO9QU+5anBqMzi2kIOhYc=; b=V0YgQqd/cdzJ38qVXCuYy7aVRyiHGyLpV1YDHrGHvoT4QKxRvwGBzQAKdNf0lL7LzrjBRpjM99wpbM1b5aPWdHHVlP0NbUv8wkZSGnuhMBxT/4VMbsaJTUSkRnMEr2pTKoqSoOKLTp4u2+pKb76IDqvrZ6fVPpNLbZ7tMppMVJs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605217758951772.0138455725445; Thu, 12 Nov 2020 13:49:18 -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-107-Hpl7cYrgN-qfltTq6l1jJQ-1; Thu, 12 Nov 2020 16:49:14 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B9731009E40; Thu, 12 Nov 2020 21:49: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 2626B6EF5F; Thu, 12 Nov 2020 21:49:08 +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 E117358111; Thu, 12 Nov 2020 21:49:07 +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 0ACLmwoO005442 for ; Thu, 12 Nov 2020 16:48:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id E3CFB20110C7; Thu, 12 Nov 2020 21:48:57 +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 DEC1F2023451 for ; Thu, 12 Nov 2020 21:48:57 +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 C60C6800183 for ; Thu, 12 Nov 2020 21:48:57 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-107-X-PbL_3NOLu2uQLUSa3CbQ-1; Thu, 12 Nov 2020 16:48:55 -0500 Received: by mail-qt1-f193.google.com with SMTP id b16so5054312qtb.6 for ; Thu, 12 Nov 2020 13:48:55 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:54 -0800 (PST) X-MC-Unique: Hpl7cYrgN-qfltTq6l1jJQ-1 X-MC-Unique: X-PbL_3NOLu2uQLUSa3CbQ-1 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=fFvn88jKxCTnryrU21p5T0iO9QU+5anBqMzi2kIOhYc=; b=n+fEJEC6Kou8EF+eDGIbfI5z92J5Pk0yFZ5fpfWJzh45dXmsnbT4sGqW6l3vXdtVYy i8NBbr2fIPmNyrMOQEmFsstqyuRKqgf46V/7/lL8IlAScZmGssmi9h84/pTjWitesJK+ MUB5oD2CdulS2fxzFnZxMrqBJSSxITwWdRR/cyN0UFO7l/o4KY0FpibrbZqO9ow2Mrbk dLMzPNHary7mdiPhHAKRGn+spvDV3rsS2UaXLGbo+7RbN1V7AoHoKBdZpyYxygvoTTBy 1lA6qA9t+TQpXJpW7UnREcw/CA/IIrNWJ0fesvlnKZtDYMNomtVO8IeGfsPJmbgKG9CO Xe6g== X-Gm-Message-State: AOAM533fTe8CgDUP5Y08B7/251X9EAosBQtsrh2kJS1dvla/NZzfLFSG tTJSgWcj3LOZbgdbVmJqzSKG5CuTfa0= X-Google-Smtp-Source: ABdhPJynOHMdxU+z1VzuKNshhr7wC2zRnEGwO59i2Yl+jatqzoIG1oAfW2YhWS7CHKSpX9NwHZ9U0w== X-Received: by 2002:a05:622a:d4:: with SMTP id p20mr1320706qtw.172.1605217734821; Thu, 12 Nov 2020 13:48:54 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 04/10] qemu_driver.c: remove unneeded 'cleanup' labels Date: Thu, 12 Nov 2020 18:48:34 -0300 Message-Id: <20201112214840.636909-5-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some labels became deprecated after the previous patches. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_driver.c | 132 +++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 77 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6ff7289fd1..b3c676001f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7751,7 +7751,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, g_autoptr(virDomainDeviceDef) devConf =3D NULL; virDomainDeviceDef devConfSave =3D { 0 }; g_autoptr(virDomainDeviceDef) devLive =3D NULL; - int ret =3D -1; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7767,12 +7766,12 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr= vm, vmdef =3D virDomainObjCopyPersistentDef(vm, driver->xmlopt, priv->qemuCaps); if (!vmdef) - goto cleanup; + return -1; =20 if (!(devConf =3D virDomainDeviceDefParse(xml, vmdef, driver->xmlopt, priv->qemu= Caps, parse_flags))) - goto cleanup; + return -1; =20 /* * devConf will be NULLed out by @@ -7783,60 +7782,58 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr= vm, =20 if (virDomainDeviceValidateAliasForHotplug(vm, devConf, VIR_DOMAIN_AFFECT_CONFI= G) < 0) - goto cleanup; + return -1; =20 if (virDomainDefCompatibleDevice(vmdef, devConf, NULL, VIR_DOMAIN_DEVICE_ACTION_ATTACH, false) < 0) - goto cleanup; + return -1; =20 if (qemuDomainAttachDeviceConfig(vmdef, devConf, priv->qemuCaps, parse_flags, driver->xmlopt) < 0) - goto cleanup; + return -1; } =20 if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!(devLive =3D virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, priv->qemu= Caps, parse_flags))) - goto cleanup; + return -1; =20 if (flags & VIR_DOMAIN_AFFECT_CONFIG) qemuDomainAttachDeviceLiveAndConfigHomogenize(&devConfSave, de= vLive); =20 if (virDomainDeviceValidateAliasForHotplug(vm, devLive, VIR_DOMAIN_AFFECT_LIVE)= < 0) - goto cleanup; + return -1; =20 if (virDomainDefCompatibleDevice(vm->def, devLive, NULL, VIR_DOMAIN_DEVICE_ACTION_ATTACH, true) < 0) - goto cleanup; + return -1; =20 if (qemuDomainAttachDeviceLive(vm, devLive, driver) < 0) - goto cleanup; + return -1; /* * update domain status forcibly because the domain status may be * changed even if we failed to attach the device. For example, * a new controller may be created. */ if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - goto cleanup; + return -1; } =20 /* Finally, if no error until here, we can save config. */ if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0) - goto cleanup; + return -1; =20 virDomainObjAssignDef(vm, vmdef, false, NULL); vmdef =3D NULL; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 static int @@ -8094,7 +8091,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, virDomainDefPtr persistentDef =3D NULL; g_autoptr(virDomainDef) vmdef =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; - int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -8106,21 +8102,21 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDri= verPtr driver, parse_flags |=3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) - goto cleanup; + return -1; =20 if (persistentDef) { virDomainDeviceDef dev; =20 if (!(vmdef =3D virDomainObjCopyPersistentDef(vm, driver->xmlopt, priv->qemuCaps))) - goto cleanup; + return -1; =20 if (virDomainDefFindDevice(vmdef, alias, &dev, true) < 0) - goto cleanup; + return -1; =20 if (qemuDomainDetachDeviceConfig(vmdef, &dev, priv->qemuCaps, parse_flags, driver->xmlopt) < 0) - goto cleanup; + return -1; } =20 if (def) { @@ -8128,25 +8124,23 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDri= verPtr driver, int rc; =20 if (virDomainDefFindDevice(def, alias, &dev, true) < 0) - goto cleanup; + return -1; =20 if ((rc =3D qemuDomainDetachDeviceLive(vm, &dev, driver, true)) < = 0) - goto cleanup; + return -1; =20 if (rc =3D=3D 0 && qemuDomainUpdateDeviceList(driver, vm, QEMU_ASY= NC_JOB_NONE) < 0) - goto cleanup; + return -1; } =20 if (vmdef) { if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0) - goto cleanup; + return -1; virDomainObjAssignDef(vm, vmdef, false, NULL); vmdef =3D NULL; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -11154,39 +11148,35 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dcon= n, g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; g_autoptr(qemuMigrationParams) migParams =3D NULL; - int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); =20 if (!(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PrepareTunnel called but no TUNNELLED flag set")= ); - goto cleanup; + return -1; } =20 if (!(migParams =3D qemuMigrationParamsFromFlags(NULL, 0, flags, QEMU_MIGRATION_DESTINAT= ION))) - goto cleanup; + return -1; =20 if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot use migrate v2 protocol with lock manager= %s"), virLockManagerPluginGetName(driver->lockManager)); - goto cleanup; + return -1; } =20 if (!(def =3D qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname,= &origname))) - goto cleanup; + return -1; =20 if (virDomainMigratePrepareTunnelEnsureACL(dconn, def) < 0) - goto cleanup; - - ret =3D qemuMigrationDstPrepareTunnel(driver, dconn, - NULL, 0, NULL, NULL, /* No cookies= in v2 */ - st, &def, origname, migParams, fla= gs); + return -1; =20 - cleanup: - return ret; + return qemuMigrationDstPrepareTunnel(driver, dconn, + NULL, 0, NULL, NULL, /* No cookie= s in v2 */ + st, &def, origname, migParams, fl= ags); } =20 /* Prepare is the first step, and it runs on the destination host. @@ -11208,7 +11198,6 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; g_autoptr(qemuMigrationParams) migParams =3D NULL; - int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); =20 @@ -11219,38 +11208,35 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Tunnelled migration requested but invalid " "RPC method called")); - goto cleanup; + return -1; } =20 if (!(migParams =3D qemuMigrationParamsFromFlags(NULL, 0, flags, QEMU_MIGRATION_DESTINAT= ION))) - goto cleanup; + return -1; =20 if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot use migrate v2 protocol with lock manager= %s"), virLockManagerPluginGetName(driver->lockManager)); - goto cleanup; + return -1; } =20 if (!(def =3D qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname,= &origname))) - goto cleanup; + return -1; =20 if (virDomainMigratePrepare2EnsureACL(dconn, def) < 0) - goto cleanup; + return -1; =20 /* Do not use cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - ret =3D qemuMigrationDstPrepareDirect(driver, dconn, - NULL, 0, NULL, NULL, /* No cookies= */ - uri_in, uri_out, - &def, origname, NULL, 0, NULL, 0, = NULL, - migParams, flags); - - cleanup: - return ret; + return qemuMigrationDstPrepareDirect(driver, dconn, + NULL, 0, NULL, NULL, /* No cookie= s */ + uri_in, uri_out, + &def, origname, NULL, 0, NULL, 0,= NULL, + migParams, flags); } =20 =20 @@ -11593,33 +11579,29 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dco= nn, g_autoptr(virDomainDef) def =3D NULL; g_autofree char *origname =3D NULL; g_autoptr(qemuMigrationParams) migParams =3D NULL; - int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); =20 if (!(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PrepareTunnel called but no TUNNELLED flag set")= ); - goto cleanup; + return -1; } =20 if (!(migParams =3D qemuMigrationParamsFromFlags(NULL, 0, flags, QEMU_MIGRATION_DESTINAT= ION))) - goto cleanup; + return -1; =20 if (!(def =3D qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname,= &origname))) - goto cleanup; + return -1; =20 if (virDomainMigratePrepareTunnel3EnsureACL(dconn, def) < 0) - goto cleanup; - - ret =3D qemuMigrationDstPrepareTunnel(driver, dconn, - cookiein, cookieinlen, - cookieout, cookieoutlen, - st, &def, origname, migParams, fla= gs); + return -1; =20 - cleanup: - return ret; + return qemuMigrationDstPrepareTunnel(driver, dconn, + cookiein, cookieinlen, + cookieout, cookieoutlen, + st, &def, origname, migParams, fl= ags); } =20 static int @@ -11639,7 +11621,6 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, const char *dname =3D NULL; g_autofree char *origname =3D NULL; g_autoptr(qemuMigrationParams) migParams =3D NULL; - int ret =3D -1; =20 virCheckFlags(QEMU_MIGRATION_FLAGS, -1); if (virTypedParamsValidate(params, nparams, QEMU_MIGRATION_PARAMETERS)= < 0) @@ -11656,26 +11637,23 @@ qemuDomainMigratePrepareTunnel3Params(virConnectP= tr dconn, if (!(flags & VIR_MIGRATE_TUNNELLED)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PrepareTunnel called but no TUNNELLED flag set")= ); - goto cleanup; + return -1; } =20 if (!(migParams =3D qemuMigrationParamsFromFlags(params, nparams, flag= s, QEMU_MIGRATION_DESTINAT= ION))) - goto cleanup; + return -1; =20 if (!(def =3D qemuMigrationAnyPrepareDef(driver, NULL, dom_xml, dname,= &origname))) - goto cleanup; + return -1; =20 if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) - goto cleanup; - - ret =3D qemuMigrationDstPrepareTunnel(driver, dconn, - cookiein, cookieinlen, - cookieout, cookieoutlen, - st, &def, origname, migParams, fla= gs); + return -1; =20 - cleanup: - return ret; + return qemuMigrationDstPrepareTunnel(driver, dconn, + cookiein, cookieinlen, + cookieout, cookieoutlen, + st, &def, origname, migParams, fl= ags); } =20 =20 --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1605217762; cv=none; d=zohomail.com; s=zohoarc; b=Xt3gu4rVwTgpadNE1gV4vHks2LdhOkqZNGX8NzhPv2tAiPOoU5jp/knDNZsbc7Jv43WBEzgOAsaUEwU5Upf065DsgqQiFzQqUeaSCxvX8HkuL6mf4xbBQqUb7Bg0k4NAC0ISIkASWLl6hUIqWAyz9VX/mS2VqIjeEBJE4uxTt18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217762; 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=DZ1kewH6Z88n5+My1DtrqrgK6pvDE4bOVbKcJcvTDNY=; b=E07FnBsS09r4IRGNnXl0HzmwTq7RDjmpP/Si8R070b1ULu4ko+sTtzu7XR7yC9qwGQzoedqSmqzjJTtADJ+1CDKNWwCzSTWr/MW3gecuk7fOEO2NOZF1DONJIGCf55FBcnovZOXOfCaHDfR78QoYoVSCBjgy3slgFxAENCp2FGo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605217762603172.33881871283359; Thu, 12 Nov 2020 13:49:22 -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-24-RKKaxncyOLSrZ6_84bvHNA-1; Thu, 12 Nov 2020 16:49:19 -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 8D7921074643; Thu, 12 Nov 2020 21:49:12 +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 6A7575D9CA; Thu, 12 Nov 2020 21:49:12 +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 36A3258118; Thu, 12 Nov 2020 21:49:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ACLn27a005476 for ; Thu, 12 Nov 2020 16:49:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id B58F910711F; Thu, 12 Nov 2020 21:49:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A78B107263 for ; Thu, 12 Nov 2020 21:48:59 +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 20540811E78 for ; Thu, 12 Nov 2020 21:48:59 +0000 (UTC) Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-CsiEqoqLOOevhqff6kxEWw-1; Thu, 12 Nov 2020 16:48:56 -0500 Received: by mail-qk1-f174.google.com with SMTP id 11so7000023qkd.5 for ; Thu, 12 Nov 2020 13:48:56 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:55 -0800 (PST) X-MC-Unique: RKKaxncyOLSrZ6_84bvHNA-1 X-MC-Unique: CsiEqoqLOOevhqff6kxEWw-1 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=DZ1kewH6Z88n5+My1DtrqrgK6pvDE4bOVbKcJcvTDNY=; b=lR13w2tjVXuLFjuwkDEw75xUvX2NrtJsk7FcxKIgLR2IIYC5eVjbNbG97ASaqZ6CEe 32zdG2PdhLXhHXHeBBKMngmd+0pTnvPn6HXTNgDMwd0WG6g+/GYlaarJVAQdEIXAa8t4 EWxU93aXRjnx+lQX4n4PMlsudUAbk086FhVorbvs/kH2buW4PMhy0p5ceiryvl23bKOy +6QFNKfY2/kBKrKGljhE8nh+qylP4muNk/gTzwmUpWcW+XDJ/77eAZWLfctGju8WtCf2 A4EivgxSrbJ+Dd2ACQEKs/2nhiJk3F3953HEtO2iDqAxxkyJsh9iDWPGMei7R3MwfYch jSVA== X-Gm-Message-State: AOAM531mIiDXGHg53BFiYFa/kYoMQ4gz3PGj6WR9iYmRv7Duxh7nSM8e ha+v5RNERCsfS+AbbdqyhEwUxDM5yBU= X-Google-Smtp-Source: ABdhPJyDdyMkWkn8SehA1gfkSEYwueY6jRLaweLqM6DzCiP3DsDz9tO7Zak7soCVc7Ytbfe7MdVRAA== X-Received: by 2002:a37:8c43:: with SMTP id o64mr2042948qkd.176.1605217736277; Thu, 12 Nov 2020 13:48:56 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 05/10] qemu_snapshot.c: remove uneeded 'cleanup' label in qemuSnapshotDelete() Date: Thu, 12 Nov 2020 18:48:35 -0300 Message-Id: <20201112214840.636909-6-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_snapshot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 8e3540bbc1..a31a62b7ec 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2304,7 +2304,7 @@ qemuSnapshotDelete(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY, -1); =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; =20 if (!(snap =3D qemuSnapObjFromSnapshot(vm, snapshot))) goto endjob; @@ -2378,6 +2378,5 @@ qemuSnapshotDelete(virDomainObjPtr vm, endjob: qemuDomainObjEndJob(driver, vm); =20 - cleanup: return ret; } --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1605217810; cv=none; d=zohomail.com; s=zohoarc; b=Hwa7TNC8KHTFBlvnrNsqlDHLyZ2qGMhSw05x8IFEi6hpWjsaGho3xDw70XwA6Gk/1pvoGl6lyzEG6NfUeCfq0AAdmWMjnxGrWWgthDhTsR0NIhVZaUDdZnrgBzPXmDdRsqGdR+nESYteg/wYtJbF4fI21+gzwZRSxxW1f24FLOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217810; 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=TECzq+UQ/L3XaA0iGqCeTzJkgrZkMFHaAgNU8ajuOpo=; b=QsU3nvl6GPnwjK8g7YO86dVAsxUstuwyzTwRVGYa1dv53H4XDeJaU3DnsMafUlQs0/fenIbZwEiwKmY2zhOkTs269LGhayqn92cS+5jeERUccr3xQO5SEp0VevrOIKEhysXR+K9BIPUL9IlOUmSHz8FxZR5vmT3qkC2szqFrVog= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605217810501529.101674369201; Thu, 12 Nov 2020 13:50: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-400-yBiV7xTTMFOVL_sEGajNvA-1; Thu, 12 Nov 2020 16:49:15 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA94780362C; Thu, 12 Nov 2020 21:49:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7B1260C13; Thu, 12 Nov 2020 21:49:09 +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 91A0318198E2; Thu, 12 Nov 2020 21:49:09 +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 0ACLn1fd005470 for ; Thu, 12 Nov 2020 16:49:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id C4EBE10064FC; Thu, 12 Nov 2020 21:49:01 +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 C0D9B1006E35 for ; Thu, 12 Nov 2020 21:49:00 +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 8973E90E422 for ; Thu, 12 Nov 2020 21:49:00 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-133-y5_hvCRlOieb3AdkaaTsSg-1; Thu, 12 Nov 2020 16:48:58 -0500 Received: by mail-qk1-f195.google.com with SMTP id r7so7013574qkf.3 for ; Thu, 12 Nov 2020 13:48:58 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:57 -0800 (PST) X-MC-Unique: yBiV7xTTMFOVL_sEGajNvA-1 X-MC-Unique: y5_hvCRlOieb3AdkaaTsSg-1 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=TECzq+UQ/L3XaA0iGqCeTzJkgrZkMFHaAgNU8ajuOpo=; b=GLlOR5YPvpgDC9Ux6oJ32JPh73xmVTwheE7g7mnHJBHgtjRdM2wftfPPWqCFYwIqg+ OHvqM8zxWLFsNgSMgpbvQqZDQmliY29llmGHQ0vyCCe4tNEwtp6MjnGuVRtuBO26fngF htCMFmCvJN1uAjw0ee6+gHIudfhse+39jVjVVua13PvWd42jWijSfSbe4Rma5R8wrdTF IwXPK6ikqLNPIIA81vxhVk+86Qj8VlfbP1Rg4GgpYlTw0Qb0nPBU1kjdwvaCIoC+cyeB Kp86hhS/6Fho8NCN5Cx7m3RKkzqyoAkOZlM4F6EiPYFRHsJgk8rNHZvj1SRPED+cpHly BJ8A== X-Gm-Message-State: AOAM530ZUIDIet6m35mT5H4kLveSHAJmiBDeOMSN/kHceHHBjhoQX15j pKUMaT09Hx+7uZTaI4IxTyQMbdM8qA4= X-Google-Smtp-Source: ABdhPJy4/o3nar8muyhx9a6QIEsg9+EhUWxmIgnqRkRyJOUCh5BnBP8bEf7Q6dKrMNbVfH28Awkurw== X-Received: by 2002:a05:620a:22d4:: with SMTP id o20mr1941444qki.151.1605217737860; Thu, 12 Nov 2020 13:48:57 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 06/10] qemu_domain.c: use g_autoptr() with virDomainDef pointers Date: Thu, 12 Nov 2020 18:48:36 -0300 Message-Id: <20201112214840.636909-7-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_domain.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 70896ad80e..3c17e6e4b4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5796,7 +5796,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, virBuffer *buf) { int ret =3D -1; - virDomainDefPtr copy =3D NULL; + g_autoptr(virDomainDef) copy =3D NULL; =20 virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU,= -1); =20 @@ -5971,7 +5971,6 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, virDomainDefFormatConvertXMLFlags(fla= gs)); =20 cleanup: - virDomainDefFree(copy); return ret; } =20 @@ -7939,8 +7938,8 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr drive= r, virDomainDefPtr src, virDomainDefPtr dst) { - virDomainDefPtr migratableDefSrc =3D NULL; - virDomainDefPtr migratableDefDst =3D NULL; + g_autoptr(virDomainDef) migratableDefSrc =3D NULL; + g_autoptr(virDomainDef) migratableDefDst =3D NULL; bool ret =3D false; =20 if (!(migratableDefSrc =3D qemuDomainDefCopy(driver, qemuCaps, src, CO= PY_FLAGS)) || @@ -7952,8 +7951,6 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr drive= r, dst, migratableDefDst); =20 cleanup: - virDomainDefFree(migratableDefSrc); - virDomainDefFree(migratableDefDst); return ret; } =20 @@ -7964,8 +7961,8 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, virDomainDefPtr dst) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virDomainDefPtr migratableSrc =3D NULL; - virDomainDefPtr migratableDst =3D NULL; + g_autoptr(virDomainDef) migratableSrc =3D NULL; + g_autoptr(virDomainDef) migratableDst =3D NULL; g_autofree char *xml =3D NULL; bool ret =3D false; =20 @@ -7979,8 +7976,6 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, dst, migratableDst); =20 cleanup: - virDomainDefFree(migratableSrc); - virDomainDefFree(migratableDst); return ret; } =20 --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1605217754; cv=none; d=zohomail.com; s=zohoarc; b=ln5biedlSId3lJicFGi6Ywsu3i/2Q3NHOj9sa2mAIseYPra64GpLg9mJ6YZLkdWS3tg7orNDCl1Gjtu7DNj1HfHXtnevGK/MPcDZdT8/XlZ9TthrzJWabdVvxfh2r9xvwSdN7Z4tn2BApeWz2dxR46p5vo50cFSsW0KTTAvVjUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217754; 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=IcFvpag/FLXGiZHzGEz1znS6wkKOxybEJgelcAllVW8=; b=IdoVWOBwgQVhyw9e4cbGoXLSw+Zz+FOa6K1bZap9O+oDRWtzEIys405yoOGlrVhDMM/JiskA0cS29kVa9yCdG3DcUb8MEd+MSUqeyXo0IlA8miJA/Cot1WQdE13x9MGF9Pqhgxf1F0X5NGte7TMThiETyDSunCbuA61/UFMbPms= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605217754126366.5063644008018; Thu, 12 Nov 2020 13:49:14 -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-331-MSSFuk0nPCGhDkajJaWZ3w-1; Thu, 12 Nov 2020 16:49:11 -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 9655F1882FAB; Thu, 12 Nov 2020 21:49:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71A065C5BB; Thu, 12 Nov 2020 21:49:05 +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 3F39B180B791; Thu, 12 Nov 2020 21:49:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ACLn2Vu005475 for ; Thu, 12 Nov 2020 16:49:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 98EE9107125; Thu, 12 Nov 2020 21:49:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93F34107272 for ; Thu, 12 Nov 2020 21:49:02 +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 810E4811E90 for ; Thu, 12 Nov 2020 21:49:02 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-HwwdR1-AOTWv7dBf-08wfg-1; Thu, 12 Nov 2020 16:49:00 -0500 Received: by mail-qt1-f195.google.com with SMTP id j31so5280339qtb.8 for ; Thu, 12 Nov 2020 13:49:00 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:58 -0800 (PST) X-MC-Unique: MSSFuk0nPCGhDkajJaWZ3w-1 X-MC-Unique: HwwdR1-AOTWv7dBf-08wfg-1 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=IcFvpag/FLXGiZHzGEz1znS6wkKOxybEJgelcAllVW8=; b=ndeclSVeBpdyYEkeDX/RL2DfDp9sJ/+BOwXMjI+30kENqAz/19SS05m3YUF5g9TfvC slG5zljoTV66bA2wAfY6ng2F8RKzr6opDFTuRTBCt8fUIyMAdIsUyPW/0NFJzGakyPAh K7Ael5ZJzlrCKY+zFAcl6Bork8I5uFOpo6danQJTawwN3qsXNcoe57WosyMPdaMr14TG uvDSs3PTk4aUqoFNdgg266f24mxXTvGjXDLojif5HpAZMz2qJbkKomgaejJM3cZ5/p+o zSuuUTk9UO/qUf49Bjs3z0dFvcm2myU3E84Glpycl9ZOQn4l7beuoHsb6/iIjqMxaEsm xMaA== X-Gm-Message-State: AOAM530nhq+oGUbYgGJmsJf3/TqsbLLhAZveQbeyRZfl1p9mClmYk/2l yh0jSdBwnW2CoOr8sy3cyZG+yUnuVUk= X-Google-Smtp-Source: ABdhPJzJGP9wShyPzyzfmAATYWlvFEJArVKWUlbH71Df4PBwwh9Atc8H3MjyK8wm307njyU+1ruF+g== X-Received: by 2002:ac8:580c:: with SMTP id g12mr1372907qtg.340.1605217739522; Thu, 12 Nov 2020 13:48:59 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 07/10] qemu_domain.c: remove unneeded cleanup labels Date: Thu, 12 Nov 2020 18:48:37 -0300 Message-Id: <20201112214840.636909-8-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove obsolete 'cleanup' labels after the changes from the previous patch. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_domain.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3c17e6e4b4..2fe8d06fdf 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5795,7 +5795,6 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, unsigned int flags, virBuffer *buf) { - int ret =3D -1; g_autoptr(virDomainDef) copy =3D NULL; =20 virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU,= -1); @@ -5805,7 +5804,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, =20 if (!(copy =3D virDomainDefCopy(def, driver->xmlopt, qemuCaps, flags & VIR_DOMAIN_XML_MIGRATABLE))) - goto cleanup; + return -1; =20 def =3D copy; =20 @@ -5823,13 +5822,13 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr dri= ver, def->virtType, def->emulator, def->os.machine))) - goto cleanup; + return -1; } =20 if (virCPUUpdate(def->os.arch, def->cpu, virQEMUCapsGetHostModel(qCaps, def->virtType, VIR_QEMU_CAPS_HOST_CPU_MI= GRATABLE)) < 0) - goto cleanup; + return -1; } =20 if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) { @@ -5959,19 +5958,16 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr dri= ver, if (origCPU) { virCPUDefFree(def->cpu); if (!(def->cpu =3D virCPUDefCopy(origCPU))) - goto cleanup; + return -1; } =20 if (def->cpu && qemuDomainMakeCPUMigratable(def->cpu) < 0) - goto cleanup; + return -1; } =20 format: - ret =3D virDomainDefFormatInternal(def, driver->xmlopt, buf, - virDomainDefFormatConvertXMLFlags(fla= gs)); - - cleanup: - return ret; + return virDomainDefFormatInternal(def, driver->xmlopt, buf, + virDomainDefFormatConvertXMLFlags(fl= ags)); } =20 =20 @@ -7940,18 +7936,14 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr dri= ver, { g_autoptr(virDomainDef) migratableDefSrc =3D NULL; g_autoptr(virDomainDef) migratableDefDst =3D NULL; - bool ret =3D false; =20 if (!(migratableDefSrc =3D qemuDomainDefCopy(driver, qemuCaps, src, CO= PY_FLAGS)) || !(migratableDefDst =3D qemuDomainDefCopy(driver, qemuCaps, dst, CO= PY_FLAGS))) - goto cleanup; - - ret =3D qemuDomainMigratableDefCheckABIStability(driver, - src, migratableDefSrc, - dst, migratableDefDst); + return false; =20 - cleanup: - return ret; + return qemuDomainMigratableDefCheckABIStability(driver, + src, migratableDefSrc, + dst, migratableDefDst); } =20 =20 @@ -7964,19 +7956,15 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, g_autoptr(virDomainDef) migratableSrc =3D NULL; g_autoptr(virDomainDef) migratableDst =3D NULL; g_autofree char *xml =3D NULL; - bool ret =3D false; =20 if (!(xml =3D qemuDomainFormatXML(driver, vm, COPY_FLAGS)) || !(migratableSrc =3D qemuDomainDefFromXML(driver, priv->qemuCaps, x= ml)) || !(migratableDst =3D qemuDomainDefCopy(driver, priv->qemuCaps, dst,= COPY_FLAGS))) - goto cleanup; - - ret =3D qemuDomainMigratableDefCheckABIStability(driver, - vm->def, migratableSrc, - dst, migratableDst); + return false; =20 - cleanup: - return ret; + return qemuDomainMigratableDefCheckABIStability(driver, + vm->def, migratableSrc, + dst, migratableDst); } =20 #undef COPY_FLAGS --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1605217766; cv=none; d=zohomail.com; s=zohoarc; b=T2+VpC7hm2tq86i7z1rPxdOtdss4OZBleLddz9h5Cf3FoV/UpMzDs7m5CXYTIoP3def6ev0p/ZLv0FLgxD+VoZY3rXA/qoPFdZbk8oOQO9ufXxiPYmBtn2G+HNroPJ0Ps5Tg0zbrGudm9Lj9Vr5GaHAYy9seS2Ay4yHewkSWP5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217766; 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+VT+h6nE/IMsdF5IKOsoYpGjDtt/1dfXyc0RwttRzU=; b=Rbi1tjAXHqB3ttin/AEo4ygnpb/MDZGDMsUpFVXuRv8tgjskhKTV/D3XuVZcdiL/zplMnwz7UZIrTLs4ncMo4oz5vOhSoFQo//GdBwrSN2hYLIyzkt4mxMAc3M5AKtk3M+RwpbIi/otq9fstdLVkVDCaPfHRrF0pdpavm5UmnKM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605217766238843.722639809525; Thu, 12 Nov 2020 13:49:26 -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-565-K48OPxRyOBOSuobYeNePzQ-1; Thu, 12 Nov 2020 16:49:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F71A1009E48; Thu, 12 Nov 2020 21:49:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B8E41C4; Thu, 12 Nov 2020 21:49:12 +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 3713E181A050; Thu, 12 Nov 2020 21:49:12 +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 0ACLn7XN005517 for ; Thu, 12 Nov 2020 16:49:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 466411007A29; Thu, 12 Nov 2020 21:49:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4271110064FC for ; Thu, 12 Nov 2020 21:49:07 +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 2F575858296 for ; Thu, 12 Nov 2020 21:49:07 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-125-TQ_IfOcSMSyRY6Lz-sC3jg-1; Thu, 12 Nov 2020 16:49:01 -0500 Received: by mail-qt1-f194.google.com with SMTP id i12so5307956qtj.0 for ; Thu, 12 Nov 2020 13:49:01 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:49:00 -0800 (PST) X-MC-Unique: K48OPxRyOBOSuobYeNePzQ-1 X-MC-Unique: TQ_IfOcSMSyRY6Lz-sC3jg-1 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=G+VT+h6nE/IMsdF5IKOsoYpGjDtt/1dfXyc0RwttRzU=; b=qc7vv2AfMzTVszJQsyzVziXQqMG3epAHvLmGGqz35x3UC1HeEAZV4m92Rp3PG7K+lY 2qUMBY/sghC9x4auHcjZCNSkB7mzhHpKtT2wOvBuwVtp75yX5eSh64yQXG3+4FWXzkMZ OyNZG9Vt7Jq7G2TaJDlDgUaBwn8abaq8aaBGAm7LwvGqisubon9RHSefJ9WWDmN7DVv2 x7bCnkaea6sOFx6YSdZn+e6/8G/gU4jDTUpm91vE9H6LTpl6YOQOHWZWhNyTACVDH8iW sMJMy898l9a05xKaHk7UYO8/nnOYDS5ZisRmHL/KQFrCm/J75eTRjqsXDEWiBA1ZGgSc 2vPQ== X-Gm-Message-State: AOAM531jcNd+mAHX4jCTmKulc5ucMbBZjcujYy6takQurVXYletrYv+o NSKc1XjFavJxFnywBl33MCTeMn/gfOw= X-Google-Smtp-Source: ABdhPJz0xv/ri/+RyyzZt6TbNb+ypbKY07zwZLysAhliC1YJKNZzRcrai7c1CiipybxpiyWHkispcg== X-Received: by 2002:ac8:7687:: with SMTP id g7mr1334326qtr.103.1605217741074; Thu, 12 Nov 2020 13:49:01 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 08/10] qemu_domain.c: modernize qemuDomainFixupCPUs() Date: Thu, 12 Nov 2020 18:48:38 -0300 Message-Id: <20201112214840.636909-9-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use g_autoptr() to deprecate the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_domain.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2fe8d06fdf..67d11aca92 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10082,10 +10082,9 @@ int qemuDomainFixupCPUs(virDomainObjPtr vm, virCPUDefPtr *origCPU) { - virCPUDefPtr fixedCPU =3D NULL; - virCPUDefPtr fixedOrig =3D NULL; + g_autoptr(virCPUDef) fixedCPU =3D NULL; + g_autoptr(virCPUDef) fixedOrig =3D NULL; virArch arch =3D vm->def->os.arch; - int ret =3D -1; =20 if (!ARCH_IS_X86(arch)) return 0; @@ -10106,13 +10105,13 @@ qemuDomainFixupCPUs(virDomainObjPtr vm, (!(fixedCPU =3D virCPUDefCopyWithoutModel(vm->def->cpu)) || virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false, virQEMUCapsCPUFilterFeatures, &arch) < 0= )) - goto cleanup; + return -1; =20 if (virCPUDefFindFeature(*origCPU, "cmt") && (!(fixedOrig =3D virCPUDefCopyWithoutModel(*origCPU)) || virCPUDefCopyModelFilter(fixedOrig, *origCPU, false, virQEMUCapsCPUFilterFeatures, &arch) < 0= )) - goto cleanup; + return -1; =20 if (fixedCPU) { virCPUDefFree(vm->def->cpu); @@ -10124,12 +10123,7 @@ qemuDomainFixupCPUs(virDomainObjPtr vm, *origCPU =3D g_steal_pointer(&fixedOrig); } =20 - ret =3D 0; - - cleanup: - virCPUDefFree(fixedCPU); - virCPUDefFree(fixedOrig); - return ret; + return 0; } =20 =20 --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1605217765; cv=none; d=zohomail.com; s=zohoarc; b=dMdtK/ck1Bn40BJSNGiSr1sZ05nzh85PlrufIgDLnNfHjY/l0z6XVScgL0XMun2QyQ5WWu1DeqpfbvmKS+LkB+Qr3y6TImF9m8pXbs7/7VCkspUj2C+ptOO52zv47hCmGDSUT0FCiBS0CaBoql5ylzuwhf1XI2RIkZbZQJZZPgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217765; 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=wQK+09gD1DHTRtY2gIHVfT5ZOONg47NHY4lEDkZA8tE=; b=WCG3NsfeP1JPnhxmuOSkNTcXX1l9Sx9FVwDHzoH/bBCbk2TpK+gpRLbZqaH9M+Pc7fDi4WJN5XLiu+GBgRDBxYtTpcpQLnCPT6vJCC7MsKiJ075W7ZCde3ve7qrI4HO6rEO8LfxW7MPOeW9qSp7pzAiBXQZ4j5tyVvbj4aDHa4U= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605217765239899.9156922669714; Thu, 12 Nov 2020 13:49:25 -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-141-tMmuLuy2P7yt3yJ9ShuWFQ-1; Thu, 12 Nov 2020 16:49:21 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89256107464A; Thu, 12 Nov 2020 21:49:15 +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 6479119C66; Thu, 12 Nov 2020 21:49:15 +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 2F12E5811F; Thu, 12 Nov 2020 21:49:15 +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 0ACLn6sf005505 for ; Thu, 12 Nov 2020 16:49:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1675C2156A50; Thu, 12 Nov 2020 21:49:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 114462156A49 for ; Thu, 12 Nov 2020 21:49:06 +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 EBA241823603 for ; Thu, 12 Nov 2020 21:49:05 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-5WKzcwaKN6qjl7_aaOEWJw-1; Thu, 12 Nov 2020 16:49:03 -0500 Received: by mail-qt1-f194.google.com with SMTP id n63so5291762qte.4 for ; Thu, 12 Nov 2020 13:49:03 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:49:02 -0800 (PST) X-MC-Unique: tMmuLuy2P7yt3yJ9ShuWFQ-1 X-MC-Unique: 5WKzcwaKN6qjl7_aaOEWJw-1 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=wQK+09gD1DHTRtY2gIHVfT5ZOONg47NHY4lEDkZA8tE=; b=dB6NkI5t9b5bev5UZ2/pfUgdf7WfjqNFNyhueoEHVbhbnOli7HJWag64mZmNIUl0UO SGISeRJ2hbPdSoRD+NZQ7t7pQ8Ew/ghPr0+t57WfEGVm/GV0a5wrn1pZiaKb6+8F7jZd fwrCBoMcmGwCBHg2K6lh7G11x2Wyplnmykbab4g1ySHfEZVirx1I3QhCuAjnXyr73NlE 2wJgX3+gvrUJDakh9pFYWVgJ6USrUFNdr+e7hBNK2w2zxUspKFzqTcLqq0czNrRjjUbW f9LeB4Ar/9mRwekhAcsP+o6esjYE5oRdsYvX19WUJvzeRtq7dmmHznNFAG8qHJ8G8TEQ ZO0w== X-Gm-Message-State: AOAM530VJuGysM0jGABB0RmmsMoJyu9bDoLH8MVUf+VT4YhPp5gk/d3b 4giY0tbEPCo1s91ef/pH10hwEc8kpZs= X-Google-Smtp-Source: ABdhPJwNfkyCULO+X7d9DhXbgGmvpnkWHriqwzG3k3kTiRWnqNoWC7BfrH/cAzipiLgkBTs+lTTN/w== X-Received: by 2002:ac8:57c2:: with SMTP id w2mr1228521qta.213.1605217743049; Thu, 12 Nov 2020 13:49:03 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 09/10] qemu_domain.c: modernize qemuDomainWriteMasterKeyFile() Date: Thu, 12 Nov 2020 18:48:39 -0300 Message-Id: <20201112214840.636909-10-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use VIR_AUTOCLOSE with 'fd' and delete the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_domain.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 67d11aca92..f28178af61 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -406,8 +406,7 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, virDomainObjPtr vm) { g_autofree char *path =3D NULL; - int fd =3D -1; - int ret =3D -1; + VIR_AUTOCLOSE fd =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 /* Only gets filled in if we have the capability */ @@ -420,24 +419,19 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, if ((fd =3D open(path, O_WRONLY|O_TRUNC|O_CREAT, 0600)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to open domain master key file for write"= )); - goto cleanup; + return -1; } =20 if (safewrite(fd, priv->masterKey, priv->masterKeyLen) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to write master key file for domain")); - goto cleanup; + return -1; } =20 if (qemuSecurityDomainSetPathLabel(driver, vm, path, false) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - VIR_FORCE_CLOSE(fd); + return -1; =20 - return ret; + return 0; } =20 =20 --=20 2.26.2 From nobody Sun May 5 17:48:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1605217765; cv=none; d=zohomail.com; s=zohoarc; b=AL8VzYkCFFf0iVGAKYWLGD73dJC5qnWHN1oNMn9NL6r4qA0kRord9DQWrfFLnWrMZtS5KzL9xLS9yYhxJic8WMHe22OmczlVpJNklK1Gumo7hiulxq7XxNYY/uV9wJp5haZhO4gNzgsxY1fhC3INHkL9GCewm87CQMd/rFhen5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217765; 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=OUyZVlRykg/lSRaNqqWgXhOdGHSkSNI8BDGA3yr3hag=; b=Vl6euPPm5IK7z8dFP7THTEqkvsmGGQFUN5Pic91U+RKR9dD9pSToZUSQc0JOXxC5jbKius8hG+B3jmIDZcNByNS6npbMRG/F5C7KtXMOvAhPs151EKi6QzZ45XgeZiqq/9bFh88zCW351tujc1/LXtGe0acMR3T0eCOsUSdJsf0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605217765852668.1034703412249; Thu, 12 Nov 2020 13:49:25 -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-85-P1wRPMFPOfGv1p84TRMtVA-1; Thu, 12 Nov 2020 16:49:22 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 394EC1009E2F; Thu, 12 Nov 2020 21:49:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 138B560C13; Thu, 12 Nov 2020 21:49:15 +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 D4CA5181A07B; Thu, 12 Nov 2020 21:49:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ACLn8B3005524 for ; Thu, 12 Nov 2020 16:49:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 36EFF10711F; Thu, 12 Nov 2020 21:49:08 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 311E210711D for ; Thu, 12 Nov 2020 21:49:08 +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 17BC81823603 for ; Thu, 12 Nov 2020 21:49:08 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-450-XCygfmZ1M7GeKkNvXcwK0Q-1; Thu, 12 Nov 2020 16:49:05 -0500 Received: by mail-qt1-f194.google.com with SMTP id n63so5291832qte.4 for ; Thu, 12 Nov 2020 13:49:05 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.49.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:49:04 -0800 (PST) X-MC-Unique: P1wRPMFPOfGv1p84TRMtVA-1 X-MC-Unique: XCygfmZ1M7GeKkNvXcwK0Q-1 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=OUyZVlRykg/lSRaNqqWgXhOdGHSkSNI8BDGA3yr3hag=; b=ENiu9RTGNfO6gZwPAn6lWynXISgFIvScS/QzqF/UqotWbAgnNgg95JUZBnGMwkfJ5S qaI9Tpn1VKgtun5nL9B29wfYbX4i4VzY2BTrb5RZNMZn7SDMPaVL39QEtlvvw/tgyUKR MzqFdiqQDWZNNoxjTHGi6j+w6yEDcOOjncUK/hND3/myZ6voLL/5/6EQEfJF+rC5HLxq Zx/Ct77ukQzMNszMpMmAh29kHx54aUgIi0zT+hl43rwXpKZ7+SqAb2nQ26vCqBoPIvaS sXT9eCOHPmIR/lntqTsF00X+Zd5J1XRoRheakPMvDXhGqO3cnl1sbR6dXrj7XP03BO6N UXXA== X-Gm-Message-State: AOAM531AUapPPiLc930hd8ixUAT68dNwRHDjg8JenBdD1s4mJCvZG0yj g6hT+HaV/V+HCCXIVBUgi/AoUiz9jfw= X-Google-Smtp-Source: ABdhPJx34dls+dVdwT1zU+7MfpxSZ1OHM5JjmhRY4hfGjJJScvXlVUyPwyWdMwvWRu5s+yYaw8dusA== X-Received: by 2002:a05:622a:14e:: with SMTP id v14mr1323307qtw.298.1605217744794; Thu, 12 Nov 2020 13:49:04 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 10/10] qemu_domain.c: modernize qemuMonitorGetCpuHalted() Date: Thu, 12 Nov 2020 18:48:40 -0300 Message-Id: <20201112214840.636909-11-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use g_autoptr() and remove the 'cleanup' label. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Jonathon Jongsma --- src/qemu/qemu_domain.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f28178af61..aea0a6bd93 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9217,9 +9217,8 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, virDomainVcpuDefPtr vcpu; qemuDomainVcpuPrivatePtr vcpupriv; size_t maxvcpus =3D virDomainDefGetVcpusMax(vm->def); - virBitmapPtr haltedmap =3D NULL; + g_autoptr(virBitmap) haltedmap =3D NULL; size_t i; - int ret =3D -1; bool fast; =20 /* Not supported currently for TCG, see qemuDomainRefreshVcpuInfo */ @@ -9244,7 +9243,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, haltedmap =3D qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcp= us, fast); if (qemuDomainObjExitMonitor(driver, vm) < 0 || !haltedmap) - goto cleanup; + return -1; =20 for (i =3D 0; i < maxvcpus; i++) { vcpu =3D virDomainDefGetVcpu(vm->def, i); @@ -9253,11 +9252,7 @@ qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, vcpup= riv->qemu_id)); } =20 - ret =3D 0; - - cleanup: - virBitmapFree(haltedmap); - return ret; + return 0; } =20 bool --=20 2.26.2