From nobody Thu May 2 03:38:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638463581; cv=none; d=zohomail.com; s=zohoarc; b=ZN1d4/gKOSW6SHqHGqxk7jH0V98IVQfo2RZqhQTti/3hLx7c3baRizl1YOY5JYuhhPScQXshBnyzRxTNq6qiecq6wMYNfSTcVPOA6yeBD7dQJRkRF+CGtCLTXxROXtgsIZqND5aHoPYM7RJmoVpxjQx0bA7Tn0bOMcTP4nQoxmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638463581; h=Content-Type:Content-Transfer-Encoding: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=o3BJ0xGzkeSeXBtq8ecfzC5nIHV4sJg1MmK4JCWG8Vg=; b=n0EG2np9UEiO3/39NSeoHPVBk/+u2ar4b3qL4lMB2/QM3Bkf+RVch2wIEg8cRMjnwXWvpxqp1TS0zTbR3iqK9ttqe6kZP9znmoUptbQCvnbBxdhOM3y14c+SejO/Bj5+ytX0GCCE1/VZKNp+m8C68371/9aHgru+PWfVK8tO1DI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 163846358183738.00395594052384; Thu, 2 Dec 2021 08:46:21 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-489-7hFsad_VNkyCLt80HMaWpQ-1; Thu, 02 Dec 2021 11:46:19 -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 C67C983DD23; Thu, 2 Dec 2021 16:46:13 +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 84D9779446; Thu, 2 Dec 2021 16:46:13 +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 0EF9C1809C89; Thu, 2 Dec 2021 16:46:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B2GkAli010621 for ; Thu, 2 Dec 2021 11:46:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1268850E11; Thu, 2 Dec 2021 16:46:10 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88F296060F for ; Thu, 2 Dec 2021 16:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638463580; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=o3BJ0xGzkeSeXBtq8ecfzC5nIHV4sJg1MmK4JCWG8Vg=; b=H159wPPHRi2d1rmlTX85/Tq/npteRvrvbTksx81Njpgjjd60YCZaH5vFb1+NWCtptHemPH VAbfTB5xY3ImODbPoHVThvkYfGq7R1iALUSRap3WpCU+jPyng5l7yBYNolz7WKtzlO3DLH Zq0wlg/k/K6v1k9g0u/ZT8qTqZV12Ek= X-MC-Unique: 7hFsad_VNkyCLt80HMaWpQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/3] virdomainobjlist: Use g_autofree Date: Thu, 2 Dec 2021 17:46:00 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638463582641100001 Content-Type: text/plain; charset="utf-8" Instead of calling VIR_FREE() explicitly, we can annotate variables with g_autofree. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/conf/virdomainobjlist.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 9be1e7ad7d..a0cffac1b8 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -423,7 +423,7 @@ virDomainObjListRename(virDomainObjList *doms, void *opaque) { int ret =3D -1; - char *old_name =3D NULL; + g_autofree char *old_name =3D NULL; int rc; =20 if (STREQ(dom->def->name, new_name)) { @@ -468,7 +468,6 @@ virDomainObjListRename(virDomainObjList *doms, ret =3D 0; cleanup: virObjectRWUnlock(doms); - VIR_FREE(old_name); return ret; } =20 @@ -482,7 +481,8 @@ virDomainObjListLoadConfig(virDomainObjList *doms, virDomainLoadConfigNotify notify, void *opaque) { - char *configFile =3D NULL, *autostartLink =3D NULL; + g_autofree char *configFile =3D NULL; + g_autofree char *autostartLink =3D NULL; virDomainDef *def =3D NULL; virDomainObj *dom; int autostart; @@ -511,13 +511,9 @@ virDomainObjListLoadConfig(virDomainObjList *doms, (*notify)(dom, oldDef =3D=3D NULL, opaque); =20 virDomainDefFree(oldDef); - VIR_FREE(configFile); - VIR_FREE(autostartLink); return dom; =20 error: - VIR_FREE(configFile); - VIR_FREE(autostartLink); virDomainDefFree(def); return NULL; } @@ -531,7 +527,7 @@ virDomainObjListLoadStatus(virDomainObjList *doms, virDomainLoadConfigNotify notify, void *opaque) { - char *statusFile =3D NULL; + g_autofree char *statusFile =3D NULL; virDomainObj *obj =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 @@ -561,12 +557,10 @@ virDomainObjListLoadStatus(virDomainObjList *doms, if (notify) (*notify)(obj, 1, opaque); =20 - VIR_FREE(statusFile); return obj; =20 error: virDomainObjEndAPI(&obj); - VIR_FREE(statusFile); return NULL; } =20 --=20 2.32.0 From nobody Thu May 2 03:38:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638463582; cv=none; d=zohomail.com; s=zohoarc; b=FLTFHwJIMgfXlYVXXfQg84wyMqVEzl4ox9XjQCoXA4oTVDxHk1c6Fq/iQs1+HT5KJXUrRjS0k3Z93mARBpLcVesVt2IOEcV8fji/CNHYhTixV+aPZ3/N3plBR4U6VVwkPf7Pr2QJDw8/RjRi8xvwO2MROmdZ5+2LYYTYb93oMpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638463582; h=Content-Type:Content-Transfer-Encoding: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=HA6btBtcOrJj0l84Q/vVG8vFhfRVdTDIxP/LKlVMkW0=; b=ClUjPp3cn10v4Mx5k3svxarz8fxanVYve58ti5647m/c1YAZuVFvusX+GrENYGTCUi4rmLY30ic5xIUdJtYwb5Qbx+T7xtj7uKBHTUox1nLDchwpf1VCBtiIVk7dTHlLS3T/0D7jxvY/G/C1j0HJ98jMD0I+57ROb0Tgz2OR5tY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638463582360746.3580189799487; Thu, 2 Dec 2021 08:46:22 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-454-3xwloEHmOGCuoHfSFR1xbQ-1; Thu, 02 Dec 2021 11:46:19 -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 5DAA983DD24; Thu, 2 Dec 2021 16:46:14 +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 1C813694DA; Thu, 2 Dec 2021 16:46:14 +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 3D03D1809C8A; Thu, 2 Dec 2021 16:46:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B2GkBcO010632 for ; Thu, 2 Dec 2021 11:46:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3BED660622; Thu, 2 Dec 2021 16:46:11 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FD796060F for ; Thu, 2 Dec 2021 16:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638463581; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HA6btBtcOrJj0l84Q/vVG8vFhfRVdTDIxP/LKlVMkW0=; b=iUxumVmMqJD8k5NWNe369/1VQL42Ste7CIDiIVdxZfATDkOmU/ZN8C4xJNSrUSU2e+0xRB OOv+FYylxLbv/eJDrQXyeGhZVeve58WZj0w+lnM7YzhEMVEAOXQ+GUQfMazEqNpCBAUgTS me0JnlaNbS+4q3FoMgaRMe1nmHpTm68= X-MC-Unique: 3xwloEHmOGCuoHfSFR1xbQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/3] lib: Use g_autoptr() for virDomainDef Date: Thu, 2 Dec 2021 17:46:01 +0100 Message-Id: <8596fb55b16e3e39bd69db4a9308f06eb3c01c54.1638463540.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638463582779100003 Content-Type: text/plain; charset="utf-8" Instead of calling virDomainDefFree() explicitly, we can annotate variables with g_autoptr(). Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/bhyve/bhyve_driver.c | 15 +++++-------- src/bhyve/bhyve_parse_command.c | 8 ++----- src/ch/ch_driver.c | 6 ++---- src/conf/domain_conf.c | 6 ++---- src/conf/virdomainobjlist.c | 6 ++---- src/esx/esx_driver.c | 14 ++++-------- src/libxl/libxl_domain.c | 12 ++++------- src/libxl/libxl_driver.c | 38 +++++++++++---------------------- src/libxl/libxl_migration.c | 3 +-- src/libxl/xen_xl.c | 5 ++--- src/libxl/xen_xm.c | 5 ++--- src/lxc/lxc_driver.c | 24 +++++++-------------- src/lxc/lxc_native.c | 5 ++--- src/openvz/openvz_conf.c | 3 +-- src/openvz/openvz_driver.c | 9 +++----- src/qemu/qemu_saveimage.c | 7 ++---- src/qemu/qemu_snapshot.c | 6 ++---- src/test/test_driver.c | 27 ++++++++--------------- src/vbox/vbox_common.c | 14 ++++-------- src/vmware/vmware_conf.c | 6 ++---- src/vmware/vmware_driver.c | 10 +++------ src/vmx/vmx.c | 12 +++++------ src/vz/vz_driver.c | 6 ++---- src/vz/vz_sdk.c | 6 ++---- tests/securityselinuxtest.c | 8 +++---- 25 files changed, 87 insertions(+), 174 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index eccf9b44a8..250e10b9d0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -504,8 +504,8 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flag { struct _bhyveConn *privconn =3D conn->privateData; virDomainPtr dom =3D NULL; - virDomainDef *def =3D NULL; - virDomainDef *oldDef =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; virDomainObj *vm =3D NULL; virObjectEvent *event =3D NULL; virCaps *caps =3D NULL; @@ -555,8 +555,6 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flag =20 cleanup: virObjectUnref(caps); - virDomainDefFree(def); - virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); virObjectEventStateQueue(privconn->domainEventState, event); =20 @@ -679,7 +677,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; struct _bhyveConn *privconn =3D conn->privateData; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virCommand *cmd =3D NULL; virCommand *loadcmd =3D NULL; char *ret =3D NULL; @@ -736,7 +734,6 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, cleanup: virCommandFree(loadcmd); virCommandFree(cmd); - virDomainDefFree(def); return ret; } =20 @@ -890,7 +887,7 @@ bhyveDomainCreateXML(virConnectPtr conn, { struct _bhyveConn *privconn =3D conn->privateData; virDomainPtr dom =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *vm =3D NULL; virObjectEvent *event =3D NULL; unsigned int start_flags =3D 0; @@ -936,7 +933,6 @@ bhyveDomainCreateXML(virConnectPtr conn, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(privconn->domainEventState, event); =20 @@ -1570,7 +1566,7 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn, unsigned int flags) { char *xml =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; struct _bhyveConn *privconn =3D conn->privateData; unsigned bhyveCaps =3D bhyveDriverGetBhyveCaps(privconn); =20 @@ -1593,7 +1589,6 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn, xml =3D virDomainDefFormat(def, privconn->xmlopt, 0); =20 cleanup: - virDomainDefFree(def); return xml; } =20 diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index f2c15f3aa5..6ee3c8305b 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -934,7 +934,7 @@ bhyveParseCommandLineString(const char* nativeConfig, unsigned caps, virDomainXMLOption *xmlopt) { - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; int bhyve_argc =3D 0; g_auto(GStrv) bhyve_argv =3D NULL; int loader_argc =3D 0; @@ -948,8 +948,6 @@ bhyveParseCommandLineString(const char* nativeConfig, if (virUUIDGenerate(def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate uuid")); - virDomainDefFree(def); - def =3D NULL; goto cleanup; } def->id =3D -1; @@ -974,9 +972,7 @@ bhyveParseCommandLineString(const char* nativeConfig, } =20 cleanup: - return def; + return g_steal_pointer(&def); error: - virDomainDefFree(def); - def =3D NULL; goto cleanup; } diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 464bcef907..108644e503 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -218,7 +218,7 @@ chDomainCreateXML(virConnectPtr conn, unsigned int flags) { virCHDriver *driver =3D conn->privateData; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -258,7 +258,6 @@ chDomainCreateXML(virConnectPtr conn, if (vm && !dom) { virDomainObjListRemove(driver->domains, vm); } - virDomainDefFree(vmdef); virDomainObjEndAPI(&vm); chDriverUnlock(driver); return dom; @@ -301,7 +300,7 @@ static virDomainPtr chDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int f= lags) { virCHDriver *driver =3D conn->privateData; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -331,7 +330,6 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virDomainDefFree(vmdef); virDomainObjEndAPI(&vm); return dom; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bdcc3dc2c1..4059acba7f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3840,7 +3840,7 @@ virDomainObjNew(virDomainXMLOption *xmlopt) virDomainDef * virDomainDefNew(virDomainXMLOption *xmlopt) { - virDomainDef *ret; + g_autoptr(virDomainDef) ret =3D NULL; =20 ret =3D g_new0(virDomainDef, 1); =20 @@ -3856,10 +3856,8 @@ virDomainDefNew(virDomainXMLOption *xmlopt) else ret->scsiBusMaxUnit =3D SCSI_NARROW_BUS_MAX_CONT_UNIT; =20 - return ret; - + return g_steal_pointer(&ret); error: - virDomainDefFree(ret); return NULL; } =20 diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index a0cffac1b8..7d3828162b 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -483,10 +483,10 @@ virDomainObjListLoadConfig(virDomainObjList *doms, { g_autofree char *configFile =3D NULL; g_autofree char *autostartLink =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *dom; int autostart; - virDomainDef *oldDef =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; =20 if ((configFile =3D virDomainConfigFile(configDir, name)) =3D=3D NULL) goto error; @@ -510,11 +510,9 @@ virDomainObjListLoadConfig(virDomainObjList *doms, if (notify) (*notify)(dom, oldDef =3D=3D NULL, opaque); =20 - virDomainDefFree(oldDef); return dom; =20 error: - virDomainDefFree(def); return NULL; } =20 diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 99e433ce93..467740804a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2535,7 +2535,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int= flags) g_autofree char *vmx =3D NULL; virVMXContext ctx; esxVMX_Data data; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; char *xml =3D NULL; =20 virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); @@ -2607,7 +2607,6 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int= flags) esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); g_free(data.datastorePathWithoutFileName); - virDomainDefFree(def); =20 return xml; } @@ -2622,7 +2621,7 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, con= st char *nativeFormat, esxPrivate *priv =3D conn->privateData; virVMXContext ctx; esxVMX_Data data; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; char *xml =3D NULL; =20 virCheckFlags(0, NULL); @@ -2651,8 +2650,6 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, con= st char *nativeFormat, xml =3D virDomainDefFormat(def, priv->xmlopt, VIR_DOMAIN_DEF_FORMAT_INACTIVE); =20 - virDomainDefFree(def); - return xml; } =20 @@ -2667,7 +2664,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const= char *nativeFormat, int virtualHW_version; virVMXContext ctx; esxVMX_Data data; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; char *vmx =3D NULL; =20 virCheckFlags(0, NULL); @@ -2704,8 +2701,6 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const= char *nativeFormat, =20 vmx =3D virVMXFormatConfig(&ctx, priv->xmlopt, def, virtualHW_version); =20 - virDomainDefFree(def); - return vmx; } =20 @@ -2866,7 +2861,7 @@ static virDomainPtr esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int = flags) { esxPrivate *priv =3D conn->privateData; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autofree char *vmx =3D NULL; size_t i; virDomainDiskDef *disk =3D NULL; @@ -3065,7 +3060,6 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flags) /* FIXME: Add proper rollback in case of an error */ =20 cleanup: - virDomainDefFree(def); esxVI_ObjectContent_Free(&virtualMachine); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index db2966a599..b3a9521e16 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -743,7 +743,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver, libxlSavefileHeader *ret_hdr) { int fd; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; libxlSavefileHeader hdr; g_autofree char *xml =3D NULL; =20 @@ -795,7 +795,6 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver, return fd; =20 error: - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); return -1; } @@ -1425,7 +1424,7 @@ libxlDomainStartNew(libxlDriverPrivate *driver, { g_autofree char *managed_save_path =3D NULL; int restore_fd =3D -1; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; libxlSavefileHeader hdr; uint32_t restore_ver =3D LIBXL_SAVE_VERSION; int ret =3D -1; @@ -1468,7 +1467,6 @@ libxlDomainStartNew(libxlDriverPrivate *driver, ret =3D libxlDomainStart(driver, vm, start_paused, restore_fd, restore= _ver); =20 cleanup: - virDomainDefFree(def); VIR_FORCE_CLOSE(restore_fd); return ret; } @@ -1489,9 +1487,9 @@ libxlDomainDefCheckABIStability(libxlDriverPrivate *d= river, virDomainDef *src, virDomainDef *dst) { - virDomainDef *migratableDefSrc =3D NULL; - virDomainDef *migratableDefDst =3D NULL; bool ret =3D false; + g_autoptr(virDomainDef) migratableDefSrc =3D NULL; + g_autoptr(virDomainDef) migratableDefDst =3D NULL; =20 if (!(migratableDefSrc =3D virDomainDefCopy(src, driver->xmlopt, NULL,= true)) || !(migratableDefDst =3D virDomainDefCopy(dst, driver->xmlopt, NULL,= true))) @@ -1502,8 +1500,6 @@ libxlDomainDefCheckABIStability(libxlDriverPrivate *d= river, driver->xmlopt); =20 cleanup: - virDomainDefFree(migratableDefSrc); - virDomainDefFree(migratableDefDst); return ret; } =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 23a28dc124..5b49089f7d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -563,7 +563,7 @@ static int libxlAddDom0(libxlDriverPrivate *driver) { libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *vm =3D NULL; libxl_dominfo d_info; unsigned long long maxmem; @@ -619,7 +619,6 @@ libxlAddDom0(libxlDriverPrivate *driver) =20 cleanup: libxl_dominfo_dispose(&d_info); - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; @@ -1008,7 +1007,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *= xml, unsigned int flags) { libxlDriverPrivate *driver =3D conn->privateData; - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); @@ -1053,7 +1052,6 @@ libxlDomainCreateXML(virConnectPtr conn, const char *= xml, libxlDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return dom; @@ -1922,7 +1920,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const cha= r *from, { libxlDriverPrivate *driver =3D conn->privateData; virDomainObj *vm =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; libxlSavefileHeader hdr; int fd =3D -1; int ret =3D -1; @@ -1970,7 +1968,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const cha= r *from, cleanup: if (VIR_CLOSE(fd) < 0) virReportSystemError(errno, "%s", _("cannot close file")); - virDomainDefFree(def); virDomainObjEndAPI(&vm); return ret; } @@ -2633,7 +2630,7 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, { libxlDriverPrivate *driver =3D conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autoptr(virConf) conf =3D NULL; char *xml =3D NULL; =20 @@ -2670,7 +2667,6 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, xml =3D virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_= INACTIVE); =20 cleanup: - virDomainDefFree(def); virObjectUnref(cfg); return xml; } @@ -2683,7 +2679,7 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, con= st char * nativeFormat, { libxlDriverPrivate *driver =3D conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autoptr(virConf) conf =3D NULL; int len =3D MAX_CONFIG_SIZE; char *ret =3D NULL; @@ -2719,7 +2715,6 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, con= st char * nativeFormat, } =20 cleanup: - virDomainDefFree(def); virObjectUnref(cfg); return ret; } @@ -2801,11 +2796,11 @@ libxlDomainDefineXMLFlags(virConnectPtr conn, const= char *xml, unsigned int flag { libxlDriverPrivate *driver =3D conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEvent *event =3D NULL; - virDomainDef *oldDef =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); @@ -2845,8 +2840,6 @@ libxlDomainDefineXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flag VIR_DOMAIN_EVENT_DEFINED_UPDATED); =20 cleanup: - virDomainDefFree(def); - virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); @@ -4072,7 +4065,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const = char *xml, libxlDriverPrivate *driver =3D dom->conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); virDomainObj *vm =3D NULL; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *devConf =3D NULL; virDomainDeviceDef devConfSave =3D { 0 }; virDomainDeviceDef *devLive =3D NULL; @@ -4147,7 +4140,6 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const = char *xml, libxlDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); virDomainObjEndAPI(&vm); @@ -4169,7 +4161,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const = char *xml, libxlDriverPrivate *driver =3D dom->conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); virDomainObj *vm =3D NULL; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *dev =3D NULL; int ret =3D -1; =20 @@ -4236,7 +4228,6 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const = char *xml, libxlDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(vmdef); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(cfg); @@ -4257,7 +4248,7 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const = char *xml, libxlDriverPrivate *driver =3D dom->conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); virDomainObj *vm =3D NULL; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *dev =3D NULL; int ret =3D -1; =20 @@ -4316,7 +4307,6 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const = char *xml, } =20 cleanup: - virDomainDefFree(vmdef); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(cfg); @@ -5822,7 +5812,7 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPtr = dconn, unsigned int flags) { libxlDriverPrivate *driver =3D dconn->privateData; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; const char *uri_in =3D NULL; @@ -5861,7 +5851,6 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPtr = dconn, return 0; =20 error: - virDomainDefFree(def); return -1; } =20 @@ -5877,7 +5866,7 @@ libxlDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { libxlDriverPrivate *driver =3D dconn->privateData; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; const char *uri_in =3D NULL; @@ -5889,7 +5878,7 @@ libxlDomainMigratePrepare3Params(virConnectPtr dconn, =20 virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS= ) < 0) - goto error; + return -1; =20 if (virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_XML, @@ -5916,7 +5905,6 @@ libxlDomainMigratePrepare3Params(virConnectPtr dconn, return 0; =20 error: - virDomainDefFree(def); return -1; } =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index cdd714d6b8..6d0ab4ee28 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -379,7 +379,7 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, libxlDriverPrivate *driver =3D conn->privateData; libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); libxlMigrationCookie *mig =3D NULL; - virDomainDef *tmpdef =3D NULL; + g_autoptr(virDomainDef) tmpdef =3D NULL; virDomainDef *def; char *xml =3D NULL; =20 @@ -426,7 +426,6 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, =20 cleanup: libxlMigrationCookieFree(mig); - virDomainDefFree(tmpdef); virObjectUnref(cfg); return xml; } diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 17c5184b9b..fc05f8f502 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1115,7 +1115,7 @@ xenParseXL(virConf *conf, virCaps *caps, virDomainXMLOption *xmlopt) { - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; =20 if (!(def =3D virDomainDefNew(xmlopt))) return NULL; @@ -1165,10 +1165,9 @@ xenParseXL(virConf *conf, xmlopt, NULL) < 0) goto cleanup; =20 - return def; + return g_steal_pointer(&def); =20 cleanup: - virDomainDefFree(def); return NULL; } =20 diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index ffcd4a7e8f..1fc3e99b08 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -408,7 +408,7 @@ xenParseXM(virConf *conf, virCaps *caps, virDomainXMLOption *xmlopt) { - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; =20 if (!(def =3D virDomainDefNew(xmlopt))) return NULL; @@ -433,10 +433,9 @@ xenParseXM(virConf *conf, xmlopt, NULL) < 0) goto cleanup; =20 - return def; + return g_steal_pointer(&def); =20 cleanup: - virDomainDefFree(def); return NULL; } =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3cdf73c69f..349783ca7c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -399,11 +399,11 @@ static virDomainPtr lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int = flags) { virLXCDriver *driver =3D conn->privateData; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEvent *event =3D NULL; - virDomainDef *oldDef =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; virLXCDriverConfig *cfg =3D virLXCDriverGetConfig(driver); virCaps *caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -457,8 +457,6 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virDomainDefFree(def); - virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -937,7 +935,7 @@ static char *lxcConnectDomainXMLFromNative(virConnectPt= r conn, unsigned int flags) { char *xml =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virLXCDriver *driver =3D conn->privateData; virCaps *caps =3D virLXCDriverGetCapabilities(driver, false); =20 @@ -959,7 +957,6 @@ static char *lxcConnectDomainXMLFromNative(virConnectPt= r conn, =20 cleanup: virObjectUnref(caps); - virDomainDefFree(def); return xml; } =20 @@ -1081,7 +1078,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, { virLXCDriver *driver =3D conn->privateData; virDomainObj *vm =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainPtr dom =3D NULL; virObjectEvent *event =3D NULL; virLXCDriverConfig *cfg =3D virLXCDriverGetConfig(driver); @@ -1151,7 +1148,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, virLXCDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -1811,7 +1807,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, size_t i; virDomainObj *vm =3D NULL; virDomainDef *def =3D NULL; - virDomainDef *persistentDefCopy =3D NULL; + g_autoptr(virDomainDef) persistentDefCopy =3D NULL; virDomainDef *persistentDef =3D NULL; int ret =3D -1; int rc; @@ -1924,7 +1920,6 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, virLXCDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(persistentDefCopy); virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); @@ -4289,7 +4284,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr do= m, { virLXCDriver *driver =3D dom->conn->privateData; virDomainObj *vm =3D NULL; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *dev =3D NULL; virDomainDeviceDef *dev_copy =3D NULL; int ret =3D -1; @@ -4373,7 +4368,6 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr do= m, virLXCDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(vmdef); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -4397,7 +4391,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr do= m, { virLXCDriver *driver =3D dom->conn->privateData; virDomainObj *vm =3D NULL; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *dev =3D NULL; int ret =3D -1; virLXCDriverConfig *cfg =3D virLXCDriverGetConfig(driver); @@ -4446,7 +4440,6 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr do= m, virLXCDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(vmdef); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(cfg); @@ -4461,7 +4454,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr do= m, virLXCDriver *driver =3D dom->conn->privateData; virCaps *caps =3D NULL; virDomainObj *vm =3D NULL; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *dev =3D NULL; virDomainDeviceDef *dev_copy =3D NULL; int ret =3D -1; @@ -4539,7 +4532,6 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr do= m, virLXCDomainObjEndJob(driver, vm); =20 cleanup: - virDomainDefFree(vmdef); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index f3b8e85143..8f38c6e086 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1086,7 +1086,7 @@ lxcParseConfigString(const char *config, virCaps *caps G_GNUC_UNUSED, virDomainXMLOption *xmlopt) { - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; g_autoptr(virConf) properties =3D NULL; g_autofree char *value =3D NULL; =20 @@ -1199,9 +1199,8 @@ lxcParseConfigString(const char *config, xmlopt, NULL) < 0) goto error; =20 - return vmdef; + return g_steal_pointer(&vmdef); =20 error: - virDomainDefFree(vmdef); return NULL; } diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index e2fbc28abc..4fb18c03ee 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -446,7 +446,7 @@ int openvzLoadDomains(struct openvz_driver *driver) char *status; char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObj *dom =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; char *temp =3D NULL; char *outbuf =3D NULL; char *line; @@ -559,7 +559,6 @@ int openvzLoadDomains(struct openvz_driver *driver) virCommandFree(cmd); VIR_FREE(temp); VIR_FREE(outbuf); - virDomainDefFree(def); return -1; } =20 diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index d9c71a5722..ce3262c0e2 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -824,7 +824,7 @@ static virDomainPtr openvzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned i= nt flags) { struct openvz_driver *driver =3D conn->privateData; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -895,7 +895,6 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, -1); =20 cleanup: - virDomainDefFree(vmdef); virDomainObjEndAPI(&vm); openvzDriverUnlock(driver); return dom; @@ -913,7 +912,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *x= ml, { g_autoptr(virCommand) cmd =3D virCommandNewArgList(VZCTL, "--quiet", "= start", NULL); struct openvz_driver *driver =3D conn->privateData; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -983,7 +982,6 @@ openvzDomainCreateXML(virConnectPtr conn, const char *x= ml, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virDomainDefFree(vmdef); virDomainObjEndAPI(&vm); openvzDriverUnlock(driver); return dom; @@ -2063,7 +2061,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, struct openvz_driver *driver =3D dconn->privateData; const char *dom_xml =3D NULL; const char *uri_in =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *vm =3D NULL; g_autofree char *my_hostname =3D NULL; const char *hostname =3D NULL; @@ -2138,7 +2136,6 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, goto done; =20 error: - virDomainDefFree(def); if (vm) virDomainObjListRemove(driver->domains, vm); =20 diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index e14e2987f1..cdba3aa34d 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -719,8 +719,8 @@ qemuSaveImageUpdateDef(virQEMUDriver *driver, const char *newxml) { virDomainDef *ret =3D NULL; - virDomainDef *newdef_migr =3D NULL; - virDomainDef *newdef =3D NULL; + g_autoptr(virDomainDef) newdef_migr =3D NULL; + g_autoptr(virDomainDef) newdef =3D NULL; =20 if (!(newdef =3D virDomainDefParseString(newxml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) @@ -756,8 +756,5 @@ qemuSaveImageUpdateDef(virQEMUDriver *driver, } =20 cleanup: - virDomainDefFree(newdef); - virDomainDefFree(newdef_migr); - return ret; } diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index edf5511e42..5562646a9e 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1940,8 +1940,8 @@ qemuSnapshotRevert(virDomainObj *vm, int detail; qemuDomainObjPrivate *priv =3D vm->privateData; int rc; - virDomainDef *config =3D NULL; - virDomainDef *inactiveConfig =3D NULL; + g_autoptr(virDomainDef) config =3D NULL; + g_autoptr(virDomainDef) inactiveConfig =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainSaveCookie *cookie; virCPUDef *origCPU =3D NULL; @@ -2235,8 +2235,6 @@ qemuSnapshotRevert(virDomainObj *vm, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virCPUDefFree(origCPU); - virDomainDefFree(config); - virDomainDefFree(inactiveConfig); =20 return ret; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index b6bca884f0..4d6ee3098e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1029,7 +1029,7 @@ testParseDomains(testDriver *privconn, return -1; =20 for (i =3D 0; i < num; i++) { - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; testDomainNamespaceDef *nsdata; xmlNodePtr node =3D testParseXMLDocFromFile(nodes[i], file, "domai= n"); if (!node) @@ -1046,7 +1046,6 @@ testParseDomains(testDriver *privconn, &def, privconn->xmlopt, 0, NULL))) { - virDomainDefFree(def); goto error; } =20 @@ -1750,7 +1749,7 @@ testDomainCreateXML(virConnectPtr conn, const char *x= ml, { testDriver *privconn =3D conn->privateData; virDomainPtr ret =3D NULL; - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *dom =3D NULL; virObjectEvent *event =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -1790,7 +1789,6 @@ testDomainCreateXML(virConnectPtr conn, const char *x= ml, cleanup: virDomainObjEndAPI(&dom); virObjectEventStateQueue(privconn->eventState, event); - virDomainDefFree(def); virObjectUnlock(privconn); return ret; } @@ -2388,7 +2386,7 @@ testDomainSaveImageOpen(testDriver *driver, char magic[15]; int fd =3D -1; int len; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; g_autofree char *xml =3D NULL; =20 if ((fd =3D open(path, O_RDONLY)) < 0) { @@ -2436,7 +2434,6 @@ testDomainSaveImageOpen(testDriver *driver, return fd; =20 error: - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); return -1; } @@ -2498,7 +2495,7 @@ testDomainRestoreFlags(virConnectPtr conn, { testDriver *privconn =3D conn->privateData; int fd =3D -1; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *dom =3D NULL; virObjectEvent *event =3D NULL; int ret =3D -1; @@ -2535,7 +2532,6 @@ testDomainRestoreFlags(virConnectPtr conn, ret =3D 0; =20 cleanup: - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); virDomainObjEndAPI(&dom); virObjectEventStateQueue(privconn->eventState, event); @@ -2558,8 +2554,8 @@ testDomainSaveImageDefineXML(virConnectPtr conn, { int ret =3D -1; int fd =3D -1; - virDomainDef *def =3D NULL; - virDomainDef *newdef =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; + g_autoptr(virDomainDef) newdef =3D NULL; testDriver *privconn =3D conn->privateData; =20 virCheckFlags(VIR_DOMAIN_SAVE_RUNNING | @@ -2579,8 +2575,6 @@ testDomainSaveImageDefineXML(virConnectPtr conn, ret =3D 0; =20 cleanup: - virDomainDefFree(def); - virDomainDefFree(newdef); return ret; } =20 @@ -2592,7 +2586,7 @@ testDomainSaveImageGetXMLDesc(virConnectPtr conn, { int fd =3D -1; char *ret =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; testDriver *privconn =3D conn->privateData; =20 virCheckFlags(VIR_DOMAIN_SAVE_IMAGE_XML_SECURE, NULL); @@ -2604,7 +2598,6 @@ testDomainSaveImageGetXMLDesc(virConnectPtr conn, VIR_DOMAIN_DEF_FORMAT_SECURE); =20 cleanup: - virDomainDefFree(def); VIR_FORCE_CLOSE(fd); return ret; } @@ -4185,10 +4178,10 @@ static virDomainPtr testDomainDefineXMLFlags(virCon= nectPtr conn, { testDriver *privconn =3D conn->privateData; virDomainPtr ret =3D NULL; - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *dom =3D NULL; virObjectEvent *event =3D NULL; - virDomainDef *oldDef =3D NULL; + g_autoptr(virDomainDef) oldDef =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); @@ -4222,8 +4215,6 @@ static virDomainPtr testDomainDefineXMLFlags(virConne= ctPtr conn, ret =3D virGetDomain(conn, dom->def->name, dom->def->uuid, dom->def->i= d); =20 cleanup: - virDomainDefFree(def); - virDomainDefFree(oldDef); virDomainObjEndAPI(&dom); virObjectEventStateQueue(privconn->eventState, event); return ret; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 72f1b9c466..d3251863e6 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1858,7 +1858,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags IMachine *machine =3D NULL; IBIOSSettings *bios =3D NULL; vboxIID mchiid; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; nsresult rc; char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainPtr ret =3D NULL; @@ -1979,8 +1979,6 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags /* if machine wasn't even created, cleanup is trivial */ if (!machine) { vboxIIDUnalloc(&mchiid); - virDomainDefFree(def); - return ret; } =20 @@ -2013,7 +2011,6 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags =20 VBOX_RELEASE(machine); vboxIIDUnalloc(&mchiid); - virDomainDefFree(def); =20 return ret; } @@ -3964,7 +3961,7 @@ vboxDumpParallel(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine, static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { struct _vboxDriver *data =3D dom->conn->privateData; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; IMachine *machine =3D NULL; vboxIID iid; PRBool accessible =3D PR_FALSE; @@ -4115,7 +4112,6 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, u= nsigned int flags) cleanup: VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); - virDomainDefFree(def); return ret; } =20 @@ -4226,7 +4222,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr do= m, IMachine *machine =3D NULL; vboxIID iid; PRUint32 state; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainDeviceDef *dev =3D NULL; nsresult rc; int ret =3D -1; @@ -4305,7 +4301,6 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr do= m, =20 cleanup: vboxIIDUnalloc(&iid); - virDomainDefFree(def); virDomainDeviceDefFree(dev); return ret; } @@ -4345,7 +4340,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, c= onst char *xml) IMachine *machine =3D NULL; vboxIID iid; PRUint32 state; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; virDomainDeviceDef *dev =3D NULL; nsresult rc; int ret =3D -1; @@ -4422,7 +4417,6 @@ static int vboxDomainDetachDevice(virDomainPtr dom, c= onst char *xml) =20 cleanup: vboxIIDUnalloc(&iid); - virDomainDefFree(def); virDomainDeviceDefFree(dev); return ret; } diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ab03617d95..8c8ecc8120 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -117,7 +117,6 @@ vmwareCapsInit(void) int vmwareLoadDomains(struct vmware_driver *driver) { - virDomainDef *vmdef =3D NULL; virDomainObj *vm =3D NULL; char *vmxPath =3D NULL; char *vmx =3D NULL; @@ -141,8 +140,8 @@ vmwareLoadDomains(struct vmware_driver *driver) if (virCommandRun(cmd, NULL) < 0) goto cleanup; =20 - for (str =3D outbuf; (vmxPath =3D strtok_r(str, "\n", &saveptr)) !=3D = NULL; - str =3D NULL) { + for (str =3D outbuf; (vmxPath =3D strtok_r(str, "\n", &saveptr)) !=3D = NULL; str =3D NULL) { + g_autoptr(virDomainDef) vmdef =3D NULL; =20 if (!g_path_is_absolute(vmxPath)) continue; @@ -182,7 +181,6 @@ vmwareLoadDomains(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); - virDomainDefFree(vmdef); VIR_FREE(vmx); virObjectUnref(vm); return ret; diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index e6843ee745..8f107dd529 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -394,7 +394,7 @@ static virDomainPtr vmwareDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned i= nt flags) { struct vmware_driver *driver =3D conn->privateData; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; char *vmx =3D NULL; @@ -454,7 +454,6 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, -1); =20 cleanup: - virDomainDefFree(vmdef); VIR_FREE(vmx); VIR_FREE(vmxPath); if (vm) @@ -646,7 +645,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, unsigned int flags) { struct vmware_driver *driver =3D conn->privateData; - virDomainDef *vmdef =3D NULL; + g_autoptr(virDomainDef) vmdef =3D NULL; virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; char *vmx =3D NULL; @@ -709,7 +708,6 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virDomainDefFree(vmdef); VIR_FREE(vmx); VIR_FREE(vmxPath); virDomainObjEndAPI(&vm); @@ -937,7 +935,7 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, co= nst char *nativeFormat, { struct vmware_driver *driver =3D conn->privateData; virVMXContext ctx; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; char *xml =3D NULL; =20 virCheckFlags(0, NULL); @@ -959,8 +957,6 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, co= nst char *nativeFormat, xml =3D virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_INACTIVE); =20 - virDomainDefFree(def); - return xml; } =20 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d3540acd84..ca65caa9a1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1382,7 +1382,7 @@ virVMXParseConfig(virVMXContext *ctx, g_autoptr(virConf) conf =3D NULL; char *encoding =3D NULL; char *utf8; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; long long config_version =3D 0; long long virtualHW_version =3D 0; long long memsize =3D 0; @@ -1982,11 +1982,6 @@ virVMXParseConfig(virVMXContext *ctx, success =3D true; =20 cleanup: - if (! success) { - virDomainDefFree(def); - def =3D NULL; - } - VIR_FREE(encoding); VIR_FREE(sched_cpu_affinity); VIR_FREE(sched_cpu_shares); @@ -1994,7 +1989,10 @@ virVMXParseConfig(virVMXContext *ctx, virCPUDefFree(cpu); VIR_FREE(firmware); =20 - return def; + if (!success) + return NULL; + + return g_steal_pointer(&def); } =20 =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 23b7795035..ff5f7cb2e7 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -788,7 +788,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) { struct _vzConn *privconn =3D conn->privateData; virDomainPtr retdom =3D NULL; - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; virDomainObj *dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; struct _vzDriver *driver =3D privconn->driver; @@ -872,7 +872,6 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) if (job) vzDomainObjEndJob(dom); virDomainObjEndAPI(&dom); - virDomainDefFree(def); return retdom; } =20 @@ -2964,7 +2963,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, const char *miguri =3D NULL; const char *dname =3D NULL; const char *dom_xml =3D NULL; - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; int ret =3D -1; =20 virCheckFlags(VZ_MIGRATION_FLAGS, -1); @@ -3009,7 +3008,6 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, ret =3D 0; =20 cleanup: - virDomainDefFree(def); return ret; } =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 1772f75c3e..7869b5c94d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1777,7 +1777,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, PRL_HANDLE sdkdom, virDomainObj *dom) { - virDomainDef *def =3D NULL; + g_autoptr(virDomainDef) def =3D NULL; struct vzDomObj *pdom =3D NULL; VIRTUAL_MACHINE_STATE domainState; =20 @@ -1883,7 +1883,6 @@ prlsdkLoadDomain(struct _vzDriver *driver, virObjectUnlock(driver); =20 if (olddom) { - virDomainDefFree(def); return olddom; } else if (!dom) { goto error; @@ -1898,7 +1897,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, * we can't use virDomainObjAssignDef, because it checks * for state and domain name */ virDomainDefFree(dom->def); - dom->def =3D def; + dom->def =3D g_steal_pointer(&def); } =20 pdom =3D dom->privateData; @@ -1914,7 +1913,6 @@ prlsdkLoadDomain(struct _vzDriver *driver, return dom; =20 error: - virDomainDefFree(def); return NULL; } =20 diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 119ad6df34..4912cc3483 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -64,7 +64,7 @@ testBuildDomainDef(bool dynamic, const char *label, const char *baselabel) { - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; virSecurityLabelDef *secdef =3D NULL; =20 if (!(def =3D virDomainDefNew(NULL))) @@ -86,10 +86,9 @@ testBuildDomainDef(bool dynamic, =20 def->seclabels[0] =3D secdef; def->nseclabels++; - return def; + return g_steal_pointer(&def); =20 error: - virDomainDefFree(def); virSecurityLabelDefFree(secdef); return NULL; } @@ -211,7 +210,7 @@ testSELinuxGenLabel(const void *opaque) { const struct testSELinuxGenLabelData *data =3D opaque; int ret =3D -1; - virDomainDef *def; + g_autoptr(virDomainDef) def =3D NULL; context_t con =3D NULL; context_t imgcon =3D NULL; =20 @@ -255,7 +254,6 @@ testSELinuxGenLabel(const void *opaque) cleanup: context_free(con); context_free(imgcon); - virDomainDefFree(def); return ret; } =20 --=20 2.32.0 From nobody Thu May 2 03:38:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638463623; cv=none; d=zohomail.com; s=zohoarc; b=OuT2+HKk2CSf4hVJxYRNO+Dr8H15ZaXZEIzEXhqmVaB1BD10xGBEL8xdx/zsUmlEsdLv6QG2FqocjHmWKHVlpft0Z+7ViBcv5yIiBtqVK4eX9gkwhpS3BcRCn8y9dze+QKqecRE+NTzIBMGkNC+5Nyl9IiZ6hqWuplUxkPw8Nlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638463623; h=Content-Type:Content-Transfer-Encoding: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=A3E98Dzok0/vhd2dvUGm802f6bfN5mJ1EgXoJfZfUMc=; b=IAzwoemiLp8/BVafa6i4EK5+uQyqkx0eCjFyY92+C7zj3JoV1PvDhq1oPFEaNbcMnXEi/gJ4QA1yCo9mO7vY2+gBysOlHc2J9hdH9fRGSo1STxcqod9U86wW5beIlOQHLDJIqVSApfYGgiItveZUOqmlIgCVHk00aN8MFck9BJA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1638463623800323.6210083889897; Thu, 2 Dec 2021 08:47:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-525-Qma4wPXSOM66qY4dmLKakg-1; Thu, 02 Dec 2021 11:46:33 -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 4C06E101F7A3; Thu, 2 Dec 2021 16:46:28 +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 2CB23196F9; Thu, 2 Dec 2021 16:46:28 +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 F2B5D1809CB9; Thu, 2 Dec 2021 16:46:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B2GkCGS010642 for ; Thu, 2 Dec 2021 11:46:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1F27B60622; Thu, 2 Dec 2021 16:46:12 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91F956060F for ; Thu, 2 Dec 2021 16:46:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638463622; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=A3E98Dzok0/vhd2dvUGm802f6bfN5mJ1EgXoJfZfUMc=; b=A/mFCwmw3ej9OTEdYCfN6u1lT+lbH/tXs887JOLBIj8NasiNM/w/HZ7OG8GTz3sGOFkaHC s19qkqX43zj2HELJ9svBMJOABpzrhfcZ+Pt+Unl3RWNVuOE3FKbQlBS3Z9mMDXZYKXqibV 6e2ol6UhflTdhMc1CgSIsW1j2TfvRh0= X-MC-Unique: Qma4wPXSOM66qY4dmLKakg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/3] lib: Drop some needles labels Date: Thu, 2 Dec 2021 17:46:02 +0100 Message-Id: <85881a65aabe22b4e6e69ff047bf1ec920449d93.1638463540.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638463625206100001 Content-Type: text/plain; charset="utf-8" After previous cleanups some labels became needles because they contain just a return statement. There's no point in having such labels. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/bhyve/bhyve_parse_command.c | 15 ++++++-------- src/conf/domain_conf.c | 4 +--- src/conf/virdomainobjlist.c | 13 +++++------- src/libxl/libxl_domain.c | 12 ++++------- src/libxl/libxl_driver.c | 24 +++++++++------------- src/libxl/xen_xl.c | 29 ++++++++++++--------------- src/libxl/xen_xm.c | 13 +++++------- src/lxc/lxc_native.c | 35 +++++++++++++++------------------ src/qemu/qemu_saveimage.c | 14 +++++-------- src/test/test_driver.c | 12 ++++------- src/vz/vz_driver.c | 18 +++++++---------- src/vz/vz_sdk.c | 35 +++++++++++++++------------------ 12 files changed, 91 insertions(+), 133 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 6ee3c8305b..2a5959ba1d 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -941,14 +941,14 @@ bhyveParseCommandLineString(const char* nativeConfig, g_auto(GStrv) loader_argv =3D NULL; =20 if (!(def =3D virDomainDefNew(xmlopt))) - goto cleanup; + return NULL; =20 /* Initialize defaults. */ def->virtType =3D VIR_DOMAIN_VIRT_BHYVE; if (virUUIDGenerate(def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate uuid")); - goto cleanup; + return NULL; } def->id =3D -1; def->clock.offset =3D VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME; @@ -958,21 +958,18 @@ bhyveParseCommandLineString(const char* nativeConfig, &bhyve_argc, &bhyve_argv)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to convert the command string to argv-lis= ts")); - goto error; + return NULL; } =20 if (bhyveParseBhyveCommandLine(def, xmlopt, caps, bhyve_argc, bhyve_ar= gv)) - goto error; + return NULL; if (loader_argv && STREQ(loader_argv[0], "/usr/sbin/bhyveload")) { if (bhyveParseBhyveLoadCommandLine(def, loader_argc, loader_argv)) - goto error; + return NULL; } else if (loader_argv) { if (bhyveParseCustomLoaderCommandLine(def, loader_argc, loader_arg= v)) - goto error; + return NULL; } =20 - cleanup: return g_steal_pointer(&def); - error: - goto cleanup; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4059acba7f..107d2a4f5d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3845,7 +3845,7 @@ virDomainDefNew(virDomainXMLOption *xmlopt) ret =3D g_new0(virDomainDef, 1); =20 if (!(ret->numa =3D virDomainNumaNew())) - goto error; + return NULL; =20 ret->mem.hard_limit =3D VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; ret->mem.soft_limit =3D VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; @@ -3857,8 +3857,6 @@ virDomainDefNew(virDomainXMLOption *xmlopt) ret->scsiBusMaxUnit =3D SCSI_NARROW_BUS_MAX_CONT_UNIT; =20 return g_steal_pointer(&ret); - error: - return NULL; } =20 =20 diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 7d3828162b..70b73e87ec 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -489,21 +489,21 @@ virDomainObjListLoadConfig(virDomainObjList *doms, g_autoptr(virDomainDef) oldDef =3D NULL; =20 if ((configFile =3D virDomainConfigFile(configDir, name)) =3D=3D NULL) - goto error; + return NULL; if (!(def =3D virDomainDefParseFile(configFile, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE | VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARS= E_FAIL))) - goto error; + return NULL; =20 if ((autostartLink =3D virDomainConfigFile(autostartDir, name)) =3D=3D= NULL) - goto error; + return NULL; =20 if ((autostart =3D virFileLinkPointsTo(autostartLink, configFile)) < 0) - goto error; + return NULL; =20 if (!(dom =3D virDomainObjListAddLocked(doms, &def, xmlopt, 0, &oldDef= ))) - goto error; + return NULL; =20 dom->autostart =3D autostart; =20 @@ -511,9 +511,6 @@ virDomainObjListLoadConfig(virDomainObjList *doms, (*notify)(dom, oldDef =3D=3D NULL, opaque); =20 return dom; - - error: - return NULL; } =20 =20 diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index b3a9521e16..60079ba63f 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1487,20 +1487,16 @@ libxlDomainDefCheckABIStability(libxlDriverPrivate = *driver, virDomainDef *src, virDomainDef *dst) { - bool ret =3D false; g_autoptr(virDomainDef) migratableDefSrc =3D NULL; g_autoptr(virDomainDef) migratableDefDst =3D NULL; =20 if (!(migratableDefSrc =3D virDomainDefCopy(src, driver->xmlopt, NULL,= true)) || !(migratableDefDst =3D virDomainDefCopy(dst, driver->xmlopt, NULL,= true))) - goto cleanup; + return false; =20 - ret =3D virDomainDefCheckABIStability(migratableDefSrc, - migratableDefDst, - driver->xmlopt); - - cleanup: - return ret; + return virDomainDefCheckABIStability(migratableDefSrc, + migratableDefDst, + driver->xmlopt); } =20 =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5b49089f7d..0b14b5093e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5824,7 +5824,7 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPtr = dconn, =20 virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS= ) < 0) - goto error; + return -1; =20 if (virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_XML, @@ -5836,22 +5836,19 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPt= r dconn, VIR_MIGRATE_PARAM_URI, &uri_in) < 0) =20 - goto error; + return -1; =20 if (!(def =3D libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname= ))) - goto error; + return -1; =20 if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) - goto error; + return -1; =20 if (libxlDomainMigrationDstPrepareTunnel3(dconn, st, &def, cookiein, cookieinlen, flags) < 0) - goto error; + return -1; =20 return 0; - - error: - return -1; } =20 static int @@ -5890,22 +5887,19 @@ libxlDomainMigratePrepare3Params(virConnectPtr dcon= n, VIR_MIGRATE_PARAM_URI, &uri_in) < 0) =20 - goto error; + return -1; =20 if (!(def =3D libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname= ))) - goto error; + return -1; =20 if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) - goto error; + return -1; =20 if (libxlDomainMigrationDstPrepare(dconn, &def, uri_in, uri_out, cookiein, cookieinlen, flags) < 0) - goto error; + return -1; =20 return 0; - - error: - return -1; } =20 static int diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index fc05f8f502..8aba115d96 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1126,49 +1126,46 @@ xenParseXL(virConf *conf, =20 if (xenParseConfigCommon(conf, def, caps, XEN_CONFIG_FORMAT_XL, xmlopt) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLOS(conf, def, caps) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLVnuma(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLXenbusLimits(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLCPUID(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLDisk(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLSpice(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLInputDevs(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLUSB(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLUSBController(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLChannel(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXLNamespaceData(conf, def) < 0) - goto cleanup; + return NULL; =20 if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) - goto cleanup; + return NULL; =20 return g_steal_pointer(&def); - - cleanup: - return NULL; } =20 =20 diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 1fc3e99b08..9c2d091918 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -418,25 +418,22 @@ xenParseXM(virConf *conf, =20 if (xenParseConfigCommon(conf, def, caps, XEN_CONFIG_FORMAT_XM, xmlopt) < 0) - goto cleanup; + return NULL; =20 if (xenParseXMOS(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXMDiskList(conf, def) < 0) - goto cleanup; + return NULL; =20 if (xenParseXMInputDevs(conf, def) < 0) - goto cleanup; + return NULL; =20 if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) - goto cleanup; + return NULL; =20 return g_steal_pointer(&def); - - cleanup: - return NULL; } =20 static int diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 8f38c6e086..972e9cdc15 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1094,12 +1094,12 @@ lxcParseConfigString(const char *config, return NULL; =20 if (!(vmdef =3D virDomainDefNew(xmlopt))) - goto error; + return NULL; =20 if (virUUIDGenerate(vmdef->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to generate uuid")); - goto error; + return NULL; } =20 vmdef->id =3D -1; @@ -1113,10 +1113,10 @@ lxcParseConfigString(const char *config, /* Value not handled by the LXC driver, setting to * minimum required to make XML parsing pass */ if (virDomainDefSetVcpusMax(vmdef, 1, xmlopt) < 0) - goto error; + return NULL; =20 if (virDomainDefSetVcpus(vmdef, 1) < 0) - goto error; + return NULL; =20 vmdef->nfss =3D 0; vmdef->os.type =3D VIR_DOMAIN_OSTYPE_EXE; @@ -1139,7 +1139,7 @@ lxcParseConfigString(const char *config, =20 /* Check for pre LXC 3.0 legacy key */ if (virConfGetValueString(properties, "lxc.utsname", &value) <=3D = 0) - goto error; + return NULL; } =20 vmdef->name =3D g_strdup(value); @@ -1148,7 +1148,7 @@ lxcParseConfigString(const char *config, vmdef->name =3D g_strdup("unnamed"); =20 if (lxcSetRootfs(vmdef, properties) < 0) - goto error; + return NULL; =20 /* LXC 3.0 uses "lxc.mount.fstab", while legacy used just "lxc.mount". * In either case, generate the error to use "lxc.mount.entry" instead= */ @@ -1157,50 +1157,47 @@ lxcParseConfigString(const char *config, virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("lxc.mount.fstab or lxc.mount found, use " "lxc.mount.entry lines instead")); - goto error; + return NULL; } =20 /* Loop over lxc.mount.entry to add filesystem devices for them */ if (virConfWalk(properties, lxcFstabWalkCallback, vmdef) < 0) - goto error; + return NULL; =20 /* Network configuration */ if (lxcConvertNetworkSettings(vmdef, properties) < 0) - goto error; + return NULL; =20 /* Consoles */ if (lxcCreateConsoles(vmdef, properties) < 0) - goto error; + return NULL; =20 /* lxc.idmap or legacy lxc.id_map */ if (virConfWalk(properties, lxcIdmapWalkCallback, vmdef) < 0) - goto error; + return NULL; =20 /* lxc.cgroup.memory.* */ if (lxcSetMemTune(vmdef, properties) < 0) - goto error; + return NULL; =20 /* lxc.cgroup.cpu.* */ if (lxcSetCpuTune(vmdef, properties) < 0) - goto error; + return NULL; =20 /* lxc.cgroup.cpuset.* */ if (lxcSetCpusetTune(vmdef, properties) < 0) - goto error; + return NULL; =20 /* lxc.cgroup.blkio.* */ if (lxcSetBlkioTune(vmdef, properties) < 0) - goto error; + return NULL; =20 /* lxc.cap.drop */ lxcSetCapDrop(vmdef, properties); =20 if (virDomainDefPostParse(vmdef, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) - goto error; + return NULL; =20 return g_steal_pointer(&vmdef); - - error: - return NULL; } diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index cdba3aa34d..557ee2cd21 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -718,19 +718,18 @@ qemuSaveImageUpdateDef(virQEMUDriver *driver, virDomainDef *def, const char *newxml) { - virDomainDef *ret =3D NULL; g_autoptr(virDomainDef) newdef_migr =3D NULL; g_autoptr(virDomainDef) newdef =3D NULL; =20 if (!(newdef =3D virDomainDefParseString(newxml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) - goto cleanup; + return NULL; =20 if (!(newdef_migr =3D qemuDomainDefCopy(driver, NULL, newdef, QEMU_DOMAIN_FORMAT_LIVE_FLAGS | VIR_DOMAIN_XML_MIGRATABLE))) - goto cleanup; + return NULL; =20 if (!virDomainDefCheckABIStability(def, newdef_migr, driver->xmlopt)) { virErrorPtr save_err; @@ -745,16 +744,13 @@ qemuSaveImageUpdateDef(virQEMUDriver *driver, * fails. Snapshots created prior to v1.1.3 have this issue. */ if (!virDomainDefCheckABIStability(def, newdef, driver->xmlopt)) { virErrorRestore(&save_err); - goto cleanup; + return NULL; } virFreeError(save_err); =20 /* use the user provided XML */ - ret =3D g_steal_pointer(&newdef); - } else { - ret =3D g_steal_pointer(&newdef_migr); + return g_steal_pointer(&newdef); } =20 - cleanup: - return ret; + return g_steal_pointer(&newdef_migr); } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4d6ee3098e..7ad6e15402 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2552,7 +2552,6 @@ testDomainSaveImageDefineXML(virConnectPtr conn, const char *dxml, unsigned int flags) { - int ret =3D -1; int fd =3D -1; g_autoptr(virDomainDef) def =3D NULL; g_autoptr(virDomainDef) newdef =3D NULL; @@ -2562,20 +2561,17 @@ testDomainSaveImageDefineXML(virConnectPtr conn, VIR_DOMAIN_SAVE_PAUSED, -1); =20 if ((fd =3D testDomainSaveImageOpen(privconn, path, &def)) < 0) - goto cleanup; + return -1; VIR_FORCE_CLOSE(fd); =20 if ((newdef =3D virDomainDefParseString(dxml, privconn->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)) = =3D=3D NULL) - goto cleanup; + return -1; =20 if (!testDomainSaveImageWrite(privconn, path, newdef)) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index ff5f7cb2e7..83ff119dd9 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2964,12 +2964,11 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, const char *dname =3D NULL; const char *dom_xml =3D NULL; g_autoptr(virDomainDef) def =3D NULL; - int ret =3D -1; =20 virCheckFlags(VZ_MIGRATION_FLAGS, -1); =20 if (virTypedParamsValidate(params, nparams, VZ_MIGRATION_PARAMETERS) <= 0) - goto cleanup; + return -1; =20 if (virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &miguri) < 0 || @@ -2977,12 +2976,12 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, VIR_MIGRATE_PARAM_DEST_XML, &dom_xml) < 0 = || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0) - goto cleanup; + return -1; =20 /* We must set uri_out if miguri is not set. This is direct * managed migration requirement */ if (!miguri && !(*uri_out =3D vzMigrationCreateURI())) - goto cleanup; + return -1; =20 /* domain uuid and domain name are for backward compat */ if (vzBakeCookie(privconn->driver, NULL, @@ -2990,12 +2989,12 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, VZ_MIGRATION_COOKIE_SESSION_UUID | VZ_MIGRATION_COOKIE_DOMAIN_UUID | VZ_MIGRATION_COOKIE_DOMAIN_NAME) < 0) - goto cleanup; + return -1; =20 if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) - goto cleanup; + return -1; =20 if (dname) { VIR_FREE(def->name); @@ -3003,12 +3002,9 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, } =20 if (virDomainMigratePrepare3ParamsEnsureACL(conn, def) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 static int diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7869b5c94d..5ed33902fd 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1789,10 +1789,10 @@ prlsdkLoadDomain(struct _vzDriver *driver, char uuidstr[VIR_UUID_STRING_BRACED_BUFLEN]; =20 if (!(def =3D virDomainDefNew(driver->xmlopt))) - goto error; + return NULL; =20 if (!(def->name =3D prlsdkGetStringParamVar(PrlVmCfg_GetName, sdkdom))) - goto error; + return NULL; =20 pret =3D prlsdkGetStringParamBuf(PrlVmCfg_GetUuid, sdkdom, uuidstr, sizeof(uuidstr)); @@ -1801,7 +1801,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, if (prlsdkUUIDParse(uuidstr, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Domain UUID is malformed or empty")); - goto error; + return NULL; } =20 def->virtType =3D VIR_DOMAIN_VIRT_VZ; @@ -1818,24 +1818,24 @@ prlsdkLoadDomain(struct _vzDriver *driver, def->mem.cur_balloon =3D ram << 10; =20 if (prlsdkConvertCpuInfo(sdkdom, def, driver->xmlopt) < 0) - goto error; + return NULL; =20 if (prlsdkConvertCpuMode(sdkdom, def) < 0) - goto error; + return NULL; =20 if (prlsdkConvertDomainType(sdkdom, def) < 0) - goto error; + return NULL; =20 if (prlsdkAddVNCInfo(sdkdom, def) < 0) - goto error; + return NULL; =20 /* depends on prlsdkAddVNCInfo */ if (prlsdkAddDomainHardware(driver, sdkdom, def, driver->xmlopt) < 0) - goto error; + return NULL; =20 /* depends on prlsdkAddDomainHardware */ if (!IS_CT(def) && prlsdkConvertBootOrderVm(sdkdom, def) < 0) - goto error; + return NULL; =20 pret =3D PrlVmCfg_GetEnvId(sdkdom, &envId); prlsdkCheckRetGoto(pret, error); @@ -1846,14 +1846,14 @@ prlsdkLoadDomain(struct _vzDriver *driver, autostart !=3D PAO_VM_START_MANUAL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown autostart mode: %X"), autostart); - goto error; + return NULL; } =20 if (prlsdkGetDomainState(dom, sdkdom, &domainState) < 0) - goto error; + return NULL; =20 if (!IS_CT(def) && virDomainDefAddImplicitDevices(def, driver->xmlopt)= < 0) - goto error; + return NULL; =20 if (def->ngraphics > 0) { int bus =3D IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : @@ -1862,12 +1862,12 @@ prlsdkLoadDomain(struct _vzDriver *driver, if (virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, bus) < 0) - goto error; + return NULL; =20 if (virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus) < 0) - goto error; + return NULL; } =20 if (!dom) { @@ -1875,7 +1875,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, =20 job =3D PrlVm_SubscribeToPerfStats(sdkdom, NULL); if (PRL_FAILED(waitJob(job))) - goto error; + return NULL; =20 virObjectLock(driver); if (!(olddom =3D virDomainObjListFindByUUID(driver->domains, def->= uuid))) @@ -1885,7 +1885,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, if (olddom) { return olddom; } else if (!dom) { - goto error; + return NULL; } =20 pdom =3D dom->privateData; @@ -1911,9 +1911,6 @@ prlsdkLoadDomain(struct _vzDriver *driver, dom->autostart =3D 0; =20 return dom; - - error: - return NULL; } =20 int --=20 2.32.0