pool/xen
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- bnc#725169 - xen-4.0.2_21511_03-0.5.3: bootup hangs

Browse Source 
23993-x86-microcode-amd-fix-23871.patch

- Update to Xen 4.1.2 FCS c/s 23174

- bnc#720054 - Fix syntax error introduced during recent adjustment
  of Xen's tap udev rule.
  Updated udev-rules.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=154
This commit is contained in:
Charles Arnold 2011-10-28 15:40:38 +00:00 committed by Git OBS Bridge
parent e2d8bf077a
commit 7505a6b224
12 changed files with 299 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
23614-x86_64-EFI-boot.patch
View File

@ -2143,7 +2143,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/mm.c
#include <asm/paging.h> #include <asm/paging.h>
#include <asm/shadow.h> #include <asm/shadow.h>
#include <asm/page.h> #include <asm/page.h>
@@ -353,6 +354,8 @@ void __init arch_init_memory(void) @@ -355,6 +356,8 @@ void __init arch_init_memory(void)
subarch_init_memory(); subarch_init_memory();
@ -2288,7 +2288,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c
#include <xen/sched.h> #include <xen/sched.h>
#include <xen/numa.h> #include <xen/numa.h>
#include <xen/nodemask.h> #include <xen/nodemask.h>
@@ -828,7 +829,8 @@ void __init zap_low_mappings(void) @@ -830,7 +831,8 @@ void __init zap_low_mappings(void)
/* Replace with mapping of the boot trampoline only. */ /* Replace with mapping of the boot trampoline only. */
map_pages_to_xen(BOOT_TRAMPOLINE, BOOT_TRAMPOLINE >> PAGE_SHIFT, map_pages_to_xen(BOOT_TRAMPOLINE, BOOT_TRAMPOLINE >> PAGE_SHIFT,

2
23676-x86_64-image-map-bounds.patch
View File

@ -18,7 +18,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/mm.c
=================================================================== ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/mm.c --- xen-4.1.2-testing.orig/xen/arch/x86/mm.c
+++ xen-4.1.2-testing/xen/arch/x86/mm.c +++ xen-4.1.2-testing/xen/arch/x86/mm.c
@@ -776,7 +776,7 @@ static int update_xen_mappings(unsigned @@ -778,7 +778,7 @@ static int update_xen_mappings(unsigned
int err = 0; int err = 0;
#ifdef __x86_64__ #ifdef __x86_64__
bool_t alias = mfn >= PFN_DOWN(xen_phys_start) && bool_t alias = mfn >= PFN_DOWN(xen_phys_start) &&

12
23723-x86-CMOS-lock.patch
View File

@ -136,7 +136,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/traps.c
#include <public/arch-x86/cpuid.h> #include <public/arch-x86/cpuid.h>
/* /*
@@ -1629,6 +1631,10 @@ static int admin_io_okay( @@ -1630,6 +1632,10 @@ static int admin_io_okay(
if ( (port == 0xcf8) && (bytes == 4) ) if ( (port == 0xcf8) && (bytes == 4) )
return 0; return 0;
@ -147,7 +147,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/traps.c
return ioports_access_permitted(v->domain, port, port + bytes - 1); return ioports_access_permitted(v->domain, port, port + bytes - 1);
} }
@@ -1658,6 +1664,21 @@ static uint32_t guest_io_read( @@ -1659,6 +1665,21 @@ static uint32_t guest_io_read(
{ {
sub_data = pv_pit_handler(port, 0, 0); sub_data = pv_pit_handler(port, 0, 0);
} }
@ -169,7 +169,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/traps.c
else if ( (port == 0xcf8) && (bytes == 4) ) else if ( (port == 0xcf8) && (bytes == 4) )
{ {
size = 4; size = 4;
@@ -1683,8 +1704,6 @@ static uint32_t guest_io_read( @@ -1684,8 +1705,6 @@ static uint32_t guest_io_read(
return data; return data;
} }
@ -178,7 +178,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/traps.c
static void guest_io_write( static void guest_io_write(
unsigned int port, unsigned int bytes, uint32_t data, unsigned int port, unsigned int bytes, uint32_t data,
struct vcpu *v, struct cpu_user_regs *regs) struct vcpu *v, struct cpu_user_regs *regs)
@@ -1693,8 +1712,6 @@ static void guest_io_write( @@ -1694,8 +1713,6 @@ static void guest_io_write(
{ {
switch ( bytes ) { switch ( bytes ) {
case 1: case 1:
@ -187,7 +187,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/traps.c
outb((uint8_t)data, port); outb((uint8_t)data, port);
if ( pv_post_outb_hook ) if ( pv_post_outb_hook )
pv_post_outb_hook(port, (uint8_t)data); pv_post_outb_hook(port, (uint8_t)data);
@@ -1717,6 +1734,23 @@ static void guest_io_write( @@ -1718,6 +1735,23 @@ static void guest_io_write(
{ {
pv_pit_handler(port, (uint8_t)data, 1); pv_pit_handler(port, (uint8_t)data, 1);
} }
@ -211,7 +211,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/traps.c
else if ( (port == 0xcf8) && (bytes == 4) ) else if ( (port == 0xcf8) && (bytes == 4) )
{ {
size = 4; size = 4;
@@ -2082,10 +2116,6 @@ static int emulate_privileged_op(struct @@ -2083,10 +2117,6 @@ static int emulate_privileged_op(struct
goto fail; goto fail;
if ( admin_io_okay(port, op_bytes, v, regs) ) if ( admin_io_okay(port, op_bytes, v, regs) )
{ {

4
23772-x86-trampoline.patch
View File

@ -316,7 +316,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/x86_32/mm.c
#include <xen/sched.h> #include <xen/sched.h>
#include <xen/guest_access.h> #include <xen/guest_access.h>
#include <asm/current.h> #include <asm/current.h>
@@ -164,8 +165,9 @@ void __init zap_low_mappings(l2_pgentry_ @@ -166,8 +167,9 @@ void __init zap_low_mappings(l2_pgentry_
flush_all(FLUSH_TLB_GLOBAL); flush_all(FLUSH_TLB_GLOBAL);
/* Replace with mapping of the boot trampoline only. */ /* Replace with mapping of the boot trampoline only. */
@ -332,7 +332,7 @@ Index: xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c
=================================================================== ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/x86_64/mm.c --- xen-4.1.2-testing.orig/xen/arch/x86/x86_64/mm.c
+++ xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c +++ xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c
@@ -828,7 +828,7 @@ void __init zap_low_mappings(void) @@ -830,7 +830,7 @@ void __init zap_low_mappings(void)
flush_local(FLUSH_TLB_GLOBAL); flush_local(FLUSH_TLB_GLOBAL);
/* Replace with mapping of the boot trampoline only. */ /* Replace with mapping of the boot trampoline only. */

20
23897-x86-mce-offline-again.patch
View File

@ -10,8 +10,10 @@ To avoid recursive mce.
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com> Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Committed-by: Keir Fraser <keir@xen.org> Committed-by: Keir Fraser <keir@xen.org>
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c Index: xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -639,6 +639,8 @@ static void intel_memerr_dhandler(int bn @@ -639,6 +639,8 @@ static void intel_memerr_dhandler(int bn
/* This is free page */ /* This is free page */
if (status & PG_OFFLINE_OFFLINED) if (status & PG_OFFLINE_OFFLINED)
@ -21,8 +23,10 @@ Committed-by: Keir Fraser <keir@xen.org>
else if (status & PG_OFFLINE_PENDING) { else if (status & PG_OFFLINE_PENDING) {
/* This page has owner */ /* This page has owner */
if (status & PG_OFFLINE_OWNED) { if (status & PG_OFFLINE_OWNED) {
--- a/xen/common/page_alloc.c Index: xen-4.1.2-testing/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/page_alloc.c
+++ xen-4.1.2-testing/xen/common/page_alloc.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include <xen/tmem.h> #include <xen/tmem.h>
#include <xen/tmem_xen.h> #include <xen/tmem_xen.h>
@ -31,7 +35,7 @@ Committed-by: Keir Fraser <keir@xen.org>
#include <asm/page.h> #include <asm/page.h>
#include <asm/numa.h> #include <asm/numa.h>
#include <asm/flushtlb.h> #include <asm/flushtlb.h>
@@ -704,6 +705,19 @@ int offline_page(unsigned long mfn, int @@ -708,6 +709,19 @@ int offline_page(unsigned long mfn, int
return -EINVAL; return -EINVAL;
} }
@ -51,8 +55,10 @@ Committed-by: Keir Fraser <keir@xen.org>
spin_lock(&heap_lock); spin_lock(&heap_lock);
old_info = mark_page_offline(pg, broken); old_info = mark_page_offline(pg, broken);
--- a/xen/include/public/sysctl.h Index: xen-4.1.2-testing/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h ===================================================================
--- xen-4.1.2-testing.orig/xen/include/public/sysctl.h
+++ xen-4.1.2-testing/xen/include/public/sysctl.h
@@ -399,6 +399,7 @@ struct xen_sysctl_page_offline_op { @@ -399,6 +399,7 @@ struct xen_sysctl_page_offline_op {
#define PG_OFFLINE_OFFLINED (0x1UL << 1) #define PG_OFFLINE_OFFLINED (0x1UL << 1)
#define PG_OFFLINE_PENDING (0x1UL << 2) #define PG_OFFLINE_PENDING (0x1UL << 2)

71
23993-x86-microcode-amd-fix-23871.patch Normal file
View File

@ -0,0 +1,71 @@
# HG changeset patch
# User Jan Beulich <jbeulich@novell.com>
# Date 1319475620 -3600
# Node ID e458dfc35b8d3be04a9b72c30ff97163e27a7314
# Parent ffe861c1d5dfa8f4485052e5600e06124105033f
x86/ucode-amd: fix regression from c/s 23871:503ee256fecf
microcode_fits() must return distinct values for the success and
no-fit-but-no-error cases, so the caller can react accordingly. Make
it return 1 in the success case, and adjust its single caller.
Also remove an impossible code path - install_equiv_cpu_table(), which
gets called prior to microcode_fits(), never leaves equiv_cpu_table
being NULL without also returning an error.
Note that this is still awaiting testing on a system where the
regression was actually observed (which also requires a new enough
microcode_ctl package). Note also that this will need to be
backported to 4.0 and 4.1 (or the broken c/s that got backported
there reverted).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Committed-by: Keir Fraser <keir@xen.org>
Index: xen-4.1.2-testing/xen/arch/x86/microcode_amd.c
===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/microcode_amd.c
+++ xen-4.1.2-testing/xen/arch/x86/microcode_amd.c
@@ -76,14 +76,6 @@ static int microcode_fits(void *mc, int
/* We should bind the task to the CPU */
BUG_ON(cpu != raw_smp_processor_id());
- if ( equiv_cpu_table == NULL )
- {
- printk(KERN_INFO "microcode: CPU%d microcode update with "
- "version 0x%x (current=0x%x)\n",
- cpu, mc_header->patch_id, uci->cpu_sig.rev);
- goto out;
- }
-
current_cpu_id = cpuid_eax(0x00000001);
for ( i = 0; equiv_cpu_table[i].installed_cpu != 0; i++ )
@@ -96,7 +88,7 @@ static int microcode_fits(void *mc, int
}
if ( !equiv_cpu_id )
- return 0;
+ return 0;
if ( (mc_header->processor_rev_id) != equiv_cpu_id )
{
@@ -113,8 +105,7 @@ static int microcode_fits(void *mc, int
"update with version 0x%x (current=0x%x)\n",
cpu, mc_header->patch_id, uci->cpu_sig.rev);
-out:
- return 0;
+ return 1;
}
static int apply_microcode(int cpu)
@@ -289,7 +280,7 @@ static int cpu_request_microcode(int cpu
while ( (ret = get_next_ucode_from_buffer_amd(mc, buf, size, &offset)) == 0)
{
error = microcode_fits(mc, cpu);
- if (error != 0)
+ if (error <= 0)
continue;
error = apply_microcode(cpu);

2
udev-rules.patch
View File

@ -7,5 +7,5 @@ Index: xen-4.1.2-testing/tools/hotplug/Linux/xen-backend.rules
KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600"
-SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" -SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
+SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", TEST="/proc/xen", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", TEST=="/proc/xen", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
+KERNELS=="xen", KERNEL=="xvd*", SUBSYSTEM=="block", OPTIONS+="last_rule" +KERNELS=="xen", KERNEL=="xvd*", SUBSYSTEM=="block", OPTIONS+="last_rule"

4
xen-4.1.2-testing-src.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:da40746250019fd62c9c0c71085545f8eb4adcf45ca9e3a7af7560c715e0e970 oid sha256:24db3184741ea494f3a11cd522ad308c6dae6a47572360efe5d902ccb4780822
size 10786312 size 10787209

4
xen-config.diff
View File

@ -9,9 +9,9 @@ Index: xen-4.1.2-testing/Config.mk
-CONFIG_QEMU ?= $(QEMU_REMOTE) -CONFIG_QEMU ?= $(QEMU_REMOTE)
+CONFIG_QEMU ?= ioemu-qemu-xen +CONFIG_QEMU ?= ioemu-qemu-xen
QEMU_TAG := xen-4.1.2-rc3 QEMU_TAG := xen-4.1.2
#QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599 #QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
@@ -187,7 +187,7 @@ QEMU_TAG := xen-4.1.2-rc3 @@ -187,7 +187,7 @@ QEMU_TAG := xen-4.1.2
# Optional components # Optional components
XENSTAT_XENTOP ?= y XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n VTPM_TOOLS ?= n

272
xen-warnings-unused.diff
View File

@ -1,5 +1,7 @@
--- a/tools/libxc/xc_tmem.c Index: xen-4.1.2-testing/tools/libxc/xc_tmem.c
+++ b/tools/libxc/xc_tmem.c ===================================================================
--- xen-4.1.2-testing.orig/tools/libxc/xc_tmem.c
+++ xen-4.1.2-testing/tools/libxc/xc_tmem.c
@@ -390,7 +390,8 @@ static int xc_tmem_restore_new_pool( @@ -390,7 +390,8 @@ static int xc_tmem_restore_new_pool(
int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) int xc_tmem_restore(xc_interface *xch, int dom, int io_fd)
@ -10,8 +12,10 @@
uint32_t this_max_pools, this_version; uint32_t this_max_pools, this_version;
uint32_t pool_id; uint32_t pool_id;
uint32_t minusone; uint32_t minusone;
--- a/tools/libxc/xc_domain_restore.c Index: xen-4.1.2-testing/tools/libxc/xc_domain_restore.c
+++ b/tools/libxc/xc_domain_restore.c ===================================================================
--- xen-4.1.2-testing.orig/tools/libxc/xc_domain_restore.c
+++ xen-4.1.2-testing/tools/libxc/xc_domain_restore.c
@@ -1087,7 +1087,6 @@ int xc_domain_restore(xc_interface *xch, @@ -1087,7 +1087,6 @@ int xc_domain_restore(xc_interface *xch,
int vcpuextstate = 0; int vcpuextstate = 0;
uint32_t vcpuextstate_size = 0; uint32_t vcpuextstate_size = 0;
@ -28,8 +32,10 @@
n = m = 0; n = m = 0;
loadpages: loadpages:
--- a/tools/misc/gtraceview.c Index: xen-4.1.2-testing/tools/misc/gtraceview.c
+++ b/tools/misc/gtraceview.c ===================================================================
--- xen-4.1.2-testing.orig/tools/misc/gtraceview.c
+++ xen-4.1.2-testing/tools/misc/gtraceview.c
@@ -622,7 +622,8 @@ void crt_init(void) @@ -622,7 +622,8 @@ void crt_init(void)
void nr_addch(int nr, int ch) void nr_addch(int nr, int ch)
{ {
@ -40,8 +46,10 @@
getyx(stdscr, y, x); getyx(stdscr, y, x);
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
if (x == COLS-1) if (x == COLS-1)
--- a/tools/xcutils/xc_restore.c Index: xen-4.1.2-testing/tools/xcutils/xc_restore.c
+++ b/tools/xcutils/xc_restore.c ===================================================================
--- xen-4.1.2-testing.orig/tools/xcutils/xc_restore.c
+++ xen-4.1.2-testing/tools/xcutils/xc_restore.c
@@ -19,7 +19,8 @@ int @@ -19,7 +19,8 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@ -52,8 +60,10 @@
xc_interface *xch; xc_interface *xch;
int io_fd, ret; int io_fd, ret;
int superpages; int superpages;
--- a/tools/firmware/rombios/32bit/tcgbios/tcgbios.c Index: xen-4.1.2-testing/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
+++ b/tools/firmware/rombios/32bit/tcgbios/tcgbios.c ===================================================================
--- xen-4.1.2-testing.orig/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
+++ xen-4.1.2-testing/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
@@ -1064,7 +1064,7 @@ uint32_t HashLogEvent32(struct hlei *hle @@ -1064,7 +1064,7 @@ uint32_t HashLogEvent32(struct hlei *hle
uint32_t rc = 0; uint32_t rc = 0;
uint16_t size; uint16_t size;
@ -63,8 +73,10 @@
uint32_t hashdataptr; uint32_t hashdataptr;
uint32_t hashdatalen; uint32_t hashdatalen;
--- a/tools/console/client/main.c Index: xen-4.1.2-testing/tools/console/client/main.c
+++ b/tools/console/client/main.c ===================================================================
--- xen-4.1.2-testing.orig/tools/console/client/main.c
+++ xen-4.1.2-testing/tools/console/client/main.c
@@ -277,7 +277,8 @@ int main(int argc, char **argv) @@ -277,7 +277,8 @@ int main(int argc, char **argv)
}; };
@ -75,8 +87,10 @@
struct xs_handle *xs; struct xs_handle *xs;
char *end; char *end;
console_type type = CONSOLE_INVAL; console_type type = CONSOLE_INVAL;
--- a/tools/xenstat/xentop/xentop.c Index: xen-4.1.2-testing/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c ===================================================================
--- xen-4.1.2-testing.orig/tools/xenstat/xentop/xentop.c
+++ xen-4.1.2-testing/tools/xenstat/xentop/xentop.c
@@ -272,7 +272,8 @@ static void fail(const char *str) @@ -272,7 +272,8 @@ static void fail(const char *str)
/* Return the row containing the cursor. */ /* Return the row containing the cursor. */
static int current_row(void) static int current_row(void)
@ -97,9 +111,11 @@
getmaxyx(stdscr, y, x); getmaxyx(stdscr, y, x);
return y; return y;
} }
--- a/tools/libxl/libxlu_cfg.c Index: xen-4.1.2-testing/tools/libxl/libxlu_cfg.c
+++ b/tools/libxl/libxlu_cfg.c ===================================================================
@@ -348,7 +348,7 @@ char *xlu__cfgl_dequote(CfgParseContext --- xen-4.1.2-testing.orig/tools/libxl/libxlu_cfg.c
+++ xen-4.1.2-testing/tools/libxl/libxlu_cfg.c
@@ -348,7 +348,7 @@ char *xlu__cfgl_dequote(CfgParseContext
#define NUMERIC_CHAR(minlen,maxlen,base,basetext) do{ \ #define NUMERIC_CHAR(minlen,maxlen,base,basetext) do{ \
char numbuf[(maxlen)+1], *ep; \ char numbuf[(maxlen)+1], *ep; \
@ -108,9 +124,11 @@
\ \
strncpy(numbuf,p,(maxlen)); \ strncpy(numbuf,p,(maxlen)); \
numbuf[(maxlen)]= 0; \ numbuf[(maxlen)]= 0; \
--- a/tools/libxl/libxl.c Index: xen-4.1.2-testing/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c ===================================================================
@@ -221,7 +221,7 @@ int libxl_domain_rename(libxl_ctx *ctx, --- xen-4.1.2-testing.orig/tools/libxl/libxl.c
+++ xen-4.1.2-testing/tools/libxl/libxl.c
@@ -221,7 +221,7 @@ int libxl_domain_rename(libxl_ctx *ctx,
int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid) int libxl_domain_resume(libxl_ctx *ctx, uint32_t domid)
{ {
libxl__gc gc = LIBXL_INIT_GC(ctx); libxl__gc gc = LIBXL_INIT_GC(ctx);
@ -137,8 +155,10 @@
libxl__sprintf(&gc, "%s/device/vif", dompath), &nb_nics); libxl__sprintf(&gc, "%s/device/vif", dompath), &nb_nics);
if (!l) if (!l)
goto err; goto err;
--- a/tools/libxl/libxl_pci.c Index: xen-4.1.2-testing/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c ===================================================================
--- xen-4.1.2-testing.orig/tools/libxl/libxl_pci.c
+++ xen-4.1.2-testing/tools/libxl/libxl_pci.c
@@ -240,7 +240,7 @@ static int libxl_create_pci_backend(libx @@ -240,7 +240,7 @@ static int libxl_create_pci_backend(libx
flexarray_t *front = NULL; flexarray_t *front = NULL;
flexarray_t *back = NULL; flexarray_t *back = NULL;
@ -157,8 +177,10 @@
LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Creating pci backend"); LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Creating pci backend");
/* add pci device */ /* add pci device */
--- a/tools/libxl/libxl_dom.c Index: xen-4.1.2-testing/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c ===================================================================
--- xen-4.1.2-testing.orig/tools/libxl/libxl_dom.c
+++ xen-4.1.2-testing/tools/libxl/libxl_dom.c
@@ -265,14 +265,13 @@ int libxl__build_hvm(libxl_ctx *ctx, uin @@ -265,14 +265,13 @@ int libxl__build_hvm(libxl_ctx *ctx, uin
libxl_domain_build_info *info, libxl_domain_build_state *state) libxl_domain_build_info *info, libxl_domain_build_state *state)
{ {
@ -183,8 +205,10 @@
out: out:
libxl__free_all(&gc); libxl__free_all(&gc);
return 0; return 0;
--- a/tools/libxl/libxl_utils.c Index: xen-4.1.2-testing/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c ===================================================================
--- xen-4.1.2-testing.orig/tools/libxl/libxl_utils.c
+++ xen-4.1.2-testing/tools/libxl/libxl_utils.c
@@ -531,7 +531,7 @@ int libxl_devid_to_device_disk(libxl_ctx @@ -531,7 +531,7 @@ int libxl_devid_to_device_disk(libxl_ctx
libxl__gc gc = LIBXL_INIT_GC(ctx); libxl__gc gc = LIBXL_INIT_GC(ctx);
char *val; char *val;
@ -194,8 +218,10 @@
int rc = ERROR_INVAL; int rc = ERROR_INVAL;
devid_n = libxl__device_disk_dev_number(devid); devid_n = libxl__device_disk_dev_number(devid);
--- a/tools/libxl/xl_cmdimpl.c Index: xen-4.1.2-testing/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c ===================================================================
--- xen-4.1.2-testing.orig/tools/libxl/xl_cmdimpl.c
+++ xen-4.1.2-testing/tools/libxl/xl_cmdimpl.c
@@ -5448,7 +5448,7 @@ int main_cpupoollist(int argc, char **ar @@ -5448,7 +5448,7 @@ int main_cpupoollist(int argc, char **ar
{"cpus", 0, 0, 'c'}, {"cpus", 0, 0, 'c'},
{0, 0, 0, 0} {0, 0, 0, 0}
@ -205,8 +231,10 @@
int opt_cpus = 0; int opt_cpus = 0;
const char *pool = NULL; const char *pool = NULL;
libxl_cpupoolinfo *poolinfo; libxl_cpupoolinfo *poolinfo;
--- a/tools/debugger/gdbsx/gx/gx_comm.c Index: xen-4.1.2-testing/tools/debugger/gdbsx/gx/gx_comm.c
+++ b/tools/debugger/gdbsx/gx/gx_comm.c ===================================================================
--- xen-4.1.2-testing.orig/tools/debugger/gdbsx/gx/gx_comm.c
+++ xen-4.1.2-testing/tools/debugger/gdbsx/gx/gx_comm.c
@@ -163,7 +163,7 @@ readchar(void) @@ -163,7 +163,7 @@ readchar(void)
static char buf[BUFSIZ]; static char buf[BUFSIZ];
static int bufcnt = 0; static int bufcnt = 0;
@ -216,8 +244,10 @@
if (bufcnt-- > 0) if (bufcnt-- > 0)
return *bufp++ & 0x7f; return *bufp++ & 0x7f;
--- a/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c Index: xen-4.1.2-testing/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
+++ b/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c ===================================================================
--- xen-4.1.2-testing.orig/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
+++ xen-4.1.2-testing/tools/python/xen/lowlevel/checkpoint/libcheckpoint.c
@@ -820,7 +820,7 @@ static int create_suspend_thread(checkpo @@ -820,7 +820,7 @@ static int create_suspend_thread(checkpo
static void stop_suspend_thread(checkpoint_state* s) static void stop_suspend_thread(checkpoint_state* s)
@ -227,8 +257,10 @@
s->done = 1; s->done = 1;
--- a/tools/python/xen/lowlevel/netlink/libnetlink.c Index: xen-4.1.2-testing/tools/python/xen/lowlevel/netlink/libnetlink.c
+++ b/tools/python/xen/lowlevel/netlink/libnetlink.c ===================================================================
--- xen-4.1.2-testing.orig/tools/python/xen/lowlevel/netlink/libnetlink.c
+++ xen-4.1.2-testing/tools/python/xen/lowlevel/netlink/libnetlink.c
@@ -433,7 +433,8 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt @@ -433,7 +433,8 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt
nladdr.nl_groups = 0; nladdr.nl_groups = 0;
@ -239,8 +271,10 @@
int l; int l;
status = fread(&buf, 1, sizeof(*h), rtnl); status = fread(&buf, 1, sizeof(*h), rtnl);
--- a/xen/arch/x86/msi.c Index: xen-4.1.2-testing/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/msi.c
+++ xen-4.1.2-testing/xen/arch/x86/msi.c
@@ -799,7 +799,7 @@ static void __pci_disable_msi(struct msi @@ -799,7 +799,7 @@ static void __pci_disable_msi(struct msi
{ {
struct pci_dev *dev; struct pci_dev *dev;
@ -250,9 +284,11 @@
u8 bus, slot, func; u8 bus, slot, func;
dev = entry->dev; dev = entry->dev;
--- a/xen/arch/x86/microcode_amd.c Index: xen-4.1.2-testing/xen/arch/x86/microcode_amd.c
+++ b/xen/arch/x86/microcode_amd.c ===================================================================
@@ -160,7 +160,7 @@ static int apply_microcode(int cpu) --- xen-4.1.2-testing.orig/xen/arch/x86/microcode_amd.c
+++ xen-4.1.2-testing/xen/arch/x86/microcode_amd.c
@@ -151,7 +151,7 @@ static int apply_microcode(int cpu)
static int get_next_ucode_from_buffer_amd(void *mc, const void *buf, static int get_next_ucode_from_buffer_amd(void *mc, const void *buf,
size_t size, unsigned long *offset) size_t size, unsigned long *offset)
{ {
@ -261,8 +297,10 @@
size_t total_size; size_t total_size;
const uint8_t *bufp = buf; const uint8_t *bufp = buf;
unsigned long off; unsigned long off;
--- a/xen/common/cpupool.c Index: xen-4.1.2-testing/xen/common/cpupool.c
+++ b/xen/common/cpupool.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/cpupool.c
+++ xen-4.1.2-testing/xen/common/cpupool.c
@@ -356,7 +356,7 @@ int cpupool_add_domain(struct domain *d, @@ -356,7 +356,7 @@ int cpupool_add_domain(struct domain *d,
{ {
struct cpupool *c; struct cpupool *c;
@ -283,8 +321,10 @@
if ( d->cpupool == NULL ) if ( d->cpupool == NULL )
return; return;
--- a/xen/common/grant_table.c Index: xen-4.1.2-testing/xen/common/grant_table.c
+++ b/xen/common/grant_table.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/grant_table.c
+++ xen-4.1.2-testing/xen/common/grant_table.c
@@ -765,7 +765,7 @@ __gnttab_unmap_common( @@ -765,7 +765,7 @@ __gnttab_unmap_common(
struct domain *ld, *rd; struct domain *ld, *rd;
struct active_grant_entry *act; struct active_grant_entry *act;
@ -294,8 +334,10 @@
ld = current->domain; ld = current->domain;
--- a/xen/common/kexec.c Index: xen-4.1.2-testing/xen/common/kexec.c
+++ b/xen/common/kexec.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/kexec.c
+++ xen-4.1.2-testing/xen/common/kexec.c
@@ -569,7 +569,8 @@ static int kexec_exec(XEN_GUEST_HANDLE(v @@ -569,7 +569,8 @@ static int kexec_exec(XEN_GUEST_HANDLE(v
{ {
xen_kexec_exec_t exec; xen_kexec_exec_t exec;
@ -306,8 +348,10 @@
if ( unlikely(copy_from_guest(&exec, uarg, 1)) ) if ( unlikely(copy_from_guest(&exec, uarg, 1)) )
return -EFAULT; return -EFAULT;
--- a/xen/drivers/passthrough/vtd/intremap.c Index: xen-4.1.2-testing/xen/drivers/passthrough/vtd/intremap.c
+++ b/xen/drivers/passthrough/vtd/intremap.c ===================================================================
--- xen-4.1.2-testing.orig/xen/drivers/passthrough/vtd/intremap.c
+++ xen-4.1.2-testing/xen/drivers/passthrough/vtd/intremap.c
@@ -367,7 +367,7 @@ unsigned int io_apic_read_remap_rte( @@ -367,7 +367,7 @@ unsigned int io_apic_read_remap_rte(
unsigned int ioapic_pin = (reg - 0x10) / 2; unsigned int ioapic_pin = (reg - 0x10) / 2;
int index; int index;
@ -326,8 +370,10 @@
iommu = drhd->iommu; iommu = drhd->iommu;
qi_ctrl = iommu_qi_ctrl(iommu); qi_ctrl = iommu_qi_ctrl(iommu);
--- a/xen/common/sched_credit2.c Index: xen-4.1.2-testing/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/sched_credit2.c
+++ xen-4.1.2-testing/xen/common/sched_credit2.c
@@ -1854,7 +1854,8 @@ static void deactivate_runqueue(struct c @@ -1854,7 +1854,8 @@ static void deactivate_runqueue(struct c
static void init_pcpu(const struct scheduler *ops, int cpu) static void init_pcpu(const struct scheduler *ops, int cpu)
@ -338,9 +384,11 @@
struct csched_private *prv = CSCHED_PRIV(ops); struct csched_private *prv = CSCHED_PRIV(ops);
struct csched_runqueue_data *rqd; struct csched_runqueue_data *rqd;
spinlock_t *old_lock; spinlock_t *old_lock;
--- a/xen/common/unlzo.c Index: xen-4.1.2-testing/xen/common/unlzo.c
+++ b/xen/common/unlzo.c ===================================================================
@@ -68,7 +68,7 @@ static int INIT parse_header(u8 *input, --- xen-4.1.2-testing.orig/xen/common/unlzo.c
+++ xen-4.1.2-testing/xen/common/unlzo.c
@@ -68,7 +68,7 @@ static int INIT parse_header(u8 *input,
{ {
int l; int l;
u8 *parse = input; u8 *parse = input;
@ -349,8 +397,10 @@
u16 version; u16 version;
/* read magic: 9 first bits */ /* read magic: 9 first bits */
--- a/xen/arch/x86/time.c Index: xen-4.1.2-testing/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/time.c
+++ xen-4.1.2-testing/xen/arch/x86/time.c
@@ -1009,7 +1009,8 @@ static void local_time_calibration(void) @@ -1009,7 +1009,8 @@ static void local_time_calibration(void)
* System timestamps, extrapolated from local and master oscillators, * System timestamps, extrapolated from local and master oscillators,
* taken during this calibration and the previous calibration. * taken during this calibration and the previous calibration.
@ -361,8 +411,10 @@
s_time_t prev_master_stime, curr_master_stime; s_time_t prev_master_stime, curr_master_stime;
/* TSC timestamps taken during this calibration and prev calibration. */ /* TSC timestamps taken during this calibration and prev calibration. */
--- a/xen/arch/x86/cpu/amd.c Index: xen-4.1.2-testing/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/amd.c
+++ xen-4.1.2-testing/xen/arch/x86/cpu/amd.c
@@ -391,7 +391,7 @@ static void __devinit init_amd(struct cp @@ -391,7 +391,7 @@ static void __devinit init_amd(struct cp
{ {
u32 l, h; u32 l, h;
@ -372,9 +424,11 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
unsigned long long value; unsigned long long value;
--- a/xen/arch/x86/mm/p2m.c Index: xen-4.1.2-testing/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c ===================================================================
@@ -2338,7 +2338,7 @@ p2m_remove_page(struct p2m_domain *p2m, --- xen-4.1.2-testing.orig/xen/arch/x86/mm/p2m.c
+++ xen-4.1.2-testing/xen/arch/x86/mm/p2m.c
@@ -2338,7 +2338,7 @@ p2m_remove_page(struct p2m_domain *p2m,
unsigned int page_order) unsigned int page_order)
{ {
unsigned long i; unsigned long i;
@ -392,8 +446,10 @@
int pod_count = 0; int pod_count = 0;
int rc = 0; int rc = 0;
--- a/xen/arch/x86/hvm/emulate.c Index: xen-4.1.2-testing/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/emulate.c
+++ xen-4.1.2-testing/xen/arch/x86/hvm/emulate.c
@@ -59,7 +59,7 @@ static int hvmemul_do_io( @@ -59,7 +59,7 @@ static int hvmemul_do_io(
ioreq_t *p = get_ioreq(curr); ioreq_t *p = get_ioreq(curr);
unsigned long ram_gfn = paddr_to_pfn(ram_gpa); unsigned long ram_gfn = paddr_to_pfn(ram_gpa);
@ -403,8 +459,10 @@
int rc; int rc;
/* Check for paged out page */ /* Check for paged out page */
--- a/xen/arch/x86/hvm/hvm.c Index: xen-4.1.2-testing/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/hvm.c
+++ xen-4.1.2-testing/xen/arch/x86/hvm/hvm.c
@@ -253,7 +253,8 @@ void hvm_migrate_timers(struct vcpu *v) @@ -253,7 +253,8 @@ void hvm_migrate_timers(struct vcpu *v)
void hvm_migrate_pirqs(struct vcpu *v) void hvm_migrate_pirqs(struct vcpu *v)
@ -424,8 +482,10 @@
mfn = gfn_to_mfn_unshare(p2m, pfn, &t, 0); mfn = gfn_to_mfn_unshare(p2m, pfn, &t, 0);
if ( p2m_is_paging(t) ) if ( p2m_is_paging(t) )
{ {
--- a/xen/arch/x86/acpi/cpu_idle.c Index: xen-4.1.2-testing/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/acpi/cpu_idle.c
+++ xen-4.1.2-testing/xen/arch/x86/acpi/cpu_idle.c
@@ -275,7 +275,7 @@ static void acpi_processor_ffh_cstate_en @@ -275,7 +275,7 @@ static void acpi_processor_ffh_cstate_en
static void acpi_idle_do_entry(struct acpi_processor_cx *cx) static void acpi_idle_do_entry(struct acpi_processor_cx *cx)
@ -435,8 +495,10 @@
switch ( cx->entry_method ) switch ( cx->entry_method )
{ {
--- a/xen/arch/x86/cpu/intel_cacheinfo.c Index: xen-4.1.2-testing/xen/arch/x86/cpu/intel_cacheinfo.c
+++ b/xen/arch/x86/cpu/intel_cacheinfo.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/intel_cacheinfo.c
+++ xen-4.1.2-testing/xen/arch/x86/cpu/intel_cacheinfo.c
@@ -170,7 +170,8 @@ unsigned int __cpuinit init_intel_cachei @@ -170,7 +170,8 @@ unsigned int __cpuinit init_intel_cachei
unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */ unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */
unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */ unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
@ -447,9 +509,11 @@
if (c->cpuid_level > 3) { if (c->cpuid_level > 3) {
static int is_initialized; static int is_initialized;
--- a/xen/arch/x86/mm/mem_sharing.c Index: xen-4.1.2-testing/xen/arch/x86/mm/mem_sharing.c
+++ b/xen/arch/x86/mm/mem_sharing.c ===================================================================
@@ -376,7 +376,7 @@ int mem_sharing_debug_gfn(struct domain --- xen-4.1.2-testing.orig/xen/arch/x86/mm/mem_sharing.c
+++ xen-4.1.2-testing/xen/arch/x86/mm/mem_sharing.c
@@ -375,7 +375,7 @@ int mem_sharing_debug_gfn(struct domain
{ {
p2m_type_t p2mt; p2m_type_t p2mt;
mfn_t mfn; mfn_t mfn;
@ -458,8 +522,10 @@
mfn = gfn_to_mfn(p2m_get_hostp2m(d), gfn, &p2mt); mfn = gfn_to_mfn(p2m_get_hostp2m(d), gfn, &p2mt);
page = mfn_to_page(mfn); page = mfn_to_page(mfn);
--- a/xen/arch/x86/hvm/viridian.c Index: xen-4.1.2-testing/xen/arch/x86/hvm/viridian.c
+++ b/xen/arch/x86/hvm/viridian.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/hvm/viridian.c
+++ xen-4.1.2-testing/xen/arch/x86/hvm/viridian.c
@@ -270,7 +270,7 @@ int rdmsr_viridian_regs(uint32_t idx, ui @@ -270,7 +270,7 @@ int rdmsr_viridian_regs(uint32_t idx, ui
int viridian_hypercall(struct cpu_user_regs *regs) int viridian_hypercall(struct cpu_user_regs *regs)
{ {
@ -469,9 +535,11 @@
uint16_t status = HV_STATUS_SUCCESS; uint16_t status = HV_STATUS_SUCCESS;
union hypercall_input { union hypercall_input {
--- a/xen/arch/x86/mm.c Index: xen-4.1.2-testing/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c ===================================================================
@@ -4904,7 +4904,7 @@ static int ptwr_emulated_update( --- xen-4.1.2-testing.orig/xen/arch/x86/mm.c
+++ xen-4.1.2-testing/xen/arch/x86/mm.c
@@ -4906,7 +4906,7 @@ static int ptwr_emulated_update(
{ {
unsigned long mfn; unsigned long mfn;
unsigned long unaligned_addr = addr; unsigned long unaligned_addr = addr;
@ -480,8 +548,10 @@
l1_pgentry_t pte, ol1e, nl1e, *pl1e; l1_pgentry_t pte, ol1e, nl1e, *pl1e;
struct vcpu *v = current; struct vcpu *v = current;
struct domain *d = v->domain; struct domain *d = v->domain;
--- a/xen/arch/x86/x86_64/mm.c Index: xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/x86_64/mm.c
+++ xen-4.1.2-testing/xen/arch/x86/x86_64/mm.c
@@ -436,7 +436,8 @@ void destroy_m2p_mapping(struct mem_hota @@ -436,7 +436,8 @@ void destroy_m2p_mapping(struct mem_hota
static int setup_compat_m2p_table(struct mem_hotadd_info *info) static int setup_compat_m2p_table(struct mem_hotadd_info *info)
{ {
@ -492,8 +562,10 @@
l3_pgentry_t *l3_ro_mpt = NULL; l3_pgentry_t *l3_ro_mpt = NULL;
l2_pgentry_t *l2_ro_mpt = NULL; l2_pgentry_t *l2_ro_mpt = NULL;
struct page_info *l1_pg; struct page_info *l1_pg;
--- a/xen/arch/x86/cpu/mcheck/mce.c Index: xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/mcheck/mce.c
+++ xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/mce.c
@@ -151,7 +151,6 @@ static struct mcinfo_bank *mca_init_bank @@ -151,7 +151,6 @@ static struct mcinfo_bank *mca_init_bank
struct mc_info *mi, int bank) struct mc_info *mi, int bank)
{ {
@ -510,7 +582,7 @@
if (mib->mc_status & MCi_STATUS_MISCV) if (mib->mc_status & MCi_STATUS_MISCV)
mib->mc_misc = mca_rdmsr(MSR_IA32_MCx_MISC(bank)); mib->mc_misc = mca_rdmsr(MSR_IA32_MCx_MISC(bank));
@@ -281,7 +279,7 @@ mctelem_cookie_t mcheck_mca_logout(enum @@ -281,7 +279,7 @@ mctelem_cookie_t mcheck_mca_logout(enum
recover = (mc_recoverable_scan)? 1: 0; recover = (mc_recoverable_scan)? 1: 0;
for (i = 0; i < 32 && i < nr_mce_banks; i++) { for (i = 0; i < 32 && i < nr_mce_banks; i++) {
@ -528,8 +600,10 @@
uint64_t hwcr = 0; uint64_t hwcr = 0;
int intpose; int intpose;
int i; int i;
--- a/xen/common/tmem.c Index: xen-4.1.2-testing/xen/common/tmem.c
+++ b/xen/common/tmem.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/tmem.c
+++ xen-4.1.2-testing/xen/common/tmem.c
@@ -1351,7 +1351,8 @@ obj_unlock: @@ -1351,7 +1351,8 @@ obj_unlock:
static int tmem_evict(void) static int tmem_evict(void)
{ {
@ -550,8 +624,10 @@
client_t *client = pool->client; client_t *client = pool->client;
int ret = client->frozen ? -EFROZEN : -ENOMEM; int ret = client->frozen ? -EFROZEN : -ENOMEM;
--- a/xen/common/tmem_xen.c Index: xen-4.1.2-testing/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c ===================================================================
--- xen-4.1.2-testing.orig/xen/common/tmem_xen.c
+++ xen-4.1.2-testing/xen/common/tmem_xen.c
@@ -177,7 +177,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p @@ -177,7 +177,7 @@ EXPORT int tmh_copy_from_client(pfp_t *p
EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn, EXPORT int tmh_compress_from_client(tmem_cli_mfn_t cmfn,
void **out_va, size_t *out_len, void *cli_va) void **out_va, size_t *out_len, void *cli_va)
@ -589,8 +665,10 @@
tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get, tmh->persistent_pool = xmem_pool_create(name, tmh_persistent_pool_page_get,
tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE); tmh_persistent_pool_page_put, PAGE_SIZE, 0, PAGE_SIZE);
if ( tmh->persistent_pool == NULL ) if ( tmh->persistent_pool == NULL )
--- a/xen/arch/x86/cpu/mcheck/vmce.c Index: xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/vmce.c
+++ b/xen/arch/x86/cpu/mcheck/vmce.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/cpu/mcheck/vmce.c
+++ xen-4.1.2-testing/xen/arch/x86/cpu/mcheck/vmce.c
@@ -574,7 +574,7 @@ int is_vmce_ready(struct mcinfo_bank *ba @@ -574,7 +574,7 @@ int is_vmce_ready(struct mcinfo_bank *ba
*/ */
int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn) int unmmap_broken_page(struct domain *d, mfn_t mfn, unsigned long gfn)
@ -600,9 +678,11 @@
struct p2m_domain *p2m; struct p2m_domain *p2m;
p2m_type_t pt; p2m_type_t pt;
--- a/xen/arch/x86/mm/shadow/multi.c Index: xen-4.1.2-testing/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c ===================================================================
@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t --- xen-4.1.2-testing.orig/xen/arch/x86/mm/shadow/multi.c
+++ xen-4.1.2-testing/xen/arch/x86/mm/shadow/multi.c
@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t
/* Put a shadow into the hash table */ /* Put a shadow into the hash table */
{ {
struct domain *d = v->domain; struct domain *d = v->domain;
@ -620,8 +700,10 @@
shadow_l1e_t *sl1p, sl1e; shadow_l1e_t *sl1p, sl1e;
struct page_info *sp; struct page_info *sp;
--- a/xen/arch/x86/domain_build.c Index: xen-4.1.2-testing/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c ===================================================================
--- xen-4.1.2-testing.orig/xen/arch/x86/domain_build.c
+++ xen-4.1.2-testing/xen/arch/x86/domain_build.c
@@ -378,8 +378,7 @@ int __init construct_dom0( @@ -378,8 +378,7 @@ int __init construct_dom0(
return rc; return rc;
@ -632,9 +714,11 @@
machine = elf_uval(&elf, elf.ehdr, e_machine); machine = elf_uval(&elf, elf.ehdr, e_machine);
switch (CONFIG_PAGING_LEVELS) { switch (CONFIG_PAGING_LEVELS) {
case 3: /* x86_32p */ case 3: /* x86_32p */
--- a/xen/arch/x86/traps.c Index: xen-4.1.2-testing/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c ===================================================================
@@ -1853,7 +1853,11 @@ static int emulate_privileged_op(struct --- xen-4.1.2-testing.orig/xen/arch/x86/traps.c
+++ xen-4.1.2-testing/xen/arch/x86/traps.c
@@ -1854,7 +1854,11 @@ static int emulate_privileged_op(struct
struct vcpu *v = current; struct vcpu *v = current;
unsigned long *reg, eip = regs->eip; unsigned long *reg, eip = regs->eip;
u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0; u8 opcode, modrm_reg = 0, modrm_rm = 0, rep_prefix = 0, lock = 0, rex = 0;

18
xen.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Oct 26 10:13:04 MDT 2011 - carnold@novell.com
- bnc#725169 - xen-4.0.2_21511_03-0.5.3: bootup hangs
23993-x86-microcode-amd-fix-23871.patch
-------------------------------------------------------------------
Wed Oct 26 09:48:14 MDT 2011 - carnold@novell.com
- Update to Xen 4.1.2 FCS c/s 23174
-------------------------------------------------------------------
Mon Oct 24 09:26:24 MDT 2011 - jfehlig@suse.com
- bnc#720054 - Fix syntax error introduced during recent adjustment
of Xen's tap udev rule.
Updated udev-rules.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 20 21:39:08 CEST 2011 - ohering@suse.de Thu Oct 20 21:39:08 CEST 2011 - ohering@suse.de

33
xen.spec
View File

@ -22,7 +22,7 @@ Name: xen
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
%define xvers 4.1 %define xvers 4.1
%define xvermaj 4 %define xvermaj 4
%define changeset 23171 %define changeset 23174
%define xen_build_dir xen-4.1.2-testing %define xen_build_dir xen-4.1.2-testing
%define with_kmp 1 %define with_kmp 1
%define with_stubdom 1 %define with_stubdom 1
@ -240,6 +240,7 @@ Patch23957: 23957-cpufreq-error-paths.patch
Patch23978: 23978-xenpaging_check_p2mt_in_p2m_mem_paging_functions.patch Patch23978: 23978-xenpaging_check_p2mt_in_p2m_mem_paging_functions.patch
Patch23979: 23979-xenpaging_document_p2m_mem_paging_functions.patch Patch23979: 23979-xenpaging_document_p2m_mem_paging_functions.patch
Patch23980: 23980-xenpaging_disallow_paging_in_a_PoD_guest.patch Patch23980: 23980-xenpaging_disallow_paging_in_a_PoD_guest.patch
Patch23993: 23993-x86-microcode-amd-fix-23871.patch
# Upstream qemu patches # Upstream qemu patches
# Our patches # Our patches
Patch300: xen-config.diff Patch300: xen-config.diff
@ -393,7 +394,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%suse_kernel_module_package -n xen um xen -f kmp_filelist %suse_kernel_module_package -n xen um xen -f kmp_filelist
%endif %endif
%description %description
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -455,7 +455,6 @@ Group: System/Kernel
#Requires: xen = %{version} #Requires: xen = %{version}
AutoReqProv: on AutoReqProv: on
%description libs %description libs
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -501,7 +500,6 @@ Authors:
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%package tools %package tools
License: GPLv2+ License: GPLv2+
Summary: Xen Virtualization: Control tools for domain 0 Summary: Xen Virtualization: Control tools for domain 0
@ -513,7 +511,6 @@ Provides: xen-tools-ioemu = 3.2
Obsoletes: xen-tools-ioemu <= 3.2 Obsoletes: xen-tools-ioemu <= 3.2
AutoReqProv: on AutoReqProv: on
%description tools %description tools
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -561,7 +558,6 @@ Authors:
Ian Pratt <ian.pratt@cl.cam.ac.uk> Ian Pratt <ian.pratt@cl.cam.ac.uk>
%endif %endif
%package tools-domU %package tools-domU
License: GPLv2+ License: GPLv2+
Summary: Xen Virtualization: Control tools for domain U Summary: Xen Virtualization: Control tools for domain U
@ -569,7 +565,6 @@ Group: System/Kernel
Conflicts: xen-tools Conflicts: xen-tools
AutoReqProv: on AutoReqProv: on
%description tools-domU %description tools-domU
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -590,7 +585,6 @@ Summary: Xen Virtualization: Headers and libraries for development
Group: System/Kernel Group: System/Kernel
Requires: xen-libs = %{version} Requires: xen-libs = %{version}
%description devel %description devel
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -636,14 +630,12 @@ Authors:
%if %{?with_kmp}0 %if %{?with_kmp}0
%package KMP %package KMP
License: GPLv2+ License: GPLv2+
Group: System/Kernel Group: System/Kernel
Summary: Xen para-virtual device drivers for fully virtualized guests Summary: Xen para-virtual device drivers for fully virtualized guests
Conflicts: xen Conflicts: xen
%description KMP %description KMP
Xen para-virtual device drivers for fully virtualized guests Xen para-virtual device drivers for fully virtualized guests
@ -689,13 +681,11 @@ Xen, but is not available for release due to license restrictions.
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%package doc-html %package doc-html
License: GPLv2+ License: GPLv2+
Summary: Xen Virtualization: HTML documentation Summary: Xen Virtualization: HTML documentation
Group: Documentation/HTML Group: Documentation/HTML
%description doc-html %description doc-html
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -715,7 +705,6 @@ License: GPLv2+
Summary: Xen Virtualization: PDF documentation Summary: Xen Virtualization: PDF documentation
Group: Documentation/Other Group: Documentation/Other
%description doc-pdf %description doc-pdf
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -732,7 +721,6 @@ Authors:
Ian Pratt <ian.pratt@cl.cam.ac.uk> Ian Pratt <ian.pratt@cl.cam.ac.uk>
%endif %endif
%prep %prep
%setup -q -n %xen_build_dir -a 1 -a 20000 %setup -q -n %xen_build_dir -a 1 -a 20000
%patch20000 -p1 %patch20000 -p1
@ -836,6 +824,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch23978 -p1 %patch23978 -p1
%patch23979 -p1 %patch23979 -p1
%patch23980 -p1 %patch23980 -p1
%patch23993 -p1
# Upstream patches # Upstream patches
%patch300 -p1 %patch300 -p1
%patch301 -p1 %patch301 -p1
@ -974,7 +963,6 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch99998 -p1 %patch99998 -p1
%patch99999 -p1 %patch99999 -p1
%build %build
XEN_EXTRAVERSION=%version-%release XEN_EXTRAVERSION=%version-%release
XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}} XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
@ -1010,7 +998,6 @@ for flavor in %flavors_to_build; do
done done
%endif %endif
%install %install
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
@ -1213,7 +1200,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%files -f xen.files.txt %files -f xen.files.txt
%defattr(-,root,root) %defattr(-,root,root)
/boot/xen-%{version}-%{release}.gz /boot/xen-%{version}-%{release}.gz
@ -1230,7 +1216,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
/boot/xen.gz /boot/xen.gz
%endif %endif
%files libs %files libs
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/fs/ %{_libdir}/fs/
@ -1238,7 +1223,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%files tools %files tools
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/xenalyze /usr/bin/xenalyze
@ -1379,14 +1363,12 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%config %{_fwdefdir}/xend-relocation-server %config %{_fwdefdir}/xend-relocation-server
%endif %endif
%files tools-domU %files tools-domU
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/xen-detect /usr/bin/xen-detect
/bin/domu-xenstore /bin/domu-xenstore
/bin/xenstore-* /bin/xenstore-*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/serial-split %{_bindir}/serial-split
@ -1396,12 +1378,10 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%files doc-html %files doc-html
%defattr(-,root,root) %defattr(-,root,root)
%{_defaultdocdir}/xen/html %{_defaultdocdir}/xen/html
%files doc-pdf %files doc-pdf
%defattr(-,root,root) %defattr(-,root,root)
%{_defaultdocdir}/xen/pdf %{_defaultdocdir}/xen/pdf
@ -1409,7 +1389,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%post tools %post tools
%if %{?with_xend}0 %if %{?with_xend}0
# with_xend # with_xend
@ -1455,11 +1434,9 @@ if [ -f /usr/bin/qemu-nbd ]; then
ln -s /usr/bin/qemu-nbd /usr/bin/qemu-nbd-xen ln -s /usr/bin/qemu-nbd /usr/bin/qemu-nbd-xen
fi fi
%preun tools %preun tools
%{stop_on_removal xendomains xend xencommons} %{stop_on_removal xendomains xend xencommons}
%postun tools %postun tools
%if %{?with_xend}0 %if %{?with_xend}0
# with_xend # with_xend
@ -1474,12 +1451,8 @@ if [ -f /usr/bin/qemu-nbd-xen ]; then
fi fi
%endif %endif
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog