From nobody Thu May 15 10:09:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526992602860593.798590804158; Tue, 22 May 2018 05:36:42 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 9B4CA11B790; Tue, 22 May 2018 12:36:40 +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 157D52B6F2; Tue, 22 May 2018 12:36:40 +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 BF090180B5B2; Tue, 22 May 2018 12:36:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4MCa4Dg013704 for ; Tue, 22 May 2018 08:36:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BE53215CDAC; Tue, 22 May 2018 12:36:04 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7BA6215CDA7; Tue, 22 May 2018 12:36:03 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 22 May 2018 14:35:45 +0200 Message-Id: <4bc0bacc81bf5a09a051d0b1e477126ba676c5e4.1526992488.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 5/8] qemu: monitor: Drop JSON versions of savevm/delvm/loadv 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 22 May 2018 12:36:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" qemu did not QAPIfy these and the design and name will most probably change. The replacements will not be compatible. Drop the JSON stubs and annotate that there won't be a replacement. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_monitor.c | 18 ++++++------------ src/qemu/qemu_monitor_json.c | 21 --------------------- src/qemu/qemu_monitor_json.h | 4 ---- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 9d665928d6..e07d578fa8 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3213,10 +3213,8 @@ qemuMonitorCreateSnapshot(qemuMonitorPtr mon, const = char *name) QEMU_CHECK_MONITOR(mon); - if (mon->json) - return qemuMonitorJSONCreateSnapshot(mon, name); - else - return qemuMonitorTextCreateSnapshot(mon, name); + /* there won't ever be a direct QMP replacement for this function */ + return qemuMonitorTextCreateSnapshot(mon, name); } int @@ -3226,10 +3224,8 @@ qemuMonitorLoadSnapshot(qemuMonitorPtr mon, const ch= ar *name) QEMU_CHECK_MONITOR(mon); - if (mon->json) - return qemuMonitorJSONLoadSnapshot(mon, name); - else - return qemuMonitorTextLoadSnapshot(mon, name); + /* there won't ever be a direct QMP replacement for this function */ + return qemuMonitorTextLoadSnapshot(mon, name); } @@ -3240,10 +3236,8 @@ qemuMonitorDeleteSnapshot(qemuMonitorPtr mon, const = char *name) QEMU_CHECK_MONITOR(mon); - if (mon->json) - return qemuMonitorJSONDeleteSnapshot(mon, name); - else - return qemuMonitorTextDeleteSnapshot(mon, name); + /* there won't ever be a direct QMP replacement for this function */ + return qemuMonitorTextDeleteSnapshot(mon, name); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7ddecbc907..42afa6201f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4062,27 +4062,6 @@ int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr= mon, return ret; } -int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name) -{ - /* XXX Update to use QMP, if QMP ever adds support for savevm */ - VIR_DEBUG("savevm command not found, trying HMP"); - return qemuMonitorTextCreateSnapshot(mon, name); -} - -int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name) -{ - /* XXX Update to use QMP, if QMP ever adds support for loadvm */ - VIR_DEBUG("loadvm command not found, trying HMP"); - return qemuMonitorTextLoadSnapshot(mon, name); -} - -int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name) -{ - /* XXX Update to use QMP, if QMP ever adds support for delvm */ - VIR_DEBUG("delvm command not found, trying HMP"); - return qemuMonitorTextDeleteSnapshot(mon, name); -} - int qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, const char *device, const char *file, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 8461932cac..8a9c214c82 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -241,10 +241,6 @@ int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr m= on, const char *alias, const char *passphrase); -int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name); -int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name); -int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name); - int qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, const char *device, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list