From: Sheng Yang <sheng@linux.intel.com>
To: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Keir Fraser <keir.fraser@eu.citrix.com>,
Ian Pratt <Ian.Pratt@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
xen-devel <xen-devel@lists.xensource.com>,
linux-kernel@vger.kernel.org, Sheng Yang <sheng@linux.intel.com>
Subject: [PATCH][v9 3/6] xen: Make pv drivers only work with xen_pv_domain()
Date: Fri, 12 Mar 2010 10:57:24 +0800 [thread overview]
Message-ID: <1268362647-5317-4-git-send-email-sheng@linux.intel.com> (raw)
In-Reply-To: <1268362647-5317-1-git-send-email-sheng@linux.intel.com>
Otherwise they would still try to enable with HVM domain type.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
drivers/block/xen-blkfront.c | 2 +-
drivers/input/xen-kbdfront.c | 2 +-
drivers/net/xen-netfront.c | 2 +-
drivers/video/xen-fbfront.c | 2 +-
drivers/xen/grant-table.c | 2 +-
drivers/xen/xenbus/xenbus_probe.c | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index b8578bb..f2f4d4e 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1067,7 +1067,7 @@ static struct xenbus_driver blkfront = {
static int __init xlblk_init(void)
{
- if (!xen_domain())
+ if (!xen_pv_domain())
return -ENODEV;
if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index b115726..8ec2201 100644
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -335,7 +335,7 @@ static struct xenbus_driver xenkbd_driver = {
static int __init xenkbd_init(void)
{
- if (!xen_domain())
+ if (!xen_pv_domain())
return -ENODEV;
/* Nothing to do if running in dom0. */
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index baa051d..6132286 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1803,7 +1803,7 @@ static struct xenbus_driver netfront_driver = {
static int __init netif_init(void)
{
- if (!xen_domain())
+ if (!xen_pv_domain())
return -ENODEV;
if (xen_initial_domain())
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 54cd916..450f958 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -680,7 +680,7 @@ static struct xenbus_driver xenfb_driver = {
static int __init xenfb_init(void)
{
- if (!xen_domain())
+ if (!xen_pv_domain())
return -ENODEV;
/* Nothing to do if running in dom0. */
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 7d8f531..f6d9b8c 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -509,7 +509,7 @@ static int __devinit gnttab_init(void)
unsigned int max_nr_glist_frames, nr_glist_frames;
unsigned int nr_init_grefs;
- if (!xen_domain())
+ if (!xen_pv_domain())
return -ENODEV;
nr_grant_frames = 1;
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index d42e25d..bce893e 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -784,7 +784,7 @@ static int __init xenbus_probe_init(void)
DPRINTK("");
err = -ENODEV;
- if (!xen_domain())
+ if (!xen_pv_domain())
goto out_error;
/* Register ourselves with the kernel bus subsystem */
@@ -915,7 +915,7 @@ static void wait_for_devices(struct xenbus_driver *xendrv)
unsigned long timeout = jiffies + 10*HZ;
struct device_driver *drv = xendrv ? &xendrv->driver : NULL;
- if (!ready_to_wait_for_devices || !xen_domain())
+ if (!ready_to_wait_for_devices || !xen_pv_domain())
return;
while (exists_disconnected_device(drv)) {
--
1.7.0.1
next prev parent reply other threads:[~2010-03-12 2:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-12 2:57 [PATCH][v9 0/6] PV extension of HVM (Hybrid) for Xen Sheng Yang
2010-03-12 2:57 ` [PATCH][v9 1/6] xen: add support for hvm_op Sheng Yang
2010-03-12 2:57 ` [PATCH][v9 2/6] xen: Import cpuid.h from Xen Sheng Yang
2010-03-12 2:57 ` Sheng Yang [this message]
2010-03-12 2:57 ` [PATCH][v9 4/6] xen/hvm: Xen PV extension of HVM initialization Sheng Yang
2010-03-12 20:35 ` [Xen-devel] " Jeremy Fitzhardinge
2010-03-15 1:45 ` Sheng Yang
2010-03-15 12:04 ` Stefano Stabellini
2010-03-15 22:59 ` Jeremy Fitzhardinge
2010-03-16 1:51 ` Sheng Yang
2010-03-16 17:12 ` Jeremy Fitzhardinge
2010-03-16 17:20 ` Ian Campbell
2010-03-16 17:29 ` Jeremy Fitzhardinge
2010-03-12 2:57 ` [PATCH][v9 5/6] x86/xen: The entrance for PV extension of HVM Sheng Yang
2010-03-12 2:57 ` [PATCH][v9 6/6] xen: Enable PV clocksource for HVM Sheng Yang
2010-03-12 20:37 ` Jeremy Fitzhardinge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268362647-5317-4-git-send-email-sheng@linux.intel.com \
--to=sheng@linux.intel.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Pratt@eu.citrix.com \
--cc=jeremy@goop.org \
--cc=keir.fraser@eu.citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).