From nobody Wed Nov 5 07:53:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15336166434151006.4656607375185; Mon, 6 Aug 2018 21:37:23 -0700 (PDT) Received: from localhost ([::1]:37274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmtkI-0007be-Co for importer@patchew.org; Tue, 07 Aug 2018 00:37:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmth1-0004fY-Ss for qemu-devel@nongnu.org; Tue, 07 Aug 2018 00:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmth0-0001GG-6y for qemu-devel@nongnu.org; Tue, 07 Aug 2018 00:33:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45958 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fmtgv-0001Bs-4t; Tue, 07 Aug 2018 00:33:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8EE081663CC; Tue, 7 Aug 2018 04:33:51 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-197.bos.redhat.com [10.18.17.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D7F72022EE2; Tue, 7 Aug 2018 04:33:51 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 7 Aug 2018 00:33:31 -0400 Message-Id: <20180807043349.27196-4-jsnow@redhat.com> In-Reply-To: <20180807043349.27196-1-jsnow@redhat.com> References: <20180807043349.27196-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 07 Aug 2018 04:33:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 07 Aug 2018 04:33:51 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 03/21] block/backup: utilize job_exit shim X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, John Snow , Jeff Cody , Markus Armbruster , "Dr. David Alan Gilbert" , jtc@redhat.com, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Utilize the job_exit shim by simply not calling job_defer_to_main_loop. Signed-off-by: John Snow --- block/backup.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/block/backup.c b/block/backup.c index f3bf842423..af6ee5ab54 100644 --- a/block/backup.c +++ b/block/backup.c @@ -380,18 +380,6 @@ static BlockErrorAction backup_error_action(BackupBloc= kJob *job, } } =20 -typedef struct { - int ret; -} BackupCompleteData; - -static void backup_complete(Job *job, void *opaque) -{ - BackupCompleteData *data =3D opaque; - - job_completed(job, data->ret); - g_free(data); -} - static bool coroutine_fn yield_and_check(BackupBlockJob *job) { uint64_t delay_ns; @@ -483,7 +471,6 @@ static void backup_incremental_init_copy_bitmap(BackupB= lockJob *job) static void coroutine_fn backup_run(void *opaque) { BackupBlockJob *job =3D opaque; - BackupCompleteData *data; BlockDriverState *bs =3D blk_bs(job->common.blk); int64_t offset, nb_clusters; int ret =3D 0; @@ -584,9 +571,7 @@ static void coroutine_fn backup_run(void *opaque) qemu_co_rwlock_unlock(&job->flush_rwlock); hbitmap_free(job->copy_bitmap); =20 - data =3D g_malloc(sizeof(*data)); - data->ret =3D ret; - job_defer_to_main_loop(&job->common.job, backup_complete, data); + job->common.job.ret =3D ret; } =20 static const BlockJobDriver backup_job_driver =3D { --=20 2.14.4