Module Name: src
Committed By: bouyer
Date: Wed Aug 31 12:53:27 UTC 2022
Modified Files:
src/sys/arch/xen/include: xenmem.h
src/sys/arch/xen/xen: xenmem.c
Log Message:
Remove XENPV support from xenmem; it's only used for !XENPV at this time.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/xen/include/xenmem.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/xen/xen/xenmem.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/include/xenmem.h
diff -u src/sys/arch/xen/include/xenmem.h:1.1 src/sys/arch/xen/include/xenmem.h:1.2
--- src/sys/arch/xen/include/xenmem.h:1.1 Wed Aug 31 12:51:56 2022
+++ src/sys/arch/xen/include/xenmem.h Wed Aug 31 12:53:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xenmem.h,v 1.1 2022/08/31 12:51:56 bouyer Exp $ */
+/* $NetBSD: xenmem.h,v 1.2 2022/08/31 12:53:27 bouyer Exp $ */
/*
* Copyright (c) 2022 Manuel Bouyer.
*
@@ -29,12 +29,6 @@
#ifndef _XEN_XENMEM_H_
#define _XEN_XENMEM_H_
#include "opt_xen.h"
-#ifdef XENPV
-extern paddr_t pmap_pa_start; /* PA of first physical page for this domain */
-extern paddr_t pmap_pa_end; /* PA of last physical page for this domain */
-
-void xenmem_pa_register(paddr_t, paddr_t);
-#endif /* XENPV */
paddr_t xenmem_alloc_pa(u_long, u_long, bool);
void xenmem_free_pa(paddr_t, u_long);
Index: src/sys/arch/xen/xen/xenmem.c
diff -u src/sys/arch/xen/xen/xenmem.c:1.1 src/sys/arch/xen/xen/xenmem.c:1.2
--- src/sys/arch/xen/xen/xenmem.c:1.1 Wed Aug 31 12:51:56 2022
+++ src/sys/arch/xen/xen/xenmem.c Wed Aug 31 12:53:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xenmem.c,v 1.1 2022/08/31 12:51:56 bouyer Exp $ */
+/* $NetBSD: xenmem.c,v 1.2 2022/08/31 12:53:27 bouyer Exp $ */
/*
* Copyright (c) 2022 Manuel Bouyer.
*
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenmem.c,v 1.1 2022/08/31 12:51:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenmem.c,v 1.2 2022/08/31 12:53:27 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,35 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: xenmem.c,v 1
* we reuse the iomem_ex
*/
-#if 0 /* def XENPV */
-extern paddr_t pmap_pa_start; /* PA of first physical page for this domain */
-extern paddr_t pmap_pa_end; /* PA of last physical page for this domain */
-
-static long xenmem_ex_storage[EXTENT_FIXED_STORAGE_SIZE(64) / sizeof(long)];
-struct extent *xenmem_ex;
-#define XENMEM_EX xenmem_ex
-#else /* !XENPV */
extern struct extent *iomem_ex;
#define XENMEM_EX iomem_ex
-#endif /* XENPV */
-
-#ifdef XENPV
-void
-xenmem_pa_register(paddr_t pa_start, paddr_t pa_end)
-{
- int error;
- uvm_page_physload(atop(pa_start), atop(pa_end),
- atop(pa_start), atop(pa_end), VM_FREELIST_DEFAULT);
- xenmem_ex = extent_create("xenmem", 0x0, MAXIOMEM,
- (void *)xenmem_ex_storage, sizeof(xenmem_ex_storage),
- EX_NOCOALESCE|EX_NOWAIT);
-
- error = extent_alloc_region(xenmem_ex, 0, pa_end, EX_NOWAIT);
- if (error)
- panic("xenmem_ex: can't reserve allocated RAM");
-
-}
-#endif /* XENPV */
paddr_t
xenmem_alloc_pa(u_long size, u_long align, bool waitok)
