From nobody Mon Dec 15 23:05:15 2025 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=1658846371; cv=none; d=zohomail.com; s=zohoarc; b=EJPq9cfb6xfJ4gJZhNGeh9W6li2VBdYaSpOcJO/1gWHzTWbliMqOpngcF8uPUbK/rlt87I2GnTIH78CphzumPzP0t9yt2SbkY+wvg6hb98cA7sfrcn3FKhP9Fa0x27+lkAE3KZlT5KTbMSjeUE9DJ/KbJrtDROUJv3UCLaLqk3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846371; 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=4dRR2uV68Z6MgEJ5qQfU8+m2ZLbF6FxUtjVX7QJccLo=; b=WvseXr/ePzDULXkAB0HqWUSCe1p+bLuxsYhDKBhfsHSgCT1lKyXaYZROhClP5Hl37D2dwhNzim1pS92C8GzjFaH+5dfp2rEWQumi5jxI+KfPy6j98boohEcYksxOhigJx6eCwsJYcQQXEkHyu25NtbR4EzzKmhBZS2wkSR2Ktks= 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 1658846371434798.0121641486379; Tue, 26 Jul 2022 07:39:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-572-guuKWM_SP_6wb5MNSeanOA-1; Tue, 26 Jul 2022 10:39:26 -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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57B81108C1B2; Tue, 26 Jul 2022 14:38:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 436ED2026609; Tue, 26 Jul 2022 14:38:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A72C194705A; Tue, 26 Jul 2022 14:38:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9C8DE1945DBF for ; Tue, 26 Jul 2022 14:38:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8DBDB400EA8E; Tue, 26 Jul 2022 14:38:44 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CD1A400DFD7 for ; Tue, 26 Jul 2022 14:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846370; 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=4dRR2uV68Z6MgEJ5qQfU8+m2ZLbF6FxUtjVX7QJccLo=; b=gVLjrbAV7FlcsgJsoLfvK9e2/yJoxtNtGnU4JPAVqlEGIVY2uXAtyMfWgcSxRIxB3b8coo TRYdRaE57Th26FMzWdi7s9iVm6RwCffVp08cGScwPOysZ+PL5msCeZUpDD/++9M4u+gleJ LqMBPlRDt5CbZkPMvlRMr4YdPHii2iI= X-MC-Unique: guuKWM_SP_6wb5MNSeanOA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 44/80] qemu: monitor: Remove unused arguments of qemuMonitorBlockCommit Date: Tue, 26 Jul 2022 16:37:22 +0200 Message-Id: <05fe72e0e1de329666e2f41e07391b01d1ac65ec.1658843187.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: 1658846372424100001 Content-Type: text/plain; charset="utf-8" The 'persistjob' is always true and 'top' and 'base' are always NULL. Adjust the functions to drop the arguments. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_driver.c | 3 --- src/qemu/qemu_monitor.c | 15 +++++---------- src/qemu/qemu_monitor.h | 3 --- src/qemu/qemu_monitor_json.c | 14 ++------------ src/qemu/qemu_monitor_json.h | 3 --- tests/qemumonitorjsontest.c | 2 +- 6 files changed, 8 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e8dc524186..ac20d04353 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15637,10 +15637,7 @@ qemuDomainBlockCommit(virDomainPtr dom, ret =3D qemuMonitorBlockCommit(priv->mon, qemuDomainDiskGetTopNodename(disk), job->name, - true, - NULL, topSource->nodeformat, - NULL, baseSource->nodeformat, backingPath, speed); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 9c24b842bd..1453181f94 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2913,24 +2913,19 @@ int qemuMonitorBlockCommit(qemuMonitor *mon, const char *device, const char *jobname, - bool persistjob, - const char *top, const char *topNode, - const char *base, const char *baseNode, const char *backingName, unsigned long long bandwidth) { - VIR_DEBUG("device=3D%s, jobname=3D%s, persistjob=3D%d, top=3D%s, topNo= de=3D%s, " - "base=3D%s, baseNode=3D%s, backingName=3D%s, bandwidth=3D%ll= u", - device, NULLSTR(jobname), persistjob, NULLSTR(top), NULLSTR(= topNode), - NULLSTR(base), NULLSTR(baseNode), NULLSTR(backingName), band= width); + VIR_DEBUG("device=3D%s, jobname=3D%s, topNode=3D%s, baseNode=3D%s, bac= kingName=3D%s, bandwidth=3D%llu", + device, NULLSTR(jobname), NULLSTR(topNode), + NULLSTR(baseNode), NULLSTR(backingName), bandwidth); QEMU_CHECK_MONITOR(mon); - return qemuMonitorJSONBlockCommit(mon, device, jobname, persistjob, to= p, - topNode, base, baseNode, backingName, - bandwidth); + return qemuMonitorJSONBlockCommit(mon, device, jobname, topNode, baseN= ode, + backingName, bandwidth); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index aee9ca0e6a..7aed4ffd4f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -997,10 +997,7 @@ int qemuMonitorDrivePivot(qemuMonitor *mon, int qemuMonitorBlockCommit(qemuMonitor *mon, const char *device, const char *jobname, - bool persistjob, - const char *top, const char *topNode, - const char *base, const char *baseNode, const char *backingName, unsigned long long bandwidth) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index bd3130075b..e6eb41d85b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4176,31 +4176,21 @@ int qemuMonitorJSONBlockCommit(qemuMonitor *mon, const char *device, const char *jobname, - bool persistjob, - const char *top, const char *topNode, - const char *base, const char *baseNode, const char *backingName, unsigned long long speed) { g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; - virTristateBool autofinalize =3D VIR_TRISTATE_BOOL_ABSENT; - virTristateBool autodismiss =3D VIR_TRISTATE_BOOL_ABSENT; - - if (persistjob) { - autofinalize =3D VIR_TRISTATE_BOOL_YES; - autodismiss =3D VIR_TRISTATE_BOOL_NO; - } + virTristateBool autofinalize =3D VIR_TRISTATE_BOOL_YES; + virTristateBool autodismiss =3D VIR_TRISTATE_BOOL_NO; cmd =3D qemuMonitorJSONMakeCommand("block-commit", "s:device", device, "S:job-id", jobname, "Y:speed", speed, - "S:top", top, "S:top-node", topNode, - "S:base", base, "S:base-node", baseNode, "S:backing-file", backingName, "T:auto-finalize", autofinalize, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index f409480c0b..9da26ca646 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -328,10 +328,7 @@ int qemuMonitorJSONBlockCommit(qemuMonitor *mon, const char *device, const char *jobname, - bool persistjob, - const char *top, const char *topNode, - const char *base, const char *baseNode, const char *backingName, unsigned long long bandwidth) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 265fa0b705..d5915720c8 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1215,7 +1215,7 @@ GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0") GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0") GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targ= etnode", 1024, 1234, 31234, true, true) GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/ba= r1", "backingnode", "backingfilename", 1024) -GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", true, "/foo/ba= r1", "topnode", "/foo/bar2", "basenode", "backingfilename", 1024) +GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "ba= senode", "backingfilename", 1024) GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb") GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar") GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd", false) --=20 2.36.1