WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Merge

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1173440749 0
# Node ID 101a1ccfc3f7c95d25188d058e653bbd895a1c3a
# Parent  b46a92ba0b614647debe57e53efc1a023e85bb74
# Parent  8af1a8250c137f3da4cc9cb4df4069ee046e20a5
Merge
---
 buildconfigs/linux-defconfig_xen0_ia64                           |    2 
 buildconfigs/linux-defconfig_xen0_x86_32                         |    2 
 buildconfigs/linux-defconfig_xen0_x86_64                         |    2 
 buildconfigs/linux-defconfig_xenU_ia64                           |    2 
 buildconfigs/linux-defconfig_xenU_x86_32                         |    2 
 buildconfigs/linux-defconfig_xenU_x86_64                         |    2 
 buildconfigs/linux-defconfig_xen_ia64                            |    2 
 buildconfigs/linux-defconfig_xen_x86_32                          |    2 
 buildconfigs/linux-defconfig_xen_x86_64                          |    2 
 linux-2.6-xen-sparse/arch/i386/kernel/cpu/mtrr/main-xen.c        |   24 
+++++-----
 linux-2.6-xen-sparse/arch/i386/kernel/io_apic-xen.c              |    4 -
 linux-2.6-xen-sparse/arch/i386/kernel/ioport-xen.c               |    2 
 linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c            |    6 +-
 linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c              |    3 -
 linux-2.6-xen-sparse/arch/i386/kernel/quirks-xen.c               |    6 +-
 linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c                 |   12 ++---
 linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c                   |    4 -
 linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c                  |    2 
 linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c                   |    2 
 linux-2.6-xen-sparse/arch/ia64/xen/xcom_privcmd.c                |   24 
+++++-----
 linux-2.6-xen-sparse/arch/x86_64/kernel/ioport-xen.c             |    2 
 linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c            |    5 +-
 linux-2.6-xen-sparse/drivers/xen/Kconfig                         |    2 
 linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c           |    1 
 linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c               |    1 
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h   |   10 ++--
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h  |    2 
 linux-2.6-xen-sparse/include/asm-ia64/hypercall.h                |    6 +-
 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h               |    2 
 linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/hypercall.h |   10 ++--
 30 files changed, 74 insertions(+), 74 deletions(-)

diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64    Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen0_ia64    Fri Mar 09 11:45:49 2007 +0000
@@ -1619,7 +1619,7 @@ CONFIG_XEN_BALLOON=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_REBOOT=y
 # CONFIG_XEN_SMPBOOT is not set
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xen0_x86_32
--- a/buildconfigs/linux-defconfig_xen0_x86_32  Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen0_x86_32  Fri Mar 09 11:45:49 2007 +0000
@@ -1384,7 +1384,7 @@ CONFIG_CRYPTO_CRC32C=m
 #
 # CONFIG_CRYPTO_DEV_PADLOCK is not set
 CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xen0_x86_64
--- a/buildconfigs/linux-defconfig_xen0_x86_64  Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen0_x86_64  Fri Mar 09 11:45:49 2007 +0000
@@ -1334,7 +1334,7 @@ CONFIG_CRYPTO_CRC32C=m
 # Hardware crypto devices
 #
 CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64    Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xenU_ia64    Fri Mar 09 11:45:49 2007 +0000
@@ -1471,7 +1471,7 @@ CONFIG_XEN_BALLOON=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_REBOOT=y
 # CONFIG_XEN_SMPBOOT is not set
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xenU_x86_32
--- a/buildconfigs/linux-defconfig_xenU_x86_32  Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xenU_x86_32  Fri Mar 09 11:45:49 2007 +0000
@@ -904,7 +904,7 @@ CONFIG_CRYPTO_CRC32C=m
 #
 # CONFIG_CRYPTO_DEV_PADLOCK is not set
 CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xenU_x86_64
--- a/buildconfigs/linux-defconfig_xenU_x86_64  Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xenU_x86_64  Fri Mar 09 11:45:49 2007 +0000
@@ -1200,7 +1200,7 @@ CONFIG_CRYPTO_CRC32C=m
 # Hardware crypto devices
 #
 CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xen_ia64
