Module Name: src
Committed By: martin
Date: Thu Dec 14 17:39:35 UTC 2023
Modified Files:
src/sys/arch/xen/x86 [netbsd-10]: xen_ipi.c
src/sys/dev/nvmm/x86 [netbsd-10]: nvmm_x86_vmx.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #494):
sys/arch/xen/x86/xen_ipi.c: revision 1.42
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.86
xen_ipi: valid_ipimask: Sprinkle __diagused to fix clang !DIAGNOSTIC build
nvmm_x86_vmx: vmx_vmptrst: Sprinkle __diagused to fix clang !DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.40.4.1 -r1.40.4.2 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.85 -r1.85.4.1 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.40.4.1 src/sys/arch/xen/x86/xen_ipi.c:1.40.4.2
--- src/sys/arch/xen/x86/xen_ipi.c:1.40.4.1 Thu Aug 10 10:23:54 2023
+++ src/sys/arch/xen/x86/xen_ipi.c Thu Dec 14 17:39:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.40.4.1 2023/08/10 10:23:54 sborrill Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.40.4.2 2023/12/14 17:39:35 martin Exp $ */
/*-
* Copyright (c) 2011, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
* Based on: x86/ipi.c
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.40.4.1 2023/08/10 10:23:54 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.40.4.2 2023/12/14 17:39:35 martin Exp $");
#include "opt_ddb.h"
@@ -149,7 +149,7 @@ xen_ipi_init(void)
hypervisor_unmask_event(evtchn);
}
-static inline bool /* helper */
+static inline bool __diagused
valid_ipimask(uint32_t ipimask)
{
uint32_t masks = XEN_IPI_GENERIC | XEN_IPI_HVCB | XEN_IPI_XCALL |
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.85 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.85.4.1
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.85 Tue Sep 13 20:10:04 2022
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Thu Dec 14 17:39:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.85 2022/09/13 20:10:04 riastradh Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.85.4.1 2023/12/14 17:39:35 martin Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.85 2022/09/13 20:10:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.85.4.1 2023/12/14 17:39:35 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@ vmx_vmwrite(uint64_t field, uint64_t val
);
}
-static inline paddr_t
+static inline paddr_t __diagused
vmx_vmptrst(void)
{
paddr_t pa;
