From nobody Thu Jan 26 22:11:51 2023 X-Original-To: dev-commits-src-branches@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 4P2w0m1814z3c8XP; Thu, 26 Jan 2023 22:11:52 +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 4P2w0l6y78z3vpW; Thu, 26 Jan 2023 22:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771112; 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=282kGAD1CHAk2vpzAnes6jCXnhJUuoSKQPBe9FhNciY=; b=jnSQGWJYLMOQSsa8Rpfj3JHC1CcV5kIWttE7SHMNwjx+oChS6H4TT8/PzL/CP+fhW5kOJ1 wXYgda1ME33n79zzFw5o8RGX1yTZVlc0VhEAzvaHbv9yyB7uadCSwQLpSp8xwX2fNVcO9+ VfazV8MxCRFQyNAEmgTaAavOMZHOzv0+Vi3T+u+qRwaaxZTYprTHP16JIN61nR73jCkyYx YLoZlKeQC0HkNzTQ1wQQjwiq6pBGPoxiac9oJ8XdIo8+wC2h09TmJgZfYMMZzWGXNXlfYE 2Yf2LwyWJ867ogEFp0HkWxll7Aeu3ckwq+sm9G9Mm0OfbdrQgRKlv0Ozfnl/AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771112; 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=282kGAD1CHAk2vpzAnes6jCXnhJUuoSKQPBe9FhNciY=; b=CqK4iGvaez0A1dQHr/uui/P6atqfnczWhvUgmmLuhln/qGlV1IYho9SUBYuthUSN7GTBG5 oiZvrz9U1ltcuGYEoiHfXUORtUTBJXtU7NwjmfNZ59UsCGFMN+21jrfRBGwSCJ/Huu6pcg BiO0fW4H5kvHgTn+ACiyUe9TnsW2S78sv3KP8TRUOMjEq/jcYeuV2t39uxChG5RNkUtjTt EJN3Aw/c6Ik0i6JAq/AoIo2bHTO4ZbrMMZR4bnXnniH1++4vTb7Odx91TxoqsN+/0xCsP6 d+Xrk1vk6rjAQiKuv0o95IiLNJCrBtkH6SBVkKlYrSRJmdBzcoRuF48+l6WMuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771112; a=rsa-sha256; cv=none; b=h08jMPmC4WQtiC5FrWXaESn4sO9UEuz9mcq4klEkNNcIlkhTUITF//Kpnu6Zl3UQCoXwMo U4JB++MwaLNNagKfgFC/hblHK02Rpym+a7i9DHWMAAKpDqvvrECbiDOBF1m2oZs9FmZLxF NDuv6/m6drcRaDi8RMuhceWAs0WV8rX+yn/t7YCRLASR28Dp/MdP1dHoVtvlSys20AKpmf 9zkrP4XA/m+HAy50IywGJ6sFxC/MuggSH29+mgZ7lhcyVeRwlZ6+xs7tTN98MPz6Y1KKiW rfq6KeILyFSRR46/3GrU/mBzY+10tY3uDHLqVZGjHR1BQqQw8SkPYJQY0hPoig== 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 4P2w0l5K33zljc; Thu, 26 Jan 2023 22:11:51 +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 30QMBp1i021898; Thu, 26 Jan 2023 22:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMBp7S021897; Thu, 26 Jan 2023 22:11:51 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:11:51 GMT Message-Id: <202301262211.30QMBp7S021897@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: b558a25c103a - stable/13 - vmm: Add _KERNEL guards for io headers shared with userspace. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b558a25c103ad25ccc0bcc8e7964b0963505a685 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b558a25c103ad25ccc0bcc8e7964b0963505a685 commit b558a25c103ad25ccc0bcc8e7964b0963505a685 Author: John Baldwin AuthorDate: 2022-11-18 18:01:51 +0000 Commit: John Baldwin CommitDate: 2023-01-26 21:47:15 +0000 vmm: Add _KERNEL guards for io headers shared with userspace. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37159 (cherry picked from commit 0f435e647645afc68076ff5b005f9366c44413eb) --- 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_ */