[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


  • To: xen-changelog@xxxxxxxxxxxxxxxxxxx
  • From: Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>
  • Date: Tue, 28 Jan 2014 14:11:02 +0000
  • Delivery-date: Tue, 28 Jan 2014 14:11:11 +0000
  • List-id: "Change log for Mercurial \(receive only\)" <xen-changelog.lists.xen.org>

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1390917611 -3600
# Node ID ac24179a78750ed99a8bee90e523af7c28962b3f
# Parent  c5f5087bd3c729b875beba524f32e0f7e0ca3fb5
update to latest interface version (4.4.0)

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


diff -r c5f5087bd3c7 -r ac24179a7875 arch/ia64/xen/hypervisor.c
--- a/arch/ia64/xen/hypervisor.c        Tue Jan 28 14:08:04 2014 +0100
+++ b/arch/ia64/xen/hypervisor.c        Tue Jan 28 15:00:11 2014 +0100
@@ -260,7 +260,7 @@ xen_limit_pages_to_max_mfn(struct page *
 #include <xen/interface/xen.h>
 #include <xen/gnttab.h>
 
-void *arch_gnttab_alloc_shared(unsigned long *frames)
+void *arch_gnttab_alloc_shared(xen_pfn_t *frames)
 {
        return __va(frames[0] << PAGE_SHIFT);
 }
diff -r c5f5087bd3c7 -r ac24179a7875 arch/ia64/xen/xcom_hcall.c
--- a/arch/ia64/xen/xcom_hcall.c        Tue Jan 28 14:08:04 2014 +0100
+++ b/arch/ia64/xen/xcom_hcall.c        Tue Jan 28 15:00:11 2014 +0100
@@ -721,9 +721,9 @@ xencomm_hypercall_kexec_op(int cmd, void
        case KEXEC_CMD_kexec_get_range:
                argsize = sizeof(xen_kexec_range_t);
                break;
-       case KEXEC_CMD_kexec_load:
-       case KEXEC_CMD_kexec_unload:
-               argsize = sizeof(xen_kexec_load_t);
+       case KEXEC_CMD_kexec_load_v1:
+       case KEXEC_CMD_kexec_unload_v1:
+               argsize = sizeof(xen_kexec_load_v1_t);
                break;
        case KEXEC_CMD_kexec:
                argsize = sizeof(xen_kexec_exec_t);
diff -r c5f5087bd3c7 -r ac24179a7875 arch/powerpc/platforms/xen/gnttab.c
--- a/arch/powerpc/platforms/xen/gnttab.c       Tue Jan 28 14:08:04 2014 +0100
+++ b/arch/powerpc/platforms/xen/gnttab.c       Tue Jan 28 15:00:11 2014 +0100
@@ -448,7 +448,7 @@ static void setup_grant_area(void)
        foreign_map_pgs = pgs;
 }
 
-void *arch_gnttab_alloc_shared(unsigned long *frames)
+void *arch_gnttab_alloc_shared(xen_pfn_t *frames)
 {
        void *shared;
        ulong pa = frames[0] << PAGE_SHIFT;
diff -r c5f5087bd3c7 -r ac24179a7875 arch/powerpc/platforms/xen/hcall.c
--- a/arch/powerpc/platforms/xen/hcall.c        Tue Jan 28 14:08:04 2014 +0100
+++ b/arch/powerpc/platforms/xen/hcall.c        Tue Jan 28 15:00:11 2014 +0100
@@ -242,11 +242,9 @@ int HYPERVISOR_kexec_op(unsigned long op
                case KEXEC_CMD_kexec_get_range:
                        argsize = sizeof(struct xen_kexec_range);
                        break;
-               case KEXEC_CMD_kexec_load:
-                       argsize = sizeof(struct xen_kexec_load);
-                       break;
-               case KEXEC_CMD_kexec_unload:
-                       argsize = sizeof(struct xen_kexec_load);
+               case KEXEC_CMD_kexec_load_v1:
+               case KEXEC_CMD_kexec_unload_v1:
+                       argsize = sizeof(struct xen_kexec_load_v1);
                        break;
                case KEXEC_CMD_kexec:
                        argsize = sizeof(struct xen_kexec_exec);
diff -r c5f5087bd3c7 -r ac24179a7875 drivers/xen/Kconfig
--- a/drivers/xen/Kconfig       Tue Jan 28 14:08:04 2014 +0100
+++ b/drivers/xen/Kconfig       Tue Jan 28 15:00:11 2014 +0100
@@ -10,7 +10,7 @@ config XEN
 if XEN
 config XEN_INTERFACE_VERSION
        hex
-       default 0x00040200
+       default 0x00040400
 
 menu "XEN"
 
@@ -342,6 +342,12 @@ choice
        config XEN_COMPAT_040200_AND_LATER
                bool "4.2.0 and later"
 
+       config XEN_COMPAT_040300_AND_LATER
+               bool "4.3.0 and later"
+
+       config XEN_COMPAT_040400_AND_LATER
+               bool "4.4.0 and later"
+
        config XEN_COMPAT_LATEST_ONLY
                bool "no compatibility code"
 
@@ -350,6 +356,8 @@ endchoice
 config XEN_COMPAT
        hex
        default 0xffffff if XEN_COMPAT_LATEST_ONLY
+       default 0x040400 if XEN_COMPAT_040400_AND_LATER
+       default 0x040300 if XEN_COMPAT_040300_AND_LATER
        default 0x040200 if XEN_COMPAT_040200_AND_LATER
        default 0x040100 if XEN_COMPAT_040100_AND_LATER
        default 0x040000 if XEN_COMPAT_040000_AND_LATER
diff -r c5f5087bd3c7 -r ac24179a7875 drivers/xen/core/evtchn.c
--- a/drivers/xen/core/evtchn.c Tue Jan 28 14:08:04 2014 +0100
+++ b/drivers/xen/core/evtchn.c Tue Jan 28 15:00:11 2014 +0100
@@ -54,8 +54,8 @@
 static DEFINE_SPINLOCK(irq_mapping_update_lock);
 
 /* IRQ <-> event-channel mappings. */
-static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
-       [0 ...  NR_EVENT_CHANNELS-1] = -1 };
+static int evtchn_to_irq[EVTCHN_2L_NR_CHANNELS] = {
+       [0 ...  EVTCHN_2L_NR_CHANNELS-1] = -1 };
 
 /* Packed IRQ information: binding type, sub-type index, and event channel. */
 static u32 irq_info[NR_IRQS];
@@ -85,7 +85,7 @@ static inline u32 mk_irq_info(u32 type, 
        BUILD_BUG_ON(NR_IPIS > (1U << _INDEX_BITS));
        BUG_ON(index >> _INDEX_BITS);
 
-       BUILD_BUG_ON(NR_EVENT_CHANNELS > (1U << _EVTCHN_BITS));
+       BUILD_BUG_ON(EVTCHN_2L_NR_CHANNELS > (1U << _EVTCHN_BITS));
 
        return ((type << (32 - _IRQT_BITS)) | (index << _EVTCHN_BITS) | evtchn);
 }
@@ -126,8 +126,8 @@ static int irq_bindcount[NR_IRQS];
 
 #ifdef CONFIG_SMP
 
-static u8 cpu_evtchn[NR_EVENT_CHANNELS];
-static unsigned long cpu_evtchn_mask[NR_CPUS][NR_EVENT_CHANNELS/BITS_PER_LONG];
+static u8 cpu_evtchn[EVTCHN_2L_NR_CHANNELS];
+static unsigned long 
cpu_evtchn_mask[NR_CPUS][EVTCHN_2L_NR_CHANNELS/BITS_PER_LONG];
 
 static inline unsigned long active_evtchns(unsigned int cpu, shared_info_t *sh,
                                           unsigned int idx)
@@ -1006,7 +1006,7 @@ void disable_all_local_evtchn(void)
        unsigned i, cpu = smp_processor_id();
        shared_info_t *s = HYPERVISOR_shared_info;
 
-       for (i = 0; i < NR_EVENT_CHANNELS; ++i)
+       for (i = 0; i < EVTCHN_2L_NR_CHANNELS; ++i)
                if (cpu_from_evtchn(i) == cpu)
                        synch_set_bit(i, &s->evtchn_mask[0]);
 }
@@ -1085,7 +1085,7 @@ void irq_resume(void)
        }
 
        /* New event-channel space is not 'live' yet. */
-       for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)
+       for (evtchn = 0; evtchn < EVTCHN_2L_NR_CHANNELS; evtchn++)
                mask_evtchn(evtchn);
 
        /* Check that no PIRQs are still bound. */
