From nobody Fri Aug 18 07:18:48 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 4RRtX84dbyz4qpdt; Fri, 18 Aug 2023 07:18:48 +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 4RRtX83Tvfz4f5q; Fri, 18 Aug 2023 07:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343128; 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=62SqdEQAmQCyO4Ho27ykRNwuM78gUqEyMG04uFyS12Y=; b=Kntpl98EZ0ULLw9bbU/sx6i4iq2teXzeH4wj2eFFtqmB1btm3N+veJzpI7vgWg71nU3vcw Ws0cw4G4jrMQVEk5eC2yeqNwl9NMlWv5gLpBiJIrxTcW9INyoRWIg+ZoMT8z7E1l9Wa4r8 iwmeDcofnCBtXkjKUjcwpZ4zPTfBSE4tu/nA12X9vbSOeIjTmwZnsd9Ej4kHVEHwgIQg4C rEibgkPY2cngGztHYZk3hfnIg/2FsgDuBbUN3dt3FDMur52c61NPvxtwgrff1noPYSMYkb gA3IWUVf1XhVleh9LmigIwZF+ddV6I6+HZ07o3Y3+IIEd16yFacLj8j6KjyyYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343128; 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=62SqdEQAmQCyO4Ho27ykRNwuM78gUqEyMG04uFyS12Y=; b=c0JIXe9+Q2H/BMIxMZ2W/QQ6pQQcZ4nnc7w47Ba6Bj+mWsZYLI9nhKp+wLYTu43nrb5WxJ rOz9xW0rkzuxumDbOMqnOoEj6QlBRLq6GL+r84QRj9AbK/fz333fQIkgt2lfV6GobhyLYQ o1bp677kAb+rmKHW5xOK3aNa4VfeKhOKXOfjRhP6CYZpaTxVvhIgzNJQOWi8j9YTm/C2sm KsbknD4v6mdw7kRB13N6s3/dy3E3Qk9Q7GMYspmvHkw1cyvoMMn3U3i/f9cO2aKKEF84UX Biwhh0+BXcj/SqWmKHsr6axazwHBLIVRggiWei2iCl+w3eJBHviVsyisFxwq6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343128; a=rsa-sha256; cv=none; b=MMuBcdtmPBqmcNQqN/uaFXE8gu65spEKy25RauyH4mJrSLzvbkwPJ8d72Zy3eMM2ESZP27 JNpLU1YFKYtU97Kl6mgmN/gTP7E1/k2QJSQKyB5KKPtsuRewuJUk5udZQoNra1K6AaeVNj BFOSIgKm20OsoH3SytMd6QWO0SCbjqdEYTXXdMOfLyF04N0JmkjZ3aw4tqrJihPqUXCgF6 A9sz11Oh5DY8u6gsQ2dm8p8QVVBwu2rC++y2+0WfZsaMp5+qCCpRpfBeYbKkXEccPPg0U7 5f63EDHPvk3Oe90Xg3y/IhhB9L+4HFoL0+LQbxcn0NLgcKbNB9NZWIyyfMSC2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRtX82bmqz16gy; Fri, 18 Aug 2023 07:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7ImF1017710; Fri, 18 Aug 2023 07:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7ImDx017707; Fri, 18 Aug 2023 07:18:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:48 GMT Message-Id: <202308180718.37I7ImDx017707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 5a07451f796f - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a07451f796f9f619ee8c2da9aaa314c5b570992 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=5a07451f796f9f619ee8c2da9aaa314c5b570992 commit 5a07451f796f9f619ee8c2da9aaa314c5b570992 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:25:15 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:26 +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 (cherry picked from commit 50aef9f62c1be9e723169ef57920c3fca07bd2fb) --- 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 451839944bd6..9cd1ce34eeea 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -118,10 +118,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" @@ -422,16 +422,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(int data_fd, xo_handle_t *xop, const char *array_key, 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; @@ -1095,7 +1095,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; @@ -1111,7 +1111,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)