From nobody Mon Jun 19 05:57:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QkzZY2RBrz4fCN0; Mon, 19 Jun 2023 05:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkzZY1SQPz4KCr; Mon, 19 Jun 2023 05:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154277; h=from:from: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; bh=mWylfvB3Wsi4NnqvyY61zxKqtW3Z78qLIoL9LZWEz74=; b=IopofepLLtVlyLO+H1KTAQhS1M+66UyXOwXMQpD9YtA+59INQFadCMI5EDqb33TDPALGb1 9N3WWYJSEaRYOshGbuP9gqQVds1GGQUOx8p+K9hKrqtokgylj0QrtLl3cLzvZfViCl/qyU RMirnNupz02tTZRiTgUfN4jOraVVd0L8zZezPOtfdEQSt5BRd4xVkKpiLCJkauJ9TRuUUt dbT/2r2Gp0I/w7ofbEspTTxwBviO5XCbaGhjdMH9KU9FHER/45EoCuij7C06q0scIeV+/C UdSFyIC5GgloHfJqMKSBBLP9bIxpftnYSMsfYSYV+qHl1kjkv2HLll8q3siw+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687154277; h=from:from: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; bh=mWylfvB3Wsi4NnqvyY61zxKqtW3Z78qLIoL9LZWEz74=; b=kK6lyGWUmUUO39bqbAznrqRuOLi6Pm6V0piDJpXg158CbzackAOmHX3TfCCtsDTJZIk4CG PF1GynAzNE6vBK8pqqpVKGAXus0FqUx7OMS5X+Bm5uKfTzUzdj2Wvf7lWNican/KsrO0wa 7qm0/iIC8DaqhH+aGD+Y1LAKloYmbKX0mGbSAFX7kAxT/nLPMd0H+KABq+prywkjkMSa7v T8EIGd7sUhCqs0mtQHjyd2X8Df3VTYiwTKYNxtgTEvNOMk74h7xhAo+S+ElbV1hMa0r5oo 2CSo/pvJqRC8gll9rNezSdSL7dXfWt/hswkJjmwZCxaacNV+VuOuZYPlQ8uOPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687154277; a=rsa-sha256; cv=none; b=iXRg4HoNqS4gbWWCmJ4mEyEEFn7mUcG5MTAGyScoVzesQuhqZNUNsZpOnY5agvrUsJfB2v D4wzT6QP1kCvqycqPVpQHWT3kam32gI0McAr4BIRdpLzSfhaIeNL/xvVxapU+aeX+KAOf7 P8YvC3J8ytl3DRTLcoWD9u2xhQbsrljvKwAVtL4U+uWTyfHumo2jCt/rQEWaXP2u+rfHYt WXqkJp+Zh5Igd8NV47x7TmEkOOGTR4bzFZrQ0VDQb6qht+S23Wfkom7zPCLSLNAwlBzZh9 FPJTw3LKjC20dVELvj9tDO1GJGTGtlTVe8Y6bpOQIz+y+ulZiMbTvUDeHvxFKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QkzZY06VQz15Xx; Mon, 19 Jun 2023 05:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J5vuXo025936; Mon, 19 Jun 2023 05:57:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J5vunN025935; Mon, 19 Jun 2023 05:57:56 GMT (envelope-from git) Date: Mon, 19 Jun 2023 05:57:56 GMT Message-Id: <202306190557.35J5vunN025935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 50aef9f62c1b - main - bhyve: rename 'structs' snapshot key with 'kern_structs' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50aef9f62c1be9e723169ef57920c3fca07bd2fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=50aef9f62c1be9e723169ef57920c3fca07bd2fb commit 50aef9f62c1be9e723169ef57920c3fca07bd2fb Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:25:15 +0000 Commit: Corvin Köhne CommitDate: 2023-06-19 05:50:36 +0000 bhyve: rename 'structs' snapshot key with 'kern_structs' Using key 'structs' is ambiguous. This section contains data related to the kernel. It should use a more informative naming. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40104 --- usr.sbin/bhyve/snapshot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index a9e172588870..7e635c13ef31 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -119,10 +119,10 @@ static sig_t old_winch_handler; #define SNAPSHOT_BUFFER_SIZE (20 * MB) -#define JSON_STRUCT_ARR_KEY "structs" +#define JSON_KERNEL_ARR_KEY "kern_structs" #define JSON_DEV_ARR_KEY "devices" #define JSON_BASIC_METADATA_KEY "basic metadata" -#define JSON_SNAPSHOT_REQ_KEY "snapshot_req" +#define JSON_SNAPSHOT_REQ_KEY "device" #define JSON_SIZE_KEY "size" #define JSON_FILE_OFFSET_KEY "file_offset" @@ -423,16 +423,16 @@ lookup_struct(enum snapshot_req struct_id, struct restore_state *rstate, ucl_object_iter_t it = NULL; int64_t snapshot_req, size, file_offset; - structs = ucl_object_lookup(rstate->meta_root_obj, JSON_STRUCT_ARR_KEY); + structs = ucl_object_lookup(rstate->meta_root_obj, JSON_KERNEL_ARR_KEY); if (structs == NULL) { fprintf(stderr, "Failed to find '%s' object.\n", - JSON_STRUCT_ARR_KEY); + JSON_KERNEL_ARR_KEY); return (NULL); } if (ucl_object_type(structs) != UCL_ARRAY) { fprintf(stderr, "Object '%s' is not an array.\n", - JSON_STRUCT_ARR_KEY); + JSON_KERNEL_ARR_KEY); return (NULL); } @@ -1059,7 +1059,7 @@ vm_snapshot_kern_struct(struct vmctx *ctx, int data_fd, xo_handle_t *xop, meta->dev_req); xo_emit_h(xop, "{:" JSON_SIZE_KEY "/%lu}\n", data_size); xo_emit_h(xop, "{:" JSON_FILE_OFFSET_KEY "/%lu}\n", *offset); - xo_close_instance_h(xop, JSON_STRUCT_ARR_KEY); + xo_close_instance_h(xop, JSON_KERNEL_ARR_KEY); *offset += data_size; @@ -1093,7 +1093,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) .op = VM_SNAPSHOT_SAVE, }; - xo_open_list_h(xop, JSON_STRUCT_ARR_KEY); + xo_open_list_h(xop, JSON_KERNEL_ARR_KEY); for (i = 0; i < nitems(snapshot_kern_structs); i++) { meta->dev_name = snapshot_kern_structs[i].struct_name; meta->dev_req = snapshot_kern_structs[i].req; @@ -1109,7 +1109,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) goto err_vm_snapshot_kern_data; } } - xo_close_list_h(xop, JSON_STRUCT_ARR_KEY); + xo_close_list_h(xop, JSON_KERNEL_ARR_KEY); err_vm_snapshot_kern_data: if (buffer != NULL)