svn commit: r286372 - in head/sys: amd64/include/xen dev/xen/balloon dev/xen/blkfront dev/xen/control dev/xen/netback dev/xen/netfront dev/xen/pcifront i386/include/xen x86/xen
John Baldwin
jhb at FreeBSD.org
Thu Aug 6 17:07:24 UTC 2015
Author: jhb
Date: Thu Aug 6 17:07:21 2015
New Revision: 286372
URL: https://svnweb.freebsd.org/changeset/base/286372
Log:
Remove some more vestiges of the Xen PV domu support. Specifically,
use vtophys() directly instead of vtomach() and retire the no-longer-used
headers <machine/xenfunc.h> and <machine/xenvar.h>.
Reported by: bde (stale bits in <machine/xenfunc.h>)
Reviewed by: royger (earlier version)
Differential Revision: https://reviews.freebsd.org/D3266
Deleted:
head/sys/amd64/include/xen/xenfunc.h
head/sys/amd64/include/xen/xenvar.h
head/sys/i386/include/xen/xenfunc.h
head/sys/i386/include/xen/xenvar.h
Modified:
head/sys/dev/xen/balloon/balloon.c
head/sys/dev/xen/blkfront/blkfront.c
head/sys/dev/xen/control/control.c
head/sys/dev/xen/netback/netback.c
head/sys/dev/xen/netfront/netfront.c
head/sys/dev/xen/pcifront/pcifront.c
head/sys/x86/xen/xen_intr.c
Modified: head/sys/dev/xen/balloon/balloon.c
==============================================================================
--- head/sys/dev/xen/balloon/balloon.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/dev/xen/balloon/balloon.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$");
#include <xen/features.h>
#include <xen/xenstore/xenstorevar.h>
-#include <machine/xen/xenvar.h>
-
static MALLOC_DEFINE(M_BALLOON, "Balloon", "Xen Balloon Driver");
/* Convert from KB (as fetched from xenstore) to number of PAGES */
Modified: head/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- head/sys/dev/xen/blkfront/blkfront.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/dev/xen/blkfront/blkfront.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
#include <xen/xenbus/xenbusvar.h>
#include <machine/_inttypes.h>
-#include <machine/xen/xenvar.h>
#include <geom/geom_disk.h>
@@ -762,7 +761,7 @@ xbd_alloc_ring(struct xbd_softc *sc)
i++, sring_page_addr += PAGE_SIZE) {
error = xenbus_grant_ring(sc->xbd_dev,
- (vtomach(sring_page_addr) >> PAGE_SHIFT),
+ (vtophys(sring_page_addr) >> PAGE_SHIFT),
&sc->xbd_ring_ref[i]);
if (error) {
xenbus_dev_fatal(sc->xbd_dev, error,
@@ -1305,7 +1304,7 @@ xbd_connect(struct xbd_softc *sc)
for (j = 0; j < sc->xbd_max_request_indirectpages; j++) {
if (gnttab_grant_foreign_access(
xenbus_get_otherend_id(sc->xbd_dev),
- (vtomach(indirectpages) >> PAGE_SHIFT) + j,
+ (vtophys(indirectpages) >> PAGE_SHIFT) + j,
1 /* grant read-only access */,
&cm->cm_indirectionrefs[j]))
break;
Modified: head/sys/dev/xen/control/control.c
==============================================================================
--- head/sys/dev/xen/control/control.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/dev/xen/control/control.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -145,9 +145,6 @@ __FBSDID("$FreeBSD$");
#include <xen/xenbus/xenbusvar.h>
-#include <machine/xen/xenvar.h>
-#include <machine/xen/xenfunc.h>
-
/*--------------------------- Forward Declarations --------------------------*/
/** Function signature for shutdown event handlers. */
typedef void (xctrl_shutdown_handler_t)(void);
Modified: head/sys/dev/xen/netback/netback.c
==============================================================================
--- head/sys/dev/xen/netback/netback.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/dev/xen/netback/netback.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -87,8 +87,6 @@ __FBSDID("$FreeBSD$");
#include <xen/interface/io/netif.h>
#include <xen/xenbus/xenbusvar.h>
-#include <machine/xen/xenvar.h>
-
/*--------------------------- Compile-time Tunables --------------------------*/
/*---------------------------------- Macros ----------------------------------*/
@@ -132,7 +130,7 @@ static MALLOC_DEFINE(M_XENNETBACK, "xnb"
req < rsp ? req : rsp; \
})
-#define virt_to_mfn(x) (vtomach(x) >> PAGE_SHIFT)
+#define virt_to_mfn(x) (vtophys(x) >> PAGE_SHIFT)
#define virt_to_offset(x) ((x) & (PAGE_SIZE - 1))
/**
Modified: head/sys/dev/xen/netfront/netfront.c
==============================================================================
--- head/sys/dev/xen/netfront/netfront.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/dev/xen/netfront/netfront.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -86,8 +86,6 @@ __FBSDID("$FreeBSD$");
#include <xen/interface/io/netif.h>
#include <xen/xenbus/xenbusvar.h>
-#include <machine/xen/xenvar.h>
-
#include "xenbus_if.h"
/* Features supported by all backends. TSO and LRO can be negotiated */
@@ -190,7 +188,7 @@ static int xennet_get_responses(struct n
struct netfront_rx_info *rinfo, RING_IDX rp, RING_IDX *cons,
struct mbuf **list, int *pages_flipped_p);
-#define virt_to_mfn(x) (vtomach(x) >> PAGE_SHIFT)
+#define virt_to_mfn(x) (vtophys(x) >> PAGE_SHIFT)
#define INVALID_P2M_ENTRY (~0UL)
@@ -901,7 +899,7 @@ refill:
req->gref = ref;
sc->rx_pfn_array[i] =
- vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT;
+ vtophys(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT;
}
KASSERT(i, ("no mbufs processed")); /* should have returned earlier */
Modified: head/sys/dev/xen/pcifront/pcifront.c
==============================================================================
--- head/sys/dev/xen/pcifront/pcifront.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/dev/xen/pcifront/pcifront.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$");
#define INVALID_GRANT_REF (0)
#define INVALID_EVTCHN (-1)
-#define virt_to_mfn(x) (vtomach(x) >> PAGE_SHIFT)
+#define virt_to_mfn(x) (vtophys(x) >> PAGE_SHIFT)
struct pcifront_device {
STAILQ_ENTRY(pcifront_device) next;
Modified: head/sys/x86/xen/xen_intr.c
==============================================================================
--- head/sys/x86/xen/xen_intr.c Thu Aug 6 16:50:37 2015 (r286371)
+++ head/sys/x86/xen/xen_intr.c Thu Aug 6 17:07:21 2015 (r286372)
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <machine/xen/synch_bitops.h>
#include <machine/xen/xen-os.h>
-#include <machine/xen/xenvar.h>
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
More information about the svn-src-all
mailing list