[fedora-virt-maint] rpms/xen/devel xen-bzip2-xz-1.patch, NONE, 1.1 xen-bzip2-xz-2.patch, NONE, 1.1 xen-bzip2-xz-3.patch, NONE, 1.1 xen-pygrub-fix-timeout-0.patch, NONE, 1.1 xen-qemu-dm-fix-block-memory-leak.patch, NONE, 1.1 xen-stubdomain-bridging.patch, NONE, 1.1 xen.spec, 1.244, 1.245
Gerd Hoffmann
kraxel at fedoraproject.org
Tue Sep 1 11:35:37 UTC 2009
Author: kraxel
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16175
Modified Files:
xen.spec
Added Files:
xen-bzip2-xz-1.patch xen-bzip2-xz-2.patch xen-bzip2-xz-3.patch
xen-pygrub-fix-timeout-0.patch
xen-qemu-dm-fix-block-memory-leak.patch
xen-stubdomain-bridging.patch
Log Message:
backport patches
xen-bzip2-xz-1.patch:
Makefile | 22 ++
xc_dom_bzimageloader.c | 392 +++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 353 insertions(+), 61 deletions(-)
--- NEW FILE xen-bzip2-xz-1.patch ---
# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1250802745 -3600
# Node ID a687c4d35fdd00c89c097d691c3039e07f737a1d
# Parent 29fe6ba28490124ffbfc1252b6fa7a9d7e20803e
domain builder: Implement bzip2 and LZMA loaders
Recent upstream kernels can be compressed using either gzip,
bzip2, or LZMA. However, the PV kernel loader in Xen currently only
understands gzip, and will fail on the other two types. The attached
patch implements kernel decompression for gzip, bzip2, and LZMA so
that kernels compressed with any of these methods can be launched.
Signed-off-by: Chris Lalancette <clalance at redhat.com>
Signed-off-by: Keir Fraser <keir.fraser at citrix.com>
--- a/tools/libxc/Makefile Thu Aug 20 21:15:24 2009 +0100
+++ b/tools/libxc/Makefile Thu Aug 20 22:12:25 2009 +0100
@@ -114,7 +114,7 @@ TAGS:
.PHONY: clean
clean:
- rm -rf *.rpm $(LIB) *~ $(DEPS) \
+ rm -rf *.rpm $(LIB) *~ $(DEPS) .*.deps \
$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \
$(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS)
@@ -151,6 +151,26 @@ libxenguest.so.$(MAJOR): libxenguest.so.
libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
ln -sf $< $@
+.zlib.deps:
+ @(set -e; \
+ . ../check/funcs.sh; \
+ rm -f $@.new; \
+ if has_header bzlib.h; then \
+ echo "-DHAVE_BZLIB" >>$@.new; \
+ echo "-lbz2" >>$@.new; \
+ echo " - BZIP2 decompression supported"; \
+ fi; \
+ if has_header lzma.h; then \
+ echo "-DHAVE_LZMA" >>$@.new; \
+ echo "-llzma" >>$@.new; \
+ echo " - LZMA decompression supported"; \
+ fi; \
+ mv $@.new $@)
+
+xc_dom_bzimageloader.o: .zlib.deps
+xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)
+
+libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(shell grep l .zlib.deps)
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
--- a/tools/libxc/xc_dom_bzimageloader.c Thu Aug 20 21:15:24 2009 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c Thu Aug 20 22:12:25 2009 +0100
@@ -11,6 +11,7 @@
* 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>
+ * written 2009 by Chris Lalancette <clalance at redhat.com>
*
*/
#include <stdio.h>
@@ -20,43 +21,289 @@
#include "xg_private.h"
#include "xc_dom.h"
+#if defined(HAVE_BZLIB)
+
+#include <bzlib.h>
+
+static int xc_try_bzip2_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ bz_stream stream;
+ int ret;
+ char *out_buf;
+ int retval = -1;
+ int outsize;
+ uint64_t total;
+
+ stream.bzalloc = NULL;
+ stream.bzfree = NULL;
+ stream.opaque = NULL;
+
+ ret = BZ2_bzDecompressInit(&stream, 0, 0);
+ if ( ret != BZ_OK )
+ {
+ xc_dom_printf("Error initting bz2 stream\n");
+ return -1;
+ }
+
+ /* sigh. We don't know up-front how much memory we are going to need
+ * for the output buffer. Allocate the output buffer to be equal
+ * the input buffer to start, and we'll realloc as needed.
+ */
+ outsize = dom->kernel_size;
+ out_buf = malloc(outsize);
+ if ( out_buf == NULL )
+ {
+ xc_dom_printf("Failed to alloc memory\n");
+ goto bzip2_cleanup;
+ }
+
+ stream.next_in = dom->kernel_blob;
+ stream.avail_in = dom->kernel_size;
+
+ stream.next_out = out_buf;
+ stream.avail_out = dom->kernel_size;
+
+ for ( ; ; )
+ {
+ ret = BZ2_bzDecompress(&stream);
+ if ( (stream.avail_out == 0) || (ret != BZ_OK) )
+ {
+ out_buf = realloc(out_buf, outsize * 2);
+ if ( out_buf == NULL )
+ {
+ xc_dom_printf("Failed to realloc memory\n");
+ break;
+ }
+
+ stream.next_out = out_buf + outsize;
+ stream.avail_out = (outsize * 2) - outsize;
+ outsize *= 2;
+ }
+
+ if ( ret != BZ_OK )
+ {
+ if ( ret == BZ_STREAM_END )
+ {
+ xc_dom_printf("Saw data stream end\n");
+ retval = 0;
+ break;
+ }
+ xc_dom_printf("BZIP error\n");
+ }
+ }
+
+ total = (stream.total_out_hi32 << 31) | stream.total_out_lo32;
+
+ xc_dom_printf("%s: BZIP2 decompress OK, 0x%zx -> 0x%lx\n",
+ __FUNCTION__, *size, (long unsigned int) total);
+
+ *blob = out_buf;
+ *size = total;
+
+ bzip2_cleanup:
+ BZ2_bzDecompressEnd(&stream);
+
+ return retval;
+}
+
+#else /* !defined(HAVE_BZLIB) */
+
+static int xc_try_bzip2_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ xc_dom_printf("%s: LZMA decompress support unavailable\n",
+ __FUNCTION__);
+ return -1;
+}
+
+#endif
+
+#if defined(HAVE_LZMA)
+
+#include <lzma.h>
+
+static uint64_t physmem(void)
+{
+ uint64_t ret = 0;
+ const long pagesize = sysconf(_SC_PAGESIZE);
+ const long pages = sysconf(_SC_PHYS_PAGES);
+
+ if ( (pagesize != -1) || (pages != -1) )
+ {
+ /*
+ * According to docs, pagesize * pages can overflow.
+ * Simple case is 32-bit box with 4 GiB or more RAM,
+ * which may report exactly 4 GiB of RAM, and "long"
+ * being 32-bit will overflow. Casting to uint64_t
+ * hopefully avoids overflows in the near future.
+ */
+ ret = (uint64_t)(pagesize) * (uint64_t)(pages);
+ }
+
+ return ret;
+}
+
+static int xc_try_lzma_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ lzma_stream stream = LZMA_STREAM_INIT;
+ lzma_ret ret;
+ lzma_action action = LZMA_RUN;
+ unsigned char *out_buf;
+ int retval = -1;
+ int outsize;
+ const char *msg;
+
+ ret = lzma_alone_decoder(&stream, physmem() / 3);
+ if ( ret != LZMA_OK )
+ {
+ xc_dom_printf("Failed to init lzma stream decoder\n");
+ return -1;
+ }
+
+ /* sigh. We don't know up-front how much memory we are going to need
+ * for the output buffer. Allocate the output buffer to be equal
+ * the input buffer to start, and we'll realloc as needed.
+ */
+ outsize = dom->kernel_size;
+ out_buf = malloc(outsize);
+ if ( out_buf == NULL )
+ {
+ xc_dom_printf("Failed to alloc memory\n");
+ goto lzma_cleanup;
+ }
+
+ stream.next_in = dom->kernel_blob;
+ stream.avail_in = dom->kernel_size;
+
+ stream.next_out = out_buf;
+ stream.avail_out = dom->kernel_size;
+
+ for ( ; ; )
+ {
+ ret = lzma_code(&stream, action);
+ if ( (stream.avail_out == 0) || (ret != LZMA_OK) )
+ {
+ out_buf = realloc(out_buf, outsize * 2);
+ if ( out_buf == NULL )
+ {
+ xc_dom_printf("Failed to realloc memory\n");
+ break;
+ }
+
+ stream.next_out = out_buf + outsize;
+ stream.avail_out = (outsize * 2) - outsize;
+ outsize *= 2;
+ }
+
+ if ( ret != LZMA_OK )
+ {
+ if ( ret == LZMA_STREAM_END )
+ {
+ xc_dom_printf("Saw data stream end\n");
+ retval = 0;
+ break;
+ }
+
+ switch ( ret )
+ {
+ case LZMA_MEM_ERROR:
+ msg = strerror(ENOMEM);
+ break;
+
+ case LZMA_MEMLIMIT_ERROR:
+ msg = "Memory usage limit reached";
+ break;
+
+ case LZMA_FORMAT_ERROR:
+ msg = "File format not recognized";
+ break;
+
+ case LZMA_OPTIONS_ERROR:
+ // FIXME: Better message?
+ msg = "Unsupported compression options";
+ break;
+
+ case LZMA_DATA_ERROR:
+ msg = "File is corrupt";
+ break;
+
+ case LZMA_BUF_ERROR:
+ msg = "Unexpected end of input";
+ break;
+
+ default:
+ msg = "Internal program error (bug)";
+ break;
+ }
+ xc_dom_printf("%s: LZMA decompression error %s\n",
+ __FUNCTION__, msg);
+ break;
+ }
+ }
+
+ xc_dom_printf("%s: LZMA decompress OK, 0x%zx -> 0x%zx\n",
+ __FUNCTION__, *size, (size_t)stream.total_out);
+
+ *blob = out_buf;
+ *size = stream.total_out;
+
+ lzma_cleanup:
+ lzma_end(&stream);
+
+ return retval;
+}
+
+#else /* !defined(HAVE_LZMA) */
+
+static int xc_try_lzma_decode(
+ struct xc_dom_image *dom, void **blob, size_t *size)
+{
+ xc_dom_printf("%s: LZMA decompress support unavailable\n",
+ __FUNCTION__);
+ return -1;
+}
+
+#endif
+
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;
+ 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;
@@ -70,22 +317,22 @@ static unsigned int payload_offset(struc
return off;
}
-static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
+static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
{
struct setup_header *hdr;
+ int ret;
if ( dom->kernel_blob == NULL )
{
- if ( verbose )
- xc_dom_panic(XC_INTERNAL_ERROR, "%s: no kernel image loaded\n",
- __FUNCTION__);
- return -EINVAL;
- }
+ 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__);
+ xc_dom_panic(XC_INTERNAL_ERROR, "%s: kernel image too small\n",
+ __FUNCTION__);
return -EINVAL;
}
@@ -93,37 +340,62 @@ static int check_bzimage_kernel(struct x
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__);
+ 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);
+ 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",
+ if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
+ {
+ ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
+ if ( ret == -1 )
+ {
+ xc_dom_panic(XC_INVALID_KERNEL,
+ "%s: unable to gzip decompress kernel\n",
__FUNCTION__);
+ return -EINVAL;
+ }
+ }
+ else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 )
+ {
+ ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+ if ( ret < 0 )
+ {
+ xc_dom_panic(XC_INVALID_KERNEL,
+ "%s unable to BZIP2 decompress kernel",
+ __FUNCTION__);
+ return -EINVAL;
+ }
+ }
+ else if ( memcmp(dom->kernel_blob, "\135\000", 2) == 0 )
+ {
+ ret = xc_try_lzma_decode(dom, &dom->kernel_blob, &dom->kernel_size);
+ if ( ret < 0 )
+ {
+ xc_dom_panic(XC_INVALID_KERNEL,
+ "%s unable to LZMA decompress kernel\n",
+ __FUNCTION__);
+ return -EINVAL;
+ }
+ }
+ else
+ {
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\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)
xen-bzip2-xz-2.patch:
Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE xen-bzip2-xz-2.patch ---
# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1250803576 -3600
# Node ID 7dad2e23bf892a6be9244265e028a9899503e664
# Parent a687c4d35fdd00c89c097d691c3039e07f737a1d
libxenguest: Fix libbz2/liblzma dependency computation.
1. Create an empty dep file if neither lib is installed
2. Forcibly disable support for libs if building minios
Signed-off-by: Keir Fraser <keir.fraser at citrix.com>
--- a/tools/libxc/Makefile Thu Aug 20 22:12:25 2009 +0100
+++ b/tools/libxc/Makefile Thu Aug 20 22:26:16 2009 +0100
@@ -151,10 +151,14 @@ libxenguest.so.$(MAJOR): libxenguest.so.
libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
ln -sf $< $@
+ifeq ($(CONFIG_MiniOS),y)
+.zlib.deps:
+ echo >$@
+else
.zlib.deps:
@(set -e; \
. ../check/funcs.sh; \
- rm -f $@.new; \
+ echo >$@.new; \
if has_header bzlib.h; then \
echo "-DHAVE_BZLIB" >>$@.new; \
echo "-lbz2" >>$@.new; \
@@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.
echo " - LZMA decompression supported"; \
fi; \
mv $@.new $@)
+endif
xc_dom_bzimageloader.o: .zlib.deps
xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)
xen-bzip2-xz-3.patch:
.hgignore | 2 +-
tools/libxc/Makefile | 36 +++++++++++++++---------------------
tools/libxc/xc_dom_bzimageloader.c | 2 +-
3 files changed, 17 insertions(+), 23 deletions(-)
--- NEW FILE xen-bzip2-xz-3.patch ---
# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1251098850 -3600
# Node ID c5125c0ea051be8babe0533c94a5635eaa760272
# Parent 4e67ba3c321affda3f90734ba62ce04b23fce66c
libxc: More LZMA/BZIP fixes.
- Fix an error message in xc_try_bzip2_decode()
- Check library installation on demand using a Makefile function,
rather than generating a dependency file. Cleaner and avoids a race
on generating the dep file.
Signed-off-by: Keir Fraser <keir.fraser at citrix.com>
--- a/.hgignore Mon Aug 24 08:08:52 2009 +0100
+++ b/.hgignore Mon Aug 24 08:27:30 2009 +0100
@@ -102,6 +102,7 @@
^stubdom/ocaml-.*$
^stubdom/lwip/
^stubdom/ioemu/
+^stubdom/stubdompath\.sh$
^tools/.*/build/lib.*/.*\.py$
^tools/blktap2/daemon/blktapctrl$
^tools/blktap2/drivers/img2qcow$
@@ -170,7 +171,6 @@
^tools/ioemu/qemu\.1$
^tools/ioemu/qemu\.pod$
^tools/ioemu/tapdisk-ioemu$
-^tools/libxc/\.zlib\.deps$
^tools/libxc/ia64/asm/.*\.h$
^tools/libxc/ia64/acpi/.*\.h$
^tools/libxc/ia64/acpi/platform/.*\.h$
--- a/tools/libxc/Makefile Mon Aug 24 08:08:52 2009 +0100
+++ b/tools/libxc/Makefile Mon Aug 24 08:27:30 2009 +0100
@@ -114,7 +114,7 @@ TAGS:
.PHONY: clean
clean:
- rm -rf *.rpm $(LIB) *~ $(DEPS) .*.deps \
+ rm -rf *.rpm $(LIB) *~ $(DEPS) \
$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \
$(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS)
@@ -152,30 +152,24 @@ libxenguest.so.$(MAJOR): libxenguest.so.
ln -sf $< $@
ifeq ($(CONFIG_MiniOS),y)
-.zlib.deps:
- echo >$@
+zlib-options =
else
-.zlib.deps:
- @(set -e; \
- . ../check/funcs.sh; \
- echo >$@.new; \
- if has_header bzlib.h; then \
- echo "-DHAVE_BZLIB" >>$@.new; \
- echo "-lbz2" >>$@.new; \
- echo " - BZIP2 decompression supported"; \
- fi; \
- if has_header lzma.h; then \
- echo "-DHAVE_LZMA" >>$@.new; \
- echo "-llzma" >>$@.new; \
- echo " - LZMA decompression supported"; \
- fi; \
- mv $@.new $@)
+zlib-options = $(shell \
+ (. ../check/funcs.sh; \
+ if has_header bzlib.h; then \
+ echo "-DHAVE_BZLIB"; \
+ echo "-lbz2"; \
+ fi; \
+ if has_header lzma.h; then \
+ echo "-DHAVE_LZMA"; \
+ echo "-llzma"; \
+ fi) | grep $(1))
endif
-xc_dom_bzimageloader.o: .zlib.deps
-xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)
+xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
+xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
-libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(shell grep l .zlib.deps)
+libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
--- a/tools/libxc/xc_dom_bzimageloader.c Mon Aug 24 08:08:52 2009 +0100
+++ b/tools/libxc/xc_dom_bzimageloader.c Mon Aug 24 08:27:30 2009 +0100
@@ -112,7 +112,7 @@ static int xc_try_bzip2_decode(
static int xc_try_bzip2_decode(
struct xc_dom_image *dom, void **blob, size_t *size)
{
- xc_dom_printf("%s: LZMA decompress support unavailable\n",
+ xc_dom_printf("%s: BZIP2 decompress support unavailable\n",
__FUNCTION__);
return -1;
}
xen-pygrub-fix-timeout-0.patch:
pygrub | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
--- NEW FILE xen-pygrub-fix-timeout-0.patch ---
# HG changeset patch
# User Keir Fraser <keir.fraser at citrix.com>
# Date 1250753424 -3600
# Node ID 7a57911ff09efb2b2e5fe7811e0495adc5884a29
# Parent 3fc731e42b63f14ef0be1a972113dd19834f0d99
pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour
Signed-off-by: Keir Fraser <keir.fraser at citrix.com>
xen-unstable changeset: 20090:3509276d8ad6
xen-unstable date: Thu Aug 20 08:23:33 2009 +0100
--- a/tools/pygrub/src/pygrub Thu Aug 20 08:29:54 2009 +0100
+++ b/tools/pygrub/src/pygrub Thu Aug 20 08:30:24 2009 +0100
@@ -443,11 +443,7 @@ class Grub:
# Timed out waiting for a keypress
if mytime != -1:
mytime += 1
- # curses.timeout() does not work properly on Solaris
- # So we may come here even after a key has been pressed.
- # Check both timeout and mytime to avoid exiting
- # when we shouldn't.
- if timeout != -1 and mytime >= int(timeout):
+ if mytime >= int(timeout):
self.isdone = True
break
else:
xen-qemu-dm-fix-block-memory-leak.patch:
block.c | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE xen-qemu-dm-fix-block-memory-leak.patch ---
Date: Wed, 12 Aug 2009 17:09:15 +0100
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
To: xen-devel at lists.xensource.com
Message-ID: <alpine.DEB.2.00.0908121705330.10516 at kaball-desktop>
Subject: [Xen-devel] [PATCH] fix qemu memory leak
Hi all,
the qemu block interface leaks memory every time a read or write request
is issued, this patch fixes it.
This is also the bug that is causing stubdomains to crash under high
disk IO.
Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
---
diff --git a/block.c b/block.c
index 36f5eb9..6ce453c 100644
--- a/tools/ioemu-qemu-xen/block.c
+++ b/tools/ioemu-qemu-xen/block.c
@@ -1378,6 +1378,7 @@ static void bdrv_aio_rw_vector_cb(void *opaque, int ret)
qemu_vfree(s->bounce);
s->this_aiocb->cb(s->this_aiocb->opaque, ret);
qemu_aio_release(s->this_aiocb);
+ qemu_free(s);
}
static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
_______________________________________________
Xen-devel mailing list
Xen-devel at lists.xensource.com
http://lists.xensource.com/xen-devel
xen-stubdomain-bridging.patch:
stubdom-dm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- NEW FILE xen-stubdomain-bridging.patch ---
Date: Fri, 14 Aug 2009 17:47:42 +0100
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
To: xen-devel at lists.xensource.com
Message-ID: <alpine.DEB.2.00.0908141739580.4422 at kaball-desktop>
Subject: [Xen-devel] [PATCH] stubdoms: parse bridge informations
Hi all,
currently the stubdom-dm script doesn't read the bridge of a vif
on xenstore, therefore all the vifs assigned to the stubdom always
belong to default bridge.
This patch changes the behavior reading the bridge from xenstore and
adding the bridge to the stubdom config file.
It would be nice to have this patch in the 3.4 tree as well.
Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
---
diff -r 68e8b8379244 stubdom/stubdom-dm
--- a/stubdom/stubdom-dm Sun Aug 02 13:43:15 2009 +0100
+++ b/stubdom/stubdom-dm Fri Aug 14 17:39:53 2009 +0100
@@ -143,11 +143,18 @@
i=${i%\"}
i=${i#\"}
vif_mac=`xenstore-read $i/mac`
+ vif_bridge=`xenstore-read $i/bridge`
if [ $j -ne 0 ]
then
echo -n "," >> ${stubdom_configdir}/$domname-dm
fi
- echo -n "'mac=$vif_mac'" >> ${stubdom_configdir}/$domname-dm
+ echo -n "'mac=$vif_mac" >> ${stubdom_configdir}/$domname-dm
+ if [ "$vif_bridge" ]
+ then
+ echo -n ",bridge=$vif_bridge'" >> ${stubdom_configdir}/$domname-dm
+ else
+ echo -n "'" >> ${stubdom_configdir}/$domname-dm
+ fi
j=$(( $j + 1 ))
done
echo " ] " >> ${stubdom_configdir}/$domname-dm
_______________________________________________
Xen-devel mailing list
Xen-devel at lists.xensource.com
http://lists.xensource.com/xen-devel
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- xen.spec 7 Aug 2009 15:27:58 -0000 1.244
+++ xen.spec 1 Sep 2009 11:35:37 -0000 1.245
@@ -37,6 +37,15 @@ Patch5: xen-net-disable-iptables-on-brid
Patch10: xen-no-werror.patch
+# backports
+Patch20: xen-pygrub-fix-timeout-0.patch
+Patch21: xen-qemu-dm-fix-block-memory-leak.patch
+Patch22: xen-stubdomain-bridging.patch
+
+Patch30: xen-bzip2-xz-1.patch
+Patch31: xen-bzip2-xz-2.patch
+Patch32: xen-bzip2-xz-3.patch
+
Patch100: xen-configure-xend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -58,6 +67,8 @@ BuildRequires: gnutls-devel
BuildRequires: openssl-devel
# For ioemu PCI passthrough
BuildRequires: pciutils-devel
+# modern compressed kernels
+BuildRequires: bzip2-devel xz-devel
Requires: bridge-utils
Requires: udev >= 059
Requires: xen-runtime = %{version}-%{release}
@@ -136,6 +147,14 @@ which manage Xen virtual machines.
%patch10 -p1
+%patch20 -p1
+%patch21 -p1
+#%patch22 -p1
+
+%patch30 -p1
+%patch31 -p1
+#%patch32 -p1
+
%patch100 -p1
# stubdom sources
@@ -449,6 +468,10 @@ rm -rf %{buildroot}
%{_libdir}/*.a
%changelog
+* Tue Sep 1 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-2
+- backport bzip2+xz linux kernel compression support.
+- backport a few bugfixes.
+
* Fri Aug 7 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.1-1
- update to 3.4.1 release.
More information about the Fedora-virt-maint
mailing list