Wed Jul 23 14:34:50 UTC 2008

Author: markmc

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3184

Modified Files:
	xen-3.0.2-config-allow-unix-server.patch 
	xen-3.0.2-config-disable-reloc.patch 
	xen-3.2.0-block-rw-range-check.patch 
	xen-3.2.0-qemu-evtchn-fd.patch xen-compile-fixes.patch 
	xen-config-dom0-minmem.patch xen-dumpdir.patch 
	xen-hvm-kernel-boot-nonrelocatable.patch 
	xen-hvm-kernel-boot-relocatable.patch 
	xen-hvm-kernel-boot-xend.patch xen-ia64-hypercall-args.patch 
	xen-net-disable-bridge-by-default.patch 
	xen-net-disable-iptables-on-bridge.patch 
	xen-pvfb-validate-fb.patch xen-qemu-bootmenu.patch 
	xen-qemu-image-format.patch xen-qemu-logfile.patch 
	xen-timer-mode.patch xen-xenstore-cli.patch xen.spec 
Added Files:
	xen-3.2.0-bzimage.patch 
Log Message:
* Wed Jul 23 2008 Mark McLoughlin <markmc at redhat.com> - 3.2.0-17.fc10
- Enable xen-hypervisor build
- Backport support for booting DomU from bzImage
- Re-diff all patches for zero fuzz


xen-3.2.0-bzimage.patch:

--- NEW FILE xen-3.2.0-bzimage.patch ---
x86: Support loading Linux bzImage v2.08 and up.

The latest -mm kernel (2.6.25-rc3-mm1) contains v2.08 of the Linux
bzImage format which embeds an ELF file in place of the raw payload
allowing it to be extracted and used by the Xen domain builder.

It is expected that this functionality will be put forward for 2.6.26.

Signed-off-by : Ian Campbell <ijc at hellion.org.uk>

Index: xen-3.2.0/tools/libxc/Makefile
===================================================================
--- xen-3.2.0.orig/tools/libxc/Makefile	2008-01-16 18:34:59.000000000 +0000
+++ xen-3.2.0.orig/tools/libxc/Makefile	2008-01-16 18:34:59.000000000 +0000
@@ -47,10 +47,11 @@ $(LIBELF_SRCS) libelf-private.h:
 GUEST_SRCS-y += $(LIBELF_SRCS)
 
 # new domain builder
-GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c
-GUEST_SRCS-y += xc_dom_elfloader.c
-GUEST_SRCS-y += xc_dom_binloader.c
-GUEST_SRCS-y += xc_dom_compat_linux.c
+GUEST_SRCS-y                 += xc_dom_core.c xc_dom_boot.c
+GUEST_SRCS-y                 += xc_dom_elfloader.c
+GUEST_SRCS-$(CONFIG_X86)     += xc_dom_bzimageloader.c
+GUEST_SRCS-y                 += xc_dom_binloader.c
+GUEST_SRCS-y                 += xc_dom_compat_linux.c
 
 GUEST_SRCS-$(CONFIG_X86)     += xc_dom_x86.c
 GUEST_SRCS-$(CONFIG_IA64)    += xc_dom_ia64.c
