From nobody Mon Feb 9 03:51:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642698080; cv=none; d=zohomail.com; s=zohoarc; b=OSjJVe/URDVB7z/oyxbLgDMQr+h8BxO4JRRLd/6r6Mb9XA8ibYv76oWYKpe5IOKXJiYdgf5bfPUtjPmJBZHOET5Gt3mxCkEwj0Fl6i6igV0k2vvl+sl5SqoAw3dJQTFRI4172rxOVsqcPuS9SNkOj4kCWDZUyQTxDW90bzXz814= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642698080; h=Content-Type:Content-Transfer-Encoding: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=7JBZ65SUq/LZLdTYxo90TF4X69fzqIpy4S8QMNToEsQ=; b=PQWy0FuOybsMuDfFCgx1o2dM+mOu3eWRJpSA5/rDY/m4me45GuZSls7HHk5u9Fub8dSQW4M2MaILXs1s7QpEgaydo3huM/YVtxebCkw5N4MB+OpHj371tFR1APlzh7cCNyiiyeBxY9Uecj+82pmNCKqaDOCrik+k3HirNMTsrVc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642698080684367.26500148995217; Thu, 20 Jan 2022 09:01:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-aQnQd4iIOTyGtJiRU6Qopg-1; Thu, 20 Jan 2022 12:01:16 -0500 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 C4837185302D; Thu, 20 Jan 2022 17:01:09 +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 A33AF4EC91; Thu, 20 Jan 2022 17:01:09 +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 3D2CD1806D2B; Thu, 20 Jan 2022 17:01:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20KH0aXd029421 for ; Thu, 20 Jan 2022 12:00:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 123337ED93; Thu, 20 Jan 2022 17:00:36 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9093A7EDAB for ; Thu, 20 Jan 2022 17:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642698079; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=7JBZ65SUq/LZLdTYxo90TF4X69fzqIpy4S8QMNToEsQ=; b=VEBibFKTRk6T/h+8xJtCUMkoWW+EPtyKe3HoqAjdP3QFj8GoF0n3UyCjzA/16ZawAjTSAs YUt6j412OThRUzvjzlcfJXnbejbjuOTWsyaVVsBILcConSsFg5P/NsKKWkFbvPsKsLATmG vtZEpZE1zyWF5Eq0neB+Z8OJhLh3GSw= X-MC-Unique: aQnQd4iIOTyGtJiRU6Qopg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: make separate function for setting statsType of privateData Date: Thu, 20 Jan 2022 17:59:49 +0100 Message-Id: <4e1734e80e8e769c66d78f1a3511099613c7c678.1642697880.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642698082835100001 Content-Type: text/plain; charset="utf-8" We only need to set statsType in almost every case of setting something from private data, so it seems unnecessary to pull privateData out of current / completed job for just this one thing every time. I think this patch keeps the code cleaner without variables used just once. Signed-off-by: Kristina Hanicova --- src/qemu/qemu_backup.c | 4 ++-- src/qemu/qemu_domain.c | 8 ++++++++ src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_driver.c | 14 ++++++-------- src/qemu/qemu_migration.c | 9 ++++----- src/qemu/qemu_process.c | 5 ++--- src/qemu/qemu_snapshot.c | 5 ++--- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 081c4d023f..23d3f44dd8 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -746,7 +746,6 @@ qemuBackupBegin(virDomainObj *vm, unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; - qemuDomainJobDataPrivate *privData =3D priv->job.current->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); g_autoptr(virDomainBackupDef) def =3D NULL; g_autofree char *suffix =3D NULL; @@ -800,7 +799,8 @@ qemuBackupBegin(virDomainObj *vm, qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK | JOB_MASK(QEMU_JOB_SUSPEND) | JOB_MASK(QEMU_JOB_MODIFY))); - privData->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP; + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP); =20 if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a8401bac30..62e67b438f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -81,6 +81,14 @@ VIR_LOG_INIT("qemu.qemu_domain"); =20 =20 +void +qemuDomainJobPrivateSetStatsType(qemuDomainJobDataPrivate *privData, + qemuDomainJobStatsType type) +{ + privData->statsType =3D type; +} + + static void * qemuJobAllocPrivate(void) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e5046367e3..7363ff6444 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -488,6 +488,9 @@ void qemuDomainObjStopWorker(virDomainObj *dom); =20 virDomainObj *qemuDomainObjFromDomain(virDomainPtr domain); =20 +void qemuDomainJobPrivateSetStatsType(qemuDomainJobDataPrivate *privData, + qemuDomainJobStatsType type); + qemuDomainSaveCookie *qemuDomainSaveCookieNew(virDomainObj *vm); =20 void qemuDomainEventFlush(int timer, void *opaque); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 800db34a4b..7f7684f1cc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2630,7 +2630,6 @@ qemuDomainSaveInternal(virQEMUDriver *driver, int ret =3D -1; virObjectEvent *event =3D NULL; qemuDomainObjPrivate *priv =3D vm->privateData; - qemuDomainJobDataPrivate *privJobCurrent =3D priv->job.current->privat= eData; virQEMUSaveData *data =3D NULL; g_autoptr(qemuDomainSaveCookie) cookie =3D NULL; =20 @@ -2647,7 +2646,8 @@ qemuDomainSaveInternal(virQEMUDriver *driver, goto endjob; } =20 - privJobCurrent->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP; + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP); =20 /* Pause */ if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_RUNNING) { @@ -2988,9 +2988,8 @@ qemuDumpToFd(virQEMUDriver *driver, return -1; =20 if (detach) { - qemuDomainJobDataPrivate *privStats =3D priv->job.current->private= Data; - - privStats->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP; + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUM= P); } else { g_clear_pointer(&priv->job.current, virDomainJobDataFree); } @@ -3128,7 +3127,6 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, virQEMUDriver *driver =3D dom->conn->privateData; virDomainObj *vm; qemuDomainObjPrivate *priv =3D NULL; - qemuDomainJobDataPrivate *privJobCurrent =3D NULL; bool resume =3D false, paused =3D false; int ret =3D -1; virObjectEvent *event =3D NULL; @@ -3153,8 +3151,8 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, goto endjob; =20 priv =3D vm->privateData; - privJobCurrent =3D priv->job.current->privateData; - privJobCurrent->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP; + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP); =20 /* Migrate will always stop the VM, so the resume condition is independent of whether the stop command is issued. */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7957b79fc2..9e4fd67e2a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5859,11 +5859,10 @@ qemuMigrationDstFinish(virQEMUDriver *driver, =20 if (dom) { if (jobData) { - qemuDomainJobDataPrivate *privJob =3D jobData->privateData; - priv->job.completed =3D g_steal_pointer(&jobData); priv->job.completed->status =3D VIR_DOMAIN_JOB_STATUS_COMPLETE= D; - privJob->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION; + qemuDomainJobPrivateSetStatsType(jobData->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_MI= GRATION); } =20 if (qemuMigrationCookieFormat(mig, driver, vm, @@ -6105,7 +6104,6 @@ qemuMigrationJobStart(virQEMUDriver *driver, unsigned long apiFlags) { qemuDomainObjPrivate *priv =3D vm->privateData; - qemuDomainJobDataPrivate *privJob =3D priv->job.current->privateData; virDomainJobOperation op; unsigned long long mask; =20 @@ -6122,7 +6120,8 @@ qemuMigrationJobStart(virQEMUDriver *driver, if (qemuDomainObjBeginAsyncJob(driver, vm, job, op, apiFlags) < 0) return -1; =20 - privJob->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION; + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION); =20 qemuDomainObjSetAsyncJobMask(vm, mask); return 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fb7a04139a..39872e6c12 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3597,7 +3597,6 @@ qemuProcessRecoverJob(virQEMUDriver *driver, unsigned int *stopFlags) { qemuDomainObjPrivate *priv =3D vm->privateData; - qemuDomainJobDataPrivate *privDataJobCurrent =3D NULL; virDomainState state; int reason; unsigned long long now; @@ -3666,10 +3665,10 @@ qemuProcessRecoverJob(virQEMUDriver *driver, * active. This is possible because we are able to recover the sta= te * of blockjobs and also the backup job allows all sub-job types */ priv->job.current =3D virDomainJobDataInit(&qemuJobDataPrivateData= Callbacks); - privDataJobCurrent =3D priv->job.current->privateData; =20 + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_BACKUP= ); priv->job.current->operation =3D VIR_DOMAIN_JOB_OPERATION_BACKUP; - privDataJobCurrent->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_BACKU= P; priv->job.current->status =3D VIR_DOMAIN_JOB_STATUS_ACTIVE; priv->job.current->started =3D now; break; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 6f9aedace7..359a7a32ea 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1414,13 +1414,12 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *dri= ver, =20 /* do the memory snapshot if necessary */ if (memory) { - qemuDomainJobDataPrivate *privJobCurrent =3D priv->job.current->pr= ivateData; - /* check if migration is possible */ if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; =20 - privJobCurrent->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP; + qemuDomainJobPrivateSetStatsType(priv->job.current->privateData, + QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDU= MP); =20 /* allow the migration job to be cancelled or the domain to be pau= sed */ qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK | --=20 2.34.1