From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B075FC00144 for ; Mon, 1 Aug 2022 08:17:17 +0000 (UTC) Received: from localhost ([::1]:53876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIQc0-0003RW-Iq for qemu-devel@archiver.kernel.org; Mon, 01 Aug 2022 04:17:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIQSv-0005iF-5d for qemu-devel@nongnu.org; Mon, 01 Aug 2022 04:07:56 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:6085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIQSs-000627-UA for qemu-devel@nongnu.org; Mon, 01 Aug 2022 04:07:52 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Lx9c96byHzWfbC; Mon, 1 Aug 2022 16:03:37 +0800 (CST) Received: from kwepemm600015.china.huawei.com (7.193.23.52) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 1 Aug 2022 16:07:36 +0800 Received: from localhost (10.174.149.172) by kwepemm600015.china.huawei.com (7.193.23.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 1 Aug 2022 16:07:35 +0800 To: , , , , CC: , Subject: [PATCH v4 2/3] job: introduce dump guest memory job Date: Mon, 1 Aug 2022 16:07:21 +0800 Message-ID: <20220801080722.3318-2-hogan.wang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220801080722.3318-1-hogan.wang@huawei.com> References: <20220801080722.3318-1-hogan.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.174.149.172] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600015.china.huawei.com (7.193.23.52) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.188; envelope-from=hogan.wang@huawei.com; helo=szxga02-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Hogan Wang From: Hogan Wang via There's no way to cancel the current executing dump process, lead to the virtual machine manager daemon((e.g. libvirtd) cannot restore the dump job after daemon restart. Introduce dump guest memory job type, and add an optional 'job-id' argument for dump-guest-memory QMP to make use of jobs framework. Signed-off-by: Hogan Wang --- dump/dump-hmp-cmds.c | 12 ++++++++++-- dump/dump.c | 1 + qapi/dump.json | 6 +++++- qapi/job.json | 5 ++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c index e5053b04cd..ba28a5e631 100644 --- a/dump/dump-hmp-cmds.c +++ b/dump/dump-hmp-cmds.c @@ -24,9 +24,11 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) bool has_begin = qdict_haskey(qdict, "begin"); bool has_length = qdict_haskey(qdict, "length"); bool has_detach = qdict_haskey(qdict, "detach"); + bool has_job_id = qdict_haskey(qdict, "job-id"); int64_t begin = 0; int64_t length = 0; bool detach = false; + const char *job_id = NULL; enum DumpGuestMemoryFormat dump_format = DUMP_GUEST_MEMORY_FORMAT_ELF; char *prot; @@ -62,10 +64,16 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) detach = qdict_get_bool(qdict, "detach"); } + if (has_job_id) { + job_id = qdict_get_str(qdict, "job-id"); + } + prot = g_strconcat("file:", file, NULL); - qmp_dump_guest_memory(paging, prot, true, detach, has_begin, begin, - has_length, length, true, dump_format, &err); + qmp_dump_guest_memory(paging, prot, has_job_id, job_id, + true, detach, has_begin, begin, + has_length, length, true, dump_format, + &err); hmp_handle_error(mon, err); g_free(prot); } diff --git a/dump/dump.c b/dump/dump.c index a57c580b12..cec9be30b4 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1895,6 +1895,7 @@ DumpQueryResult *qmp_query_dump(Error **errp) } void qmp_dump_guest_memory(bool paging, const char *file, + bool has_job_id, const char *job_id, bool has_detach, bool detach, bool has_begin, int64_t begin, bool has_length, int64_t length, bool has_format, diff --git a/qapi/dump.json b/qapi/dump.json index 90859c5483..d162a9f028 100644 --- a/qapi/dump.json +++ b/qapi/dump.json @@ -59,6 +59,9 @@ # 2. fd: the protocol starts with "fd:", and the following string # is the fd's name. # +# @job-id: identifier for the newly-created memory dump job. To be compatible +# with legacy dump process, @job-id should omitted. (Since 7.2) +# # @detach: if true, QMP will return immediately rather than # waiting for the dump to finish. The user can track progress # using "query-dump". (since 2.6). @@ -88,7 +91,8 @@ # ## { 'command': 'dump-guest-memory', - 'data': { 'paging': 'bool', 'protocol': 'str', '*detach': 'bool', + 'data': { 'paging': 'bool', 'protocol': 'str', + '*job-id': 'str', '*detach': 'bool', '*begin': 'int', '*length': 'int', '*format': 'DumpGuestMemoryFormat'} } diff --git a/qapi/job.json b/qapi/job.json index d5f84e9615..e14d2290a5 100644 --- a/qapi/job.json +++ b/qapi/job.json @@ -28,11 +28,14 @@ # # @snapshot-delete: snapshot delete job type, see "snapshot-delete" (since 6.0) # +# @dump-guest-memory: dump guest memory job type, see "dump-guest-memory" (since 7.2) +# # Since: 1.7 ## { 'enum': 'JobType', 'data': ['commit', 'stream', 'mirror', 'backup', 'create', 'amend', - 'snapshot-load', 'snapshot-save', 'snapshot-delete'] } + 'snapshot-load', 'snapshot-save', 'snapshot-delete', + 'dump-guest-memory'] } ## # @JobStatus: -- 2.33.0