- bnc#681302 - xm create -x <guest> returns "ImportError: No module

named ext"
  xm-create-xflag.patch

- Fix xen-utils to cope with xen-unstable c/s 21483

- xz-devel is available since 11.2, make it optional for SLES11SP1

- bnc#665610 - xm console > 1 to same VM messes up both consoles
  Upstream rejected due to portability concern, see
  http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html
  xenconsole-no-multiple-connections.patch
- Enable support for kernel decompression for gzip, bzip2, and LZMA
  so that kernels compressed with any of these methods can be
  launched.

- Update to Xen 4.1.0 c/s 22861

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102
This commit is contained in:
Charles Arnold
2011-03-21 16:47:37 +00:00
committed by Git OBS Bridge
parent 213dc42b7c
commit 05bedd5488
168 changed files with 1330 additions and 24685 deletions

View File

@@ -1,7 +1,7 @@
Index: xen-4.0.2-testing/tools/misc/miniterm/miniterm.c
Index: xen-4.1.0-testing/tools/misc/miniterm/miniterm.c
===================================================================
--- xen-4.0.2-testing.orig/tools/misc/miniterm/miniterm.c
+++ xen-4.0.2-testing/tools/misc/miniterm/miniterm.c
--- xen-4.1.0-testing.orig/tools/misc/miniterm/miniterm.c
+++ xen-4.1.0-testing/tools/misc/miniterm/miniterm.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
case 0:
close(1); /* stdout not needed */
@@ -35,11 +35,11 @@ Index: xen-4.0.2-testing/tools/misc/miniterm/miniterm.c
break;
}
Index: xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c
Index: xen-4.1.0-testing/tools/libxc/xc_dom_elfloader.c
===================================================================
--- xen-4.0.2-testing.orig/tools/libxc/xc_dom_elfloader.c
+++ xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c
@@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct
--- xen-4.1.0-testing.orig/tools/libxc/xc_dom_elfloader.c
+++ xen-4.1.0-testing/tools/libxc/xc_dom_elfloader.c
@@ -228,8 +228,9 @@ static int xc_dom_load_elf_symtab(struct
if ( load )
{
@@ -50,10 +50,10 @@ Index: xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c
elf_section_start(elf, shdr2),
size);
}
Index: xen-4.0.2-testing/tools/xenstore/Makefile
Index: xen-4.1.0-testing/tools/xenstore/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/xenstore/Makefile
+++ xen-4.0.2-testing/tools/xenstore/Makefile
--- xen-4.1.0-testing.orig/tools/xenstore/Makefile
+++ xen-4.1.0-testing/tools/xenstore/Makefile
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
MAJOR = 3.0
MINOR = 0
@@ -63,10 +63,10 @@ Index: xen-4.0.2-testing/tools/xenstore/Makefile
CFLAGS += -I.
CFLAGS += $(CFLAGS_libxenctrl)
Index: xen-4.0.2-testing/tools/xenstore/xenstored_core.c
Index: xen-4.1.0-testing/tools/xenstore/xenstored_core.c
===================================================================
--- xen-4.0.2-testing.orig/tools/xenstore/xenstored_core.c
+++ xen-4.0.2-testing/tools/xenstore/xenstored_core.c
--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_core.c
+++ xen-4.1.0-testing/tools/xenstore/xenstored_core.c
@@ -77,8 +77,8 @@ static void check_store(void);
int quota_nb_entry_per_domain = 1000;
@@ -91,11 +91,11 @@ Index: xen-4.0.2-testing/tools/xenstore/xenstored_core.c
break;
case 'T':
tracefile = optarg;
Index: xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
Index: xen-4.1.0-testing/tools/xenstore/xenstored_domain.c
===================================================================
--- xen-4.0.2-testing.orig/tools/xenstore/xenstored_domain.c
+++ xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
@@ -212,7 +212,7 @@ void handle_event(void)
--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_domain.c
+++ xen-4.1.0-testing/tools/xenstore/xenstored_domain.c
@@ -213,7 +213,7 @@ void handle_event(void)
{
evtchn_port_t port;
@@ -104,7 +104,7 @@ Index: xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
barf_perror("Failed to read from event fd");
if (port == virq_port)
@@ -561,7 +561,7 @@ static int dom0_init(void)
@@ -562,7 +562,7 @@ static int dom0_init(void)
struct domain *dom0;
port = xenbus_evtchn();
@@ -113,10 +113,10 @@ Index: xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
return -1;
dom0 = new_domain(NULL, 0, port);
Index: xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c
Index: xen-4.1.0-testing/tools/xenstore/xenstored_transaction.c
===================================================================
--- xen-4.0.2-testing.orig/tools/xenstore/xenstored_transaction.c
+++ xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c
--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_transaction.c
+++ xen-4.1.0-testing/tools/xenstore/xenstored_transaction.c
@@ -82,7 +82,7 @@ struct transaction
struct list_head changed_domains;
};
@@ -126,11 +126,11 @@ Index: xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c
static unsigned int generation;
/* Return tdb context to use for this connection. */
Index: xen-4.0.2-testing/tools/xenstore/xenstore_client.c
Index: xen-4.1.0-testing/tools/xenstore/xenstore_client.c
===================================================================
--- xen-4.0.2-testing.orig/tools/xenstore/xenstore_client.c
+++ xen-4.0.2-testing/tools/xenstore/xenstore_client.c
@@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio
--- xen-4.1.0-testing.orig/tools/xenstore/xenstore_client.c
+++ xen-4.1.0-testing/tools/xenstore/xenstore_client.c
@@ -255,7 +255,7 @@ do_chmod(char *path, struct xs_permissio
char **xsval = xs_directory(xsh, xth, path, &xsval_n);
if (xsval) {
@@ -139,10 +139,10 @@ Index: xen-4.0.2-testing/tools/xenstore/xenstore_client.c
for (i = 0; i < xsval_n; i++) {
snprintf(buf, MAX_PATH_LEN, "%s/%s", path, xsval[i]);
Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c
Index: xen-4.1.0-testing/tools/libxen/src/xen_common.c
===================================================================
--- xen-4.0.2-testing.orig/tools/libxen/src/xen_common.c
+++ xen-4.0.2-testing/tools/libxen/src/xen_common.c
--- xen-4.1.0-testing.orig/tools/libxen/src/xen_common.c
+++ xen-4.1.0-testing/tools/libxen/src/xen_common.c
@@ -1057,6 +1057,8 @@ static size_t size_of_member(const abstr
default:
assert(false);
@@ -161,10 +161,10 @@ Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c
}
Index: xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c
Index: xen-4.1.0-testing/tools/blktap2/drivers/block-remus.c
===================================================================
--- xen-4.0.2-testing.orig/tools/blktap2/drivers/block-remus.c
+++ xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c
--- xen-4.1.0-testing.orig/tools/blktap2/drivers/block-remus.c
+++ xen-4.1.0-testing/tools/blktap2/drivers/block-remus.c
@@ -1579,7 +1579,7 @@ static int tdremus_open(td_driver_t *dri
td_flag_t flags)
{
@@ -174,10 +174,10 @@ Index: xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c
RPRINTF("opening %s\n", name);
Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
===================================================================
--- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
@@ -196,6 +196,7 @@ typedef struct msg_pid {
} msg_pid_t;
@@ -186,11 +186,11 @@ Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
#define WRITE 1
/*Control Messages between manager and tapdev*/
Index: xen-4.0.2-testing/tools/blktap2/include/blktaplib.h
Index: xen-4.1.0-testing/tools/blktap2/include/blktaplib.h
===================================================================
--- xen-4.0.2-testing.orig/tools/blktap2/include/blktaplib.h
+++ xen-4.0.2-testing/tools/blktap2/include/blktaplib.h
@@ -198,6 +198,7 @@ typedef struct msg_lock {
--- xen-4.1.0-testing.orig/tools/blktap2/include/blktaplib.h
+++ xen-4.1.0-testing/tools/blktap2/include/blktaplib.h
@@ -190,6 +190,7 @@ typedef struct msg_lock {
} msg_lock_t;
#define READ 0