Index: xen-3.2.0/tools/libxc/xc_dom_elfloader.c
===================================================================
--- xen-3.2.0.orig/tools/libxc/xc_dom_elfloader.c	2008-01-16 18:34:59.000000000 +0000
+++ xen-3.2.0.orig/tools/libxc/xc_dom_elfloader.c	2008-01-16 18:34:59.000000000 +0000
@@ -281,7 +281,7 @@ static int xc_dom_load_elf_kernel(struct
 
 /* ------------------------------------------------------------------------ */
 
-static struct xc_dom_loader elf_loader = {
+struct xc_dom_loader elf_loader = {
     .name = "ELF-generic",
     .probe = xc_dom_probe_elf_kernel,
     .parser = xc_dom_parse_elf_kernel,
Index: xen-3.2.0/tools/libxc/xc_dom_bzimageloader.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -0,0 +1,159 @@
+/*
+ * Xen domain builder -- bzImage bits
+ *
+ * Parse and load bzImage kernel images.
+ *
+ * This relies on version 2.08 of the boot protocol, which contains an
+ * ELF file embedded in the bzImage.  The loader extracts this ELF
+ * image and passes it off to the standard ELF loader.
+ *
+ * This code is licenced under the GPL.
+ * written 2006 by Gerd Hoffmann <kraxel at suse.de>.
+ * written 2007 by Jeremy Fitzhardinge <jeremy at xensource.com>
+ * written 2008 by Ian Campbell <ijc at hellion.org.uk>
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include "xg_private.h"
+#include "xc_dom.h"
+
+struct setup_header {
+	uint8_t		_pad0[0x1f1];		/* skip uninteresting stuff */
+	uint8_t		setup_sects;
+	uint16_t	root_flags;
+	uint32_t	syssize;
+	uint16_t	ram_size;
+	uint16_t	vid_mode;
+	uint16_t	root_dev;
+	uint16_t	boot_flag;
+	uint16_t	jump;
+	uint32_t	header;
+#define HDR_MAGIC		"HdrS"
+#define HDR_MAGIC_SZ	4
+	uint16_t	version;
+#define VERSION(h,l)	(((h)<<8) | (l))
+	uint32_t	realmode_swtch;
+	uint16_t	start_sys;
+	uint16_t	kernel_version;
+	uint8_t		type_of_loader;
+	uint8_t		loadflags;
+	uint16_t	setup_move_size;
+	uint32_t	code32_start;
+	uint32_t	ramdisk_image;
+	uint32_t	ramdisk_size;
+	uint32_t	bootsect_kludge;
+	uint16_t	heap_end_ptr;
+	uint16_t	_pad1;
+	uint32_t	cmd_line_ptr;
+	uint32_t	initrd_addr_max;
+	uint32_t	kernel_alignment;
+	uint8_t		relocatable_kernel;
+	uint8_t		_pad2[3];
+	uint32_t	cmdline_size;
+	uint32_t	hardware_subarch;
+	uint64_t	hardware_subarch_data;
+	uint32_t	payload_offset;
+	uint32_t	payload_length;
+} __attribute__((packed));
+
+extern struct xc_dom_loader elf_loader;
+
+static unsigned int payload_offset(struct setup_header *hdr)
+{
+    unsigned int off;
+
+    off = (hdr->setup_sects + 1) * 512;
+    off += hdr->payload_offset;
+    return off;
+}
+
+static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
+{
+    struct setup_header *hdr;
+
+    if ( dom->kernel_blob == NULL )
+    {
+        if ( verbose )
+            xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
+                         __FUNCTION__);
+        return -EINVAL;
+    }
+    if ( dom->kernel_size < sizeof(struct setup_header) )
+    {
+        if ( verbose )
+            xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
+                         __FUNCTION__);
+        return -EINVAL;
+    }
+
+    hdr = dom->kernel_blob;
+
+    if ( memcmp(&hdr->header, HDR_MAGIC, HDR_MAGIC_SZ) != 0 )
+    {
+        if ( verbose )
+            xc_dom_panic(XC_INVALID_KERNEL, "%s: kernel is not a bzImage\n",
+                         __FUNCTION__);
+        return -EINVAL;
+    }
+
+    if ( hdr->version < VERSION(2,8) )
+    {
+        if ( verbose )
+            xc_dom_panic(XC_INVALID_KERNEL, "%s: boot protocol too old (%04x)\n",
+                         __FUNCTION__, hdr->version);
+        return -EINVAL;
+    }
+
+    dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
+    dom->kernel_size = hdr->payload_length;
+
+    if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
+    {
+        if ( verbose )
+            xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\n",
+                         __FUNCTION__);
+        return -EINVAL;
+    }
+
+    return elf_loader.probe(dom);
+}
+
+static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
+{
+    return check_bzimage_kernel(dom, 0);
+}
+
+static int xc_dom_parse_bzimage_kernel(struct xc_dom_image *dom)
+{
+    return elf_loader.parser(dom);
+}
+
+static int xc_dom_load_bzimage_kernel(struct xc_dom_image *dom)
+{
+    return elf_loader.loader(dom);
+}
+
+static struct xc_dom_loader bzimage_loader = {
+    .name = "Linux bzImage",
+    .probe = xc_dom_probe_bzimage_kernel,
+    .parser = xc_dom_parse_bzimage_kernel,
+    .loader = xc_dom_load_bzimage_kernel,
+};
+
+static void __init register_loader(void)
+{
+    xc_dom_register_loader(&bzimage_loader);
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

xen-3.0.2-config-allow-unix-server.patch:

Index: xen-3.0.2-config-allow-unix-server.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.0.2-config-allow-unix-server.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-3.0.2-config-allow-unix-server.patch	11 Jul 2006 13:52:53 -0000	1.1
+++ xen-3.0.2-config-allow-unix-server.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,31 +1,20 @@
-*** xen-3.0.2/tools/examples/xend-config.sxp.orig	2006-06-07 12:53:18.000000000 +0200
---- xen-3.0.2/tools/examples/xend-config.sxp	2006-07-11 15:43:47.000000000 +0200
-***************
-*** 15,27 ****
-  #(loglevel DEBUG)
-  
-  #(xend-http-server no)
-! #(xend-unix-server no)
-  #(xend-tcp-xmlrpc-server no)
-  #(xend-unix-xmlrpc-server yes)
-  #(xend-relocation-server no)
-  (xend-relocation-server yes)
-  
-! #(xend-unix-path /var/lib/xend/xend-socket)
-  
-  # Port xend should use for the HTTP interface, if xend-http-server is set.
-  #(xend-port            8000)
---- 15,27 ----
-  #(loglevel DEBUG)
-  
-  #(xend-http-server no)
-! (xend-unix-server yes)
-  #(xend-tcp-xmlrpc-server no)
-  #(xend-unix-xmlrpc-server yes)
-  #(xend-relocation-server no)
-  (xend-relocation-server yes)
-  
-! (xend-unix-path /var/lib/xend/xend-socket)
-  
-  # Port xend should use for the HTTP interface, if xend-http-server is set.
-  #(xend-port            8000)
+Index: xen-3.2.0/tools/examples/xend-config.sxp
+===================================================================
+--- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
++++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
+@@ -56,13 +56,13 @@
+ 
+ 
+ #(xend-http-server no)
+-#(xend-unix-server no)
++(xend-unix-server yes)
+ #(xend-tcp-xmlrpc-server no)
+ #(xend-unix-xmlrpc-server yes)
+ #(xend-relocation-server no)
+ (xend-relocation-server yes)
+ 
+-#(xend-unix-path /var/lib/xend/xend-socket)
++(xend-unix-path /var/lib/xend/xend-socket)
+ 
+ 
+ # Address and port xend should use for the legacy TCP XMLRPC interface, 

xen-3.0.2-config-disable-reloc.patch:

Index: xen-3.0.2-config-disable-reloc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.0.2-config-disable-reloc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-3.0.2-config-disable-reloc.patch	17 Jul 2006 15:09:58 -0000	1.1
+++ xen-3.0.2-config-disable-reloc.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,21 +1,15 @@
-*** xen-3.0.2/tools/examples/xend-config.sxp.orig	2006-07-17 16:09:53.000000000 -0400
---- xen-3.0.2/tools/examples/xend-config.sxp	2006-07-17 16:12:27.000000000 -0400
-***************
-*** 19,25 ****
-  #(xend-tcp-xmlrpc-server no)
-  #(xend-unix-xmlrpc-server yes)
-  #(xend-relocation-server no)
-! (xend-relocation-server yes)
-  
-  (xend-unix-path /var/lib/xend/xend-socket)
-  
---- 19,27 ----
-  #(xend-tcp-xmlrpc-server no)
-  #(xend-unix-xmlrpc-server yes)
-  #(xend-relocation-server no)
-! # The relocation server should be kept desactivated unless using a trusted
-! # network, the domain virtual memory will be exchanged in raw form without
-! # encryption of the communication. See also xend-relocation-hosts-allow option
-  
-  (xend-unix-path /var/lib/xend/xend-socket)
-  
+Index: xen-3.2.0/tools/examples/xend-config.sxp
+===================================================================
+--- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
++++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
+@@ -60,7 +60,9 @@
+ #(xend-tcp-xmlrpc-server no)
+ #(xend-unix-xmlrpc-server yes)
+ #(xend-relocation-server no)
+-(xend-relocation-server yes)
++# The relocation server should be kept desactivated unless using a trusted
++# network, the domain virtual memory will be exchanged in raw form without
++# encryption of the communication. See also xend-relocation-hosts-allow option
+ 
+ (xend-unix-path /var/lib/xend/xend-socket)
+ 

xen-3.2.0-block-rw-range-check.patch:

Index: xen-3.2.0-block-rw-range-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.2.0-block-rw-range-check.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-3.2.0-block-rw-range-check.patch	28 Feb 2008 00:51:07 -0000	1.2
+++ xen-3.2.0-block-rw-range-check.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -1,6 +1,7 @@
-diff -rup xen-3.2.0.orig/tools/ioemu/block.c xen-3.2.0.new/tools/ioemu/block.c
---- xen-3.2.0.orig/tools/ioemu/block.c	2008-02-27 19:46:11.000000000 -0500
-+++ xen-3.2.0.new/tools/ioemu/block.c	2008-02-27 19:47:16.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/block.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/block.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/block.c	2008-01-16 18:34:59.000000000 +0000
 @@ -120,6 +120,60 @@ void path_combine(char *dest, int dest_s
      }
  }
