From nobody Fri Nov 18 18:26:38 2022 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 4NDQGk3n4dz4d7tT; Fri, 18 Nov 2022 18:26:38 +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 4NDQGk3Fczz4JCX; Fri, 18 Nov 2022 18:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795998; 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=ZFDFtmVnFOPnWS9avZJLeMJiX5N3IwNRfoh2BYSFzF4=; b=W1ZOpUYXRUvENbXtgugKZQ3l/bFQ1a74EAC/DECWyZl97O2hiXSjS74PmQM6UdMxheG96i qGn184KIHR6UaBdXgIGrKfD8LvdAkBZoacrYEGWoU/Jhr+mwAAULYueiuE1zu27hRRwgNX 8RVC416PwDPxC6udKNOqzL7YmmQqKa3KZSZ2VJoNa6njN+FI7YwJl9L/+OSsFV2s8NksF4 kG5WuACE2axgeQI/WVNKzMJuaTROR60S1N3JKrbieUslWRdbkgYO8mXphTsI/8U/GeaV3Y 6FW6OMu050e9GHkfacThR9PKl8yLpRDNxmLgrb6PzS2wdnw1z7pX6hMSwo5b8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795998; 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=ZFDFtmVnFOPnWS9avZJLeMJiX5N3IwNRfoh2BYSFzF4=; b=bW0NIIhKbvUtyERfn9G0ShqTj1erfJUA2ou9+0xQZhcm1E5wjcgWQD0r33j0gE+sXTJdLM 9ibToF820YGtIiDHkuxxwUbTqsc7CEJ0FX9/W7UlMXSoMAcc/BwWtFs3lEbeshAg0bdD8C q1x6l2GFc5vnNxpawZFuHevYg2goEqOUCEqZG/CHD0pdaylxCnrSby1Zsjz4zv7ilGXSAi Sg7IS+nS8f/VHf2E3LChO3DhDtj/U76XKjhzwiT2Nc4efmlO4xz0WGmluuv204exI/u1+N 9eK2ZDj7Lau1mJ8qD6L7hBRzdpX/JZML/jC2DenXce+5wUFUPfK+NO26eytqNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668795998; a=rsa-sha256; cv=none; b=vXUDtZt/Xe8cP4IMYjm0/2zkQxMANFB/rgdYDbET6MVWdfizEiikCEtDy/WlT78ygtRlNl zX1SaK8a3qg/rlUDZCVnuXOL07yuoKUO42ekhy1TJRDcsVaqXLOfbN1GUTNpaVjOmg6kg8 J5lEdTgTb2fN1tI4mdw6Y9lrXgEvErCi4GYhmrrUeh6YJIN67cxf6PyQlB9QtchGYpe3xH bbxU+9jZmqqQZVxPyJLlBN0QpRhr9+yxaqrjPjhjbDa2/hBN2dG+KyVokEfdwb7aBNSQuu IbLY8dBaCzunLF0iD/Dz3LRn22Ehbh54qIBds5eRqnvK0lBMNCoC7JXVXwje+A== 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 4NDQGk1nQBzGS5; Fri, 18 Nov 2022 18:26:38 +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 2AIIQcli030280; Fri, 18 Nov 2022 18:26:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIQcZl030279; Fri, 18 Nov 2022 18:26:38 GMT (envelope-from git) Date: Fri, 18 Nov 2022 18:26:38 GMT Message-Id: <202211181826.2AIIQcZl030279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0f435e647645 - main - vmm: Add _KERNEL guards for io headers shared with userspace. 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/main X-Git-Reftype: branch X-Git-Commit: 0f435e647645afc68076ff5b005f9366c44413eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f435e647645afc68076ff5b005f9366c44413eb commit 0f435e647645afc68076ff5b005f9366c44413eb Author: John Baldwin AuthorDate: 2022-11-18 18:01:51 +0000 Commit: John Baldwin CommitDate: 2022-11-18 18:25:36 +0000 vmm: Add _KERNEL guards for io headers shared with userspace. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37159 --- sys/amd64/vmm/io/vhpet.h | 3 +++ sys/amd64/vmm/io/vioapic.h | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/io/vhpet.h b/sys/amd64/vmm/io/vhpet.h index 113683c09b33..f22d0c3b38ac 100644 --- a/sys/amd64/vmm/io/vhpet.h +++ b/sys/amd64/vmm/io/vhpet.h @@ -35,6 +35,7 @@ #define VHPET_BASE 0xfed00000 #define VHPET_SIZE 1024 +#ifdef _KERNEL struct vm_snapshot_meta; struct vhpet *vhpet_init(struct vm *vm); @@ -49,4 +50,6 @@ int vhpet_snapshot(struct vhpet *vhpet, struct vm_snapshot_meta *meta); int vhpet_restore_time(struct vhpet *vhpet); #endif +#endif /* _KERNEL */ + #endif /* _VHPET_H_ */ diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h index 19dbffe3ec24..17d2c29b758f 100644 --- a/sys/amd64/vmm/io/vioapic.h +++ b/sys/amd64/vmm/io/vioapic.h @@ -32,11 +32,12 @@ #ifndef _VIOAPIC_H_ #define _VIOAPIC_H_ -struct vm_snapshot_meta; - #define VIOAPIC_BASE 0xFEC00000 #define VIOAPIC_SIZE 4096 +#ifdef _KERNEL +struct vm_snapshot_meta; + struct vioapic *vioapic_init(struct vm *vm); void vioapic_cleanup(struct vioapic *vioapic); @@ -56,4 +57,6 @@ int vioapic_snapshot(struct vioapic *vioapic, struct vm_snapshot_meta *meta); #endif -#endif +#endif /* _KERNEL */ + +#endif /* _VIOAPIC_H_ */