From nobody Fri Dec 19 02:49:52 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 ARC-Seal: i=1; a=rsa-sha256; t=1571415118; cv=none; d=zoho.com; s=zohoarc; b=KNUaQAvw+p1yYSNw6m56664nnNgubR5RTS012Aglcf6Eq3LgqNIi2wNwszqqnPPrccV4FE5ZpbbsZA/vQONBDccMambSBg2nHDfjMI2+ZPrdlJ5mAff5lnUfo2WLx9qQVZ+CtEzhsi8oaP/qwqSOlMYGKf5Umk1ru24Ss4JUw1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571415118; 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=cpamGbgvlXckZnC0tGJ4KmbDpJN4XUpndSBu6wERKSY=; b=RbdVrtciP5j72TCm9eSuX5pGgdg06N8U09GA0oN7CxLhsoY7SLgEUCUoay4wL8c6URgeqq4lwAKI7cSRmMaoLCGmwV3Cp1SaH48IBFkfwDKbzlhf6OQk2Uv085yD2nK0VuFaX+m9NcSGet+G9ronUUh3S/etkyMAdQOqPEQMVx4= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571415118517536.3805218693695; Fri, 18 Oct 2019 09:11:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8CCF3007F2A; Fri, 18 Oct 2019 16:11:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C02875C296; Fri, 18 Oct 2019 16:11:56 +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 7F1B24EEB9; Fri, 18 Oct 2019 16:11:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9IGBnHv004702 for ; Fri, 18 Oct 2019 12:11:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id A60CC60166; Fri, 18 Oct 2019 16:11:49 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0829360161; Fri, 18 Oct 2019 16:11:44 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 18 Oct 2019 18:11:01 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH RFC 16/40] qemu: monitor: Remove non-transaction based dirty bitmap APIs 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 18 Oct 2019 16:11:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We replaced them by use of transaction to simplify possible failure scenarios. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 51 --------------- src/qemu/qemu_monitor.h | 19 ------ src/qemu/qemu_monitor_json.c | 119 ----------------------------------- src/qemu/qemu_monitor_json.h | 17 ----- tests/qemumonitorjsontest.c | 41 ------------ 5 files changed, 247 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b6c890f9ce..8de386817b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4480,57 +4480,6 @@ qemuMonitorGetCurrentMachineInfo(qemuMonitorPtr mon, } -int -qemuMonitorAddBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap, - bool persistent) -{ - VIR_DEBUG("node=3D%s bitmap=3D%s persistent=3D%d", node, bitmap, persi= stent); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONAddBitmap(mon, node, bitmap, persistent); -} - -int -qemuMonitorEnableBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap) -{ - VIR_DEBUG("node=3D%s bitmap=3D%s", node, bitmap); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONEnableBitmap(mon, node, bitmap); -} - -int -qemuMonitorMergeBitmaps(qemuMonitorPtr mon, - const char *node, - const char *dst, - virJSONValuePtr *src) -{ - VIR_DEBUG("node=3D%s dst=3D%s", node, dst); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONMergeBitmaps(mon, node, dst, src); -} - -int -qemuMonitorDeleteBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap) -{ - VIR_DEBUG("node=3D%s bitmap=3D%s", node, bitmap); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONDeleteBitmap(mon, node, bitmap); -} - - void qemuMonitorJobInfoFree(qemuMonitorJobInfoPtr job) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 36eb5f342d..45f2a5a7d2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -702,25 +702,6 @@ int qemuMonitorSetBalloon(qemuMonitorPtr mon, unsigned long long newmem); int qemuMonitorSetCPU(qemuMonitorPtr mon, int cpu, bool online); -int qemuMonitorAddBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap, - bool persistent) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorEnableBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -int qemuMonitorMergeBitmaps(qemuMonitorPtr mon, - const char *node, - const char *dst, - virJSONValuePtr *src) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorDeleteBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - /* XXX should we pass the virDomainDiskDefPtr instead * and hide dev_name details inside monitor. Reconsider diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c474ac0203..0062816e3e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -9128,125 +9128,6 @@ qemuMonitorJSONGetCurrentMachineInfo(qemuMonitorPtr= mon, } -int -qemuMonitorJSONAddBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap, - bool persistent) -{ - int ret =3D -1; - virJSONValuePtr cmd; - virJSONValuePtr reply =3D NULL; - - if (!(cmd =3D qemuMonitorJSONMakeCommand("block-dirty-bitmap-add", - "s:node", node, - "s:name", bitmap, - "b:persistent", persistent, - NULL))) - return -1; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; - - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; -} - -int -qemuMonitorJSONEnableBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap) -{ - int ret =3D -1; - virJSONValuePtr cmd; - virJSONValuePtr reply =3D NULL; - - if (!(cmd =3D qemuMonitorJSONMakeCommand("block-dirty-bitmap-enable", - "s:node", node, - "s:name", bitmap, - NULL))) - return -1; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; - - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; -} - -int -qemuMonitorJSONMergeBitmaps(qemuMonitorPtr mon, - const char *node, - const char *dst, - virJSONValuePtr *src) -{ - int ret =3D -1; - virJSONValuePtr cmd; - virJSONValuePtr reply =3D NULL; - - if (!(cmd =3D qemuMonitorJSONMakeCommand("block-dirty-bitmap-merge", - "s:node", node, - "s:target", dst, - "a:bitmaps", src, - NULL))) - goto cleanup; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; - - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virJSONValueFree(*src); - *src =3D NULL; - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; -} - -int -qemuMonitorJSONDeleteBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap) -{ - int ret =3D -1; - virJSONValuePtr cmd; - virJSONValuePtr reply =3D NULL; - - if (!(cmd =3D qemuMonitorJSONMakeCommand("block-dirty-bitmap-remove", - "s:node", node, - "s:name", bitmap, - NULL))) - return -1; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; - - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(reply); - return ret; -} - - int qemuMonitorJSONTransactionBitmapAdd(virJSONValuePtr actions, const char *node, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 6ee3e912f9..d74ef91b83 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -627,23 +627,6 @@ int qemuMonitorJSONGetCurrentMachineInfo(qemuMonitorPtr mon, qemuMonitorCurrentMachineInfoPtr info) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -int qemuMonitorJSONAddBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap, - bool persistent); - -int qemuMonitorJSONEnableBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap); - -int qemuMonitorJSONMergeBitmaps(qemuMonitorPtr mon, - const char *node, - const char *dst, - virJSONValuePtr *src); - -int qemuMonitorJSONDeleteBitmap(qemuMonitorPtr mon, - const char *node, - const char *bitmap); int qemuMonitorJSONTransactionBitmapAdd(virJSONValuePtr actions, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f754e4d94b..4f15d231f9 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1337,9 +1337,6 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockdevTrayOpen, "foode= v", true) GEN_TEST_FUNC(qemuMonitorJSONBlockdevTrayClose, "foodev") GEN_TEST_FUNC(qemuMonitorJSONBlockdevMediumRemove, "foodev") GEN_TEST_FUNC(qemuMonitorJSONBlockdevMediumInsert, "foodev", "newnode") -GEN_TEST_FUNC(qemuMonitorJSONAddBitmap, "node", "bitmap", true) -GEN_TEST_FUNC(qemuMonitorJSONEnableBitmap, "node", "bitmap") -GEN_TEST_FUNC(qemuMonitorJSONDeleteBitmap, "node", "bitmap") GEN_TEST_FUNC(qemuMonitorJSONJobDismiss, "jobname") GEN_TEST_FUNC(qemuMonitorJSONJobCancel, "jobname", false) GEN_TEST_FUNC(qemuMonitorJSONJobComplete, "jobname") @@ -1382,40 +1379,6 @@ testQemuMonitorJSONqemuMonitorJSONNBDServerStart(con= st void *opaque) return 0; } -static int -testQemuMonitorJSONqemuMonitorJSONMergeBitmaps(const void *opaque) -{ - const testGenericData *data =3D opaque; - virDomainXMLOptionPtr xmlopt =3D data->xmlopt; - g_autoptr(qemuMonitorTest) test =3D NULL; - g_autoptr(virJSONValue) arr =3D NULL; - - if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) - return -1; - - if (!(arr =3D virJSONValueNewArray())) - return -1; - - if (virJSONValueArrayAppendString(arr, "b1") < 0 || - virJSONValueArrayAppendString(arr, "b2") < 0) - return -1; - - if (qemuMonitorTestAddItem(test, "block-dirty-bitmap-merge", - "{\"return\":{}}") < 0) - return -1; - - if (qemuMonitorJSONMergeBitmaps(qemuMonitorTestGetMonitor(test), - "node", "dst", &arr) < 0) - return -1; - - if (arr) { - VIR_TEST_VERBOSE("arr should have been cleared"); - return -1; - } - - return 0; -} - static bool testQemuMonitorJSONqemuMonitorJSONQueryCPUsEqual(struct qemuMonitorQueryCp= usEntry *a, struct qemuMonitorQueryCp= usEntry *b) @@ -3174,9 +3137,6 @@ mymain(void) DO_TEST_GEN(qemuMonitorJSONBlockdevTrayClose); DO_TEST_GEN(qemuMonitorJSONBlockdevMediumRemove); DO_TEST_GEN(qemuMonitorJSONBlockdevMediumInsert); - DO_TEST_GEN(qemuMonitorJSONAddBitmap); - DO_TEST_GEN(qemuMonitorJSONEnableBitmap); - DO_TEST_GEN(qemuMonitorJSONDeleteBitmap); DO_TEST_GEN(qemuMonitorJSONJobDismiss); DO_TEST_GEN(qemuMonitorJSONJobCancel); DO_TEST_GEN(qemuMonitorJSONJobComplete); @@ -3196,7 +3156,6 @@ mymain(void) DO_TEST(qemuMonitorJSONSendKeyHoldtime); DO_TEST(qemuMonitorSupportsActiveCommit); DO_TEST(qemuMonitorJSONNBDServerStart); - DO_TEST(qemuMonitorJSONMergeBitmaps); DO_TEST_CPU_DATA("host"); DO_TEST_CPU_DATA("full"); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list