--- a/buildconfigs/linux-defconfig_xen_ia64     Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen_ia64     Fri Mar 09 11:45:49 2007 +0000
@@ -1619,7 +1619,7 @@ CONFIG_XEN_BALLOON=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_REBOOT=y
 # CONFIG_XEN_SMPBOOT is not set
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xen_x86_32
--- a/buildconfigs/linux-defconfig_xen_x86_32   Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen_x86_32   Fri Mar 09 11:45:49 2007 +0000
@@ -3242,7 +3242,7 @@ CONFIG_CRYPTO_TEST=m
 #
 # CONFIG_CRYPTO_DEV_PADLOCK is not set
 CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 buildconfigs/linux-defconfig_xen_x86_64
--- a/buildconfigs/linux-defconfig_xen_x86_64   Fri Mar 09 11:45:19 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen_x86_64   Fri Mar 09 11:45:49 2007 +0000
@@ -3072,7 +3072,7 @@ CONFIG_CRYPTO_TEST=m
 # Hardware crypto devices
 #
 CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030203
+CONFIG_XEN_INTERFACE_VERSION=0x00030205
 
 #
 # XEN
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/cpu/mtrr/main-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/cpu/mtrr/main-xen.c Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/cpu/mtrr/main-xen.c Fri Mar 09 
11:45:49 2007 +0000
@@ -14,11 +14,11 @@ void generic_get_mtrr(unsigned int reg, 
 void generic_get_mtrr(unsigned int reg, unsigned long *base,
                      unsigned int *size, mtrr_type * type)
 {
-       dom0_op_t op;
+       struct xen_platform_op op;
 
-       op.cmd = DOM0_READ_MEMTYPE;
+       op.cmd = XENPF_read_memtype;
        op.u.read_memtype.reg = reg;
-       (void)HYPERVISOR_dom0_op(&op);
+       (void)HYPERVISOR_platform_op(&op);
 
        *size = op.u.read_memtype.nr_mfns;
        *base = op.u.read_memtype.mfn;
@@ -36,12 +36,12 @@ unsigned int *usage_table;
 
 static void __init set_num_var_ranges(void)
 {
-       dom0_op_t op;
+       struct xen_platform_op op;
 
        for (num_var_ranges = 0; ; num_var_ranges++) {
-               op.cmd = DOM0_READ_MEMTYPE;
+               op.cmd = XENPF_read_memtype;
                op.u.read_memtype.reg = num_var_ranges;
-               if (HYPERVISOR_dom0_op(&op) != 0)
+               if (HYPERVISOR_platform_op(&op) != 0)
                        break;
        }
 }
@@ -64,15 +64,15 @@ int mtrr_add_page(unsigned long base, un
                  unsigned int type, char increment)
 {
        int error;
-       dom0_op_t op;
+       struct xen_platform_op op;
 
        mutex_lock(&mtrr_mutex);
 
-       op.cmd = DOM0_ADD_MEMTYPE;
+       op.cmd = XENPF_add_memtype;
        op.u.add_memtype.mfn     = base;
        op.u.add_memtype.nr_mfns = size;
        op.u.add_memtype.type    = type;
-       error = HYPERVISOR_dom0_op(&op);
+       error = HYPERVISOR_platform_op(&op);
        if (error) {
                mutex_unlock(&mtrr_mutex);
                BUG_ON(error > 0);
@@ -117,7 +117,7 @@ int mtrr_del_page(int reg, unsigned long
        unsigned long lbase;
        unsigned int lsize;
        int error = -EINVAL;
-       dom0_op_t op;
+       struct xen_platform_op op;
 
        mutex_lock(&mtrr_mutex);
 
@@ -141,10 +141,10 @@ int mtrr_del_page(int reg, unsigned long
                goto out;
        }
        if (--usage_table[reg] < 1) {
-               op.cmd = DOM0_DEL_MEMTYPE;
+               op.cmd = XENPF_del_memtype;
                op.u.del_memtype.handle = 0;
                op.u.del_memtype.reg    = reg;
-               error = HYPERVISOR_dom0_op(&op);
+               error = HYPERVISOR_platform_op(&op);
                if (error) {
                        BUG_ON(error > 0);
                        goto out;
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/io_apic-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/io_apic-xen.c       Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/io_apic-xen.c       Fri Mar 09 
11:45:49 2007 +0000
@@ -2510,10 +2510,10 @@ static int __init io_apic_bug_finalize(v
        if(sis_apic_bug == -1)
                sis_apic_bug = 0;
        if (is_initial_xendomain()) {
-               dom0_op_t op = { .cmd = DOM0_PLATFORM_QUIRK };
+               struct xen_platform_op op = { .cmd = XENPF_platform_quirk };
                op.u.platform_quirk.quirk_id = sis_apic_bug ?
                        QUIRK_IOAPIC_BAD_REGSEL : QUIRK_IOAPIC_GOOD_REGSEL;
-               HYPERVISOR_dom0_op(&op);
+               HYPERVISOR_platform_op(&op);
        }
        return 0;
 }
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/ioport-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/ioport-xen.c        Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/ioport-xen.c        Fri Mar 09 
11:45:49 2007 +0000
@@ -81,7 +81,7 @@ asmlinkage long sys_ioperm(unsigned long
                t->io_bitmap_ptr = bitmap;
                set_thread_flag(TIF_IO_BITMAP);
 
-               set_iobitmap.bitmap   = (char *)bitmap;
+               set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
                set_iobitmap.nr_ports = IO_BITMAP_BITS;
                HYPERVISOR_physdev_op(PHYSDEVOP_set_iobitmap, &set_iobitmap);
        }
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c     Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/microcode-xen.c     Fri Mar 09 
11:45:49 2007 +0000
@@ -71,12 +71,12 @@ static int do_microcode_update (const vo
                return -ENOMEM;
 
        if (copy_from_user(kbuf, ubuf, len) == 0) {
-               dom0_op_t op;
+               struct xen_platform_op op;
 
-               op.cmd = DOM0_MICROCODE;
+               op.cmd = XENPF_microcode_update;
                set_xen_guest_handle(op.u.microcode.data, kbuf);
                op.u.microcode.length = len;
-               err = HYPERVISOR_dom0_op(&op);
+               err = HYPERVISOR_platform_op(&op);
        } else
                err = -EFAULT;
 
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Fri Mar 09 
11:45:49 2007 +0000
@@ -606,7 +606,8 @@ struct task_struct fastcall * __switch_t
        }
 
        if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr)) {
-               iobmp_op.bitmap   = (char *)next->io_bitmap_ptr;
+               set_xen_guest_handle(iobmp_op.bitmap,
+                                    (char *)next->io_bitmap_ptr);
                iobmp_op.nr_ports = next->io_bitmap_ptr ? IO_BITMAP_BITS : 0;
                mcl->op      = __HYPERVISOR_physdev_op;
                mcl->args[0] = PHYSDEVOP_set_iobitmap;
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/quirks-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/quirks-xen.c        Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/quirks-xen.c        Fri Mar 09 
11:45:49 2007 +0000
@@ -30,11 +30,11 @@ static void __devinit quirk_intel_irqbal
        raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
 
        if (!(word & (1 << 13))) {
-               dom0_op_t op;
+               struct xen_platform_op op;
                printk(KERN_INFO "Disabling irq balancing and affinity\n");
-               op.cmd = DOM0_PLATFORM_QUIRK;
+               op.cmd = XENPF_platform_quirk;
                op.u.platform_quirk.quirk_id = QUIRK_NOIRQBALANCING;
-               (void)HYPERVISOR_dom0_op(&op);
+               (void)HYPERVISOR_platform_op(&op);
        }
 
        /* put back the original value for config space*/
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c  Fri Mar 09 11:45:19 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c  Fri Mar 09 11:45:49 
2007 +0000
@@ -435,7 +435,7 @@ int do_settimeofday(struct timespec *tv)
        s64 nsec;
        unsigned int cpu;
        struct shadow_time_info *shadow;
-       dom0_op_t op;
+       struct xen_platform_op op;
 
        if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
                return -EINVAL;
@@ -460,11 +460,11 @@ int do_settimeofday(struct timespec *tv)
        __normalize_time(&sec, &nsec);
 
        if (is_initial_xendomain() && !independent_wallclock) {
-               op.cmd = DOM0_SETTIME;
+               op.cmd = XENPF_settime;
                op.u.settime.secs        = sec;
                op.u.settime.nsecs       = nsec;
                op.u.settime.system_time = shadow->system_timestamp;
-               HYPERVISOR_dom0_op(&op);
+               HYPERVISOR_platform_op(&op);
                update_wallclock();
        } else if (independent_wallclock) {
                nsec -= shadow->system_timestamp;
@@ -488,7 +488,7 @@ static void sync_xen_wallclock(unsigned 
 {
        time_t sec;
        s64 nsec;
-       dom0_op_t op;
+       struct xen_platform_op op;
 
        if (!ntp_synced() || independent_wallclock || !is_initial_xendomain())
                return;
@@ -499,11 +499,11 @@ static void sync_xen_wallclock(unsigned 
        nsec = xtime.tv_nsec + ((jiffies - wall_jiffies) * (u64)NS_PER_TICK);
        __normalize_time(&sec, &nsec);
 
-       op.cmd = DOM0_SETTIME;
+       op.cmd = XENPF_settime;
        op.u.settime.secs        = sec;
        op.u.settime.nsecs       = nsec;
        op.u.settime.system_time = processed_system_time;
-       HYPERVISOR_dom0_op(&op);
+       HYPERVISOR_platform_op(&op);
 
        update_wallclock();
 
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c    Fri Mar 09 11:45:19 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c    Fri Mar 09 11:45:49 
2007 +0000
@@ -146,7 +146,7 @@ void xen_tlb_flush_mask(cpumask_t *mask)
        if ( cpus_empty(*mask) )
                return;
        op.cmd = MMUEXT_TLB_FLUSH_MULTI;
-       op.arg2.vcpumask = mask->bits;
+       set_xen_guest_handle(op.arg2.vcpumask, mask->bits);
        BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 
@@ -165,7 +165,7 @@ void xen_invlpg_mask(cpumask_t *mask, un
                return;
        op.cmd = MMUEXT_INVLPG_MULTI;
        op.arg1.linear_addr = ptr & PAGE_MASK;
-       op.arg2.vcpumask    = mask->bits;
+       set_xen_guest_handle(op.arg2.vcpumask, mask->bits);
        BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c   Fri Mar 09 11:45:19 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c   Fri Mar 09 11:45:49 
2007 +0000
@@ -21,7 +21,7 @@
 #include <linux/gfp.h>
 #include <linux/module.h>
 #include <xen/interface/xen.h>
-#include <xen/interface/dom0_ops.h>
+#include <xen/interface/platform.h>
 #include <xen/interface/memory.h>
 #include <xen/interface/xencomm.h>
 #include <xen/interface/version.h>
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c    Fri Mar 09 11:45:19 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c    Fri Mar 09 11:45:49 
2007 +0000
@@ -20,7 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <xen/interface/xen.h>
-#include <xen/interface/dom0_ops.h>
+#include <xen/interface/platform.h>
 #include <xen/interface/memory.h>
 #include <xen/interface/xencomm.h>
 #include <xen/interface/version.h>
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/ia64/xen/xcom_privcmd.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_privcmd.c Fri Mar 09 11:45:19 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_privcmd.c Fri Mar 09 11:45:49 
2007 +0000
@@ -22,7 +22,7 @@
 #include <linux/gfp.h>
 #include <linux/module.h>
 #include <xen/interface/xen.h>
-#include <xen/interface/dom0_ops.h>
+#include <xen/interface/platform.h>
 #define __XEN__
 #include <xen/interface/domctl.h>
 #include <xen/interface/sysctl.h>
@@ -40,25 +40,25 @@
 #define ROUND_DIV(v,s) (((v) + (s) - 1) / (s))
 
 static int
-xencomm_privcmd_dom0_op(privcmd_hypercall_t *hypercall)
-{
-       dom0_op_t kern_op;
-       dom0_op_t __user *user_op = (dom0_op_t __user *)hypercall->arg[0];
+xencomm_privcmd_platform_op(privcmd_hypercall_t *hypercall)
+{
+       struct xen_platform_op kern_op;
+       struct xen_platform_op __user *user_op = (struct xen_platform_op __user 
*)hypercall->arg[0];
        struct xencomm_handle *op_desc;
        struct xencomm_handle *desc = NULL;
        int ret = 0;
 
-       if (copy_from_user(&kern_op, user_op, sizeof(dom0_op_t)))
+       if (copy_from_user(&kern_op, user_op, sizeof(struct xen_platform_op)))
                return -EFAULT;
 
-       if (kern_op.interface_version != DOM0_INTERFACE_VERSION)
+       if (kern_op.interface_version != XENPF_INTERFACE_VERSION)
                return -EACCES;
 
        op_desc = xencomm_create_inline(&kern_op);
 
        switch (kern_op.cmd) {
        default:
-               printk("%s: unknown dom0 cmd %d\n", __func__, kern_op.cmd);
+               printk("%s: unknown platform cmd %d\n", __func__, kern_op.cmd);
                return -ENOSYS;
        }
 
@@ -67,10 +67,10 @@ xencomm_privcmd_dom0_op(privcmd_hypercal
                return ret;
        }
 
-       ret = xencomm_arch_hypercall_dom0_op(op_desc);
+       ret = xencomm_arch_hypercall_platform_op(op_desc);
 
        /* FIXME: should we restore the handle?  */
-       if (copy_to_user(user_op, &kern_op, sizeof(dom0_op_t)))
+       if (copy_to_user(user_op, &kern_op, sizeof(struct xen_platform_op)))
                ret = -EFAULT;
 
        if (desc)
@@ -638,8 +638,8 @@ privcmd_hypercall(privcmd_hypercall_t *h
 privcmd_hypercall(privcmd_hypercall_t *hypercall)
 {
        switch (hypercall->op) {
-       case __HYPERVISOR_dom0_op:
-               return xencomm_privcmd_dom0_op(hypercall);
+       case __HYPERVISOR_platform_op:
+               return xencomm_privcmd_platform_op(hypercall);
        case __HYPERVISOR_domctl:
                return xencomm_privcmd_domctl(hypercall);
        case __HYPERVISOR_sysctl:
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/x86_64/kernel/ioport-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/ioport-xen.c      Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/ioport-xen.c      Fri Mar 09 
11:45:49 2007 +0000
@@ -59,7 +59,7 @@ asmlinkage long sys_ioperm(unsigned long
                memset(bitmap, 0xff, IO_BITMAP_BYTES);
                t->io_bitmap_ptr = bitmap;
 
-               set_iobitmap.bitmap   = (char *)bitmap;
+               set_xen_guest_handle(set_iobitmap.bitmap, (char *)bitmap);
                set_iobitmap.nr_ports = IO_BITMAP_BITS;
                HYPERVISOR_physdev_op(PHYSDEVOP_set_iobitmap, &set_iobitmap);
        }
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c     Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c     Fri Mar 09 
11:45:49 2007 +0000
@@ -50,7 +50,7 @@
 #include <asm/pda.h>
 #include <asm/prctl.h>
 #include <asm/kdebug.h>
-#include <xen/interface/dom0_ops.h>
+#include <xen/interface/platform.h>
 #include <xen/interface/physdev.h>
 #include <xen/interface/vcpu.h>
 #include <asm/desc.h>
@@ -540,7 +540,8 @@ __switch_to(struct task_struct *prev_p, 
        }
 
        if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr)) {
-               iobmp_op.bitmap   = (char *)next->io_bitmap_ptr;
+               set_xen_guest_handle(iobmp_op.bitmap,
+                                    (char *)next->io_bitmap_ptr);
                iobmp_op.nr_ports = next->io_bitmap_ptr ? IO_BITMAP_BITS : 0;
                mcl->op      = __HYPERVISOR_physdev_op;
                mcl->args[0] = PHYSDEVOP_set_iobitmap;
diff -r b46a92ba0b61 -r 101a1ccfc3f7 linux-2.6-xen-sparse/drivers/xen/Kconfig
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig  Fri Mar 09 11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig  Fri Mar 09 11:45:49 2007 +0000
@@ -13,7 +13,7 @@ if XEN
 if XEN
 config XEN_INTERFACE_VERSION
        hex
-       default 0x00030203
+       default 0x00030205
 
 menu "XEN"
 
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c    Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c    Fri Mar 09 
11:45:49 2007 +0000
@@ -11,7 +11,6 @@
 #include <asm/mmu_context.h>
 #include <xen/evtchn.h>
 #include <asm/hypervisor.h>
-#include <xen/interface/dom0_ops.h>
 #include <xen/xenbus.h>
 #include <linux/cpu.h>
 #include <linux/kthread.h>
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c        Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c        Fri Mar 09 
11:45:49 2007 +0000
@@ -28,7 +28,6 @@
 #include <asm/hypervisor.h>
 #include <xen/public/privcmd.h>
 #include <xen/interface/xen.h>
-#include <xen/interface/dom0_ops.h>
 #include <xen/xen_proc.h>
 
 static struct proc_dir_entry *privcmd_intf;
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h    Fri Mar 
09 11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h    Fri Mar 
09 11:45:49 2007 +0000
@@ -201,11 +201,11 @@ HYPERVISOR_set_timer_op(
 }
 
 static inline int
-HYPERVISOR_dom0_op(
-       dom0_op_t *dom0_op)
-{
-       dom0_op->interface_version = DOM0_INTERFACE_VERSION;
-       return _hypercall1(int, dom0_op, dom0_op);
+HYPERVISOR_platform_op(
+       struct xen_platform_op *platform_op)
+{
+       platform_op->interface_version = XENPF_INTERFACE_VERSION;
+       return _hypercall1(int, platform_op, platform_op);
 }
 
 static inline int
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h   Fri Mar 
09 11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h   Fri Mar 
09 11:45:49 2007 +0000
@@ -38,7 +38,7 @@
 #include <linux/version.h>
 #include <linux/errno.h>
 #include <xen/interface/xen.h>
-#include <xen/interface/dom0_ops.h>
+#include <xen/interface/platform.h>
 #include <xen/interface/event_channel.h>
 #include <xen/interface/physdev.h>
 #include <xen/interface/sched.h>
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Fri Mar 09 11:45:19 
2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Fri Mar 09 11:45:49 
2007 +0000
@@ -120,9 +120,9 @@ HYPERVISOR_set_timer_op(u64 timeout)
 }
 
 static inline int
-xencomm_arch_hypercall_dom0_op(struct xencomm_handle *op)
-{
-       return _hypercall1(int, dom0_op, op);
+xencomm_arch_hypercall_platform_op(struct xencomm_handle *op)
+{
+       return _hypercall1(int, platform_op, op);
 }
 
 static inline int
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Fri Mar 09 
11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Fri Mar 09 
11:45:49 2007 +0000
@@ -51,7 +51,7 @@ extern int running_on_xen;
 #include <linux/version.h>
 #include <linux/errno.h>
 #include <xen/interface/xen.h>
-#include <xen/interface/dom0_ops.h>
+#include <xen/interface/platform.h>
 #include <xen/interface/event_channel.h>
 #include <xen/interface/physdev.h>
 #include <xen/interface/sched.h>
diff -r b46a92ba0b61 -r 101a1ccfc3f7 
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/hypercall.h  Fri Mar 
09 11:45:19 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/hypercall.h  Fri Mar 
09 11:45:49 2007 +0000
@@ -204,11 +204,11 @@ HYPERVISOR_set_timer_op(
 }
 
 static inline int
-HYPERVISOR_dom0_op(
-       dom0_op_t *dom0_op)
-{
-       dom0_op->interface_version = DOM0_INTERFACE_VERSION;
-       return _hypercall1(int, dom0_op, dom0_op);
+HYPERVISOR_platform_op(
+       struct xen_platform_op *platform_op)
+{
+       platform_op->interface_version = XENPF_INTERFACE_VERSION;
+       return _hypercall1(int, platform_op, platform_op);
 }
 
 static inline int

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

<Prev in Thread] Current Thread [Next in Thread>