@@ -1095,7 +1095,7 @@ void irq_resume(void)
        /* No IRQ <-> event-channel mappings. */
        for (irq = 0; irq < NR_IRQS; irq++)
                irq_info[irq] &= ~((1U << _EVTCHN_BITS) - 1);
-       for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)
+       for (evtchn = 0; evtchn < EVTCHN_2L_NR_CHANNELS; evtchn++)
                evtchn_to_irq[evtchn] = -1;
 
        for_each_possible_cpu(cpu) {
@@ -1181,7 +1181,7 @@ void __init xen_init_IRQ(void)
                pirq_eoi_does_unmask = 1;
 
        /* No event channels are 'live' right now. */
-       for (i = 0; i < NR_EVENT_CHANNELS; i++)
+       for (i = 0; i < EVTCHN_2L_NR_CHANNELS; i++)
                mask_evtchn(i);
 
        /* No IRQ -> event-channel mappings. */
diff -r c5f5087bd3c7 -r ac24179a7875 drivers/xen/core/gnttab.c
--- a/drivers/xen/core/gnttab.c Tue Jan 28 14:08:04 2014 +0100
+++ b/drivers/xen/core/gnttab.c Tue Jan 28 15:00:11 2014 +0100
@@ -542,7 +542,7 @@ static int unmap_pte_fn(pte_t *pte, stru
        return 0;
 }
 
-void *arch_gnttab_alloc_shared(unsigned long *frames)
+void *arch_gnttab_alloc_shared(xen_pfn_t *frames)
 {
        struct vm_struct *area;
        area = alloc_vm_area(PAGE_SIZE * max_nr_grant_frames());
@@ -554,11 +554,11 @@ void *arch_gnttab_alloc_shared(unsigned 
 static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
 {
        struct gnttab_setup_table setup;
-       unsigned long *frames;
+       xen_pfn_t *frames;
        unsigned int nr_gframes = end_idx + 1;
        int rc;
 
-       frames = kmalloc(nr_gframes * sizeof(unsigned long), GFP_ATOMIC);
+       frames = kmalloc(nr_gframes * sizeof(*frames), GFP_ATOMIC);
        if (!frames)
                return -ENOMEM;
 
diff -r c5f5087bd3c7 -r ac24179a7875 drivers/xen/core/machine_kexec.c
--- a/drivers/xen/core/machine_kexec.c  Tue Jan 28 14:08:04 2014 +0100
+++ b/drivers/xen/core/machine_kexec.c  Tue Jan 28 15:00:11 2014 +0100
@@ -186,12 +186,12 @@ static void setup_load_arg(xen_kexec_ima
  */
 int xen_machine_kexec_load(struct kimage *image)
 {
-       xen_kexec_load_t xkl;
+       xen_kexec_load_v1_t xkl;
 
        memset(&xkl, 0, sizeof(xkl));
        xkl.type = image->type;
        setup_load_arg(&xkl.image, image);
-       return HYPERVISOR_kexec_op(KEXEC_CMD_kexec_load, &xkl);
+       return HYPERVISOR_kexec_op(KEXEC_CMD_kexec_load_v1, &xkl);
 }
 
 /*
@@ -202,11 +202,11 @@ int xen_machine_kexec_load(struct kimage
  */
 void xen_machine_kexec_unload(struct kimage *image)
 {
-       xen_kexec_load_t xkl;
+       xen_kexec_load_v1_t xkl;
 
        memset(&xkl, 0, sizeof(xkl));
        xkl.type = image->type;
-       WARN_ON(HYPERVISOR_kexec_op(KEXEC_CMD_kexec_unload, &xkl));
+       WARN_ON(HYPERVISOR_kexec_op(KEXEC_CMD_kexec_unload_v1, &xkl));
 }
 
 /*
diff -r c5f5087bd3c7 -r ac24179a7875 drivers/xen/evtchn/evtchn.c
--- a/drivers/xen/evtchn/evtchn.c       Tue Jan 28 14:08:04 2014 +0100
+++ b/drivers/xen/evtchn/evtchn.c       Tue Jan 28 15:00:11 2014 +0100
@@ -69,7 +69,7 @@ struct per_user_data {
 };
 
 /* Who's bound to each port? */
-static struct per_user_data *port_user[NR_EVENT_CHANNELS];
+static struct per_user_data *port_user[EVTCHN_2L_NR_CHANNELS];
 static spinlock_t port_user_lock;
 
 void evtchn_device_upcall(int port)
@@ -115,7 +115,7 @@ static void evtchn_check_wrong_delivery(
 
        spin_lock_irq(&port_user_lock);
 
-       for (port = 0; port < NR_EVENT_CHANNELS; port++)
+       for (port = 0; port < EVTCHN_2L_NR_CHANNELS; port++)
                if (port_user[port] == u)
                        rebind_evtchn_to_cpu(port, current_cpu);
 
@@ -223,7 +223,7 @@ static ssize_t evtchn_write(struct file 
 
        spin_lock_irq(&port_user_lock);
        for (i = 0; i < (count/sizeof(evtchn_port_t)); i++)
-               if ((kbuf[i] < NR_EVENT_CHANNELS) && (port_user[kbuf[i]] == u))
+               if ((kbuf[i] < EVTCHN_2L_NR_CHANNELS) && (port_user[kbuf[i]] == 
u))
                        unmask_evtchn(kbuf[i]);
        spin_unlock_irq(&port_user_lock);
 
@@ -338,7 +338,7 @@ static long evtchn_ioctl(struct file *fi
                        break;
 
                rc = -EINVAL;
-               if (unbind.port >= NR_EVENT_CHANNELS)
+               if (unbind.port >= EVTCHN_2L_NR_CHANNELS)
                        break;
 
                spin_lock_irq(&port_user_lock);
@@ -370,7 +370,7 @@ static long evtchn_ioctl(struct file *fi
                if (copy_from_user(&notify, uarg, sizeof(notify)))
                        break;
 
-               if (notify.port >= NR_EVENT_CHANNELS) {
+               if (notify.port >= EVTCHN_2L_NR_CHANNELS) {
                        rc = -EINVAL;
                } else if (port_user[notify.port] != u) {
                        rc = -ENOTCONN;
@@ -454,7 +454,7 @@ static int evtchn_release(struct inode *
 
        free_page((unsigned long)u->ring);
 
-       for (i = 0; i < NR_EVENT_CHANNELS; i++) {
+       for (i = 0; i < EVTCHN_2L_NR_CHANNELS; i++) {
                int ret;
                if (port_user[i] != u)
                        continue;
@@ -505,12 +505,12 @@ static int evtchn_cpu_notify(struct noti
        case CPU_DOWN_PREPARE:
                cpu_clear(hotcpu, map);
                spin_lock_irq(&port_user_lock);
-               for (i = 0; i < NR_EVENT_CHANNELS; i++) {
+               for (i = 0; i < EVTCHN_2L_NR_CHANNELS; i++) {
                        u = port_user[i];
                        if ((u == NULL) || (u->bind_cpu != hotcpu))
                                continue;
                        newcpu = next_bind_cpu(map);
-                       for (j = i; j < NR_EVENT_CHANNELS; j++)
+                       for (j = i; j < EVTCHN_2L_NR_CHANNELS; j++)
                                if (port_user[j] == u)
                                        rebind_evtchn_to_cpu(j, newcpu);
                        u->bind_cpu = newcpu;
diff -r c5f5087bd3c7 -r ac24179a7875 include/asm-i386/acpi.h
--- a/include/asm-i386/acpi.h   Tue Jan 28 14:08:04 2014 +0100
+++ b/include/asm-i386/acpi.h   Tue Jan 28 15:00:11 2014 +0100
@@ -161,16 +161,15 @@ extern int acpi_irq_balance_set(char *st
 
 #ifdef CONFIG_XEN
 static inline int acpi_notify_hypervisor_state(u8 sleep_state,
-                                              u32 pm1a_cnt_val,
-                                              u32 pm1b_cnt_val)
+                                              u32 val_a, u32 val_b)
 {
        struct xen_platform_op op = {
                .cmd = XENPF_enter_acpi_sleep,
                .interface_version = XENPF_INTERFACE_VERSION,
                .u = {
                        .enter_acpi_sleep = {
-                               .pm1a_cnt_val = pm1a_cnt_val,
-                               .pm1b_cnt_val = pm1b_cnt_val,
+                               .val_a = val_a,
+                               .val_b = val_b,
                                .sleep_state = sleep_state,
                        },
                },
diff -r c5f5087bd3c7 -r ac24179a7875 include/asm-i386/mach-xen/mach_traps.h
--- a/include/asm-i386/mach-xen/mach_traps.h    Tue Jan 28 14:08:04 2014 +0100
+++ b/include/asm-i386/mach-xen/mach_traps.h    Tue Jan 28 15:00:11 2014 +0100
@@ -22,7 +22,7 @@ static inline unsigned char get_nmi_reas
         */
        if (test_bit(_XEN_NMIREASON_io_error, &s->arch.nmi_reason))
                reason |= 0x40;
-       if (test_bit(_XEN_NMIREASON_parity_error, &s->arch.nmi_reason))
+       if (test_bit(_XEN_NMIREASON_pci_serr, &s->arch.nmi_reason))
                reason |= 0x80;
 
         return reason;
diff -r c5f5087bd3c7 -r ac24179a7875 include/asm-x86_64/acpi.h
--- a/include/asm-x86_64/acpi.h Tue Jan 28 14:08:04 2014 +0100
+++ b/include/asm-x86_64/acpi.h Tue Jan 28 15:00:11 2014 +0100
@@ -134,16 +134,15 @@ extern int acpi_irq_balance_set(char *st
 
 #ifdef CONFIG_XEN
 static inline int acpi_notify_hypervisor_state(u8 sleep_state,
-                                              u32 pm1a_cnt_val,
-                                              u32 pm1b_cnt_val)
+                                              u32 val_a, u32 val_b)
 {
        struct xen_platform_op op = {
                .cmd = XENPF_enter_acpi_sleep,
                .interface_version = XENPF_INTERFACE_VERSION,
                .u = {
                        .enter_acpi_sleep = {
-                               .pm1a_cnt_val = pm1a_cnt_val,
-                               .pm1b_cnt_val = pm1b_cnt_val,
+                               .val_a = val_a,
+                               .val_b = val_b,
                                .sleep_state = sleep_state,
                        },
                },
diff -r c5f5087bd3c7 -r ac24179a7875 include/asm-x86_64/mach-xen/asm/nmi.h
--- a/include/asm-x86_64/mach-xen/asm/nmi.h     Tue Jan 28 14:08:04 2014 +0100
+++ b/include/asm-x86_64/mach-xen/asm/nmi.h     Tue Jan 28 15:00:11 2014 +0100
@@ -62,7 +62,7 @@ static inline unsigned char get_nmi_reas
          */
         if (test_bit(_XEN_NMIREASON_io_error, &s->arch.nmi_reason))
                 reason |= 0x40;
-        if (test_bit(_XEN_NMIREASON_parity_error, &s->arch.nmi_reason))
+        if (test_bit(_XEN_NMIREASON_pci_serr, &s->arch.nmi_reason))
                 reason |= 0x80;
 
         return reason;
diff -r c5f5087bd3c7 -r ac24179a7875 include/xen/gnttab.h
--- a/include/xen/gnttab.h      Tue Jan 28 14:08:04 2014 +0100
+++ b/include/xen/gnttab.h      Tue Jan 28 15:00:11 2014 +0100
@@ -116,7 +116,7 @@ void gnttab_reset_grant_page(struct page
 int gnttab_suspend(void);
 int gnttab_resume(void);
 
-void *arch_gnttab_alloc_shared(unsigned long *frames);
+void *arch_gnttab_alloc_shared(xen_pfn_t *frames);
 
 static inline void
 gnttab_set_map_op(struct gnttab_map_grant_ref *map, maddr_t addr,

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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.