[Xen-changelog] [linux-2.6.18-xen] update to latest interface version (4.6.0)

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1445006966 -7200
# Node ID 9a50d064b249f630e9244f2da835f8ec74295521
# Parent  80f9921ed1d4e724e21d6c3778dc13789322a3a4
update to latest interface version (4.6.0)

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 80f9921ed1d4 -r 9a50d064b249 arch/i386/kernel/time-xen.c
--- a/arch/i386/kernel/time-xen.c       Fri Oct 16 16:46:04 2015 +0200
+++ b/arch/i386/kernel/time-xen.c       Fri Oct 16 16:49:26 2015 +0200
@@ -479,10 +479,10 @@ int do_settimeofday(struct timespec *tv)
        __normalize_time(&sec, &nsec);
 
        if (is_initial_xendomain() && !independent_wallclock) {
-               op.cmd = XENPF_settime;
-               op.u.settime.secs        = sec;
-               op.u.settime.nsecs       = nsec;
-               op.u.settime.system_time = shadow->system_timestamp;
+               op.cmd = XENPF_settime32;
+               op.u.settime32.secs        = sec;
+               op.u.settime32.nsecs       = nsec;
+               op.u.settime32.system_time = shadow->system_timestamp;
                WARN_ON(HYPERVISOR_platform_op(&op));
                update_wallclock();
        } else if (independent_wallclock) {
@@ -521,10 +521,10 @@ static void sync_xen_wallclock(unsigned 
        nsec = xtime.tv_nsec + ((jiffies - wall_jiffies) * (u64)NS_PER_TICK);
        __normalize_time(&sec, &nsec);
 
-       op.cmd = XENPF_settime;
-       op.u.settime.secs        = sec;
-       op.u.settime.nsecs       = nsec;
-       op.u.settime.system_time = processed_system_time;
+       op.cmd = XENPF_settime32;
+       op.u.settime32.secs        = sec;
+       op.u.settime32.nsecs       = nsec;
+       op.u.settime32.system_time = processed_system_time;
        WARN_ON(HYPERVISOR_platform_op(&op));
 
        update_wallclock();
diff -r 80f9921ed1d4 -r 9a50d064b249 arch/powerpc/platforms/xen/hcall.c
--- a/arch/powerpc/platforms/xen/hcall.c        Fri Oct 16 16:46:04 2015 +0200
+++ b/arch/powerpc/platforms/xen/hcall.c        Fri Oct 16 16:49:26 2015 +0200
@@ -536,7 +536,7 @@ static int xenppc_privcmd_platform_op(pr
                return -ENOMEM;
 
        switch (kern_op.cmd) {
-       case XENPF_settime:
+       case XENPF_settime32:
        case XENPF_add_memtype:
        case XENPF_del_memtype:
        case XENPF_read_memtype:
diff -r 80f9921ed1d4 -r 9a50d064b249 drivers/xen/Kconfig
--- a/drivers/xen/Kconfig       Fri Oct 16 16:46:04 2015 +0200
+++ b/drivers/xen/Kconfig       Fri Oct 16 16:49:26 2015 +0200
@@ -10,7 +10,7 @@ config XEN
 if XEN
 config XEN_INTERFACE_VERSION
        hex
-       default 0x00040500
+       default 0x00040600
 
 menu "XEN"
 
@@ -351,6 +351,9 @@ choice
        config XEN_COMPAT_040500_AND_LATER
                bool "4.5.0 and later"
 
+       config XEN_COMPAT_040600_AND_LATER
+               bool "4.6.0 and later"
+
        config XEN_COMPAT_LATEST_ONLY
                bool "no compatibility code"
 
@@ -359,6 +362,7 @@ endchoice
 config XEN_COMPAT
        hex
        default 0xffffff if XEN_COMPAT_LATEST_ONLY
+       default 0x040600 if XEN_COMPAT_040600_AND_LATER
        default 0x040500 if XEN_COMPAT_040500_AND_LATER
        default 0x040400 if XEN_COMPAT_040400_AND_LATER
        default 0x040300 if XEN_COMPAT_040300_AND_LATER
diff -r 80f9921ed1d4 -r 9a50d064b249 include/xen/interface/dom0_ops.h
--- a/include/xen/interface/dom0_ops.h  Fri Oct 16 16:46:04 2015 +0200
+++ b/include/xen/interface/dom0_ops.h  Fri Oct 16 16:49:26 2015 +0200
@@ -37,9 +37,9 @@
 
 #define DOM0_INTERFACE_VERSION XENPF_INTERFACE_VERSION
 
-#define DOM0_SETTIME          XENPF_settime
-#define dom0_settime          xenpf_settime
-#define dom0_settime_t        xenpf_settime_t
+#define DOM0_SETTIME          XENPF_settime32
+#define dom0_settime          xenpf_settime32
+typedef struct dom0_settime dom0_settime_t;
 
 #define DOM0_ADD_MEMTYPE      XENPF_add_memtype
 #define dom0_add_memtype      xenpf_add_memtype
diff -r 80f9921ed1d4 -r 9a50d064b249 mm/tmem.c
--- a/mm/tmem.c Fri Oct 16 16:46:04 2015 +0200
+++ b/mm/tmem.c Fri Oct 16 16:49:26 2015 +0200
@@ -16,8 +16,8 @@ int xen_tmem_op(u32 tmem_cmd, u32 tmem_p
 
        op.cmd = tmem_cmd;
        op.pool_id = tmem_pool;
-       op.u.gen.oid[0] = object;
-        op.u.gen.oid[1] = op.u.gen.oid[2] = 0;
+       op.u.gen.oid.oid[0] = object;
+       op.u.gen.oid.oid[1] = op.u.gen.oid.oid[2] = 0;
        op.u.gen.index = index;
        op.u.gen.tmem_offset = tmem_offset;
        op.u.gen.pfn_offset = pfn_offset;

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