From nobody Mon Dec 15 23:39:10 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=1658846463; cv=none; d=zohomail.com; s=zohoarc; b=XQbicbzY60hrnW9GO2ZNS7RdRzVsqmG18HWphUPKeTzG2qR/NEA9T7I086VO9YUbSVzrMHKezQPj/qX0OK/65+Ab3bZQdsLgC+maReg9OkG3gasd7Izbc8HrsDHAztSspp3cSbXdRLW5aqxRSvA8kF+GBE1fOK6OCqT48NFWe7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846463; 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=f+L+2lZpC6dG6eJcsggqbRtU6sn5yFBjNhMK0GXFrus=; b=cMmVwYvvsXvj075g695u6Lbherycb9h5LDBDTjNvoKgFGlPkiatjrmxgPqbLuuqvxzxLvenqECOXswCMf/9bIAbD4oK32xqMFvJo98TmcdU8XVpnhFXgaUB9Z5UfqPT1Vy0nykHJ6X+k2yvM5J4+HDLIbDTfOEI7t+oTnRb0eUU= 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 165884646387834.65070931947071; Tue, 26 Jul 2022 07:41:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-mITjkaW3Nf22O2bBv1ad2A-1; Tue, 26 Jul 2022 10:38:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CA7D38149B3; Tue, 26 Jul 2022 14:38:34 +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 519131415123; Tue, 26 Jul 2022 14:38:34 +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 D46761945DBF; Tue, 26 Jul 2022 14:38:33 +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 43F81194704C for ; Tue, 26 Jul 2022 14:38:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2F29D40CFD0B; Tue, 26 Jul 2022 14:38:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4805400DFD7 for ; Tue, 26 Jul 2022 14:38:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846462; 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=f+L+2lZpC6dG6eJcsggqbRtU6sn5yFBjNhMK0GXFrus=; b=YwvxRdqS/GaKd7pynWa7LVfj/w53n+mMnfe+fIUZhDB3S/p4BOBS/2l6GgSr/+1S+y4qDw o/qEhHmpy8aR6kvanYknUQ+35AueLNcJgTtRLGgneozDqG9PIOW96t/K6RRCA75niEyps5 NlXl7uTHRzJydIXU6jZfBc49Cn082Ms= X-MC-Unique: mITjkaW3Nf22O2bBv1ad2A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 26/80] qemu: Remove unused code for pre-blockdev disk snapshot monitor interaction Date: Tue, 26 Jul 2022 16:37:04 +0200 Message-Id: <9a9d305353f72894a502bdfdb2abe749e02ce7aa.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.85 on 10.11.54.7 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: 1658846465997100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_block.c | 20 -------------------- src/qemu/qemu_block.h | 6 ------ src/qemu/qemu_monitor.c | 12 ------------ src/qemu/qemu_monitor.h | 6 ------ src/qemu/qemu_monitor_json.c | 22 ---------------------- src/qemu/qemu_monitor_json.h | 6 ------ tests/qemumonitorjsontest.c | 1 - 7 files changed, 73 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 870d44ecd5..81c807660f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2108,26 +2108,6 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDrive= r *driver, } -int -qemuBlockSnapshotAddLegacy(virJSONValue *actions, - virDomainDiskDef *disk, - virStorageSource *newsrc, - bool reuse) -{ - const char *format =3D virStorageFileFormatTypeToString(newsrc->format= ); - g_autofree char *device =3D NULL; - g_autofree char *source =3D NULL; - - if (!(device =3D qemuAliasDiskDriveFromDisk(disk))) - return -1; - - if (qemuGetDriveSourceString(newsrc, NULL, &source) < 0) - return -1; - - return qemuMonitorTransactionSnapshotLegacy(actions, device, source, f= ormat, reuse); -} - - int qemuBlockSnapshotAddBlockdev(virJSONValue *actions, virDomainDiskDef *disk, diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 8641c8a2d2..bcd3f5960b 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -179,12 +179,6 @@ qemuBlockStorageSourceChainDetach(qemuMonitor *mon, G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceChainData, qemuBlockStorageSourceChainDataFree); -int -qemuBlockSnapshotAddLegacy(virJSONValue *actions, - virDomainDiskDef *disk, - virStorageSource *newsrc, - bool reuse); - int qemuBlockSnapshotAddBlockdev(virJSONValue *actions, virDomainDiskDef *disk, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6ebdeb46f3..b575eaae06 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4397,18 +4397,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(vir= JSONValue *sources, } -int -qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions, - const char *device, - const char *path, - const char *format, - bool existing) -{ - return qemuMonitorJSONTransactionSnapshotLegacy(actions, device, path, - format, existing); -} - - int qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions, const char *node, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b82f198285..916a86f423 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1461,12 +1461,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(vir= JSONValue *sources, const char *sourcebitmap); int -qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions, - const char *device, - const char *path, - const char *format, - bool existing); -int qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions, const char *node, const char *overlay); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 941596563a..8cda6f36b7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8548,28 +8548,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap= (virJSONValue *sources, } -int -qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions, - const char *device, - const char *path, - const char *format, - bool existing) -{ - const char *mode =3D NULL; - - if (existing) - mode =3D "existing"; - - return qemuMonitorJSONTransactionAdd(actions, - "blockdev-snapshot-sync", - "s:device", device, - "s:snapshot-file", path, - "s:format", format, - "S:mode", mode, - NULL); -} - - int qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions, const char *node, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index e4c65e250e..613b251908 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -813,12 +813,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap(v= irJSONValue *sources, const char *sourcebit= map); int -qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions, - const char *device, - const char *path, - const char *format, - bool existing); -int qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions, const char *node, const char *overlay); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 692aa75791..adfe6e1c55 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2742,7 +2742,6 @@ testQemuMonitorJSONTransaction(const void *opaque) qemuMonitorTransactionBitmapEnable(actions, "node3", "bitmap3") < = 0 || qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") <= 0 || qemuMonitorTransactionBitmapMerge(actions, "node5", "bitmap5", &me= rgebitmaps) < 0 || - qemuMonitorTransactionSnapshotLegacy(actions, "dev6", "path", "qco= w2", true) < 0 || qemuMonitorTransactionSnapshotBlockdev(actions, "node7", "overlay7= ") < 0 || qemuMonitorTransactionBackup(actions, "dev8", "job8", "target8", "= bitmap8", QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_= MODE_NONE) < 0 || --=20 2.36.1