@@ -154,9 +155,10 @@
      if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
          memcpy(bs->boot_sector_data, buf, 512);   
      }
-diff -rup xen-3.2.0.orig/tools/ioemu/block_int.h xen-3.2.0.new/tools/ioemu/block_int.h
---- xen-3.2.0.orig/tools/ioemu/block_int.h	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/ioemu/block_int.h	2008-02-27 19:46:39.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/block_int.h
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/block_int.h	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/block_int.h	2008-01-16 18:34:59.000000000 +0000
 @@ -87,6 +87,7 @@ struct BlockDriverState {
      int removable; /* if true, the media can be removed */
      int locked;    /* if true, the media cannot temporarily be ejected */
@@ -165,9 +167,10 @@
      /* event callback when inserting/removing */
      void (*change_cb)(void *opaque);
      void *change_opaque;
-diff -rup xen-3.2.0.orig/tools/ioemu/block-qcow2.c xen-3.2.0.new/tools/ioemu/block-qcow2.c
---- xen-3.2.0.orig/tools/ioemu/block-qcow2.c	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/ioemu/block-qcow2.c	2008-02-27 19:46:39.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/block-qcow2.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/block-qcow2.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/block-qcow2.c	2008-01-16 18:34:59.000000000 +0000
 @@ -191,7 +191,7 @@ static int qcow_open(BlockDriverState *b
      int len, i, shift, ret;
      QCowHeader header;
@@ -177,9 +180,10 @@
      if (ret < 0)
          return ret;
      if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup xen-3.2.0.orig/tools/ioemu/block-qcow.c xen-3.2.0.new/tools/ioemu/block-qcow.c
---- xen-3.2.0.orig/tools/ioemu/block-qcow.c	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/ioemu/block-qcow.c	2008-02-27 19:46:39.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/block-qcow.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/block-qcow.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/block-qcow.c	2008-01-16 18:34:59.000000000 +0000
 @@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
      int len, i, shift, ret;
      QCowHeader header;
@@ -189,9 +193,10 @@
      if (ret < 0)
          return ret;
      if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup xen-3.2.0.orig/tools/ioemu/block-vmdk.c xen-3.2.0.new/tools/ioemu/block-vmdk.c
---- xen-3.2.0.orig/tools/ioemu/block-vmdk.c	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/ioemu/block-vmdk.c	2008-02-27 19:46:39.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/block-vmdk.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/block-vmdk.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/block-vmdk.c	2008-01-16 18:34:59.000000000 +0000
 @@ -352,7 +352,7 @@ static int vmdk_open(BlockDriverState *b
      uint32_t magic;
      int l1_size, i, ret;
@@ -201,9 +206,10 @@
      if (ret < 0)
          return ret;
      if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))
-diff -rup xen-3.2.0.orig/tools/ioemu/vl.h xen-3.2.0.new/tools/ioemu/vl.h
---- xen-3.2.0.orig/tools/ioemu/vl.h	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/ioemu/vl.h	2008-02-27 19:46:39.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/vl.h
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/vl.h	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/vl.h	2008-01-16 18:34:59.000000000 +0000
 @@ -611,6 +611,7 @@ typedef struct QEMUSnapshotInfo {
                                       use a disk image format on top of
                                       it (default for

xen-3.2.0-qemu-evtchn-fd.patch:

Index: xen-3.2.0-qemu-evtchn-fd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.2.0-qemu-evtchn-fd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-3.2.0-qemu-evtchn-fd.patch	27 Feb 2008 20:33:17 -0000	1.1
+++ xen-3.2.0-qemu-evtchn-fd.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -3,9 +3,10 @@
 date:        Tue Feb 26 14:46:57 2008 +0000
 summary:     ioemu: Do not sue xce_handle directly as a file descriptor.
 
-diff -r 76479f25cdac -r ca2cf5c1adcc tools/ioemu/hw/xen_console.c
---- a/tools/ioemu/hw/xen_console.c	Tue Feb 26 14:46:07 2008 +0000
-+++ b/tools/ioemu/hw/xen_console.c	Tue Feb 26 14:46:57 2008 +0000
+Index: xen-3.2.0/tools/ioemu/hw/xen_console.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/xen_console.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/hw/xen_console.c	2008-01-16 18:34:59.000000000 +0000
 @@ -381,7 +381,7 @@ static void xencons_startup(void *opaque
  	qemu_set_fd_handler2(xs_fileno(dom->xsh), NULL, NULL, NULL, NULL);
  
@@ -15,9 +16,10 @@
  		return;
  
  	qemu_chr_add_handlers(dom->chr, xencons_can_receive, xencons_receive,
-diff -r 76479f25cdac -r ca2cf5c1adcc tools/ioemu/hw/xenfb.c
---- a/tools/ioemu/hw/xenfb.c	Tue Feb 26 14:46:07 2008 +0000
-+++ b/tools/ioemu/hw/xenfb.c	Tue Feb 26 14:46:57 2008 +0000
+Index: xen-3.2.0/tools/ioemu/hw/xenfb.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/xenfb.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/hw/xenfb.c	2008-01-16 18:34:59.000000000 +0000
 @@ -1160,7 +1160,7 @@ static int xenfb_register_console(struct
  			     xenfb);
  	dpy_resize(xenfb->ds, xenfb->width, xenfb->height);
@@ -27,4 +29,3 @@
  	        return -1;
  	if (qemu_set_fd_handler2(xs_fileno(xenfb->xsh), NULL, xenfb_dispatch_store, NULL, xenfb) < 0)
  		return -1;
-

xen-compile-fixes.patch:

Index: xen-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-compile-fixes.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xen-compile-fixes.patch	18 Jan 2007 17:22:03 -0000	1.9
+++ xen-compile-fixes.patch	23 Jul 2008 14:34:05 -0000	1.10
@@ -1,31 +1,34 @@
-diff -ruN xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile
---- xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile	2007-01-08 10:00:46.000000000 -0500
-+++ xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile	2007-01-18 11:26:37.000000000 -0500
-@@ -8,7 +8,7 @@
- INST_DIR  = /usr/sbin
+Index: xen-3.2.0/tools/blktap/drivers/Makefile
+===================================================================
+--- xen-3.2.0.orig/tools/blktap/drivers/Makefile	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/blktap/drivers/Makefile	2008-01-16 18:34:59.000000000 +0000
+@@ -8,7 +8,7 @@ QCOW_UTIL    = img2qcow qcow2raw qcow-cr
+ INST_DIR     = /usr/sbin
  LIBAIO_DIR   = ../../libaio/src
  
 -CFLAGS   += -Werror
 +#CFLAGS   += -Werror
  CFLAGS   += -Wno-unused
- CFLAGS   += -fno-strict-aliasing
  CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
-diff -ruN xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile xen-3.0.4_1-src.new/tools/blktap/lib/Makefile
---- xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile	2007-01-08 10:00:47.000000000 -0500
-+++ xen-3.0.4_1-src.new/tools/blktap/lib/Makefile	2007-01-18 11:26:45.000000000 -0500
-@@ -14,7 +14,7 @@
+ CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
+Index: xen-3.2.0/tools/blktap/lib/Makefile
+===================================================================
+--- xen-3.2.0.orig/tools/blktap/lib/Makefile	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/blktap/lib/Makefile	2008-01-16 18:34:59.000000000 +0000
+@@ -14,7 +14,7 @@ LIBS     := -lz
  SRCS     :=
  SRCS     += xenbus.c blkif.c xs_api.c
  
 -CFLAGS   += -Werror
 +#CFLAGS   += -Werror
  CFLAGS   += -Wno-unused
- CFLAGS   += -fno-strict-aliasing -fPIC
+ CFLAGS   += -fPIC
  # get asprintf():
-diff -ruN xen-3.0.4_1-src.orig/tools/console/Makefile xen-3.0.4_1-src.new/tools/console/Makefile
---- xen-3.0.4_1-src.orig/tools/console/Makefile	2007-01-08 10:00:47.000000000 -0500
-+++ xen-3.0.4_1-src.new/tools/console/Makefile	2007-01-18 11:26:00.000000000 -0500
-@@ -5,7 +5,7 @@
+Index: xen-3.2.0/tools/console/Makefile
+===================================================================
+--- xen-3.2.0.orig/tools/console/Makefile	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/console/Makefile	2008-01-16 18:34:59.000000000 +0000
+@@ -5,7 +5,7 @@ include $(XEN_ROOT)/tools/Rules.mk
  DAEMON_INSTALL_DIR = /usr/sbin
  CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
  
@@ -34,10 +37,11 @@
  
  CFLAGS  += -I $(XEN_LIBXC)
  CFLAGS  += -I $(XEN_XENSTORE)
-diff -ruN xen-3.0.4_1-src.orig/tools/xenstore/Makefile xen-3.0.4_1-src.new/tools/xenstore/Makefile
---- xen-3.0.4_1-src.orig/tools/xenstore/Makefile	2007-01-08 10:00:52.000000000 -0500
-+++ xen-3.0.4_1-src.new/tools/xenstore/Makefile	2007-01-18 11:25:48.000000000 -0500
-@@ -6,7 +6,7 @@
+Index: xen-3.2.0/tools/xenstore/Makefile
+===================================================================
+--- xen-3.2.0.orig/tools/xenstore/Makefile	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/xenstore/Makefile	2008-01-16 18:34:59.000000000 +0000
+@@ -6,7 +6,7 @@ MAJOR = 3.0
  MINOR = 0
  
  PROFILE=#-pg

xen-config-dom0-minmem.patch:

Index: xen-config-dom0-minmem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-config-dom0-minmem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-config-dom0-minmem.patch	26 Apr 2006 03:37:05 -0000	1.1
+++ xen-config-dom0-minmem.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,6 +1,8 @@
---- xen-3.0.0/tools/examples/xend-config.sxp.min	2005-12-06 15:05:29.000000000 +0100
-+++ xen-3.0.0/tools/examples/xend-config.sxp	2005-12-06 20:33:21.000000000 +0100
-@@ -105,7 +105,7 @@
+Index: xen-3.2.0/tools/examples/xend-config.sxp
+===================================================================
+--- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:26.000000000 +0100
++++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:26.000000000 +0100
+@@ -181,7 +181,7 @@
  # Dom0 will balloon out when needed to free memory for domU.
  # dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
  # If dom0-min-mem=0, dom0 will never balloon out.

xen-dumpdir.patch:

Index: xen-dumpdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-dumpdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-dumpdir.patch	1 May 2007 02:27:22 -0000	1.2
+++ xen-dumpdir.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -1,6 +1,7 @@
-diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README
---- xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README	2007-04-11 19:10:30.000000000 -0400
-+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README	2007-04-13 10:37:35.000000000 -0400
+Index: xen-3.2.0/tools/debugger/gdb/README
+===================================================================
+--- xen-3.2.0.orig/tools/debugger/gdb/README	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/debugger/gdb/README	2008-01-16 18:34:59.000000000 +0000
 @@ -33,6 +33,6 @@ To debug a crashed domU guest:
   1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before
      starting xend.
@@ -9,9 +10,10 @@
 +    '/var/lib/xen/dump/<domain-name>.<domain-id>.core'.
   3. Run 'gdbserver-xen 127.0.0.1:9999 --file <core-file>'.
   4. Connect to the server as for a running guest.
-diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile
---- xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile	2007-04-11 19:10:30.000000000 -0400
-+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile	2007-04-13 10:37:59.000000000 -0400
+Index: xen-3.2.0/tools/Makefile
+===================================================================
+--- xen-3.2.0.orig/tools/Makefile	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/Makefile	2008-01-16 18:34:59.000000000 +0000
 @@ -41,7 +41,7 @@ install: check
  		$(MAKE) -C $$subdir $@; \
  	done
@@ -19,12 +21,13 @@
 -	$(INSTALL_DIR) $(DESTDIR)/var/xen/dump
 +	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump
  	$(INSTALL_DIR) $(DESTDIR)/var/log/xen
+ 	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
  
- .PHONY: clean
-diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py
---- xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py	2007-04-11 19:10:36.000000000 -0400
-+++ xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py	2007-04-13 10:37:35.000000000 -0400
-@@ -1269,7 +1269,7 @@ class XendDomainInfo:
+Index: xen-3.2.0/tools/python/xen/xend/XendDomainInfo.py
+===================================================================
+--- xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py	2008-07-23 15:14:26.000000000 +0100
++++ xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py	2008-07-23 15:14:26.000000000 +0100
+@@ -1455,7 +1455,7 @@ class XendDomainInfo:
          try:
              if not corefile:
                  this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())

xen-hvm-kernel-boot-nonrelocatable.patch:

Index: xen-hvm-kernel-boot-nonrelocatable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-hvm-kernel-boot-nonrelocatable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-hvm-kernel-boot-nonrelocatable.patch	10 Jan 2008 21:37:26 -0000	1.2
+++ xen-hvm-kernel-boot-nonrelocatable.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -1,5 +1,7 @@
---- xen-unstable-16606.orig/tools/ioemu/hw/pc.c	2007-12-18 14:15:17.000000000 -0500
-+++ xen-unstable-16606/tools/ioemu/hw/pc.c	2007-12-18 23:53:56.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/hw/pc.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/pc.c	2008-07-23 15:14:25.000000000 +0100
++++ xen-3.2.0.orig/tools/ioemu/hw/pc.c	2008-07-23 15:14:25.000000000 +0100
 @@ -417,6 +417,90 @@ static void generate_bootsect(uint32_t g
      bdrv_set_boot_sector(bs_table[0], bootsect, sizeof(bootsect));
  }

xen-hvm-kernel-boot-relocatable.patch:

Index: xen-hvm-kernel-boot-relocatable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-hvm-kernel-boot-relocatable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-hvm-kernel-boot-relocatable.patch	10 Jan 2008 21:37:26 -0000	1.2
+++ xen-hvm-kernel-boot-relocatable.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -1,6 +1,7 @@
-diff -rup xen-unstable-16606.orig/tools/ioemu/hw/pc.c xen-unstable-16606.new/tools/ioemu/hw/pc.c
---- xen-unstable-16606.orig/tools/ioemu/hw/pc.c	2007-12-17 17:52:29.000000000 -0500
-+++ xen-unstable-16606.new/tools/ioemu/hw/pc.c	2007-12-17 17:53:51.000000000 -0500
+Index: xen-3.2.0/tools/ioemu/hw/pc.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/pc.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/hw/pc.c	2008-01-16 18:34:59.000000000 +0000
 @@ -31,10 +31,8 @@
  #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
  #define LINUX_BOOT_FILENAME "linux_boot.bin"

xen-hvm-kernel-boot-xend.patch:

Index: xen-hvm-kernel-boot-xend.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-hvm-kernel-boot-xend.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-hvm-kernel-boot-xend.patch	10 Jan 2008 21:37:26 -0000	1.2
+++ xen-hvm-kernel-boot-xend.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -1,6 +1,7 @@
-diff -rup xen-unstable-16606.orig/tools/python/xen/xend/image.py xen-unstable-16606.new/tools/python/xen/xend/image.py
---- xen-unstable-16606.orig/tools/python/xen/xend/image.py	2007-12-17 17:52:29.000000000 -0500
-+++ xen-unstable-16606.new/tools/python/xen/xend/image.py	2007-12-17 18:17:31.000000000 -0500
+Index: xen-3.2.0/tools/python/xen/xend/image.py
+===================================================================
+--- xen-3.2.0.orig/tools/python/xen/xend/image.py	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/python/xen/xend/image.py	2008-01-16 18:34:59.000000000 +0000
 @@ -127,7 +127,7 @@ class ImageHandler:
          """
          # Set params and call buildDomain().
@@ -67,9 +68,10 @@
                            memsize        = mem_mb,
                            vcpus          = self.vm.getVCpuCount(),
                            acpi           = self.acpi,
-diff -rup xen-unstable-16606.orig/tools/python/xen/xend/XendConfig.py xen-unstable-16606.new/tools/python/xen/xend/XendConfig.py
---- xen-unstable-16606.orig/tools/python/xen/xend/XendConfig.py	2007-12-17 17:52:29.000000000 -0500
-+++ xen-unstable-16606.new/tools/python/xen/xend/XendConfig.py	2007-12-17 18:26:30.000000000 -0500
+Index: xen-3.2.0/tools/python/xen/xend/XendConfig.py
+===================================================================
+--- xen-3.2.0.orig/tools/python/xen/xend/XendConfig.py	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/python/xen/xend/XendConfig.py	2008-01-16 18:34:59.000000000 +0000
 @@ -124,7 +124,7 @@ XENAPI_CFG_TO_LEGACY_CFG = {
  LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
  
@@ -97,9 +99,10 @@
              # Compatibility hack, can go away soon.
              if 'soundhw' not in self['platform'] and \
                 self['platform'].get('enable_audio'):
-diff -rup xen-unstable-16606.orig/tools/python/xen/xm/create.py xen-unstable-16606.new/tools/python/xen/xm/create.py
---- xen-unstable-16606.orig/tools/python/xen/xm/create.py	2007-12-17 17:52:29.000000000 -0500
-+++ xen-unstable-16606.new/tools/python/xen/xm/create.py	2007-12-17 18:28:06.000000000 -0500
+Index: xen-3.2.0/tools/python/xen/xm/create.py
+===================================================================
+--- xen-3.2.0.orig/tools/python/xen/xm/create.py	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/python/xen/xm/create.py	2008-01-16 18:34:59.000000000 +0000
 @@ -158,6 +158,10 @@ gopts.var('ramdisk', val='FILE',
            fn=set_value, default='',
            use="Path to ramdisk.")

xen-ia64-hypercall-args.patch:

Index: xen-ia64-hypercall-args.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-ia64-hypercall-args.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-ia64-hypercall-args.patch	9 Jul 2008 10:57:22 -0000	1.1
+++ xen-ia64-hypercall-args.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -11,10 +11,11 @@
 Signed-off-by: Alex Williamson <alex.williamson at hp.com>
 
 
-diff -r 7d300a1ea762 -r 716a637722e4 tools/libxc/ia64/xc_ia64_stubs.c
---- a/tools/libxc/ia64/xc_ia64_stubs.c	Mon Mar 10 11:52:25 2008 -0600
-+++ b/tools/libxc/ia64/xc_ia64_stubs.c	Mon Mar 10 11:55:40 2008 -0600
-@@ -92,7 +92,6 @@
+Index: xen-3.2.0/tools/libxc/ia64/xc_ia64_stubs.c
+===================================================================
+--- xen-3.2.0.orig/tools/libxc/ia64/xc_ia64_stubs.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/libxc/ia64/xc_ia64_stubs.c	2008-01-16 18:34:59.000000000 +0000
+@@ -92,7 +92,6 @@ xc_ia64_map_foreign_p2m(int xc_handle, u
      hypercall.arg[2] = dom;
      hypercall.arg[3] = (unsigned long)memmap_info;
      hypercall.arg[4] = flags;
@@ -22,4 +23,3 @@
  
      if (lock_pages(memmap_info,
                     sizeof(*memmap_info) + memmap_info->efi_memmap_size) != 0) {
-

xen-net-disable-bridge-by-default.patch:

Index: xen-net-disable-bridge-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-bridge-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-net-disable-bridge-by-default.patch	18 Feb 2008 23:09:04 -0000	1.1
+++ xen-net-disable-bridge-by-default.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,10 +1,11 @@
 Disable network-bridge script by default to avoid
 NetworkManager conflict
 
-diff -up xen-3.2.0/tools/examples/xend-config.sxp.disable-bridge-by-default xen-3.2.0/tools/examples/xend-config.sxp
---- xen-3.2.0/tools/examples/xend-config.sxp.disable-bridge-by-default	2008-02-18 22:35:26.000000000 +0000
-+++ xen-3.2.0/tools/examples/xend-config.sxp	2008-02-18 22:53:37.000000000 +0000
-@@ -140,7 +140,15 @@
+Index: xen-3.2.0/tools/examples/xend-config.sxp
+===================================================================
+--- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-01-16 18:34:59.000000000 +0000
+@@ -138,7 +138,15 @@
  # two fake interfaces per guest domain.  To do things like this, write
  # yourself a wrapper script, and call network-bridge from it, as appropriate.
  #
@@ -21,7 +22,7 @@
  
  # The script used to control virtual interfaces.  This can be overridden on a
  # per-vif basis when creating a domain or a configuring a new vif.  The
-@@ -160,12 +168,14 @@
+@@ -158,12 +166,14 @@
  
  ## Use the following if network traffic is routed, as an alternative to the
  # settings for bridged networking given above.

xen-net-disable-iptables-on-bridge.patch:

Index: xen-net-disable-iptables-on-bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-iptables-on-bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-net-disable-iptables-on-bridge.patch	18 Feb 2008 23:09:04 -0000	1.1
+++ xen-net-disable-iptables-on-bridge.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,9 +1,10 @@
 We don't want the system's iptables filter/FORWARD
 rules to apply to traffic on our bridge.
 
-diff -up xen-3.2.0/tools/examples/xen-network-common.sh.disable-iptables-on-bridge xen-3.2.0/tools/examples/xen-network-common.sh
---- xen-3.2.0/tools/examples/xen-network-common.sh.disable-iptables-on-bridge	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0/tools/examples/xen-network-common.sh	2008-02-18 22:54:18.000000000 +0000
+Index: xen-3.2.0/tools/examples/xen-network-common.sh
+===================================================================
+--- xen-3.2.0.orig/tools/examples/xen-network-common.sh	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/examples/xen-network-common.sh	2008-01-16 18:34:59.000000000 +0000
 @@ -109,6 +109,13 @@ create_bridge () {
  	brctl addbr ${bridge}
  	brctl stp ${bridge} off
@@ -18,9 +19,10 @@
      fi
  }
  
-diff -up xen-3.2.0/tools/examples/vif-bridge.disable-iptables-on-bridge xen-3.2.0/tools/examples/vif-bridge
---- xen-3.2.0/tools/examples/vif-bridge.disable-iptables-on-bridge	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0/tools/examples/vif-bridge	2008-02-18 22:54:18.000000000 +0000
+Index: xen-3.2.0/tools/examples/vif-bridge
+===================================================================
+--- xen-3.2.0.orig/tools/examples/vif-bridge	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/examples/vif-bridge	2008-01-16 18:34:59.000000000 +0000
 @@ -91,8 +91,6 @@ case "$command" in
          ;;
  esac

xen-pvfb-validate-fb.patch:

Index: xen-pvfb-validate-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-validate-fb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-pvfb-validate-fb.patch	13 Jun 2008 14:26:37 -0000	1.2
+++ xen-pvfb-validate-fb.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -6,9 +6,10 @@
 # Parent  65eec0554f39049eab354abe1ee4c305f6d1e0aa
 ioemu: Fix PVFB backend to validate frontend's frame buffer description
 
-diff -rup a/tools/ioemu/hw/xenfb.c b/tools/ioemu/hw/xenfb.c
---- a/tools/ioemu/hw/xenfb.c	2008-04-22 18:51:35.000000000 +0200
-+++ b/tools/ioemu/hw/xenfb.c	2008-04-22 18:52:07.000000000 +0200
+Index: xen-3.2.0/tools/ioemu/hw/xenfb.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/xenfb.c	2008-07-23 15:14:27.000000000 +0100
++++ xen-3.2.0.orig/tools/ioemu/hw/xenfb.c	2008-07-23 15:14:27.000000000 +0100
 @@ -23,8 +23,6 @@
  #define BTN_LEFT 0x110 /* from <linux/input.h> */
  #endif
@@ -75,7 +76,7 @@
  
  static void xenfb_on_fb_event(struct xenfb *xenfb)
  {
-@@ -506,7 +553,6 @@ static void xenfb_on_fb_event(struct xen
+@@ -506,7 +554,6 @@ static void xenfb_on_fb_event(struct xen
  			    || h != event->update.height) {
  				fprintf(stderr, "%s bogus update clipped\n",
  					xenfb->fb.nodename);
@@ -83,7 +84,7 @@
  			}
  			xenfb_guest_copy(xenfb, x, y, w, h);
  			break;
-@@ -686,16 +732,15 @@ static int xenfb_read_frontend_fb_config
+@@ -686,16 +733,15 @@ static int xenfb_read_frontend_fb_config
                  xenfb->protocol[0] = '\0';
          xenfb_xs_printf(xenfb->xsh, xenfb->fb.nodename, "request-update", "1");
  

xen-qemu-bootmenu.patch:

Index: xen-qemu-bootmenu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-bootmenu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-bootmenu.patch	10 Oct 2007 23:49:14 -0000	1.1
+++ xen-qemu-bootmenu.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,7 +1,8 @@
-diff -rup xen-3.1.0-src.orig/tools/firmware/rombios/rombios.c xen-3.1.0-src.new/tools/firmware/rombios/rombios.c
---- xen-3.1.0-src.orig/tools/firmware/rombios/rombios.c	2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/firmware/rombios/rombios.c	2007-10-10 19:34:24.000000000 -0400
-@@ -2026,6 +2026,228 @@ print_cdromboot_failure( code )
+Index: xen-3.2.0/tools/firmware/rombios/rombios.c
+===================================================================
+--- xen-3.2.0.orig/tools/firmware/rombios/rombios.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/firmware/rombios/rombios.c	2008-01-16 18:34:59.000000000 +0000
+@@ -2031,6 +2031,228 @@ print_cdromboot_failure( code )
    return;
  }
  
@@ -230,7 +231,7 @@
  void
  nmi_handler_msg()
  {
-@@ -9782,7 +10004,9 @@ post_default_ints:
+@@ -9825,7 +10047,9 @@ post_default_ints:
    call _cdemu_init
    ;;
  #endif // BX_ELTORITO_BOOT

xen-qemu-image-format.patch:

Index: xen-qemu-image-format.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-image-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-image-format.patch	27 Jun 2008 15:17:57 -0000	1.1
+++ xen-qemu-image-format.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -46,9 +46,10 @@
 changeset:   17282:0868396712b5
 summary:     ioemu: prefix phy devices with /dev/
 
-diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/block.c xen-3.2.0-new/tools/ioemu/block.c
---- xen-3.2.0/tools/ioemu/block.c	2008-06-26 13:36:21.000000000 -0400
-+++ xen-3.2.0-new/tools/ioemu/block.c	2008-06-26 14:49:21.000000000 -0400
+Index: xen-3.2.0/tools/ioemu/block.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/block.c	2008-07-23 15:14:27.000000000 +0100
++++ xen-3.2.0.orig/tools/ioemu/block.c	2008-07-23 15:14:27.000000000 +0100
 @@ -269,8 +269,28 @@ static int is_windows_drive(const char *
  }
  #endif
@@ -125,9 +126,10 @@
              goto fail;
      }
  
-diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/hw/usb-msd.c xen-3.2.0-new/tools/ioemu/hw/usb-msd.c
---- xen-3.2.0/tools/ioemu/hw/usb-msd.c	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0-new/tools/ioemu/hw/usb-msd.c	2008-06-26 15:30:53.000000000 -0400
+Index: xen-3.2.0/tools/ioemu/hw/usb-msd.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/usb-msd.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/hw/usb-msd.c	2008-01-16 18:34:59.000000000 +0000
 @@ -510,7 +510,7 @@ static void usb_msd_handle_destroy(USBDe
      qemu_free(s);
  }
@@ -146,9 +148,10 @@
          goto fail;
      s->bs = bdrv;
  
-diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/hw/usb.h xen-3.2.0-new/tools/ioemu/hw/usb.h
---- xen-3.2.0/tools/ioemu/hw/usb.h	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0-new/tools/ioemu/hw/usb.h	2008-06-26 14:42:45.000000000 -0400
+Index: xen-3.2.0/tools/ioemu/hw/usb.h
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/hw/usb.h	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/hw/usb.h	2008-01-16 18:34:59.000000000 +0000
 @@ -217,7 +217,7 @@ USBDevice *usb_mouse_init(void);
  USBDevice *usb_tablet_init(void);
  
@@ -158,9 +161,10 @@
  
  /* usb.c */
  void generic_usb_save(QEMUFile* f, void *opaque);
-diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/monitor.c xen-3.2.0-new/tools/ioemu/monitor.c
---- xen-3.2.0/tools/ioemu/monitor.c	2008-06-26 13:36:21.000000000 -0400
-+++ xen-3.2.0-new/tools/ioemu/monitor.c	2008-06-26 14:41:11.000000000 -0400
+Index: xen-3.2.0/tools/ioemu/monitor.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/monitor.c	2008-07-23 15:14:27.000000000 +0100
++++ xen-3.2.0.orig/tools/ioemu/monitor.c	2008-07-23 15:14:27.000000000 +0100
 @@ -387,7 +387,7 @@ static void do_change_block(const char *
      }
      if (eject_device(bs, 0) < 0)
@@ -170,9 +174,10 @@
      if (bdrv_is_encrypted(bs)) {
          term_printf("%s is encrypted.\n", device);
          for(i = 0; i < 3; i++) {
-diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/vl.c xen-3.2.0-new/tools/ioemu/vl.c
---- xen-3.2.0/tools/ioemu/vl.c	2008-06-26 13:36:21.000000000 -0400
-+++ xen-3.2.0-new/tools/ioemu/vl.c	2008-06-26 14:42:43.000000000 -0400
+Index: xen-3.2.0/tools/ioemu/vl.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/vl.c	2008-07-23 15:14:27.000000000 +0100
++++ xen-3.2.0.orig/tools/ioemu/vl.c	2008-07-23 15:14:27.000000000 +0100
 @@ -4211,7 +4211,9 @@ static int usb_device_add(const char *de
      } else if (!strcmp(devname, "tablet")) {
  	dev = usb_tablet_init();
@@ -196,9 +201,10 @@
                      fprintf(stderr, "qemu: could not open floppy disk image '%s'\n",
                              fd_filename[i]);
                      exit(1);
-diff -rup --exclude '*~' xen-3.2.0/tools/ioemu/xenstore.c xen-3.2.0-new/tools/ioemu/xenstore.c
---- xen-3.2.0/tools/ioemu/xenstore.c	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0-new/tools/ioemu/xenstore.c	2008-06-26 15:35:48.000000000 -0400
+Index: xen-3.2.0/tools/ioemu/xenstore.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/xenstore.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/xenstore.c	2008-01-16 18:34:59.000000000 +0000
 @@ -85,6 +85,7 @@ void xenstore_parse_domain_config(int do
          *dev = NULL, *params = NULL, *type = NULL, *drv = NULL;
      int i, is_scsi, is_hdN = 0;

xen-qemu-logfile.patch:

Index: xen-qemu-logfile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-logfile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-logfile.patch	27 Feb 2008 20:33:17 -0000	1.1
+++ xen-qemu-logfile.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -1,6 +1,7 @@
-diff -r 2a8eaba24bf0 tools/ioemu/keymaps.c
---- a/tools/ioemu/keymaps.c	Tue Feb 26 15:11:51 2008 +0000
-+++ b/tools/ioemu/keymaps.c	Wed Feb 27 15:26:53 2008 -0500
+Index: xen-3.2.0/tools/ioemu/keymaps.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/keymaps.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/keymaps.c	2008-01-16 18:34:59.000000000 +0000
 @@ -126,11 +126,11 @@ static kbd_layout_t *parse_keyboard_layo
  		    if (rest && strstr(rest, "numlock")) {
  			add_to_key_range(&k->keypad_range, keycode);
@@ -15,10 +16,11 @@
  		    }
  
  		    /* if(keycode&0x80)
-diff -r 2a8eaba24bf0 tools/ioemu/monitor.c
---- a/tools/ioemu/monitor.c	Tue Feb 26 15:11:51 2008 +0000
-+++ b/tools/ioemu/monitor.c	Wed Feb 27 15:26:53 2008 -0500
-@@ -2520,7 +2520,7 @@ static void monitor_handle_command1(void
+Index: xen-3.2.0/tools/ioemu/monitor.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/monitor.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/monitor.c	2008-01-16 18:34:59.000000000 +0000
+@@ -2514,7 +2514,7 @@ static void monitor_handle_command1(void
  
  static void monitor_start_input(void)
  {
@@ -27,10 +29,11 @@
  }
  
  static void term_event(void *opaque, int event)
-diff -r 2a8eaba24bf0 tools/ioemu/vl.c
---- a/tools/ioemu/vl.c	Tue Feb 26 15:11:51 2008 +0000
-+++ b/tools/ioemu/vl.c	Wed Feb 27 15:26:53 2008 -0500
-@@ -7611,9 +7611,7 @@ int main(int argc, char **argv)
+Index: xen-3.2.0/tools/ioemu/vl.c
+===================================================================
+--- xen-3.2.0.orig/tools/ioemu/vl.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/ioemu/vl.c	2008-01-16 18:34:59.000000000 +0000
+@@ -7538,9 +7538,7 @@ int main(int argc, char **argv)
          }
      }
  
@@ -39,13 +42,14 @@
 -    cpu_set_log_filename(qemu_dm_logfilename);
 +    cpu_set_log(0);
  
- #ifndef NO_DAEMONIZE
+ #ifndef _WIN32
      if (daemonize && !nographic && vnc_display == NULL && vncunused == 0) {
-diff -r 2a8eaba24bf0 tools/python/xen/xend/image.py
---- a/tools/python/xen/xend/image.py	Tue Feb 26 15:11:51 2008 +0000
-+++ b/tools/python/xen/xend/image.py	Wed Feb 27 15:26:53 2008 -0500
-@@ -296,7 +296,34 @@ class ImageHandler:
-                         { 'dom': self.vm.getDomid(), 'read': True, 'write': True })
+Index: xen-3.2.0/tools/python/xen/xend/image.py
+===================================================================
+--- xen-3.2.0.orig/tools/python/xen/xend/image.py	2008-07-23 15:14:25.000000000 +0100
++++ xen-3.2.0.orig/tools/python/xen/xend/image.py	2008-07-23 15:14:25.000000000 +0100
+@@ -286,7 +286,34 @@ class ImageHandler:
+             args = args + ([ "-vncviewer" ])
          log.info("spawning device models: %s %s", self.device_model, args)
          # keep track of pid and spawned options to kill it later
 -        self.pid = os.spawnve(os.P_NOWAIT, self.device_model, args, env)

xen-timer-mode.patch:

Index: xen-timer-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-timer-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-timer-mode.patch	3 Feb 2008 18:19:57 -0000	1.1
+++ xen-timer-mode.patch	23 Jul 2008 14:34:05 -0000	1.2
@@ -7,9 +7,10 @@
 Signed-off-by: Keir Fraser <keir.fraser at citrix.com>
 
 
-diff -r 1e6455d608bd -r 3f26758bcc02 tools/python/xen/xend/XendDomainInfo.py
---- a/tools/python/xen/xend/XendDomainInfo.py	Fri Jan 18 16:20:47 2008 +0000
-+++ b/tools/python/xen/xend/XendDomainInfo.py	Fri Jan 18 22:27:51 2008 +0000
+Index: xen-3.2.0/tools/python/xen/xend/XendDomainInfo.py
+===================================================================
+--- xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py	2008-01-16 18:34:59.000000000 +0000
 @@ -1650,9 +1650,10 @@ class XendDomainInfo:
          self._recreateDom()
  
@@ -23,4 +24,3 @@
  
          # Set maximum number of vcpus in domain
          xc.domain_max_vcpus(self.domid, int(self.info['VCPUs_max']))
-

xen-xenstore-cli.patch:

Index: xen-xenstore-cli.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-xenstore-cli.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-xenstore-cli.patch	6 Feb 2008 18:23:16 -0000	1.2
+++ xen-xenstore-cli.patch	23 Jul 2008 14:34:05 -0000	1.3
@@ -1,6 +1,7 @@
-diff -rup xen-3.2.0.orig/tools/xenstore/xenstore_client.c xen-3.2.0.new/tools/xenstore/xenstore_client.c
---- xen-3.2.0.orig/tools/xenstore/xenstore_client.c	2008-02-06 13:18:04.000000000 -0500
-+++ xen-3.2.0.new/tools/xenstore/xenstore_client.c	2008-02-06 13:17:43.000000000 -0500
+Index: xen-3.2.0/tools/xenstore/xenstore_client.c
+===================================================================
+--- xen-3.2.0.orig/tools/xenstore/xenstore_client.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/xenstore/xenstore_client.c	2008-01-16 18:34:59.000000000 +0000
 @@ -357,7 +357,9 @@ main(int argc, char **argv)
  
      xsh = socket ? xs_daemon_open() : xs_domain_open();
@@ -12,9 +13,10 @@
  
    again:
      if (transaction) {
-diff -rup xen-3.2.0.orig/tools/xenstore/xsls.c xen-3.2.0.new/tools/xenstore/xsls.c
---- xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/xenstore/xsls.c	2008-02-06 13:19:09.000000000 -0500
+Index: xen-3.2.0/tools/xenstore/xsls.c
+===================================================================
+--- xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 18:34:59.000000000 +0000
++++ xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 18:34:59.000000000 +0000
 @@ -163,7 +163,9 @@ int main(int argc, char *argv[])
  
      xsh = socket ? xs_daemon_open() : xs_domain_open();


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- xen.spec	9 Jul 2008 10:57:22 -0000	1.220
+++ xen.spec	23 Jul 2008 14:34:05 -0000	1.221
@@ -2,13 +2,12 @@
 
 # Always set these 3 tags
 %define base_version 3.2.0
-%define base_release 16
+%define base_release 17
 
 # Hypervisor ABI
 %define hv_abi  3.2
 # Whether to build -hypervisor pacakges
-# XXX keep this off until we finally kill off the kernel-xen PRM
-%define hv_build 0
+%define hv_build 1
 
 # For testing upstream dev trees run either
 #    hg archive -t tgz ../xen-unstable-[changeset].tgz
@@ -80,6 +79,8 @@
 Patch37: xen-pvfb-validate-fb.patch
 Patch38: xen-qemu-image-format.patch
 
+Patch40: xen-3.2.0-bzimage.patch
+
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
 Patch102: xen-3.0.2-config-allow-unix-server.patch
@@ -185,6 +186,8 @@
 %patch37 -p1
 %patch38 -p1
 
+%patch40 -p1
+
 # config patches
 %patch100 -p1
 %patch102 -p1
@@ -466,6 +469,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 23 2008 Mark McLoughlin <markmc at redhat.com> - 3.2.0-17.fc10
+- Enable xen-hypervisor build
+- Backport support for booting DomU from bzImage
+- Re-diff all patches for zero fuzz
+
 * Wed Jul  9 2008 Daniel P. Berrange <berrange at redhat.com> - 3.2.0-16.fc10
 - Remove bogus ia64 hypercall arg (rhbz #433921)
 


