From nobody Thu Jan 26 18:54:15 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 4P2qcl5Cgnz3bPKh; Thu, 26 Jan 2023 18:54:15 +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 4P2qcl3m6Dz45DN; Thu, 26 Jan 2023 18:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759255; 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=HEXHAocyT6ARfogbiqTJ5muohEGw59nwPte+pB+73uQ=; b=JI451tNEauXtMwSvKvSCAk24mbwdJDhXtDzxFMRvOgGhVpAM5Fuk9FJI8yo8TUphn+4JTo lMxYbMxt/UWGUJ7r7gqU/yF4XA75iy7yKeq8UkgFGXDJtRdgVJ5ppUqgaIpjjDtLjKSIJG 2pbsusEALvtJ9h6qmt4WEnv/Zod7HJfgRlzudLhvrIGc1+dqe1iIO+kIVYsVoyIMFZ+vts KsqGIohfOUNXXQfT+XoJssNSklX9bXdWlv+8YMLVSD/kEKW+abQqeSLXWxcWrp5r38Pudm pJLSQwvCQ41x0S8ZzCPOb1U6ZtnI1VFIM5ajOabUXRfC66VNypkHf4JxlNhQvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674759255; 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=HEXHAocyT6ARfogbiqTJ5muohEGw59nwPte+pB+73uQ=; b=S4iXb9cNEiMdF1ZQrYtsqu00PDVFonEjW7/CZ+P3tCn8SB1ax7916xfGTu61Byfj+y//jN m7j10PDLm2zSq/fzFOkaqGlGLzARwK+BOAIc4s2F9p6sbVGdwaAWq52qRDdpm06LOZforz l0k+Zdx9/j3UNkgcGgoO5hmZgIKzWBdeZC3TyRusT2+HgbI2IFpjoO9r2kC/OJeqBtQn+f pHXioGmo8+Bx9xxChAo6blw9k+4Gu8Y242meCmjMyb11X2g3htJx6wxnbYGnDlDWhay0/k 0jhojO+jUZ8n/d6Qbrs9IWize7zmStln4Kw1d7VaUthBowFLBWZA5/PtSes6/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674759255; a=rsa-sha256; cv=none; b=wcTlk3O7njDHbZWTfjT2DapMA4NUFCBCE5sO7KBLxkjkIzDXs5NcB3UZjbz/JUEOVgb0oD 4CKhlqP6cuEsDj5Qn3uu3LgFWt/ujuWyfSfvgqWjSEJHE1XoFlXJU0DoWfvzyAUsJlaOct lfob5MdHrDXWFkfI0Fyrx70hj5QJuugvbEjyMzRhj4gX8NCulvi6/FEnDTLwWvF4rfFj4z mWSnpJdR4zf8VOmMjKEDusYYWGD6mp5vRsPoPyHvN98asbY/AMAY4eo/B5yTouk4bXHauT 9vciF0I9POPQm9E6nqean9Lc5SohxzAf0Mjibk4O51chSEDNR5scB2zIG/aPvw== 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 4P2qcl2p7NzgKs; Thu, 26 Jan 2023 18:54:15 +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 30QIsFgO033957; Thu, 26 Jan 2023 18:54:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QIsFGh033956; Thu, 26 Jan 2023 18:54:15 GMT (envelope-from git) Date: Thu, 26 Jan 2023 18:54:15 GMT Message-Id: <202301261854.30QIsFGh033956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4fc5b31e2f31 - stable/13 - libvmm: clean up vmmapi.h 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4fc5b31e2f31fcc30788c27532ca8dfff987d7bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4fc5b31e2f31fcc30788c27532ca8dfff987d7bc commit 4fc5b31e2f31fcc30788c27532ca8dfff987d7bc Author: Robert Wing AuthorDate: 2021-01-29 08:30:31 +0000 Commit: John Baldwin CommitDate: 2023-01-26 18:37:19 +0000 libvmm: clean up vmmapi.h struct checkpoint_op, enum checkpoint_opcodes, and MAX_SNAPSHOT_VMNAME are not vmm specific, move them out of the vmmapi header. They are used for the save/restore functionality that bhyve(8) provides and are better suited in usr.sbin/bhyve/snapshot.h Since bhyvectl(8) requires these, the Makefile for bhyvectl has been modified to include usr.sbin/bhyve/snapshot.h Reviewed by: kevans, grehan Differential Revision: https://reviews.freebsd.org/D28410 (cherry picked from commit 4f4065e0a220a57afa03420d4f8fa97dbcb5644c) --- lib/libvmmapi/vmmapi.h | 13 ------------- usr.sbin/bhyve/snapshot.h | 12 ++++++++++++ usr.sbin/bhyvectl/Makefile | 4 ++++ usr.sbin/bhyvectl/bhyvectl.c | 4 ++++ 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h index 064875f26818..586392a0ff29 100644 --- a/lib/libvmmapi/vmmapi.h +++ b/lib/libvmmapi/vmmapi.h @@ -260,19 +260,6 @@ void vm_setup_freebsd_gdt(uint64_t *gdtr); /* * Save and restore */ - -#define MAX_SNAPSHOT_VMNAME 100 - -enum checkpoint_opcodes { - START_CHECKPOINT = 0, - START_SUSPEND = 1, -}; - -struct checkpoint_op { - unsigned int op; - char snapshot_filename[MAX_SNAPSHOT_VMNAME]; -}; - int vm_snapshot_req(struct vm_snapshot_meta *meta); int vm_restore_time(struct vmctx *ctx); diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index f9ea3d573089..eba46c497ab2 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -42,6 +42,8 @@ #include #include +#define MAX_SNAPSHOT_VMNAME 100 + struct vmctx; struct restore_state { @@ -57,6 +59,16 @@ struct restore_state { ucl_object_t *meta_root_obj; }; +enum checkpoint_opcodes { + START_CHECKPOINT = 0, + START_SUSPEND = 1, +}; + +struct checkpoint_op { + unsigned int op; + char snapshot_filename[MAX_SNAPSHOT_VMNAME]; +}; + struct checkpoint_thread_info { struct vmctx *ctx; int socket_fd; diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile index 58eaf49dae3a..12fdb706cadb 100644 --- a/usr.sbin/bhyvectl/Makefile +++ b/usr.sbin/bhyvectl/Makefile @@ -18,6 +18,10 @@ CFLAGS+= -I${SRCTOP}/sys/amd64/vmm .if ${MK_BHYVE_SNAPSHOT} != "no" CFLAGS+= -DBHYVE_SNAPSHOT + +# usr.sbin/bhyve/snapshot.h needs ucl header +CFLAGS+= -I${SRCTOP}/contrib/libucl/include +CFLAGS+= -I${SRCTOP}/usr.sbin/bhyve .endif .include diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 1b882e1e0504..9613efdd0a88 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -63,6 +63,10 @@ __FBSDID("$FreeBSD$"); #include "amd/vmcb.h" #include "intel/vmcs.h" +#ifdef BHYVE_SNAPSHOT +#include "snapshot.h" +#endif + #define MB (1UL << 20) #define GB (1UL << 30)