From nobody Mon Feb 9 21:20:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1589371118; cv=none; d=zohomail.com; s=zohoarc; b=d1mWl/u6mHoYxC1tGmwzHOugU1uS6BygoUqPEN/wcYdO1WgrjyEP1KHHi+LWWG57ABQZM7ZEJTX5WBdU/k7r2f3L05rTX1UUtuMWEIyXOHmOu9wLo9RKHApMi8x+uTj1wl5fAspjrUbsf6ETvOP9qbcstCvZALUaKTrbl5XL3h8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371118; 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=DWC7Gwg9T2gVrzfWmvTbuCsnSUsJRdGhqK6SdAy63Hs=; b=cPS7tCrMJ4tqDtfai0Qjhi6vz7FRNTsIy63o1YvJlQ9ZnbG/bUoLjL0XiaKS7gCrd40sKqAlvf6N7stEagIrXs6ilOWfSlFkgeAJ6sh/uVEfDk9HtHQ+ecS/nkAeZ1yMLM7EAcahIN8bvwQXJo4v+GMKSb1oygJbjCief+O6LEY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1589371118538166.6351152178379; Wed, 13 May 2020 04:58:38 -0700 (PDT) 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-146-gRMHm4-OMQCB5FHM60mSqw-1; Wed, 13 May 2020 07:58:35 -0400 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 5007D100A8ED; Wed, 13 May 2020 11:58:28 +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 2BD08619BF; Wed, 13 May 2020 11:58: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 F10174E984; Wed, 13 May 2020 11:58:27 +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 04DBwOJH016055 for ; Wed, 13 May 2020 07:58:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id D9EE3211D021; Wed, 13 May 2020 11:58:24 +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 D476D211D020 for ; Wed, 13 May 2020 11:58:24 +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 B1BBD85A5B0 for ; Wed, 13 May 2020 11:58:24 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-467-g9jKw1hLM3qdpWDKIqIQKw-1; Wed, 13 May 2020 07:58:22 -0400 Received: by mail-wm1-f68.google.com with SMTP id u16so28144381wmc.5 for ; Wed, 13 May 2020 04:58:22 -0700 (PDT) Received: from localhost.localdomain (public-gprs367127.centertel.pl. [37.47.65.88]) by smtp.gmail.com with ESMTPSA id l1sm27838422wrc.24.2020.05.13.04.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371117; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=DWC7Gwg9T2gVrzfWmvTbuCsnSUsJRdGhqK6SdAy63Hs=; b=eG7t5cW8rb3epNeCibaWeNhdDfl3BTRc/dKSTKzaXfkQDgeAspu4OJU5Mul44Bx4hSXt6x Om/VwESVmxeLtyie4NUK0bylZwc5dlX/6epnLhNpS898i3pdZqzIjUrUWmQxykUnvaFkru 0Qw3Nje44eOyX667dhNPa1dziYwV+rs= X-MC-Unique: gRMHm4-OMQCB5FHM60mSqw-1 X-MC-Unique: g9jKw1hLM3qdpWDKIqIQKw-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=DWC7Gwg9T2gVrzfWmvTbuCsnSUsJRdGhqK6SdAy63Hs=; b=n2sL/lyOggtfNGXEb+6xqLnTFJ782Y2r4Sq8grfhgm5J+p4N1nPA88XZ6/8H3KumZ2 4e8TDGDxvJ3MCl9F+oVV3Tr7F0lZtP1o76ASYVvLNcuQ6aGn5tSUZhtAtqA7Qa0rR5qQ pw+hwAcN2LMfu7FbrYbINcbHBqz55S6eHkZ01bxZOm5FhEHzICCdaSfBkQWXVVgkcfQi ZpOrZttHY1JMhvMkqzWWEj/fp4wK6brHkV6TwvGMV2xPEgQM9XxzxjtbipWCYEXJKmzX 02FH+1bYSPRUpYMfDy5FL6EtHty8tzhd9/CqKc+/cpcgzWE9Kv46jsqJr5KFqcmIcTWP eLdA== X-Gm-Message-State: AOAM530YGQLmrKlJ8+ZPKhSnDP3x/dXCKjsdrDQ+4zJ351uBeh7M15It 5LWs0c2+AigUjPBoL95Ul9kzEhC0 X-Google-Smtp-Source: ABdhPJzh/qnVghRsUDWN8yFth6GG0Kc6ozGoH4yEPWd3pLxpLRs1VX1OPAgga1k/tFmbY08AzLsSXg== X-Received: by 2002:a05:600c:2146:: with SMTP id v6mr8420575wml.142.1589371100465; Wed, 13 May 2020 04:58:20 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 13/40] conf: convert virDomainChrSourceDef to GObject Date: Wed, 13 May 2020 13:56:57 +0200 Message-Id: <20200513115724.157687-14-r4f4rfs@gmail.com> In-Reply-To: <20200513115724.157687-1-r4f4rfs@gmail.com> References: <20200513115724.157687-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/conf/domain_conf.c | 39 ++++++++++++++++++--------------------- src/conf/domain_conf.h | 9 ++++++++- src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 5 ++--- src/qemu/qemu_process.c | 3 +-- src/qemu/qemu_virtiofs.c | 12 +++++------- 6 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 62f49a598a..15d371df6e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2483,8 +2483,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) =20 switch (def->type) { case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - virObjectUnref(def->data.vhostuser); - def->data.vhostuser =3D NULL; + g_clear_object(&def->data.vhostuser); break; =20 case VIR_DOMAIN_NET_TYPE_SERVER: @@ -2559,6 +2558,7 @@ virDomainNetDefFree(virDomainNetDefPtr def) VIR_FREE(def); } =20 +G_DEFINE_TYPE(virDomainChrSourceDef, vir_domain_chr_source_def, G_TYPE_OBJ= ECT); =20 const char * virDomainChrSourceDefGetPath(virDomainChrSourceDefPtr chr) @@ -2691,9 +2691,9 @@ virDomainChrSourceDefCopy(virDomainChrSourceDefPtr de= st, } =20 static void -virDomainChrSourceDefDispose(void *obj) +virDomainChrSourceDefFinalize(GObject *obj) { - virDomainChrSourceDefPtr def =3D obj; + virDomainChrSourceDefPtr def =3D VIR_DOMAIN_CHR_SOURCE_DEF(obj); size_t i; =20 virDomainChrSourceDefClear(def); @@ -2704,6 +2704,8 @@ virDomainChrSourceDefDispose(void *obj) virSecurityDeviceLabelDefFree(def->seclabels[i]); VIR_FREE(def->seclabels); } + + G_OBJECT_CLASS(vir_domain_chr_source_def_parent_class)->finalize(obj); } =20 =20 @@ -13309,37 +13311,32 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, } =20 =20 -static virClassPtr virDomainChrSourceDefClass; +static void +vir_domain_chr_source_def_init(virDomainChrSourceDef *def G_GNUC_UNUSED) +{ +} =20 -static int -virDomainChrSourceDefOnceInit(void) +static void +vir_domain_chr_source_def_class_init(virDomainChrSourceDefClass *klass) { - if (!VIR_CLASS_NEW(virDomainChrSourceDef, virClassForObject())) - return -1; + GObjectClass *obj =3D G_OBJECT_CLASS(klass); =20 - return 0; + obj->finalize =3D virDomainChrSourceDefFinalize; } =20 -VIR_ONCE_GLOBAL_INIT(virDomainChrSourceDef); - virDomainChrSourceDefPtr virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt) { - virDomainChrSourceDefPtr def =3D NULL; - - if (virDomainChrSourceDefInitialize() < 0) - return NULL; + g_autoptr(virDomainChrSourceDef) def =3D NULL; =20 - if (!(def =3D virObjectNew(virDomainChrSourceDefClass))) - return NULL; + def =3D VIR_DOMAIN_CHR_SOURCE_DEF(g_object_new(VIR_TYPE_DOMAIN_CHR_SOU= RCE_DEF, NULL)); =20 if (xmlopt && xmlopt->privateData.chrSourceNew && !(def->privateData =3D xmlopt->privateData.chrSourceNew())) { - virObjectUnref(def); - def =3D NULL; + return NULL; } =20 - return def; + return g_steal_pointer(&def); } =20 =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 20fc734e06..2a4d8deaf6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1192,7 +1192,7 @@ struct _virDomainChrSourceReconnectDef { =20 /* The host side information for a character device. */ struct _virDomainChrSourceDef { - virObject parent; + GObject parent; int type; /* virDomainChrType */ virObjectPtr privateData; union { @@ -1238,6 +1238,13 @@ struct _virDomainChrSourceDef { virSecurityDeviceLabelDefPtr *seclabels; }; =20 +#define VIR_TYPE_DOMAIN_CHR_SOURCE_DEF vir_domain_chr_source_def_get_type() +G_DECLARE_FINAL_TYPE(virDomainChrSourceDef, + vir_domain_chr_source_def, + VIR, + DOMAIN_CHR_SOURCE_DEF, + GObject); + /* A complete character device, both host and domain views. */ struct _virDomainChrDef { int deviceType; /* enum virDomainChrDeviceType */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4a927a26bf..5a83243d58 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -220,6 +220,7 @@ virSEVCapabilitiesFree; =20 =20 # conf/domain_conf.h +vir_domain_chr_source_def_get_type; vir_domain_xml_option_get_type; virBlkioDeviceArrayClear; virDiskNameParse; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 252f2a045e..41dfba5597 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2339,7 +2339,7 @@ qemuDomainObjPrivateFree(void *data) =20 qemuDomainObjPrivateDataClear(priv); =20 - virObjectUnref(priv->monConfig); + g_clear_object(&priv->monConfig); qemuDomainObjFreeJob(priv); VIR_FREE(priv->lockState); VIR_FREE(priv->origname); @@ -3960,8 +3960,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, error: virBitmapFree(priv->namespaces); priv->namespaces =3D NULL; - virObjectUnref(priv->monConfig); - priv->monConfig =3D NULL; + g_clear_object(&priv->monConfig); virStringListFree(priv->qemuDevices); priv->qemuDevices =3D NULL; return -1; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0d9a83ab89..101ec3c3d8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7383,8 +7383,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, if (priv->monConfig) { if (priv->monConfig->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX) unlink(priv->monConfig->data.nix.path); - virObjectUnref(priv->monConfig); - priv->monConfig =3D NULL; + g_clear_object(&priv->monConfig); } =20 qemuDomainObjStopWorker(vm); diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 2e239cad66..483af5c798 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -80,7 +80,7 @@ qemuVirtioFSOpenChardev(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *socket_path) { - virDomainChrSourceDefPtr chrdev =3D virDomainChrSourceDefNew(NULL); + g_autoptr(virDomainChrSourceDef) chrdev =3D virDomainChrSourceDefNew(N= ULL); virDomainChrDef chr =3D { .source =3D chrdev }; VIR_AUTOCLOSE fd =3D -1; int ret =3D -1; @@ -90,23 +90,21 @@ qemuVirtioFSOpenChardev(virQEMUDriverPtr driver, chrdev->data.nix.path =3D g_strdup(socket_path); =20 if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def)= < 0) - goto cleanup; + return ret; fd =3D qemuOpenChrChardevUNIXSocket(chrdev); if (fd < 0) { ignore_value(qemuSecurityClearSocketLabel(driver->securityManager,= vm->def)); - goto cleanup; + return ret; } if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) - goto cleanup; + return ret; =20 if (qemuSecuritySetChardevLabel(driver, vm, &chr) < 0) - goto cleanup; + return ret; =20 ret =3D fd; fd =3D -1; =20 - cleanup: - virObjectUnref(chrdev); return ret; } =20 --=20 2.26.2