From nobody Sun Feb 8 14:43:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585927031; cv=none; d=zohomail.com; s=zohoarc; b=D5IzjMPzzUasofbT4k+tOq0kprlJ6Ti1sQFz7Qy1eA6CDIhfcIHBhh5VSSpRTiQlO5DUe2YVhr1l0mVoGGPv+xkOynWSyJlIICOc5ZEEbAgvNo5NL53TCPF+kQJe2oA9gDWR5hJs/CJkXj91W7Q6s8zfALibMCI71aV3vEyPk7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927031; 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=EsitiE52Ie1hJ9A89t3CnQIkclIWYHAWJhXwycLx/nQ=; b=d1nHnTuldmmwkrhWgU1n9l2X4MUAeRZ1W0Juy1LNLKxO/n8AI/gwaXHBk/jQUU5HQ2FqLGPDLlnHZbvj5vxwe05RjRa9TjbwOWNkb8pXZRD3Qf1sEruNpG5MXgqfbbl720NhU91SWGStzMtuVi4BnpDD2WR5LCPz9qQ5sk9O3+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 158592703164149.90395953460575; Fri, 3 Apr 2020 08:17:11 -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-71-icDleo3eNQSq0u62HHyARw-1; Fri, 03 Apr 2020 11:17:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D431A801E5C; Fri, 3 Apr 2020 15:16:57 +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 A6BA9A63C2; Fri, 3 Apr 2020 15:16:57 +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 58A6B4E470; Fri, 3 Apr 2020 15:16:57 +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 033FGeBh028177 for ; Fri, 3 Apr 2020 11:16:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 873932166B2E; Fri, 3 Apr 2020 15:16:40 +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 8333E2166B2C for ; Fri, 3 Apr 2020 15:16:40 +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 689318FF66C for ; Fri, 3 Apr 2020 15:16:40 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-302-rjFVxjAaOAe2EZ8WOqvykg-1; Fri, 03 Apr 2020 11:16:38 -0400 Received: by mail-wm1-f67.google.com with SMTP id e9so8124160wme.4 for ; Fri, 03 Apr 2020 08:16:37 -0700 (PDT) Received: from localhost.localdomain (public-gprs375156.centertel.pl. [37.47.96.181]) by smtp.gmail.com with ESMTPSA id p13sm12331045wru.3.2020.04.03.08.16.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927030; 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=EsitiE52Ie1hJ9A89t3CnQIkclIWYHAWJhXwycLx/nQ=; b=HYa2wikugqIcO7tCjoX03LhJZfnyu0MthM01AhNNGsKVhyr9SuQEndLkg3Dc4ZMv4cByDN aK52Ych9FPfFcQ9my8mQIWevh5OrWlJcRG+4Ij1vADbn5FugxD5lSmWISc4b+jF+86L1uF 7r1LXj7bn9Ndf/LhrOY5dmX5fMfz7C0= X-MC-Unique: icDleo3eNQSq0u62HHyARw-1 X-MC-Unique: rjFVxjAaOAe2EZ8WOqvykg-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=ydBXSGb7vFJfoOgtkOav2x7marP+BPlGaHlKPqUT26A=; b=K0bXBwI8vWfYP84dHP+04JN4pcDQw2QRaOmTMq5+pmkXMlxZ+NprHZB9VbniPbDkig drqgh89VIocBMsaMMrLK3Yx7mMuSFyptZC9yaTIOic9S51b9zpVy5U04Ol3FYPe08Wx6 pxt3njSf9jChcEW1wTAm9kGKIvbIPpxsn2FhwZP7dFtYBKbIvqSiWtuR8JNIVgg9M0ym tD3v6DYoxLNaxF6h9ZCA3YYGriCCRnJHlp0MofgWqfh9P8uX+nBj8tUHRkkMrOh2h0vz bNI5Uz4G3an3ujIKjjsEp6Pqp3b9u0e9IYf89ZU/8YDjXj7RHTx6vTS+orCNySd1Cmsi Y+Ng== X-Gm-Message-State: AGi0PuZoy/tYaj5FcpN6PXDtHaW6mopu+GHk81kRUjrWBtRSawJR6wq4 YKfv1i4nTXoZ4cEfPIqLubfOYyRoZvI= X-Google-Smtp-Source: APiQypJADx4EJPV5zJylZd11qmTmoaUdYWHmXsvcY14dunj1kUPhPtUd7hGSdH2hHYya+yxvzUH4Rg== X-Received: by 2002:a1c:99d3:: with SMTP id b202mr9519699wme.170.1585926996527; Fri, 03 Apr 2020 08:16:36 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 14/36] admin: convert virAdmClient to GObject Date: Fri, 3 Apr 2020 17:15:42 +0200 Message-Id: <20200403151604.106616-15-r4f4rfs@gmail.com> In-Reply-To: <20200403151604.106616-1-r4f4rfs@gmail.com> References: <20200403151604.106616-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FGeBh028177 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.15 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/admin/libvirt-admin.c | 2 +- src/admin/libvirt_admin_private.syms | 1 - src/datatypes.c | 36 ++++++++++++++++++---------- src/datatypes.h | 13 +++++----- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index ed7a57cbbb..6f86de4360 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -676,7 +676,7 @@ int virAdmClientFree(virAdmClientPtr client) =20 virCheckAdmClientReturn(client, -1); =20 - virObjectUnref(client); + g_object_unref(client); return 0; } =20 diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin= _private.syms index 270fa43995..9ba4b68932 100644 --- a/src/admin/libvirt_admin_private.syms +++ b/src/admin/libvirt_admin_private.syms @@ -34,7 +34,6 @@ xdr_admin_server_set_threadpool_parameters_args; xdr_admin_server_update_tls_files_args; =20 # datatypes.h -virAdmClientClass; virAdmConnectClass; virAdmConnectCloseCallbackDataRegister; virAdmConnectCloseCallbackDataReset; diff --git a/src/datatypes.c b/src/datatypes.c index d6afaf89ad..68fc216ffa 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -71,8 +71,21 @@ virClassPtr virAdmConnectCloseCallbackDataClass; static void virAdmConnectDispose(void *obj); static void virAdmConnectCloseCallbackDataDispose(void *obj); =20 -virClassPtr virAdmClientClass; -static void virAdmClientDispose(void *obj); +G_DEFINE_TYPE(virAdmClient, vir_adm_client, G_TYPE_OBJECT); +static void virAdmClientFinalize(GObject *obj); + +static void +vir_adm_client_init(virAdmClient *clt G_GNUC_UNUSED) +{ +} + +static void +vir_adm_client_class_init(virAdmClientClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virAdmClientFinalize; +} =20 G_DEFINE_TYPE(virAdmServer, vir_adm_server, G_TYPE_OBJECT); static void virAdmServerFinalize(GObject *obj); @@ -119,7 +132,6 @@ virDataTypesOnceInit(void) =20 DECLARE_CLASS_LOCKABLE(virAdmConnect); DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); - DECLARE_CLASS(virAdmClient); =20 #undef DECLARE_CLASS_COMMON #undef DECLARE_CLASS_LOCKABLE @@ -1216,30 +1228,28 @@ virAdmClientPtr virAdmGetClient(virAdmServerPtr srv, const unsigned long long id, unsigned long long timestamp, unsigned int transport) { - virAdmClientPtr ret =3D NULL; + g_autoptr(virAdmClient) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) - goto error; + return NULL; =20 - if (!(ret =3D virObjectNew(virAdmClientClass))) - goto error; + ret =3D VIR_ADM_CLIENT(g_object_new(VIR_TYPE_ADM_CLIENT, NULL)); =20 ret->id =3D id; ret->timestamp =3D timestamp; ret->transport =3D transport; ret->srv =3D g_object_ref(srv); =20 - return ret; - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 static void -virAdmClientDispose(void *obj) +virAdmClientFinalize(GObject *obj) { - virAdmClientPtr clt =3D obj; + virAdmClientPtr clt =3D VIR_ADM_CLIENT(obj); VIR_DEBUG("release client clt=3D%p, id=3D%llu", clt, clt->id); =20 g_object_unref(clt->srv); + + G_OBJECT_CLASS(vir_adm_client_parent_class)->finalize(obj); } diff --git a/src/datatypes.h b/src/datatypes.h index 20b64ca788..4e9f338f8b 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -46,10 +46,11 @@ extern virClassPtr virStorageVolClass; extern virClassPtr virStoragePoolClass; =20 extern virClassPtr virAdmConnectClass; -extern virClassPtr virAdmClientClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() G_DECLARE_FINAL_TYPE(virAdmServer, vir_adm_server, VIR, ADM_SERVER, GObjec= t); +#define VIR_TYPE_ADM_CLIENT vir_adm_client_get_type() +G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR, ADM_CLIENT, GObjec= t); =20 #define virCheckConnectReturn(obj, retval) \ do { \ @@ -447,8 +448,8 @@ G_DECLARE_FINAL_TYPE(virAdmServer, vir_adm_server, VIR,= ADM_SERVER, GObject); =20 #define virCheckAdmClientReturn(obj, retval) \ do { \ - virAdmClientPtr _clt =3D (obj); \ - if (!virObjectIsClass(_clt, virAdmClientClass) || \ + virAdmClientPtr _clt =3D VIR_ADM_CLIENT(obj); \ + if (!G_IS_OBJECT(_clt) || !(G_OBJECT_TYPE(_clt) =3D=3D VIR_TYPE_AD= M_CLIENT) || \ !G_IS_OBJECT(_clt->srv) || !(G_OBJECT_TYPE(_clt->srv) =3D=3D V= IR_TYPE_ADM_SERVER) || \ !virObjectIsClass(_clt->srv->conn, virAdmConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ @@ -460,8 +461,8 @@ G_DECLARE_FINAL_TYPE(virAdmServer, vir_adm_server, VIR,= ADM_SERVER, GObject); } while (0) #define virCheckAdmClientGoto(obj, label) \ do { \ - virAdmClientPtr _clt =3D (obj); \ - if (!virObjectIsClass(_clt, virAdmClientClass) || \ + virAdmClientPtr _clt =3D VIR_ADM_CLIENT(obj); \ + if (!G_IS_OBJECT(_clt) || !(G_OBJECT_TYPE(_clt) =3D=3D VIR_TYPE_AD= M_CLIENT) || \ !G_IS_OBJECT(_clt->srv) || !(G_OBJECT_TYPE(_clt->srv) =3D=3D V= IR_TYPE_ADM_SERVER) || \ !virObjectIsClass(_clt->srv->conn, virAdmConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ @@ -588,7 +589,7 @@ struct _virAdmServer { * Internal structure associated to a client connected to daemon */ struct _virAdmClient { - virObject parent; + GObject parent; virAdmServerPtr srv; /* pointer to the server client is * connected to, which also holds a * reference back to the admin connect= ion --=20 2.25.1