[Xen-changelog] [xen-unstable] [LINUX] Transparent virtualization fixes.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID fc1c6dfd1807fc6cd3574074051c0172a8074a89
# Parent  59e05ddfd0ad63ebe31634d65905759f66dd9e54
[LINUX] Transparent virtualization fixes.
Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c  |    4 ++--
 linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c |    3 +++
 linux-2.6-xen-sparse/drivers/xen/core/evtchn.c      |    4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff -r 59e05ddfd0ad -r fc1c6dfd1807 
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Wed Jun 21 
10:56:20 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c        Wed Jun 21 
16:54:09 2006 +0100
@@ -468,10 +468,10 @@ static int __init balloon_init(void)
        unsigned long pfn;
        struct page *page;
 
-       IPRINTK("Initialising balloon driver.\n");
-
        if (!is_running_on_xen())
                return -ENODEV;
+
+       IPRINTK("Initialising balloon driver.\n");
 
        current_pages = min(xen_start_info->nr_pages, max_pfn);
        totalram_pages = current_pages;
diff -r 59e05ddfd0ad -r fc1c6dfd1807 
linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c       Wed Jun 21 
10:56:20 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c       Wed Jun 21 
16:54:09 2006 +0100
@@ -109,6 +109,9 @@ static int __init setup_vcpu_hotplug_eve
        static struct notifier_block xsn_cpu = {
                .notifier_call = setup_cpu_watcher };
 
+       if (!is_running_on_xen())
+               return -ENODEV;
+
        register_cpu_notifier(&hotplug_cpu);
        register_xenstore_notifier(&xsn_cpu);
 
diff -r 59e05ddfd0ad -r fc1c6dfd1807 
linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c    Wed Jun 21 10:56:20 
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c    Wed Jun 21 16:54:09 
2006 +0100
@@ -666,6 +666,10 @@ int irq_ignore_unhandled(unsigned int ir
 int irq_ignore_unhandled(unsigned int irq)
 {
        struct physdev_irq_status_query irq_status = { .irq = irq };
+
+       if (!is_running_on_xen())
+               return 0;
+
        (void)HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status);
        return !!(irq_status.flags & XENIRQSTAT_shared);
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog