From nobody Mon Aug 26 18:58:34 2024 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 4Wt0Lz0kZ9z5TR9X; Mon, 26 Aug 2024 18:58:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wt0Ly5jTwz4FfY; Mon, 26 Aug 2024 18:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724698714; 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=dsnhcOjM6SHp14UvjKdEBQc/MYgq+J7Ihnbcsa6L7jw=; b=AnfAvrGAnR67C3Bmm5Wvkaf5xYs7hkhSHavXb8B6jB2BxzdvkLKOy9TakkSQkGedmQ6OBX v9b0w0kruTFJzSycbPofnw0RBJ0qzcmwKvrV8oMPFiHGHJ36QBPIF3kYGAmA8UtskrxUk0 w82tAxN08J82X1yOgAtfA38ccup50qko10ygQsw8jNtEqfKLQT1DIzPxB7lJoVVv1EucvZ CDLinCswR5BXNW5wdM68mzhHtB7iydftzuCz9sCMxIUOiig/8uYWya9swHB68rUztJgwgu X2mNgmD9ZywLbC0rpIAqxvzbTV+gytAks1Kn2kGGeFwZ26yfv18+ZjNbgq0jNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724698714; a=rsa-sha256; cv=none; b=Te62IJb3eI3xJaFHiTufhsj3BFuEqIByVx/xiHvUbLUipS8n4R9aKtsS89nWxw0/zqCpic hYF7Y9sCImLY8zztI5EdphAEGxfgMqAX3YZ2zyKyN7yJtm169M4keE+pamUuMQRcAOSakG TK19po+7vqEOUR7JJ1Jrr49BOg8KwSETkKi2qXUfkuztovkBJbFIk04qpaN1/RQa99KuIw 1yyKm471CT81K1amk/lC04hN73eIVpkObpNXIwL++vOOVn7PZkFbM61GqA1NJ0lBVmDpqR fKEJnqaRJUufp/fD4EW8gu4odJnvOwI8jiNyMKIyoelsFmdXL58EQZz8XCQ1CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724698714; 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=dsnhcOjM6SHp14UvjKdEBQc/MYgq+J7Ihnbcsa6L7jw=; b=TDfOqi+tWOxI9kGi/2a2kP7u1KYf6M8LD7icLFsxnszz4XIFMLiYQpKOviGMAw5PmAOlbR 0ZXcE25xcZVyzeLMIBsZspDwOM1bHVibtJk7QblaxBvkEtrszpKxkSLzzaN0bBx2S+AFQt JkACCe3prLqAVONi76TuXCPdpnLHFLV4FCIADQnSjWN/dZwb9neoECo6cwPRpLeMF08nca m1BZ2PbIOPxlOidPYKAwN4sCIrRrpoRO7KQn/MP1PpXBO0j8Tg4gz6EwjA9RoahlHmK1We meKNcx/MfzGbJ2Yg8AZ3N25yUlPwPLA6krzoXZN9i4obKvpzDzGwOsWzLPUU6g== 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 4Wt0Ly5KlLzJZ7; Mon, 26 Aug 2024 18:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47QIwYWd027741; Mon, 26 Aug 2024 18:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47QIwYsq027738; Mon, 26 Aug 2024 18:58:34 GMT (envelope-from git) Date: Mon, 26 Aug 2024 18:58:34 GMT Message-Id: <202408261858.47QIwYsq027738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e12b6aaf0d51 - main - vmm: Move compat ioctl definitions to vmm_dev.c 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e12b6aaf0d515dede86001c544024e791a968707 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e12b6aaf0d515dede86001c544024e791a968707 commit e12b6aaf0d515dede86001c544024e791a968707 Author: Mark Johnston AuthorDate: 2024-08-26 18:42:13 +0000 Commit: Mark Johnston CommitDate: 2024-08-26 18:42:13 +0000 vmm: Move compat ioctl definitions to vmm_dev.c There is no reason to keep them in vmm_dev.h. No functional change intended. Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D46432 --- sys/amd64/include/vmm_dev.h | 11 ----------- sys/dev/vmm/vmm_dev.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h index a007ce5515a5..5f347e46b9c4 100644 --- a/sys/amd64/include/vmm_dev.h +++ b/sys/amd64/include/vmm_dev.h @@ -54,13 +54,6 @@ struct vm_memseg { char name[VM_MAX_SUFFIXLEN + 1]; }; -struct vm_memseg_fbsd12 { - int segid; - size_t len; - char name[64]; -}; -_Static_assert(sizeof(struct vm_memseg_fbsd12) == 80, "COMPAT_FREEBSD12 ABI"); - struct vm_register { int cpuid; int regnum; /* enum vm_reg_name */ @@ -349,12 +342,8 @@ enum { _IOW('v', IOCNUM_SUSPEND, struct vm_suspend) #define VM_REINIT \ _IO('v', IOCNUM_REINIT) -#define VM_ALLOC_MEMSEG_FBSD12 \ - _IOW('v', IOCNUM_ALLOC_MEMSEG, struct vm_memseg_fbsd12) #define VM_ALLOC_MEMSEG \ _IOW('v', IOCNUM_ALLOC_MEMSEG, struct vm_memseg) -#define VM_GET_MEMSEG_FBSD12 \ - _IOWR('v', IOCNUM_GET_MEMSEG, struct vm_memseg_fbsd12) #define VM_GET_MEMSEG \ _IOWR('v', IOCNUM_GET_MEMSEG, struct vm_memseg) #define VM_MMAP_MEMSEG \ diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 554583358168..db3e2c992f3b 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -28,6 +28,20 @@ #include #include +#if defined(__amd64__) && defined(COMPAT_FREEBSD12) +struct vm_memseg_fbsd12 { + int segid; + size_t len; + char name[64]; +}; +_Static_assert(sizeof(struct vm_memseg_fbsd12) == 80, "COMPAT_FREEBSD12 ABI"); + +#define VM_ALLOC_MEMSEG_FBSD12 \ + _IOW('v', IOCNUM_ALLOC_MEMSEG, struct vm_memseg_fbsd12) +#define VM_GET_MEMSEG_FBSD12 \ + _IOWR('v', IOCNUM_GET_MEMSEG, struct vm_memseg_fbsd12) +#endif + static int devmem_create_cdev(const char *vmname, int id, char *devmem); struct devmem_softc {