From nobody Mon Feb 9 12:25:03 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=1589371145; cv=none; d=zohomail.com; s=zohoarc; b=fzT0Ji1PJw3Tfl0Owt1josXg+Ym3oQl3YC1N2/DT37ciu99+P3Rntbg6bfXgnGOxxdDpBSz2Ro2M6ycXOcnuoB60ZsxcmhVeo68x5k2psvsbgOeQzxSwFWitsI61jx5Ll3cVhwfQaFJeVsK5ZZT2On1C7YZejZqNJpKScUSY4eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371145; 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=Ym7tWbQOX55Z1dXVa3Sv/gKEIN9S4jnpP+vEGSBdAC4=; b=LUVihC1DBqz4rd0vxLFQ5vDNmw18NJ53CMMQeB0+ZuSLhCWSnTzlj1ycIjVYMM3sVK5zoCmp3KEbCrh4j2MRaJDPR4nbp25nAGezSW3EKq1AdNpSrc8BCJ1mh9aNy1dduGEKJnRFbwxwF3UE2tGdphu36o/EMb0STaoLIbCpH4Q= 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 1589371145934781.5332982843303; Wed, 13 May 2020 04:59:05 -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-328-6bMLJhI9Ple8gWHmuJzOdA-1; Wed, 13 May 2020 07:59:02 -0400 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 6DC1C8018AC; Wed, 13 May 2020 11:58:56 +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 493FF7D94C; Wed, 13 May 2020 11:58:56 +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 1A4E54E9FF; Wed, 13 May 2020 11:58:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04DBwqAs016290 for ; Wed, 13 May 2020 07:58:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44A3F2166B27; Wed, 13 May 2020 11:58:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F8A62156A49 for ; Wed, 13 May 2020 11:58:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 41A6A1019CB0 for ; Wed, 13 May 2020 11:58:50 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-Wf7nJQfEO2i_2Yy6wIzfZg-1; Wed, 13 May 2020 07:58:46 -0400 Received: by mail-wr1-f41.google.com with SMTP id v12so20500302wrp.12 for ; Wed, 13 May 2020 04:58:46 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371144; 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=Ym7tWbQOX55Z1dXVa3Sv/gKEIN9S4jnpP+vEGSBdAC4=; b=JZDisYHFahr3BfhAgjtPCfShShWJ0D6ocPpP01PyIue6asCaw7Oe8Bdz8ud8O7GJR6iKdl zATLdbYrKUmu+jCj/w5g68ZzRfgfKE0a4WB2Wkvb+VMsVbav0TxhyPMJGrOJOC2tscNuwo NF4NTEpHFcXPR8rMeiojgMoxQmJer50= X-MC-Unique: 6bMLJhI9Ple8gWHmuJzOdA-1 X-MC-Unique: Wf7nJQfEO2i_2Yy6wIzfZg-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=Ym7tWbQOX55Z1dXVa3Sv/gKEIN9S4jnpP+vEGSBdAC4=; b=XT3Gj6UvYVHs7VX4iIvp7JhUf4ODJKyJ7lKtAvD7saevKEXo+4PJZteb0gpOcN6rZa vmIpnZ7Y7Gf/1BGWFYS6OA1neXZBff/x6dg3gLaf+RVmGfAkOmX/b8N4ru8pdZAnqFPC SPQSr30txZevIg4qCAsKWsAVhQKY1gIa96f9Y505uucIjSldqb18SFFCqUrismIVVFyY /1Ps//vZYg5e9TY7Pb7Jtr0bFiaa6dgG55nsWB6ObWYn/DTabYWn60O7lZssORbyvW9n 7gLpg06smZse8txYenM57qvBR6C8H6k9+Mc4Ung+vKK+pyxe/GEeuV5EjRDuTZqj+2iz 23NQ== X-Gm-Message-State: AOAM5313iw3JGGaNb9SNEL/BNcp9Q7rvMsnZsAHXfNixG9qEIt5Pldbg 5zHQUoAb/yqsWDXShalLFjD1Tnt8 X-Google-Smtp-Source: ABdhPJzqe0zQdhjfcIipj+yG/ddZKyFn9sHD6KHoRCmB6PXKLChPXqROHs38xhUikYg8e3n3F/6ENQ== X-Received: by 2002:a5d:490e:: with SMTP id x14mr7327545wrq.375.1589371125221; Wed, 13 May 2020 04:58:45 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 28/40] datatypes: convert virStream to GObject Date: Wed, 13 May 2020 13:57:12 +0200 Message-Id: <20200513115724.157687-29-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.6 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.13 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/virchrdev.c | 4 ++-- src/datatypes.c | 32 +++++++++++++++++++++-------- src/datatypes.h | 14 +++++++------ src/libvirt-stream.c | 7 +++---- src/libvirt_private.syms | 2 +- src/libxl/libxl_migration.c | 3 +-- src/qemu/qemu_migration.c | 6 ++---- src/remote/remote_daemon_dispatch.c | 4 ++-- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 2 +- src/rpc/gendispatch.pl | 3 ++- src/util/virfdstream.c | 4 ++-- 12 files changed, 48 insertions(+), 35 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 800e82869e..8a60ac4dad 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -205,7 +205,7 @@ static void virChrdevHashEntryFree(void *data) return; =20 /* free stream reference */ - virObjectUnref(ent->st); + g_clear_object(&ent->st); =20 /* delete lock file */ virChrdevLockFileRemove(ent->dev); @@ -435,7 +435,7 @@ int virChrdevOpen(virChrdevsPtr devs, if (added) virHashRemoveEntry(devs->hash, path); else - virObjectUnref(st); + g_clear_object(&st); =20 if (cbdata) VIR_FREE(cbdata->path); diff --git a/src/datatypes.c b/src/datatypes.c index b98db8721f..1c8eff9685 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -36,12 +36,10 @@ VIR_LOG_INIT("datatypes"); virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; -virClassPtr virStreamClass; =20 static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); -static void virStreamDispose(void *obj); =20 G_DEFINE_TYPE(virDomainCheckpoint, vir_domain_checkpoint, G_TYPE_OBJECT); static void virDomainCheckpointFinalize(GObject *obj); @@ -219,6 +217,22 @@ vir_storage_vol_class_init(virStorageVolClass *klass) obj->finalize =3D virStorageVolFinalize; } =20 +G_DEFINE_TYPE(virStream, vir_stream, G_TYPE_OBJECT); +static void virStreamFinalize(GObject *obj); + +static void +vir_stream_init(virStream *strm G_GNUC_UNUSED) +{ +} + +static void +vir_stream_class_init(virStreamClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virStreamFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -271,7 +285,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virStream); =20 DECLARE_CLASS_LOCKABLE(virAdmConnect); DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); @@ -930,7 +943,7 @@ virSecretFinalize(GObject *obj) * @conn: the hypervisor connection * * Allocates a new stream object. When the object is no longer needed, - * virObjectUnref() must be called in order to not leak data. + * g_object_unref() must be called in order to not leak data. * * Returns a pointer to the stream object, or NULL on error. */ @@ -942,8 +955,7 @@ virGetStream(virConnectPtr conn) if (virDataTypesInitialize() < 0) return NULL; =20 - if (!(ret =3D virObjectNew(virStreamClass))) - return NULL; + ret =3D VIR_STREAM(g_object_new(VIR_TYPE_STREAM, NULL)); =20 ret->conn =3D virObjectRef(conn); =20 @@ -951,7 +963,7 @@ virGetStream(virConnectPtr conn) } =20 /** - * virStreamDispose: + * virStreamFinalize: * @obj: the stream to release * * Unconditionally release all memory associated with a stream. @@ -961,14 +973,16 @@ virGetStream(virConnectPtr conn) * which may also be released if its ref count hits zero. */ static void -virStreamDispose(void *obj) +virStreamFinalize(GObject *obj) { - virStreamPtr st =3D obj; + virStreamPtr st =3D VIR_STREAM(obj); VIR_DEBUG("release dev %p", st); =20 if (st->ff) st->ff(st->privateData); virObjectUnref(st->conn); + + G_OBJECT_CLASS(vir_stream_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index 2f97268691..e96654cac1 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -32,7 +32,6 @@ =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; -extern virClassPtr virStreamClass; =20 #define VIR_TYPE_DOMAIN_CHECKPOINT vir_domain_checkpoint_get_type() G_DECLARE_FINAL_TYPE(virDomainCheckpoint, @@ -79,6 +78,9 @@ G_DECLARE_FINAL_TYPE(virStoragePool, vir_storage_pool, VI= R, STORAGE_POOL, GObjec #define VIR_TYPE_STORAGE_VOL vir_storage_vol_get_type() G_DECLARE_FINAL_TYPE(virStorageVol, vir_storage_vol, VIR, STORAGE_VOL, GOb= ject); =20 +#define VIR_TYPE_STREAM vir_stream_get_type() +G_DECLARE_FINAL_TYPE(virStream, vir_stream, VIR, STREAM, GObject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -307,8 +309,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckStreamReturn(obj, retval) \ do { \ - virStreamPtr _st =3D (obj); \ - if (!virObjectIsClass(_st, virStreamClass) || \ + virStreamPtr _st =3D VIR_STREAM(obj); \ + if (_st =3D=3D NULL || \ !virObjectIsClass(_st->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STREAMS, \ VIR_ERR_INVALID_STREAM, \ @@ -320,8 +322,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); } while (0) #define virCheckStreamGoto(obj, label) \ do { \ - virStreamPtr _st =3D (obj); \ - if (!virObjectIsClass(_st, virStreamClass) || \ + virStreamPtr _st =3D VIR_STREAM(obj); \ + if (_st =3D=3D NULL || \ !virObjectIsClass(_st->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STREAMS, \ VIR_ERR_INVALID_STREAM, \ @@ -763,7 +765,7 @@ typedef int (*virStreamFinishFunc)(virStreamPtr, void *= opaque); * Internal structure associated with an input stream */ struct _virStream { - virObject parent; + GObject parent; virConnectPtr conn; unsigned int flags; =20 diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index 41b9cc1445..d1e2fde3b4 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -85,14 +85,13 @@ virStreamNew(virConnectPtr conn, int virStreamRef(virStreamPtr stream) { - VIR_DEBUG("stream=3D%p refs=3D%d", stream, - stream ? stream->parent.u.s.refs : 0); + VIR_DEBUG("stream=3D%p", stream); =20 virResetLastError(); =20 virCheckStreamReturn(stream, -1); =20 - virObjectRef(stream); + g_object_ref(stream); return 0; } =20 @@ -1265,6 +1264,6 @@ virStreamFree(virStreamPtr stream) =20 /* XXX Enforce shutdown before free'ing resources ? */ =20 - virObjectUnref(stream); + g_object_unref(stream); return 0; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7a1e7b60dc..fc3fe83b14 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1367,6 +1367,7 @@ vir_nw_filter_get_type; vir_secret_get_type; vir_storage_pool_get_type; vir_storage_vol_get_type; +vir_stream_get_type; virConnectClass; virConnectCloseCallbackDataCall; virConnectCloseCallbackDataClass; @@ -1389,7 +1390,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virNewConnectCloseCallbackData; -virStreamClass; =20 =20 # driver.h diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index defdda5ed6..50804ca8b8 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -999,7 +999,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivatePtr driver, virErrorPtr orig_err =3D NULL; int ret =3D -1; /* For tunnel migration */ - virStreamPtr st =3D NULL; + g_autoptr(virStream) st =3D NULL; struct libxlTunnelControl *tc =3D NULL; =20 if (dname && @@ -1110,7 +1110,6 @@ libxlDoMigrateSrcP2P(libxlDriverPrivatePtr driver, cleanup: if (flags & VIR_MIGRATE_TUNNELLED) { libxlMigrationSrcStopTunnel(tc); - virObjectUnref(st); } =20 if (ddomain) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f1ad2806e8..1f5afbe0a4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3998,7 +3998,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr dr= iver, int cookielen =3D 0, ret; virErrorPtr orig_err =3D NULL; bool cancelled; - virStreamPtr st =3D NULL; + g_autoptr(virStream) st =3D NULL; unsigned long destflags; =20 VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, vm=3D%p, dconnuri=3D%s= , " @@ -4107,7 +4107,6 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr dr= iver, ret =3D -1; } =20 - virObjectUnref(st); =20 virErrorRestore(&orig_err); VIR_FREE(uri_out); @@ -4151,7 +4150,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr dr= iver, int ret =3D -1; virErrorPtr orig_err =3D NULL; bool cancelled =3D true; - virStreamPtr st =3D NULL; + g_autoptr(virStream) st =3D NULL; unsigned long destflags; virTypedParameterPtr params =3D NULL; int nparams =3D 0; @@ -4444,7 +4443,6 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr dr= iver, ret =3D -1; } =20 - virObjectUnref(st); =20 virErrorRestore(&orig_err); VIR_FREE(uri_out); diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 427cede17e..70c1dd3cbb 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -5641,7 +5641,7 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNe= tServerPtr server G_GNUC_UN char *cookieout =3D NULL; int cookieoutlen =3D 0; int rv =3D -1; - virStreamPtr st =3D NULL; + g_autoptr(virStream) st =3D NULL; daemonClientStreamPtr stream =3D NULL; virConnectPtr conn =3D remoteGetHypervisorConn(client); =20 @@ -5688,7 +5688,7 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNe= tServerPtr server G_GNUC_UN virStreamAbort(st); daemonFreeClientStream(client, stream); } else { - virObjectUnref(st); + g_clear_object(&st); } } return rv; diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index 62bc9e0f5b..6e1dba3bc0 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -419,7 +419,7 @@ int daemonFreeClientStream(virNetServerClientPtr client, msg =3D tmp; } =20 - virObjectUnref(stream->st); + g_clear_object(&stream->st); VIR_FREE(stream); =20 return ret; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c108b56c34..b9337967af 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5823,7 +5823,7 @@ static void remoteStreamCallbackFree(void *opaque) if (!cbdata->cb && cbdata->ff) (cbdata->ff)(cbdata->opaque); =20 - virObjectUnref(cbdata->st); + g_clear_object(&cbdata->st); VIR_FREE(opaque); } =20 diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 902ff091a5..29b3feb17c 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -207,6 +207,7 @@ my %gobject_impl =3D ( virSecret =3D> 1, virStoragePool =3D> 1, virStorageVol =3D> 1, + virStream =3D> 1, ); =20 sub use_gobject { @@ -1068,7 +1069,7 @@ elsif ($mode eq "server") { push(@free_list_on_error, " virStreamAbort(st);"); push(@free_list_on_error, " daemonFreeClientStream(client, = stream);"); push(@free_list_on_error, "} else {"); - push(@free_list_on_error, " virObjectUnref(st);"); + push(@free_list_on_error, " g_clear_object(&st);"); push(@free_list_on_error, "}"); } =20 diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 111e451f8c..e6271b860c 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -407,7 +407,7 @@ virFDStreamThreadDataFree(virFDStreamThreadDataPtr data) if (!data) return; =20 - virObjectUnref(data->st); + g_clear_object(&data->st); VIR_FREE(data->fdinname); VIR_FREE(data->fdoutname); VIR_FREE(data); @@ -1282,7 +1282,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, if (VIR_ALLOC(threadData) < 0) goto error; =20 - threadData->st =3D virObjectRef(st); + threadData->st =3D g_object_ref(st); threadData->length =3D length; threadData->sparse =3D sparse; =20 --=20 2.26.2