# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1283442713 -3600
# Node ID 81da889f671fe22bda4ffafe680dfc81c9c9bb76
# Parent 20e01ec42aabac99fa4ff2d5db630a04d4bc6820
# Parent 0ac7307a250182d7fa227ede911c454e0daea13f
Merge
---
xen/arch/ia64/xen/irq.c | 2 +-
xen/drivers/acpi/Makefile | 2 +-
xen/drivers/passthrough/vtd/intremap.c | 8 ++++++++
xen/include/public/arch-x86/xen-x86_32.h | 4 +++-
xen/include/public/hvm/hvm_op.h | 3 ++-
xen/include/public/xen.h | 7 ++++++-
6 files changed, 21 insertions(+), 5 deletions(-)
diff -r 20e01ec42aab -r 81da889f671f xen/arch/ia64/xen/irq.c
--- a/xen/arch/ia64/xen/irq.c Wed Sep 01 14:37:18 2010 +0100
+++ b/xen/arch/ia64/xen/irq.c Thu Sep 02 16:51:53 2010 +0100
@@ -85,7 +85,7 @@ struct irq_cfg irq_cfg[NR_IRQS] = {
struct irq_cfg irq_cfg[NR_IRQS] = {
[0 ... NR_IRQS-1] ={
.vector = -1,
- .domain = CPU_MASK_ALL,
+ .cpu_mask = CPU_MASK_ALL,
}
};
diff -r 20e01ec42aab -r 81da889f671f xen/drivers/acpi/Makefile
--- a/xen/drivers/acpi/Makefile Wed Sep 01 14:37:18 2010 +0100
+++ b/xen/drivers/acpi/Makefile Thu Sep 02 16:51:53 2010 +0100
@@ -1,6 +1,6 @@ subdir-y += tables
subdir-y += tables
subdir-y += utilities
-subdir-y += apei
+subdir-$(x86) += apei
obj-y += tables.o
obj-y += numa.o
diff -r 20e01ec42aab -r 81da889f671f xen/drivers/passthrough/vtd/intremap.c
--- a/xen/drivers/passthrough/vtd/intremap.c Wed Sep 01 14:37:18 2010 +0100
+++ b/xen/drivers/passthrough/vtd/intremap.c Thu Sep 02 16:51:53 2010 +0100
@@ -322,8 +322,12 @@ static int ioapic_rte_to_remap_entry(str
new_ire.lo.dm = new_rte.dest_mode;
new_ire.lo.tm = new_rte.trigger;
new_ire.lo.dlm = new_rte.delivery_mode;
+#ifdef CONFIG_X86
/* Hardware require RH = 1 for LPR delivery mode */
new_ire.lo.rh = (new_ire.lo.dlm == dest_LowestPrio);
+#else
+ new_ire.lo.rh = 0;
+#endif
new_ire.lo.avail = 0;
new_ire.lo.res_1 = 0;
new_ire.lo.vector = new_rte.vector;
@@ -635,8 +639,12 @@ static int msi_msg_to_remap_entry(
new_ire.lo.dm = (msg->address_lo >> MSI_ADDR_DESTMODE_SHIFT) & 0x1;
new_ire.lo.tm = (msg->data >> MSI_DATA_TRIGGER_SHIFT) & 0x1;
new_ire.lo.dlm = (msg->data >> MSI_DATA_DELIVERY_MODE_SHIFT) & 0x1;
+#ifdef CONFIG_X86
/* Hardware require RH = 1 for LPR delivery mode */
new_ire.lo.rh = (new_ire.lo.dlm == dest_LowestPrio);
+#else
+ new_ire.lo.rh = 0;
+#endif
new_ire.lo.avail = 0;
new_ire.lo.res_1 = 0;
new_ire.lo.vector = (msg->data >> MSI_DATA_VECTOR_SHIFT) &
diff -r 20e01ec42aab -r 81da889f671f xen/include/public/arch-x86/xen-x86_32.h
--- a/xen/include/public/arch-x86/xen-x86_32.h Wed Sep 01 14:37:18 2010 +0100
+++ b/xen/include/public/arch-x86/xen-x86_32.h Thu Sep 02 16:51:53 2010 +0100
@@ -100,7 +100,8 @@
#define machine_to_phys_mapping ((unsigned long *)MACH2PHYS_VIRT_START)
#endif
-/* 32-/64-bit invariability. */
+/* 32-/64-bit invariability for control interfaces (domctl/sysctl). */
+#if defined(__XEN__) || defined(__XEN_TOOLS__)
#undef ___DEFINE_XEN_GUEST_HANDLE
#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
typedef struct { type *p; } \
@@ -115,6 +116,7 @@
#define uint64_aligned_t uint64_t __attribute__((aligned(8)))
#define __XEN_GUEST_HANDLE_64(name) __guest_handle_64_ ## name
#define XEN_GUEST_HANDLE_64(name) __XEN_GUEST_HANDLE_64(name)
+#endif
#ifndef __ASSEMBLY__
diff -r 20e01ec42aab -r 81da889f671f xen/include/public/hvm/hvm_op.h
--- a/xen/include/public/hvm/hvm_op.h Wed Sep 01 14:37:18 2010 +0100
+++ b/xen/include/public/hvm/hvm_op.h Thu Sep 02 16:51:53 2010 +0100
@@ -135,8 +135,9 @@ struct xen_hvm_pagetable_dying {
struct xen_hvm_pagetable_dying {
/* Domain with a pagetable about to be destroyed. */
domid_t domid;
+ uint16_t pad[3]; /* align next field on 8-byte boundary */
/* guest physical address of the toplevel pagetable dying */
- uint64_aligned_t gpa;
+ uint64_t gpa;
};
typedef struct xen_hvm_pagetable_dying xen_hvm_pagetable_dying_t;
DEFINE_XEN_GUEST_HANDLE(xen_hvm_pagetable_dying_t);
diff -r 20e01ec42aab -r 81da889f671f xen/include/public/xen.h
--- a/xen/include/public/xen.h Wed Sep 01 14:37:18 2010 +0100
+++ b/xen/include/public/xen.h Thu Sep 02 16:51:53 2010 +0100
@@ -688,6 +688,9 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64
#endif /* !__ASSEMBLY__ */
+/* Default definitions for macros used by domctl/sysctl. */
+#if defined(__XEN__) || defined(__XEN_TOOLS__)
+
#ifndef uint64_aligned_t
#define uint64_aligned_t uint64_t
#endif
@@ -695,12 +698,14 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64
#define XEN_GUEST_HANDLE_64(name) XEN_GUEST_HANDLE(name)
#endif
-#if (defined(__XEN__) || defined(__XEN_TOOLS__)) && !defined(__ASSEMBLY__)
+#ifndef __ASSEMBLY__
struct xenctl_cpumap {
XEN_GUEST_HANDLE_64(uint8) bitmap;
uint32_t nr_cpus;
};
#endif
+
+#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
#endif /* __XEN_PUBLIC_XEN_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home