From nobody Mon Feb 9 06:00:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1589371157; cv=none; d=zohomail.com; s=zohoarc; b=jzNQs6QCeQm7O6WRFc2UpxMt22iDTn7lauX4N/eIRtjas8VvBjBx8hlKgi4n2GG83+uHpG7vU+t36KhmeG1gJfOvU/7eLvSZEgItozupb659biupSYqVoUx722B/LxZ2/obVtKpycumVIIACFmmIb1jiKgpDkYupd5t5vXE9EGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371157; 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=K1yJhcWZu214MO9YL/ACMlfaJug9MJ7/27dvd9+pHSQ=; b=OhtvZARhRNBnubP9iC1nouc2cH3AF/knPEv5wMtO8V4Vo6wlRn3RRvMN8RKkb0Pk3zbyQp/Emre9lZI3NhUE9D2z+ZnMBWOSWTXvWfLwjGg6OW9aJZ1ghgDP0/ncTzKGveNFY9iCY1xEFMg5m2n9rb4/45mHliQS+WRwhC0ZszQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1589371157577815.0084625844507; Wed, 13 May 2020 04:59:17 -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-190-OCYa-5GPMg6Rf3-RToqfJw-1; Wed, 13 May 2020 07:59:12 -0400 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 8362B18FF683; Wed, 13 May 2020 11:59:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E4E0341FD; Wed, 13 May 2020 11:59:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2E759180531F; Wed, 13 May 2020 11:59:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04DBx1h5016376 for ; Wed, 13 May 2020 07:59:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 00FFC114D07; Wed, 13 May 2020 11:59:01 +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 F015611515B for ; Wed, 13 May 2020 11:59:00 +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 D31A7916114 for ; Wed, 13 May 2020 11:59:00 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-198-GfITUeM0OJ6odHkejVZZGg-1; Wed, 13 May 2020 07:58:58 -0400 Received: by mail-wr1-f65.google.com with SMTP id h17so11645263wrc.8 for ; Wed, 13 May 2020 04:58:58 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371156; 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=K1yJhcWZu214MO9YL/ACMlfaJug9MJ7/27dvd9+pHSQ=; b=XF+LfqcIBTxF4HIMLYOdFG5vJO7/82y0o9BDNq4SJ/Vu0GpCmqzYUEQC2UEtDtyukHJKjk UjN7+IOqWxKTi8tdXXJwrTcuKpaUZF/DsOwp9+1gsOitl8ySqxtBf5XusA9YIhzaTH57p+ KdC8f1skucy/+XaY6d+DQC+My65Ept8= X-MC-Unique: OCYa-5GPMg6Rf3-RToqfJw-1 X-MC-Unique: GfITUeM0OJ6odHkejVZZGg-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=K1yJhcWZu214MO9YL/ACMlfaJug9MJ7/27dvd9+pHSQ=; b=VdoPr/DXLNP09i40ecRr/kuReiWIqWhAjieii3qn6sw1vPSQ6zJq7XbYZbRP7gzbn6 qi4OIrPnoANw4FEQElm3heEu6bGMiUmkl1cPDhqKuVRXT1Ltd6Q1hGdOpn7nUg5wqDPT YB3MGJ01BkaRzPkQdsqUAiL3DEPglKBOszZrXyMbzKRIyZIH8QHUK860nCAWGdLxj75z GozEpOke1fOd/ASr1PcBDFMiVl071tiH7acCaxnJaXNVhlc2jwDvRu+qMCIIX/IkGTTt 6DiRYNuQazfUbxPOcR8SBbxEcBoM4mSRzmjJaiWIGOXUUStqsaQimhipMYNfuU2UonZd 1/0A== X-Gm-Message-State: AGi0PuYRXL9KKXP+S9aKgihc82WAb8b57CGush2MPvbiucillmbdekmN TRikAdqZN/EHbRfb/hEKJcjjtuFH X-Google-Smtp-Source: APiQypJnXHpD+i3PQEpj8a24H3k38Mv7lxLRwVZa4NxKhlSrZH1J/qz8XcX38EsysnO+CslQ9hRNOg== X-Received: by 2002:adf:dc50:: with SMTP id m16mr30875974wrj.329.1589371136970; Wed, 13 May 2020 04:58:56 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 36/40] qemu: convert qemuBlockJobData to GObject Date: Wed, 13 May 2020 13:57:20 +0200 Message-Id: <20200513115724.157687-37-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.79 on 10.11.54.5 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.84 on 10.5.11.23 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/qemu/qemu_blockjob.c | 55 ++++++++++++++++++--------------------- src/qemu/qemu_blockjob.h | 15 +++++++---- src/qemu/qemu_domain.c | 4 +-- src/qemu/qemu_hotplug.c | 3 +-- src/qemu/qemu_migration.c | 16 +++--------- 5 files changed, 43 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e51499532f..671bfad19b 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -71,8 +71,21 @@ VIR_ENUM_IMPL(qemuBlockjob, "create", "broken"); =20 -static virClassPtr qemuBlockJobDataClass; +G_DEFINE_TYPE(qemuBlockJobData, qemu_block_job_data, G_TYPE_OBJECT); +static void qemuBlockJobDataFinalize(GObject *obj); =20 +static void +qemu_block_job_data_init(qemuBlockJobData *job G_GNUC_UNUSED) +{ +} + +static void +qemu_block_job_data_class_init(qemuBlockJobDataClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D qemuBlockJobDataFinalize; +} =20 static void qemuBlockJobDataDisposeJobdata(qemuBlockJobDataPtr job) @@ -88,9 +101,9 @@ qemuBlockJobDataDisposeJobdata(qemuBlockJobDataPtr job) =20 =20 static void -qemuBlockJobDataDispose(void *obj) +qemuBlockJobDataFinalize(GObject *obj) { - qemuBlockJobDataPtr job =3D obj; + qemuBlockJobDataPtr job =3D QEMU_BLOCK_JOB_DATA(obj); =20 virObjectUnref(job->chain); virObjectUnref(job->mirrorChain); @@ -99,32 +112,17 @@ qemuBlockJobDataDispose(void *obj) =20 g_free(job->name); g_free(job->errmsg); -} =20 - -static int -qemuBlockJobDataOnceInit(void) -{ - if (!VIR_CLASS_NEW(qemuBlockJobData, virClassForObject())) - return -1; - - return 0; + G_OBJECT_CLASS(qemu_block_job_data_parent_class)->finalize(obj); } =20 =20 -VIR_ONCE_GLOBAL_INIT(qemuBlockJobData); - qemuBlockJobDataPtr qemuBlockJobDataNew(qemuBlockJobType type, const char *name) { - g_autoptr(qemuBlockJobData) job =3D NULL; - - if (qemuBlockJobDataInitialize() < 0) - return NULL; - - if (!(job =3D virObjectNew(qemuBlockJobDataClass))) - return NULL; + g_autoptr(qemuBlockJobData) job =3D + QEMU_BLOCK_JOB_DATA(g_object_new(QEMU_TYPE_BLOCK_JOB_DATA, NULL)); =20 job->name =3D g_strdup(name); =20 @@ -180,15 +178,15 @@ qemuBlockJobRegister(qemuBlockJobDataPtr job, return -1; } =20 - if (virHashAddEntry(priv->blockjobs, job->name, virObjectRef(job)) < 0= ) { - virObjectUnref(job); + if (virHashAddEntry(priv->blockjobs, job->name, g_object_ref(job)) < 0= ) { + g_object_unref(job); return -1; } =20 if (disk) { job->disk =3D disk; job->chain =3D virObjectRef(disk->src); - QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob =3D virObjectRef(job); + QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob =3D g_object_ref(job); } =20 if (savestatus) @@ -209,8 +207,7 @@ qemuBlockJobUnregister(qemuBlockJobDataPtr job, diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(job->disk); =20 if (job =3D=3D diskPriv->blockjob) { - virObjectUnref(diskPriv->blockjob); - diskPriv->blockjob =3D NULL; + g_clear_object(&diskPriv->blockjob); } =20 job->disk =3D NULL; @@ -427,7 +424,7 @@ qemuBlockJobDiskGetJob(virDomainDiskDefPtr disk) if (!job) return NULL; =20 - return virObjectRef(job); + return g_object_ref(job); } =20 =20 @@ -466,7 +463,7 @@ qemuBlockJobStartupFinalize(virDomainObjPtr vm, if (job->state =3D=3D QEMU_BLOCKJOB_STATE_NEW) qemuBlockJobUnregister(job, vm); =20 - virObjectUnref(job); + g_object_unref(job); } =20 =20 @@ -1743,7 +1740,7 @@ qemuBlockJobGetByDisk(virDomainDiskDefPtr disk) if (!job) return NULL; =20 - return virObjectRef(job); + return g_object_ref(job); } =20 =20 diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index 19498b5bd8..fc36131c67 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -23,6 +23,7 @@ =20 #include "internal.h" #include "qemu_conf.h" +#include =20 /** * This enum has to map all known block job states from enum virDomainBloc= kJobType @@ -119,11 +120,8 @@ struct _qemuBlockJobBackupData { }; =20 =20 -typedef struct _qemuBlockJobData qemuBlockJobData; -typedef qemuBlockJobData *qemuBlockJobDataPtr; - struct _qemuBlockJobData { - virObject parent; + GObject parent; =20 char *name; =20 @@ -154,7 +152,14 @@ struct _qemuBlockJobData { bool invalidData; /* the job data (except name) is not valid */ bool reconnected; /* internal field for tracking whether job is live a= fter reconnect to qemu */ }; -G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockJobData, virObjectUnref); + +#define QEMU_TYPE_BLOCK_JOB_DATA qemu_block_job_data_get_type() +G_DECLARE_FINAL_TYPE(qemuBlockJobData, + qemu_block_job_data, + QEMU, + BLOCK_JOB_DATA, + GObject); +typedef qemuBlockJobData *qemuBlockJobDataPtr; =20 int qemuBlockJobRegister(qemuBlockJobDataPtr job, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 41dfba5597..e422db80a5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1190,7 +1190,7 @@ qemuDomainDiskPrivateDispose(void *obj) virObjectUnref(priv->migrSource); VIR_FREE(priv->qomName); VIR_FREE(priv->nodeCopyOnRead); - virObjectUnref(priv->blockjob); + g_clear_object(&priv->blockjob); } =20 static virClassPtr qemuDomainStorageSourcePrivateClass; @@ -2239,7 +2239,7 @@ qemuDomainObjPrivateAlloc(void *opaque) if (!(priv->devs =3D virChrdevAlloc())) goto error; =20 - if (!(priv->blockjobs =3D virHashCreate(5, virObjectFreeHashData))) + if (!(priv->blockjobs =3D virHashCreate(5, g_object_unref))) goto error; =20 /* agent commands block by default, user can choose different behavior= */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ab5a7aef84..1826c4f997 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4277,8 +4277,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, if (diskPriv->blockjob) { /* the block job keeps reference to the disk chain */ diskPriv->blockjob->disk =3D NULL; - virObjectUnref(diskPriv->blockjob); - diskPriv->blockjob =3D NULL; + g_clear_object(&diskPriv->blockjob); } else { if (!(diskBackend =3D qemuBlockStorageSourceChainDetachPrepare= Blockdev(disk->src))) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 26e8d067ea..64897d0aa2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -512,7 +512,7 @@ qemuMigrationSrcNBDStorageCopyReady(virDomainObjPtr vm, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); - qemuBlockJobDataPtr job; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (!diskPriv->migrating) continue; @@ -526,12 +526,9 @@ qemuMigrationSrcNBDStorageCopyReady(virDomainObjPtr vm, qemuBlockJobUpdate(vm, job, asyncJob); if (job->state =3D=3D VIR_DOMAIN_BLOCK_JOB_FAILED) { qemuMigrationNBDReportMirrorError(job, disk->dst); - virObjectUnref(job); return -1; } =20 - virObjectUnref(job); - if (disk->mirrorState !=3D VIR_DOMAIN_DISK_MIRROR_STATE_READY) notReady++; } @@ -570,7 +567,7 @@ qemuMigrationSrcNBDCopyCancelled(virDomainObjPtr vm, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); - qemuBlockJobDataPtr job; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (!diskPriv->migrating) continue; @@ -597,8 +594,6 @@ qemuMigrationSrcNBDCopyCancelled(virDomainObjPtr vm, =20 if (job->state =3D=3D VIR_DOMAIN_BLOCK_JOB_COMPLETED) completed++; - - virObjectUnref(job); } =20 /* Updating completed block job drops the lock thus we have to recheck @@ -704,14 +699,13 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); - qemuBlockJobDataPtr job; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (!(job =3D qemuBlockJobDiskGetJob(disk)) || !qemuBlockJobIsRunning(job)) diskPriv->migrating =3D false; =20 if (!diskPriv->migrating) { - virObjectUnref(job); continue; } =20 @@ -726,8 +720,6 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, qemuBlockJobSyncEnd(vm, job, asyncJob); diskPriv->migrating =3D false; } - - virObjectUnref(job); } =20 while ((rv =3D qemuMigrationSrcNBDCopyCancelled(vm, asyncJob, check)) = !=3D 1) { @@ -5435,7 +5427,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, storage =3D true; } =20 - virObjectUnref(job); + g_clear_object(&job); } =20 if (storage && --=20 2.26.2