Module Name: src
Committed By: jym
Date: Wed Mar 30 23:15:06 UTC 2011
Modified Files:
src/sys/arch/xen/include/amd64 [jym-xensuspend]: hypercalls.h
src/sys/arch/xen/include/i386 [jym-xensuspend]: hypercalls.h
src/sys/arch/xen/x86 [jym-xensuspend]: hypervisor_machdep.c x86_xpmap.c
src/sys/arch/xen/xen [jym-xensuspend]: if_xennet_xenbus.c xbd_xenbus.c
src/sys/arch/xen/xenbus [jym-xensuspend]: xenbus_probe.c
Log Message:
Sync with my commits in HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.5.4.3 -r1.5.4.4 src/sys/arch/xen/include/amd64/hypercalls.h
cvs rdiff -u -r1.8.4.3 -r1.8.4.4 src/sys/arch/xen/include/i386/hypercalls.h
cvs rdiff -u -r1.11.8.5 -r1.11.8.6 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.12.4.12 -r1.12.4.13 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.33.2.7 -r1.33.2.8 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.38.2.7 -r1.38.2.8 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.27.2.5 -r1.27.2.6 src/sys/arch/xen/xenbus/xenbus_probe.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/amd64/hypercalls.h
diff -u src/sys/arch/xen/include/amd64/hypercalls.h:1.5.4.3 src/sys/arch/xen/include/amd64/hypercalls.h:1.5.4.4
--- src/sys/arch/xen/include/amd64/hypercalls.h:1.5.4.3 Sun Nov 1 21:43:28 2009
+++ src/sys/arch/xen/include/amd64/hypercalls.h Wed Mar 30 23:15:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.5.4.3 2009/11/01 21:43:28 jym Exp $ */
+/* $NetBSD: hypercalls.h,v 1.5.4.4 2011/03/30 23:15:05 jym Exp $ */
/******************************************************************************
* hypercall.h
*
Index: src/sys/arch/xen/include/i386/hypercalls.h
diff -u src/sys/arch/xen/include/i386/hypercalls.h:1.8.4.3 src/sys/arch/xen/include/i386/hypercalls.h:1.8.4.4
--- src/sys/arch/xen/include/i386/hypercalls.h:1.8.4.3 Sun Nov 1 21:43:28 2009
+++ src/sys/arch/xen/include/i386/hypercalls.h Wed Mar 30 23:15:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.8.4.3 2009/11/01 21:43:28 jym Exp $ */
+/* $NetBSD: hypercalls.h,v 1.8.4.4 2011/03/30 23:15:05 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
Index: src/sys/arch/xen/x86/hypervisor_machdep.c
diff -u src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.5 src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.6
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.11.8.5 Tue Mar 29 20:43:01 2011
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Wed Mar 30 23:15:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.11.8.5 2011/03/29 20:43:01 jym Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.11.8.6 2011/03/30 23:15:05 jym Exp $ */
/*
*
@@ -54,7 +54,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.11.8.5 2011/03/29 20:43:01 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.11.8.6 2011/03/30 23:15:05 jym Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -394,11 +394,11 @@
* A L1 page contains the list of MFN we are looking for
*/
max_pfn = xen_start_info.nr_pages;
- fpp = PAGE_SIZE / sizeof(vaddr_t);
+ fpp = PAGE_SIZE / sizeof(xen_pfn_t);
/* we only need one L3 page */
l3_p2m_page = (vaddr_t *)uvm_km_alloc(kernel_map, PAGE_SIZE,
- PAGE_SIZE, UVM_KMF_WIRED | UVM_KMF_NOWAIT);
+ PAGE_SIZE, UVM_KMF_WIRED | UVM_KMF_NOWAIT);
if (l3_p2m_page == NULL)
panic("could not allocate memory for l3_p2m_page");
@@ -430,7 +430,7 @@
unsigned long max_pfn;
max_pfn = xen_start_info.nr_pages;
- fpp = PAGE_SIZE / sizeof(vaddr_t);
+ fpp = PAGE_SIZE / sizeof(xen_pfn_t);
for (i = 0; i < l2_p2m_page_size; i++) {
/*
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.12.4.12 src/sys/arch/xen/x86/x86_xpmap.c:1.12.4.13
--- src/sys/arch/xen/x86/x86_xpmap.c:1.12.4.12 Tue Mar 29 20:43:01 2011
+++ src/sys/arch/xen/x86/x86_xpmap.c Wed Mar 30 23:15:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.12.4.12 2011/03/29 20:43:01 jym Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.12.4.13 2011/03/30 23:15:05 jym Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <[email protected]>
@@ -69,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.12.4.12 2011/03/29 20:43:01 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.12.4.13 2011/03/30 23:15:05 jym Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.33.2.7 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.33.2.8
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.33.2.7 Mon Mar 28 23:04:56 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Wed Mar 30 23:15:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.33.2.7 2011/03/28 23:04:56 jym Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.33.2.8 2011/03/30 23:15:06 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.33.2.7 2011/03/28 23:04:56 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.33.2.8 2011/03/30 23:15:06 jym Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -1040,7 +1040,7 @@
}
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (__predict_false(m == NULL)) {
- aprint_error_ifnet(ifp, "rx no mbuf\n");
+ printf("%s: rx no mbuf\n", ifp->if_xname);
ifp->if_ierrors++;
xennet_rx_mbuf_free(NULL, (void *)va, PAGE_SIZE, req);
continue;
Index: src/sys/arch/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.38.2.7 src/sys/arch/xen/xen/xbd_xenbus.c:1.38.2.8
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.38.2.7 Sun Oct 24 22:48:23 2010
+++ src/sys/arch/xen/xen/xbd_xenbus.c Wed Mar 30 23:15:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.38.2.7 2010/10/24 22:48:23 jym Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.38.2.8 2011/03/30 23:15:06 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.38.2.7 2010/10/24 22:48:23 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.38.2.8 2011/03/30 23:15:06 jym Exp $");
#include "opt_xen.h"
#include "rnd.h"
@@ -811,7 +811,6 @@
blkif_request_t *req;
int notify;
-
DPRINTF(("xbdioctl(%d, %08lx, %p, %d, %p)\n",
dev, cmd, data, flag, l));
dksc = &sc->sc_dksc;
Index: src/sys/arch/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.27.2.5 src/sys/arch/xen/xenbus/xenbus_probe.c:1.27.2.6
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.27.2.5 Sun Oct 24 22:48:23 2010
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Wed Mar 30 23:15:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.27.2.5 2010/10/24 22:48:23 jym Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.27.2.6 2011/03/30 23:15:06 jym Exp $ */
/******************************************************************************
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.27.2.5 2010/10/24 22:48:23 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.27.2.6 2011/03/30 23:15:06 jym Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -69,21 +69,24 @@
static void xenbus_attach(device_t, device_t, void *);
static int xenbus_print(void *, const char *);
-static void xenbus_probe_init(void *);
-
-static struct xenbus_device *xenbus_lookup_device_path(const char *);
-
/* power management, for save/restore */
static bool xenbus_suspend(device_t, const pmf_qual_t *);
static bool xenbus_resume(device_t, const pmf_qual_t *);
/* routines gathering device information from XenStore */
static int read_otherend_details(struct xenbus_device *,
- const char *, const char *);
+ const char *, const char *);
static int read_backend_details (struct xenbus_device *);
static int read_frontend_details(struct xenbus_device *);
static void free_otherend_details(struct xenbus_device *);
+static int watch_otherend (struct xenbus_device *);
+static void free_otherend_watch(struct xenbus_device *);
+
+static void xenbus_probe_init(void *);
+
+static struct xenbus_device *xenbus_lookup_device_path(const char *);
+
CFATTACH_DECL_NEW(xenbus, 0, xenbus_match, xenbus_attach,
NULL, NULL);
@@ -240,7 +243,6 @@
dev->xbusd_otherend = NULL;
}
-
static void
free_otherend_watch(struct xenbus_device *dev)
{
@@ -299,18 +301,6 @@
xdev->xbusd_u.b.b_cookie : xdev->xbusd_u.f.f_dev, state);
}
-#ifdef unused
-static int
-talk_to_otherend(struct xenbus_device *dev)
-{
- free_otherend_watch(dev);
-
- return xenbus_watch_path2(dev, dev->xbusd_otherend, "state",
- &dev->xbusd_otherend_watch,
- otherend_changed);
-}
-#endif
-
static int
watch_otherend(struct xenbus_device *dev)
{
