rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=76

Browse Source
This commit is contained in:
OBS User unknown 2009-08-01 09:53:46 +00:00 committed by Git OBS Bridge
parent 616dfa112f
commit b4c780fd71
80 changed files with 627 additions and 602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
32on64-extra-mem.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -2560,7 +2560,7 @@ class XendDomainInfo: @@ -2560,7 +2560,7 @@ class XendDomainInfo:
vtd_mem = ((vtd_mem + 1023) / 1024) * 1024 vtd_mem = ((vtd_mem + 1023) / 1024) * 1024

21
bdrv_open2_fix_flags.patch
View File

@ -1,6 +1,7 @@
diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/block.c xen-3.4.0-testing/tools/ioemu-remote/block.c Index: xen-3.4.1-testing/tools/ioemu-remote/block.c
--- xen-3.4.0-testing.orig/tools/ioemu-remote/block.c 2009-06-09 14:02:11.000000000 +0800 ===================================================================
+++ xen-3.4.0-testing/tools/ioemu-remote/block.c 2009-06-09 14:07:40.000000000 +0800 --- xen-3.4.1-testing.orig/tools/ioemu-remote/block.c
+++ xen-3.4.1-testing/tools/ioemu-remote/block.c
@@ -347,7 +347,7 @@ int bdrv_file_open(BlockDriverState **pb @@ -347,7 +347,7 @@ int bdrv_file_open(BlockDriverState **pb
int bdrv_open(BlockDriverState *bs, const char *filename, int flags) int bdrv_open(BlockDriverState *bs, const char *filename, int flags)
@ -27,9 +28,10 @@ diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/block.c xen-3.4.0-testing/t
ret = drv->bdrv_open(bs, filename, open_flags); ret = drv->bdrv_open(bs, filename, open_flags);
if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) { if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) {
ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR); ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR);
diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/hw/usb-msd.c xen-3.4.0-testing/tools/ioemu-remote/hw/usb-msd.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/usb-msd.c
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/usb-msd.c 2009-06-09 14:02:11.000000000 +0800 ===================================================================
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/usb-msd.c 2009-06-09 14:06:50.000000000 +0800 --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/usb-msd.c
+++ xen-3.4.1-testing/tools/ioemu-remote/hw/usb-msd.c
@@ -551,7 +551,7 @@ USBDevice *usb_msd_init(const char *file @@ -551,7 +551,7 @@ USBDevice *usb_msd_init(const char *file
s = qemu_mallocz(sizeof(MSDState)); s = qemu_mallocz(sizeof(MSDState));
@ -39,9 +41,10 @@ diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/hw/usb-msd.c xen-3.4.0-test
goto fail; goto fail;
s->bs = bdrv; s->bs = bdrv;
*pbs = bdrv; *pbs = bdrv;
diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-img.c xen-3.4.0-testing/tools/ioemu-remote/qemu-img.c Index: xen-3.4.1-testing/tools/ioemu-remote/qemu-img.c
--- xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-img.c 2009-06-09 14:02:11.000000000 +0800 ===================================================================
+++ xen-3.4.0-testing/tools/ioemu-remote/qemu-img.c 2009-06-09 14:06:32.000000000 +0800 --- xen-3.4.1-testing.orig/tools/ioemu-remote/qemu-img.c
+++ xen-3.4.1-testing/tools/ioemu-remote/qemu-img.c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#endif #endif

14
bdrv_open2_flags_2.patch
View File

@ -1,6 +1,7 @@
diff -uNrp xen-3.4.0-testing.orig.2/tools/ioemu-remote/hw/xen_blktap.c xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
--- xen-3.4.0-testing.orig.2/tools/ioemu-remote/hw/xen_blktap.c 2009-06-09 14:08:58.000000000 +0800 ===================================================================
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c 2009-06-09 14:09:08.000000000 +0800 --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -227,6 +227,7 @@ static int open_disk(struct td_state *s, @@ -227,6 +227,7 @@ static int open_disk(struct td_state *s,
BlockDriver* drv; BlockDriver* drv;
char* devname; char* devname;
@ -18,9 +19,10 @@ diff -uNrp xen-3.4.0-testing.orig.2/tools/ioemu-remote/hw/xen_blktap.c xen-3.4.0
fprintf(stderr, "Could not open image file %s\n", path); fprintf(stderr, "Could not open image file %s\n", path);
return -ENOMEM; return -ENOMEM;
} }
diff -uNrp xen-3.4.0-testing.orig.2/tools/ioemu-remote/xenstore.c xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
--- xen-3.4.0-testing.orig.2/tools/ioemu-remote/xenstore.c 2009-06-09 14:08:58.000000000 +0800 ===================================================================
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c 2009-06-09 14:09:08.000000000 +0800 --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -64,7 +64,8 @@ static void insert_media(void *opaque) @@ -64,7 +64,8 @@ static void insert_media(void *opaque)
for (i = 0; i < MAX_DRIVES + 1; i++) { for (i = 0; i < MAX_DRIVES + 1; i++) {
bs = drives_table[i].bdrv; bs = drives_table[i].bdrv;

44
blktap-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/blktap/drivers/block-cdrom.c Index: xen-3.4.1-testing/tools/blktap/drivers/block-cdrom.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/blktap/drivers/block-cdrom.c +++ xen-3.4.1-testing/tools/blktap/drivers/block-cdrom.c
@@ -0,0 +1,536 @@ @@ -0,0 +1,536 @@
+/* block-cdrom.c +/* block-cdrom.c
+ * + *
@ -539,10 +539,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/block-cdrom.c
+ .td_get_parent_id = tdcdrom_get_parent_id, + .td_get_parent_id = tdcdrom_get_parent_id,
+ .td_validate_parent = tdcdrom_validate_parent + .td_validate_parent = tdcdrom_validate_parent
+}; +};
Index: xen-3.4.0-testing/xen/include/public/io/cdromif.h Index: xen-3.4.1-testing/xen/include/public/io/cdromif.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/include/public/io/cdromif.h +++ xen-3.4.1-testing/xen/include/public/io/cdromif.h
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+/****************************************************************************** +/******************************************************************************
+ * cdromif.h + * cdromif.h
@ -664,10 +664,10 @@ Index: xen-3.4.0-testing/xen/include/public/io/cdromif.h
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense)) + sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
+ +
+#endif +#endif
Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile Index: xen-3.4.1-testing/tools/blktap/drivers/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/drivers/Makefile --- xen-3.4.1-testing.orig/tools/blktap/drivers/Makefile
+++ xen-3.4.0-testing/tools/blktap/drivers/Makefile +++ xen-3.4.1-testing/tools/blktap/drivers/Makefile
@@ -20,8 +20,9 @@ CRYPT_LIB := -lcrypto @@ -20,8 +20,9 @@ CRYPT_LIB := -lcrypto
$(warning === libgcrypt not installed: falling back to libcrypto ===) $(warning === libgcrypt not installed: falling back to libcrypto ===)
endif endif
@ -688,10 +688,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile
BLK-OBJS-y += aes.o BLK-OBJS-y += aes.o
BLK-OBJS-y += tapaio.o BLK-OBJS-y += tapaio.o
BLK-OBJS-$(CONFIG_Linux) += blk_linux.o BLK-OBJS-$(CONFIG_Linux) += blk_linux.o
Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.h Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/drivers/tapdisk.h --- xen-3.4.1-testing.orig/tools/blktap/drivers/tapdisk.h
+++ xen-3.4.0-testing/tools/blktap/drivers/tapdisk.h +++ xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
@@ -137,6 +137,9 @@ struct tap_disk { @@ -137,6 +137,9 @@ struct tap_disk {
int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id); int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id);
int (*td_validate_parent)(struct disk_driver *dd, int (*td_validate_parent)(struct disk_driver *dd,
@ -736,10 +736,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.h
}; };
typedef struct driver_list_entry { typedef struct driver_list_entry {
Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h Index: xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/lib/blktaplib.h --- xen-3.4.1-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-3.4.0-testing/tools/blktap/lib/blktaplib.h +++ xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
@@ -220,6 +220,7 @@ typedef struct msg_pid { @@ -220,6 +220,7 @@ typedef struct msg_pid {
#define DISK_TYPE_RAM 3 #define DISK_TYPE_RAM 3
#define DISK_TYPE_QCOW 4 #define DISK_TYPE_QCOW 4
@ -748,10 +748,10 @@ Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
/* xenstore/xenbus: */ /* xenstore/xenbus: */
#define DOMNAME "Domain-0" #define DOMNAME "Domain-0"
Index: xen-3.4.0-testing/xen/include/public/io/blkif.h Index: xen-3.4.1-testing/xen/include/public/io/blkif.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/public/io/blkif.h --- xen-3.4.1-testing.orig/xen/include/public/io/blkif.h
+++ xen-3.4.0-testing/xen/include/public/io/blkif.h +++ xen-3.4.1-testing/xen/include/public/io/blkif.h
@@ -76,6 +76,10 @@ @@ -76,6 +76,10 @@
* "feature-flush-cache" node! * "feature-flush-cache" node!
*/ */
@ -763,10 +763,10 @@ Index: xen-3.4.0-testing/xen/include/public/io/blkif.h
/* /*
* Maximum scatter/gather segments per request. * Maximum scatter/gather segments per request.
Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.c Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/drivers/tapdisk.c --- xen-3.4.1-testing.orig/tools/blktap/drivers/tapdisk.c
+++ xen-3.4.0-testing/tools/blktap/drivers/tapdisk.c +++ xen-3.4.1-testing/tools/blktap/drivers/tapdisk.c
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta @@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
goto out; goto out;
} }
@ -790,10 +790,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.c
default: default:
DPRINTF("Unknown block operation\n"); DPRINTF("Unknown block operation\n");
break; break;
Index: xen-3.4.0-testing/tools/python/xen/xend/server/BlktapController.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/BlktapController.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/BlktapController.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/BlktapController.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/BlktapController.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/BlktapController.py
@@ -14,6 +14,7 @@ blktap_disk_types = [ @@ -14,6 +14,7 @@ blktap_disk_types = [
'ram', 'ram',
'qcow', 'qcow',

12
blktap.patch
View File

@ -1,10 +1,10 @@
bug #239173 bug #239173
bug #242953 bug #242953
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -2940,7 +2940,7 @@ class XendDomainInfo: @@ -2940,7 +2940,7 @@ class XendDomainInfo:
(fn, BOOTLOADER_LOOPBACK_DEVICE)) (fn, BOOTLOADER_LOOPBACK_DEVICE))
@ -14,10 +14,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
'device': BOOTLOADER_LOOPBACK_DEVICE, 'device': BOOTLOADER_LOOPBACK_DEVICE,
} }
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c +++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -311,9 +311,9 @@ void xenstore_parse_domain_config(int hv @@ -311,9 +311,9 @@ void xenstore_parse_domain_config(int hv
{ {
char **e_danger = NULL; char **e_danger = NULL;

6
blktapctrl-default-to-ioemu.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.h Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/drivers/tapdisk.h --- xen-3.4.1-testing.orig/tools/blktap/drivers/tapdisk.h
+++ xen-3.4.0-testing/tools/blktap/drivers/tapdisk.h +++ xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
@@ -168,7 +168,7 @@ static disk_info_t aio_disk = { @@ -168,7 +168,7 @@ static disk_info_t aio_disk = {
"raw image (aio)", "raw image (aio)",
"aio", "aio",

6
block-flags.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/block Index: xen-3.4.1-testing/tools/hotplug/Linux/block
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/block --- xen-3.4.1-testing.orig/tools/hotplug/Linux/block
+++ xen-3.4.0-testing/tools/hotplug/Linux/block +++ xen-3.4.1-testing/tools/hotplug/Linux/block
@@ -225,11 +225,14 @@ case "$command" in @@ -225,11 +225,14 @@ case "$command" in
;; ;;

6
block-losetup-retry.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/block Index: xen-3.4.1-testing/tools/hotplug/Linux/block
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/block --- xen-3.4.1-testing.orig/tools/hotplug/Linux/block
+++ xen-3.4.0-testing/tools/hotplug/Linux/block +++ xen-3.4.1-testing/tools/hotplug/Linux/block
@@ -241,107 +241,111 @@ case "$command" in @@ -241,107 +241,111 @@ case "$command" in
mount it read-write in a guest domain." mount it read-write in a guest domain."
fi fi

6
bridge-bonding.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-bridge Index: xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-bridge --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-bridge +++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
@@ -241,6 +241,9 @@ op_start () { @@ -241,6 +241,9 @@ op_start () {
return return
fi fi

6
bridge-opensuse.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-bridge Index: xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-bridge --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-bridge +++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
@@ -262,18 +262,18 @@ op_stop () { @@ -262,18 +262,18 @@ op_stop () {
transfer_addrs ${bridge} ${pdev} transfer_addrs ${bridge} ${pdev}
if ! ifdown ${bridge}; then if ! ifdown ${bridge}; then

6
bridge-record-creation.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-bridge Index: xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-bridge --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-bridge +++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
@@ -249,6 +249,11 @@ op_start () { @@ -249,6 +249,11 @@ op_start () {
create_bridge ${tdev} create_bridge ${tdev}

6
bridge-vlan.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-bridge Index: xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-bridge --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-bridge +++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge
@@ -191,6 +191,28 @@ antispoofing () { @@ -191,6 +191,28 @@ antispoofing () {
iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT
} }

24
build-tapdisk-ioemu.patch
View File

@ -15,10 +15,10 @@ Signed-off-by: Kevin Wolf <kwolf@suse.de>
tapdisk-ioemu.c | 17 ----------------- tapdisk-ioemu.c | 17 -----------------
4 files changed, 17 insertions(+), 26 deletions(-) 4 files changed, 17 insertions(+), 26 deletions(-)
Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile Index: xen-3.4.1-testing/tools/ioemu-remote/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/Makefile --- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile
+++ xen-3.4.0-testing/tools/ioemu-remote/Makefile +++ xen-3.4.1-testing/tools/ioemu-remote/Makefile
@@ -46,13 +46,6 @@ $(filter %-user,$(SUBDIR_RULES)): libqem @@ -46,13 +46,6 @@ $(filter %-user,$(SUBDIR_RULES)): libqem
recurse-all: $(SUBDIR_RULES) recurse-all: $(SUBDIR_RULES)
@ -55,10 +55,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile
###################################################################### ######################################################################
# libqemu_common.a: Target independent part of system emulation. The # libqemu_common.a: Target independent part of system emulation. The
# long term path is to suppress *all* target specific code in case of # long term path is to suppress *all* target specific code in case of
Index: xen-3.4.0-testing/tools/ioemu-remote/configure Index: xen-3.4.1-testing/tools/ioemu-remote/configure
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/configure --- xen-3.4.1-testing.orig/tools/ioemu-remote/configure
+++ xen-3.4.0-testing/tools/ioemu-remote/configure +++ xen-3.4.1-testing/tools/ioemu-remote/configure
@@ -1508,7 +1508,7 @@ bsd) @@ -1508,7 +1508,7 @@ bsd)
;; ;;
esac esac
@ -68,10 +68,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/configure
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
tools="qemu-img\$(EXESUF) $tools" tools="qemu-img\$(EXESUF) $tools"
if [ "$linux" = "yes" ] ; then if [ "$linux" = "yes" ] ; then
Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c Index: xen-3.4.1-testing/tools/ioemu-remote/qemu-tool.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-tool.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/qemu-tool.c
+++ xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c +++ xen-3.4.1-testing/tools/ioemu-remote/qemu-tool.c
@@ -68,7 +68,7 @@ void qemu_bh_delete(QEMUBH *bh) @@ -68,7 +68,7 @@ void qemu_bh_delete(QEMUBH *bh)
qemu_free(bh); qemu_free(bh);
} }
@ -81,10 +81,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c
IOCanRWHandler *fd_read_poll, IOCanRWHandler *fd_read_poll,
IOHandler *fd_read, IOHandler *fd_read,
IOHandler *fd_write, IOHandler *fd_write,
Index: xen-3.4.0-testing/tools/ioemu-remote/tapdisk-ioemu.c Index: xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c
+++ xen-3.4.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +++ xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c
@@ -12,34 +12,12 @@ @@ -12,34 +12,12 @@
extern void qemu_aio_init(void); extern void qemu_aio_init(void);

20
cdrom-removable.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/server/HalDaemon.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/HalDaemon.py
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/python/xen/xend/server/HalDaemon.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/HalDaemon.py
@@ -0,0 +1,243 @@ @@ -0,0 +1,243 @@
+#!/usr/bin/env python +#!/usr/bin/env python
+# -*- mode: python; -*- +# -*- mode: python; -*-
@ -246,10 +246,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/HalDaemon.py
+ print 'Falling off end' + print 'Falling off end'
+ +
+ +
Index: xen-3.4.0-testing/tools/python/xen/xend/server/Hald.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/Hald.py
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/python/xen/xend/server/Hald.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/Hald.py
@@ -0,0 +1,125 @@ @@ -0,0 +1,125 @@
+#============================================================================ +#============================================================================
+# This library is free software; you can redistribute it and/or +# This library is free software; you can redistribute it and/or
@ -376,10 +376,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/Hald.py
+ watcher.run() + watcher.run()
+ time.sleep(10) + time.sleep(10)
+ watcher.shutdown() + watcher.shutdown()
Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvServer.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/SrvServer.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/SrvServer.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/SrvServer.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/SrvServer.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/SrvServer.py
@@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir @@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir
from SrvRoot import SrvRoot from SrvRoot import SrvRoot
@ -397,10 +397,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvServer.py
def create(): def create():
root = SrvDir() root = SrvDir()
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c +++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -503,6 +503,19 @@ void xenstore_parse_domain_config(int hv @@ -503,6 +503,19 @@ void xenstore_parse_domain_config(int hv
if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0)
fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0"); fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0");

6
checkpoint-rename.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendCheckpoint.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendCheckpoint.py
@@ -151,7 +151,7 @@ def save(fd, dominfo, network, live, dst @@ -151,7 +151,7 @@ def save(fd, dominfo, network, live, dst
dominfo.destroy() dominfo.destroy()
dominfo.testDeviceComplete() dominfo.testDeviceComplete()

6
dom-print.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/arch/x86/domain.c Index: xen-3.4.1-testing/xen/arch/x86/domain.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/domain.c --- xen-3.4.1-testing.orig/xen/arch/x86/domain.c
+++ xen-3.4.0-testing/xen/arch/x86/domain.c +++ xen-3.4.1-testing/xen/arch/x86/domain.c
@@ -143,7 +143,7 @@ void dump_pageframe_info(struct domain * @@ -143,7 +143,7 @@ void dump_pageframe_info(struct domain *
printk("Memory pages belonging to domain %u:\n", d->domain_id); printk("Memory pages belonging to domain %u:\n", d->domain_id);

24
dump-exec-state.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/arch/ia64/linux-xen/smp.c Index: xen-3.4.1-testing/xen/arch/ia64/linux-xen/smp.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/ia64/linux-xen/smp.c --- xen-3.4.1-testing.orig/xen/arch/ia64/linux-xen/smp.c
+++ xen-3.4.0-testing/xen/arch/ia64/linux-xen/smp.c +++ xen-3.4.1-testing/xen/arch/ia64/linux-xen/smp.c
@@ -190,7 +190,7 @@ handle_IPI (int irq, void *dev_id, struc @@ -190,7 +190,7 @@ handle_IPI (int irq, void *dev_id, struc
* At this point the structure may be gone unless * At this point the structure may be gone unless
* wait is true. * wait is true.
@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/xen/arch/ia64/linux-xen/smp.c
/* Notify the sending CPU that the task is done. */ /* Notify the sending CPU that the task is done. */
mb(); mb();
Index: xen-3.4.0-testing/xen/arch/x86/smp.c Index: xen-3.4.1-testing/xen/arch/x86/smp.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/smp.c --- xen-3.4.1-testing.orig/xen/arch/x86/smp.c
+++ xen-3.4.0-testing/xen/arch/x86/smp.c +++ xen-3.4.1-testing/xen/arch/x86/smp.c
@@ -356,7 +356,7 @@ fastcall void smp_call_function_interrup @@ -356,7 +356,7 @@ fastcall void smp_call_function_interrup
if ( call_data->wait ) if ( call_data->wait )
@ -33,10 +33,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/smp.c
} }
irq_exit(); irq_exit();
Index: xen-3.4.0-testing/xen/common/keyhandler.c Index: xen-3.4.1-testing/xen/common/keyhandler.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/common/keyhandler.c --- xen-3.4.1-testing.orig/xen/common/keyhandler.c
+++ xen-3.4.0-testing/xen/common/keyhandler.c +++ xen-3.4.1-testing/xen/common/keyhandler.c
@@ -91,14 +91,25 @@ static void show_handlers(unsigned char @@ -91,14 +91,25 @@ static void show_handlers(unsigned char
key_table[i].desc); key_table[i].desc);
} }
@ -83,10 +83,10 @@ Index: xen-3.4.0-testing/xen/common/keyhandler.c
on_selected_cpus(cpumask_of_cpu(cpu), __dump_execstate, NULL, 1, 1); on_selected_cpus(cpumask_of_cpu(cpu), __dump_execstate, NULL, 1, 1);
} }
Index: xen-3.4.0-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h Index: xen-3.4.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/asm-ia64/linux-xen/asm/ptrace.h --- xen-3.4.1-testing.orig/xen/include/asm-ia64/linux-xen/asm/ptrace.h
+++ xen-3.4.0-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h +++ xen-3.4.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h
@@ -278,7 +278,7 @@ struct switch_stack { @@ -278,7 +278,7 @@ struct switch_stack {
# define ia64_task_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1) # define ia64_task_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1)
# define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr) # define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr)

30
hv_tools.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c Index: xen-3.4.1-testing/tools/python/xen/lowlevel/xc/xc.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/lowlevel/xc/xc.c --- xen-3.4.1-testing.orig/tools/python/xen/lowlevel/xc/xc.c
+++ xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c +++ xen-3.4.1-testing/tools/python/xen/lowlevel/xc/xc.c
@@ -890,14 +890,14 @@ static PyObject *pyxc_hvm_build(XcObject @@ -890,14 +890,14 @@ static PyObject *pyxc_hvm_build(XcObject
int i; int i;
#endif #endif
@ -31,10 +31,10 @@ Index: xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c
return Py_BuildValue("{}"); return Py_BuildValue("{}");
} }
Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendConfig.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendConfig.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py
@@ -143,6 +143,7 @@ XENAPI_PLATFORM_CFG_TYPES = { @@ -143,6 +143,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
'monitor': int, 'monitor': int,
'nographic': int, 'nographic': int,
@ -43,11 +43,11 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py
'rtc_timeoffset': int, 'rtc_timeoffset': int,
'serial': str, 'serial': str,
'sdl': int, 'sdl': int,
Index: xen-3.4.0-testing/tools/python/xen/xend/image.py Index: xen-3.4.1-testing/tools/python/xen/xend/image.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/image.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.4.0-testing/tools/python/xen/xend/image.py +++ xen-3.4.1-testing/tools/python/xen/xend/image.py
@@ -764,6 +764,7 @@ class HVMImageHandler(ImageHandler): @@ -762,6 +762,7 @@ class HVMImageHandler(ImageHandler):
self.apic = int(vmConfig['platform'].get('apic', 0)) self.apic = int(vmConfig['platform'].get('apic', 0))
self.acpi = int(vmConfig['platform'].get('acpi', 0)) self.acpi = int(vmConfig['platform'].get('acpi', 0))
@ -55,7 +55,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
self.guest_os_type = vmConfig['platform'].get('guest_os_type') self.guest_os_type = vmConfig['platform'].get('guest_os_type')
@@ -880,6 +881,7 @@ class HVMImageHandler(ImageHandler): @@ -878,6 +879,7 @@ class HVMImageHandler(ImageHandler):
log.debug("memsize = %d", memmax_mb) log.debug("memsize = %d", memmax_mb)
log.debug("target = %d", mem_mb) log.debug("target = %d", mem_mb)
log.debug("vcpus = %d", self.vm.getVCpuCount()) log.debug("vcpus = %d", self.vm.getVCpuCount())
@ -63,7 +63,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
log.debug("acpi = %d", self.acpi) log.debug("acpi = %d", self.acpi)
log.debug("apic = %d", self.apic) log.debug("apic = %d", self.apic)
@@ -888,6 +890,7 @@ class HVMImageHandler(ImageHandler): @@ -886,6 +888,7 @@ class HVMImageHandler(ImageHandler):
memsize = memmax_mb, memsize = memmax_mb,
target = mem_mb, target = mem_mb,
vcpus = self.vm.getVCpuCount(), vcpus = self.vm.getVCpuCount(),
@ -71,10 +71,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
acpi = self.acpi, acpi = self.acpi,
apic = self.apic) apic = self.apic)
rc['notes'] = { 'SUSPEND_CANCEL': 1 } rc['notes'] = { 'SUSPEND_CANCEL': 1 }
Index: xen-3.4.0-testing/tools/python/xen/xm/create.py Index: xen-3.4.1-testing/tools/python/xen/xm/create.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xm/create.py --- xen-3.4.1-testing.orig/tools/python/xen/xm/create.py
+++ xen-3.4.0-testing/tools/python/xen/xm/create.py +++ xen-3.4.1-testing/tools/python/xen/xm/create.py
@@ -229,6 +229,10 @@ gopts.var('viridian', val='VIRIDIAN', @@ -229,6 +229,10 @@ gopts.var('viridian', val='VIRIDIAN',
use="""Expose Viridian interface to x86 HVM guest? use="""Expose Viridian interface to x86 HVM guest?
(Default is 0).""") (Default is 0).""")

36
hv_xen_base.patch
View File

@ -1,8 +1,8 @@
%patch %patch
Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/domain.h Index: xen-3.4.1-testing/xen/include/asm-x86/hvm/domain.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/asm-x86/hvm/domain.h --- xen-3.4.1-testing.orig/xen/include/asm-x86/hvm/domain.h
+++ xen-3.4.0-testing/xen/include/asm-x86/hvm/domain.h +++ xen-3.4.1-testing/xen/include/asm-x86/hvm/domain.h
@@ -89,6 +89,7 @@ struct hvm_domain { @@ -89,6 +89,7 @@ struct hvm_domain {
struct vmx_domain vmx; struct vmx_domain vmx;
struct svm_domain svm; struct svm_domain svm;
@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/domain.h
}; };
#endif /* __ASM_X86_HVM_DOMAIN_H__ */ #endif /* __ASM_X86_HVM_DOMAIN_H__ */
Index: xen-3.4.0-testing/xen/arch/x86/hvm/Makefile Index: xen-3.4.1-testing/xen/arch/x86/hvm/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/Makefile --- xen-3.4.1-testing.orig/xen/arch/x86/hvm/Makefile
+++ xen-3.4.0-testing/xen/arch/x86/hvm/Makefile +++ xen-3.4.1-testing/xen/arch/x86/hvm/Makefile
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
subdir-y += svm subdir-y += svm
subdir-y += vmx subdir-y += vmx
@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/Makefile
obj-y += emulate.o obj-y += emulate.o
obj-y += hvm.o obj-y += hvm.o
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c Index: xen-3.4.1-testing/xen/arch/x86/hvm/hvm.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/hvm.c --- xen-3.4.1-testing.orig/xen/arch/x86/hvm/hvm.c
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c +++ xen-3.4.1-testing/xen/arch/x86/hvm/hvm.c
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
#include <asm/mc146818rtc.h> #include <asm/mc146818rtc.h>
#include <asm/spinlock.h> #include <asm/spinlock.h>
@ -136,10 +136,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c
} }
if ( rc == 0 ) if ( rc == 0 )
Index: xen-3.4.0-testing/xen/include/public/arch-x86/hvm/save.h Index: xen-3.4.1-testing/xen/include/public/arch-x86/hvm/save.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/public/arch-x86/hvm/save.h --- xen-3.4.1-testing.orig/xen/include/public/arch-x86/hvm/save.h
+++ xen-3.4.0-testing/xen/include/public/arch-x86/hvm/save.h +++ xen-3.4.1-testing/xen/include/public/arch-x86/hvm/save.h
@@ -432,9 +432,26 @@ struct hvm_viridian_context { @@ -432,9 +432,26 @@ struct hvm_viridian_context {
DECLARE_HVM_SAVE_TYPE(VIRIDIAN, 15, struct hvm_viridian_context); DECLARE_HVM_SAVE_TYPE(VIRIDIAN, 15, struct hvm_viridian_context);
@ -168,10 +168,10 @@ Index: xen-3.4.0-testing/xen/include/public/arch-x86/hvm/save.h
+#define HVM_SAVE_CODE_MAX 17 +#define HVM_SAVE_CODE_MAX 17
#endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */
Index: xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c Index: xen-3.4.1-testing/xen/arch/x86/hvm/vlapic.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/hvm/vlapic.c --- xen-3.4.1-testing.orig/xen/arch/x86/hvm/vlapic.c
+++ xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c +++ xen-3.4.1-testing/xen/arch/x86/hvm/vlapic.c
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
#include <asm/hvm/hvm.h> #include <asm/hvm/hvm.h>
#include <asm/hvm/io.h> #include <asm/hvm/io.h>
@ -188,10 +188,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c
return X86EMUL_OKAY; return X86EMUL_OKAY;
} }
Index: xen-3.4.0-testing/xen/include/public/hvm/params.h Index: xen-3.4.1-testing/xen/include/public/hvm/params.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/public/hvm/params.h --- xen-3.4.1-testing.orig/xen/include/public/hvm/params.h
+++ xen-3.4.0-testing/xen/include/public/hvm/params.h +++ xen-3.4.1-testing/xen/include/public/hvm/params.h
@@ -106,6 +106,8 @@ @@ -106,6 +106,8 @@
/* Boolean: Enable aligning all periodic vpts to reduce interrupts */ /* Boolean: Enable aligning all periodic vpts to reduce interrupts */
#define HVM_PARAM_VPT_ALIGN 16 #define HVM_PARAM_VPT_ALIGN 16

28
hv_xen_extension.patch
View File

@ -1,8 +1,8 @@
%patch %patch
Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/hvm_extensions.h Index: xen-3.4.1-testing/xen/include/asm-x86/hvm/hvm_extensions.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/include/asm-x86/hvm/hvm_extensions.h +++ xen-3.4.1-testing/xen/include/asm-x86/hvm/hvm_extensions.h
@@ -0,0 +1,165 @@ @@ -0,0 +1,165 @@
+/**************************************************************************** +/****************************************************************************
+ | + |
@ -169,17 +169,17 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/hvm_extensions.h
+int hyperx_initialize(struct domain *d); +int hyperx_initialize(struct domain *d);
+ +
+#endif +#endif
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/Makefile Index: xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/Makefile +++ xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/Makefile
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+obj-y += hv_intercept.o +obj-y += hv_intercept.o
+obj-y += hv_hypercall.o +obj-y += hv_hypercall.o
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_errno.h Index: xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_errno.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_errno.h +++ xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_errno.h
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+/**************************************************************************** +/****************************************************************************
+ | + |
@ -243,10 +243,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_errno.h
+#define HV_STATUS_NO_MEMORY_256PAGES 0x0103 +#define HV_STATUS_NO_MEMORY_256PAGES 0x0103
+#define HV_STATUS_NO_MEMORY_1024PAGES 0x0104 +#define HV_STATUS_NO_MEMORY_1024PAGES 0x0104
+#endif +#endif
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c Index: xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c +++ xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c
@@ -0,0 +1,153 @@ @@ -0,0 +1,153 @@
+/**************************************************************************** +/****************************************************************************
+ | + |
@ -401,10 +401,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c
+ return; + return;
+ } + }
+} +}
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h Index: xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h +++ xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+/**************************************************************************** +/****************************************************************************
+ | + |
@ -452,10 +452,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h
+#define HV_NOTIFY_LONG_SPIN_WAIT 0x0008 +#define HV_NOTIFY_LONG_SPIN_WAIT 0x0008
+ +
+#endif /* HV_HYPERCALL_H */ +#endif /* HV_HYPERCALL_H */
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c Index: xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c +++ xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c
@@ -0,0 +1,1008 @@ @@ -0,0 +1,1008 @@
+/**************************************************************************** +/****************************************************************************
+ | + |
@ -1465,10 +1465,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c
+ hvm_inject_exception(TRAP_gp_fault, 0, 0); + hvm_inject_exception(TRAP_gp_fault, 0, 0);
+ return (1); + return (1);
+} +}
Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_shim.h Index: xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_shim.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_shim.h +++ xen-3.4.1-testing/xen/arch/x86/hvm/hyperv/hv_shim.h
@@ -0,0 +1,285 @@ @@ -0,0 +1,285 @@
+/**************************************************************************** +/****************************************************************************
+ | + |

6
ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch
View File

@ -17,10 +17,10 @@ qcow2 image (the header is gone after three loop iterations):
Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Index: xen-3.4.0-testing/tools/ioemu-remote/block-qcow2.c Index: xen-3.4.1-testing/tools/ioemu-remote/block-qcow2.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/block-qcow2.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/block-qcow2.c
+++ xen-3.4.0-testing/tools/ioemu-remote/block-qcow2.c +++ xen-3.4.1-testing/tools/ioemu-remote/block-qcow2.c
@@ -916,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr @@ -916,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
goto err; goto err;

6
ioemu-blktap-barriers.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -362,6 +362,15 @@ static void qemu_send_responses(void* op @@ -362,6 +362,15 @@ static void qemu_send_responses(void* op
} }

6
ioemu-blktap-fv-init.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_machine_fv.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_machine_fv.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_machine_fv.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_machine_fv.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_machine_fv.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_machine_fv.c
@@ -266,6 +266,7 @@ void qemu_invalidate_entry(uint8_t *buff @@ -266,6 +266,7 @@ void qemu_invalidate_entry(uint8_t *buff
#endif /* defined(MAPCACHE) */ #endif /* defined(MAPCACHE) */

12
ioemu-blktap-image-format.patch
View File

@ -15,10 +15,10 @@ Signed-off-by: Kevin Wolf <kwolf@suse.de>
hw/xen_blktap.h | 14 ++++++++++++++ hw/xen_blktap.h | 14 ++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-) 2 files changed, 33 insertions(+), 3 deletions(-)
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -220,9 +220,10 @@ static int map_new_dev(struct td_state * @@ -220,9 +220,10 @@ static int map_new_dev(struct td_state *
return -1; return -1;
} }
@ -64,10 +64,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
msglen = sizeof(msg_hdr_t); msglen = sizeof(msg_hdr_t);
msg->type = CTLMSG_IMG_FAIL; msg->type = CTLMSG_IMG_FAIL;
msg->len = msglen; msg->len = msglen;
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.h Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.h --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.h
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.h +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.h
@@ -52,4 +52,18 @@ typedef struct fd_list_entry { @@ -52,4 +52,18 @@ typedef struct fd_list_entry {
int init_blktap(void); int init_blktap(void);

12
ioemu-blktap-zero-size.patch
View File

@ -12,10 +12,10 @@ Signed-off-by: Kevin Wolf <kwolf@suse.de>
hw/xen_blktap.c | 6 ++++++ hw/xen_blktap.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-) 1 files changed, 6 insertions(+), 0 deletions(-)
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -258,6 +258,12 @@ static int open_disk(struct td_state *s, @@ -258,6 +258,12 @@ static int open_disk(struct td_state *s,
s->size = bs->total_sectors; s->size = bs->total_sectors;
s->sector_size = 512; s->sector_size = 512;
@ -29,10 +29,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
s->info = ((s->flags & TD_RDONLY) ? VDISK_READONLY : 0); s->info = ((s->flags & TD_RDONLY) ? VDISK_READONLY : 0);
#ifndef QEMU_TOOL #ifndef QEMU_TOOL
Index: xen-3.4.0-testing/tools/python/xen/xend/server/DevController.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/DevController.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/DevController.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/DevController.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/DevController.py
@@ -155,7 +155,7 @@ class DevController: @@ -155,7 +155,7 @@ class DevController:
(devid, self.deviceClass)) (devid, self.deviceClass))

12
ioemu-debuginfo.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile Index: xen-3.4.1-testing/tools/ioemu-remote/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/Makefile --- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile
+++ xen-3.4.0-testing/tools/ioemu-remote/Makefile +++ xen-3.4.1-testing/tools/ioemu-remote/Makefile
@@ -242,7 +242,7 @@ endif @@ -242,7 +242,7 @@ endif
install: all $(if $(BUILD_DOCS),install-doc) install: all $(if $(BUILD_DOCS),install-doc)
mkdir -p "$(DESTDIR)$(bindir)" mkdir -p "$(DESTDIR)$(bindir)"
@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile
endif endif
ifneq ($(BLOBS),) ifneq ($(BLOBS),)
mkdir -p "$(DESTDIR)$(datadir)" mkdir -p "$(DESTDIR)$(datadir)"
Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile.target Index: xen-3.4.1-testing/tools/ioemu-remote/Makefile.target
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/Makefile.target --- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile.target
+++ xen-3.4.0-testing/tools/ioemu-remote/Makefile.target +++ xen-3.4.1-testing/tools/ioemu-remote/Makefile.target
@@ -754,7 +754,7 @@ clean: @@ -754,7 +754,7 @@ clean:
install: all install-hook install: all install-hook

6
ioemu-vnc-resize.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/vnc.c Index: xen-3.4.1-testing/tools/ioemu-remote/vnc.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/vnc.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/vnc.c
+++ xen-3.4.0-testing/tools/ioemu-remote/vnc.c +++ xen-3.4.1-testing/tools/ioemu-remote/vnc.c
@@ -1713,6 +1713,31 @@ static int protocol_client_msg(VncState @@ -1713,6 +1713,31 @@ static int protocol_client_msg(VncState
} }

6
libxen_permissive.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/libxen/src/xen_common.c Index: xen-3.4.1-testing/tools/libxen/src/xen_common.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/libxen/src/xen_common.c --- xen-3.4.1-testing.orig/tools/libxen/src/xen_common.c
+++ xen-3.4.0-testing/tools/libxen/src/xen_common.c +++ xen-3.4.1-testing/tools/libxen/src/xen_common.c
@@ -904,8 +904,15 @@ static void parse_into(xen_session *s, x @@ -904,8 +904,15 @@ static void parse_into(xen_session *s, x
0 != strcmp((char *)value_node->children->name, "struct") || 0 != strcmp((char *)value_node->children->name, "struct") ||
value_node->children->children == NULL) value_node->children->children == NULL)

7
network-nat-open-SuSEfirewall2-FORWARD.patch
View File

@ -1,8 +1,9 @@
Open SuSEfirewall2 FORWARD rule when use xen nat Open SuSEfirewall2 FORWARD rule when use xen nat
diff -uNrp xen-3.4.0-testing/tools/hotplug/Linux/network-nat xen-3.4.0-testing/tools/hotplug/Linux/network-nat Index: xen-3.4.1-testing/tools/hotplug/Linux/network-nat
--- xen-3.4.0-testing/tools/hotplug/Linux/network-nat 2009-04-08 17:31:50.000000000 +0800 ===================================================================
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-nat 2009-04-08 17:33:20.000000000 +0800 --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-nat
+++ xen-3.4.1-testing/tools/hotplug/Linux/network-nat
@@ -82,6 +82,7 @@ function dhcp_stop() @@ -82,6 +82,7 @@ function dhcp_stop()
op_start() { op_start() {
echo 1 >/proc/sys/net/ipv4/ip_forward echo 1 >/proc/sys/net/ipv4/ip_forward

6
network-nat.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-nat Index: xen-3.4.1-testing/tools/hotplug/Linux/network-nat
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-nat --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-nat
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-nat +++ xen-3.4.1-testing/tools/hotplug/Linux/network-nat
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/bin/bash -x -#!/bin/bash -x
+#!/bin/bash +#!/bin/bash

6
network-route.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-route Index: xen-3.4.1-testing/tools/hotplug/Linux/network-route
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-route --- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-route
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-route +++ xen-3.4.1-testing/tools/hotplug/Linux/network-route
@@ -21,7 +21,7 @@ dir=$(dirname "$0") @@ -21,7 +21,7 @@ dir=$(dirname "$0")
evalVariables "$@" evalVariables "$@"

6
pv-driver-build.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild Index: xen-3.4.1-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild --- xen-3.4.1-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild
+++ xen-3.4.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild +++ xen-3.4.1-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
@@ -3,3 +3,4 @@ include $(M)/overrides.mk @@ -3,3 +3,4 @@ include $(M)/overrides.mk
obj-m += xen-vbd.o obj-m += xen-vbd.o

8
pvdrv_emulation_control.patch
View File

@ -1,8 +1,8 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_platform.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_platform.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_platform.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_platform.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_platform.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_platform.c
@@ -356,6 +356,19 @@ static void platform_ioport_write(void * @@ -361,6 +361,19 @@ static void platform_ioport_write(void *
net_tap_shutdown_all(); net_tap_shutdown_all();
fprintf(logfile, "Done.\n"); fprintf(logfile, "Done.\n");
break; break;

6
qemu-dm-segfault.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/ide.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/ide.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/ide.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/ide.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/ide.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/ide.c
@@ -934,8 +934,9 @@ static inline void ide_dma_submit_check( @@ -934,8 +934,9 @@ static inline void ide_dma_submit_check(
static inline void ide_set_irq(IDEState *s) static inline void ide_set_irq(IDEState *s)

12
qemu-security-etch1.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/ne2000.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/ne2000.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/ne2000.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/ne2000.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/ne2000.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/ne2000.c
@@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq @@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq
NE2000State *s = opaque; NE2000State *s = opaque;
@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/ne2000.c
return !ne2000_buffer_full(s); return !ne2000_buffer_full(s);
} }
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/pc.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/pc.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/pc.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/pc.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/pc.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/pc.c
@@ -409,7 +409,8 @@ static void bochs_bios_write(void *opaqu @@ -409,7 +409,8 @@ static void bochs_bios_write(void *opaqu
case 0x400: case 0x400:
case 0x401: case 0x401:

8
serial-split.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/misc/serial-split/Makefile Index: xen-3.4.1-testing/tools/misc/serial-split/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/misc/serial-split/Makefile +++ xen-3.4.1-testing/tools/misc/serial-split/Makefile
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+CC ?= gcc +CC ?= gcc
+CFLAGS ?= -Wall -Os +CFLAGS ?= -Wall -Os
@ -23,10 +23,10 @@ Index: xen-3.4.0-testing/tools/misc/serial-split/Makefile
+ +
+%.o: %.c Makefile +%.o: %.c Makefile
+ $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $<
Index: xen-3.4.0-testing/tools/misc/serial-split/serial-split.c Index: xen-3.4.1-testing/tools/misc/serial-split/serial-split.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/misc/serial-split/serial-split.c +++ xen-3.4.1-testing/tools/misc/serial-split/serial-split.c
@@ -0,0 +1,422 @@ @@ -0,0 +1,422 @@
+/* +/*
+ * serial-split.c + * serial-split.c

18
snapshot-ioemu-delete.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c +++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -919,6 +919,18 @@ static void xenstore_process_dm_command_ @@ -919,6 +919,18 @@ static void xenstore_process_dm_command_
} }
@ -21,10 +21,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
} else if (!strncmp(command, "continue", len)) { } else if (!strncmp(command, "continue", len)) {
fprintf(logfile, "dm-command: continue after state save\n"); fprintf(logfile, "dm-command: continue after state save\n");
xen_pause_requested = 0; xen_pause_requested = 0;
Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c Index: xen-3.4.1-testing/tools/ioemu-remote/savevm.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/savevm.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/savevm.c
+++ xen-3.4.0-testing/tools/ioemu-remote/savevm.c +++ xen-3.4.1-testing/tools/ioemu-remote/savevm.c
@@ -1096,6 +1096,35 @@ the_end: @@ -1096,6 +1096,35 @@ the_end:
return ret; return ret;
} }
@ -61,10 +61,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c
#ifndef CONFIG_DM #ifndef CONFIG_DM
void do_savevm(const char *name) void do_savevm(const char *name)
Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h Index: xen-3.4.1-testing/tools/ioemu-remote/qemu-xen.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-xen.h --- xen-3.4.1-testing.orig/tools/ioemu-remote/qemu-xen.h
+++ xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h +++ xen-3.4.1-testing/tools/ioemu-remote/qemu-xen.h
@@ -42,6 +42,7 @@ enum { @@ -42,6 +42,7 @@ enum {
/* xen-vl-extra.c */ /* xen-vl-extra.c */

24
snapshot-ioemu-restore.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c Index: xen-3.4.1-testing/tools/blktap/drivers/blktapctrl.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/drivers/blktapctrl.c --- xen-3.4.1-testing.orig/tools/blktap/drivers/blktapctrl.c
+++ xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c +++ xen-3.4.1-testing/tools/blktap/drivers/blktapctrl.c
@@ -346,6 +346,7 @@ static int write_msg(int fd, int msgtype @@ -346,6 +346,7 @@ static int write_msg(int fd, int msgtype
msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t));
msg_dev->devnum = blkif->minor; msg_dev->devnum = blkif->minor;
@ -10,10 +10,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c
break; break;
Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h Index: xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/lib/blktaplib.h --- xen-3.4.1-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-3.4.0-testing/tools/blktap/lib/blktaplib.h +++ xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
@@ -189,6 +189,7 @@ typedef struct msg_hdr { @@ -189,6 +189,7 @@ typedef struct msg_hdr {
typedef struct msg_newdev { typedef struct msg_newdev {
uint8_t devnum; uint8_t devnum;
@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
} msg_newdev_t; } msg_newdev_t;
typedef struct msg_pid { typedef struct msg_pid {
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -67,6 +67,8 @@ int write_fd; @@ -67,6 +67,8 @@ int write_fd;
static pid_t process; static pid_t process;
fd_list_entry_t *fd_start = NULL; fd_list_entry_t *fd_start = NULL;
@ -87,10 +87,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
memset(buf, 0x00, MSG_SIZE); memset(buf, 0x00, MSG_SIZE);
msglen = sizeof(msg_hdr_t); msglen = sizeof(msg_hdr_t);
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c +++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -38,6 +38,8 @@ static QEMUTimer *insert_timer = NULL; @@ -38,6 +38,8 @@ static QEMUTimer *insert_timer = NULL;
#define UWAIT_MAX (30*1000000) /* thirty seconds */ #define UWAIT_MAX (30*1000000) /* thirty seconds */
#define UWAIT (100000) /* 1/10th second */ #define UWAIT (100000) /* 1/10th second */

24
snapshot-ioemu-save.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c Index: xen-3.4.1-testing/tools/ioemu-remote/savevm.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/savevm.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/savevm.c
+++ xen-3.4.0-testing/tools/ioemu-remote/savevm.c +++ xen-3.4.1-testing/tools/ioemu-remote/savevm.c
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include "sysemu.h" #include "sysemu.h"
#include "qemu-timer.h" #include "qemu-timer.h"
@ -97,10 +97,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c
#ifndef CONFIG_DM #ifndef CONFIG_DM
void do_savevm(const char *name) void do_savevm(const char *name)
Index: xen-3.4.0-testing/tools/ioemu-remote/i386-dm/helper2.c Index: xen-3.4.1-testing/tools/ioemu-remote/i386-dm/helper2.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/i386-dm/helper2.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/i386-dm/helper2.c
+++ xen-3.4.0-testing/tools/ioemu-remote/i386-dm/helper2.c +++ xen-3.4.1-testing/tools/ioemu-remote/i386-dm/helper2.c
@@ -109,6 +109,9 @@ int send_vcpu = 0; @@ -109,6 +109,9 @@ int send_vcpu = 0;
#define NR_CPUS 32 #define NR_CPUS 32
evtchn_port_t ioreq_local_port[NR_CPUS]; evtchn_port_t ioreq_local_port[NR_CPUS];
@ -167,10 +167,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/i386-dm/helper2.c
/* Wait to be allowed to continue */ /* Wait to be allowed to continue */
while (xen_pause_requested) { while (xen_pause_requested) {
Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h Index: xen-3.4.1-testing/tools/ioemu-remote/qemu-xen.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-xen.h --- xen-3.4.1-testing.orig/tools/ioemu-remote/qemu-xen.h
+++ xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h +++ xen-3.4.1-testing/tools/ioemu-remote/qemu-xen.h
@@ -34,6 +34,15 @@ void qemu_invalidate_map_cache(void) @@ -34,6 +34,15 @@ void qemu_invalidate_map_cache(void)
#define mapcache_lock() ((void)0) #define mapcache_lock() ((void)0)
#define mapcache_unlock() ((void)0) #define mapcache_unlock() ((void)0)
@ -195,10 +195,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h
void xenstore_check_new_media_present(int timeout); void xenstore_check_new_media_present(int timeout);
void xenstore_write_vncport(int vnc_display); void xenstore_write_vncport(int vnc_display);
void xenstore_read_vncpasswd(int domid, char *pwbuf, size_t pwbuflen); void xenstore_read_vncpasswd(int domid, char *pwbuf, size_t pwbuflen);
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c +++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include "exec-all.h" #include "exec-all.h"

48
snapshot-xend.patch
View File

@ -1,8 +1,8 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/image.py Index: xen-3.4.1-testing/tools/python/xen/xend/image.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/image.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.4.0-testing/tools/python/xen/xend/image.py +++ xen-3.4.1-testing/tools/python/xen/xend/image.py
@@ -447,7 +447,7 @@ class ImageHandler: @@ -445,7 +445,7 @@ class ImageHandler:
# have a callback but sadly we don't have Twisted in xend # have a callback but sadly we don't have Twisted in xend
self.sentinel_thread = thread.start_new_thread(self._sentinel_watch,()) self.sentinel_thread = thread.start_new_thread(self._sentinel_watch,())
@ -11,7 +11,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
if self.device_model is None: if self.device_model is None:
return return
# Signal the device model to for action # Signal the device model to for action
@@ -470,10 +470,17 @@ class ImageHandler: @@ -468,10 +468,17 @@ class ImageHandler:
while state != ret: while state != ret:
state = xstransact.Read("/local/domain/0/device-model/%i/state" state = xstransact.Read("/local/domain/0/device-model/%i/state"
% self.vm.getDomid()) % self.vm.getDomid())
@ -32,7 +32,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
#resotre orig state #resotre orig state
xstransact.Store("/local/domain/0/device-model/%i" xstransact.Store("/local/domain/0/device-model/%i"
@@ -498,6 +505,10 @@ class ImageHandler: @@ -496,6 +503,10 @@ class ImageHandler:
except: except:
pass pass
@ -43,10 +43,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
def recreate(self): def recreate(self):
if self.device_model is None: if self.device_model is None:
return return
Index: xen-3.4.0-testing/tools/python/xen/xend/server/blkif.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/blkif.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/blkif.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/blkif.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/blkif.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/blkif.py
@@ -88,6 +88,9 @@ class BlkifController(DevController): @@ -88,6 +88,9 @@ class BlkifController(DevController):
if bootable != None: if bootable != None:
back['bootable'] = str(bootable) back['bootable'] = str(bootable)
@ -57,10 +57,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/blkif.py
if security.on() == xsconstants.XS_POLICY_USE: if security.on() == xsconstants.XS_POLICY_USE:
self.do_access_control(config, uname) self.do_access_control(config, uname)
Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/SrvDomain.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -95,6 +95,31 @@ class SrvDomain(SrvDir): @@ -95,6 +95,31 @@ class SrvDomain(SrvDir):
def do_save(self, _, req): def do_save(self, _, req):
return self.xd.domain_save(self.dom.domid, req.args['file'][0]) return self.xd.domain_save(self.dom.domid, req.args['file'][0])
@ -102,10 +102,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py
return self.perform(req) return self.perform(req)
# #
Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendCheckpoint.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendCheckpoint.py
@@ -65,7 +65,7 @@ def insert_after(list, pred, value): @@ -65,7 +65,7 @@ def insert_after(list, pred, value):
return return
@ -323,10 +323,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py
if not paused: if not paused:
dominfo.unpause() dominfo.unpause()
Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendConfig.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendConfig.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py
@@ -220,6 +220,7 @@ XENAPI_CFG_TYPES = { @@ -220,6 +220,7 @@ XENAPI_CFG_TYPES = {
'machine_address_size': int, 'machine_address_size': int,
'suppress_spurious_page_faults': bool0, 'suppress_spurious_page_faults': bool0,
@ -335,10 +335,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py
} }
# List of legacy configuration keys that have no equivalent in the # List of legacy configuration keys that have no equivalent in the
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomain.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomain.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomain.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomain.py
@@ -52,6 +52,7 @@ from xen.xend.xenstore.xstransact import @@ -52,6 +52,7 @@ from xen.xend.xenstore.xstransact import
from xen.xend.xenstore.xswatch import xswatch from xen.xend.xenstore.xswatch import xswatch
from xen.util import mkdir, rwlock from xen.util import mkdir, rwlock
@ -535,10 +535,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py
def domain_pincpu(self, domid, vcpu, cpumap): def domain_pincpu(self, domid, vcpu, cpumap):
"""Set which cpus vcpu can use """Set which cpus vcpu can use
Index: xen-3.4.0-testing/tools/python/xen/xm/main.py Index: xen-3.4.1-testing/tools/python/xen/xm/main.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xm/main.py --- xen-3.4.1-testing.orig/tools/python/xen/xm/main.py
+++ xen-3.4.0-testing/tools/python/xen/xm/main.py +++ xen-3.4.1-testing/tools/python/xen/xm/main.py
@@ -120,6 +120,14 @@ SUBCOMMAND_HELP = { @@ -120,6 +120,14 @@ SUBCOMMAND_HELP = {
'Restore a domain from a saved state.'), 'Restore a domain from a saved state.'),
'save' : ('[-c|-f] <Domain> <CheckpointFile>', 'save' : ('[-c|-f] <Domain> <CheckpointFile>',

4
supported_module.diff
View File

@ -2,10 +2,10 @@ Make our PV drivers "Novell supported modules"
Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com> Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
Index: xen-3.4.0-testing/unmodified_drivers/linux-2.6/Module.supported Index: xen-3.4.1-testing/unmodified_drivers/linux-2.6/Module.supported
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/unmodified_drivers/linux-2.6/Module.supported +++ xen-3.4.1-testing/unmodified_drivers/linux-2.6/Module.supported
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+xen-vbd +xen-vbd
+xen-platform-pci +xen-platform-pci

12
tapdisk-ioemu-shutdown-fix.patch
View File

@ -16,10 +16,10 @@ Signed-off-by: Kevin Wolf <kwolf@suse.de>
tapdisk-ioemu.c | 13 ++++++++++--- tapdisk-ioemu.c | 13 ++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-) 2 files changed, 14 insertions(+), 4 deletions(-)
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -65,6 +65,7 @@ int read_fd; @@ -65,6 +65,7 @@ int read_fd;
int write_fd; int write_fd;
@ -46,10 +46,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
case CTLMSG_PID: case CTLMSG_PID:
memset(buf, 0x00, MSG_SIZE); memset(buf, 0x00, MSG_SIZE);
Index: xen-3.4.0-testing/tools/ioemu-remote/tapdisk-ioemu.c Index: xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c
+++ xen-3.4.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +++ xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c
@@ -14,6 +14,7 @@ extern void qemu_aio_init(void); @@ -14,6 +14,7 @@ extern void qemu_aio_init(void);
extern void qemu_aio_poll(void); extern void qemu_aio_poll(void);

6
tmp_build.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/xenstore/Makefile Index: xen-3.4.1-testing/tools/xenstore/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/Makefile --- xen-3.4.1-testing.orig/tools/xenstore/Makefile
+++ xen-3.4.0-testing/tools/xenstore/Makefile +++ xen-3.4.1-testing/tools/xenstore/Makefile
@@ -56,6 +56,7 @@ $(CLIENTS_DOMU): xenstore @@ -56,6 +56,7 @@ $(CLIENTS_DOMU): xenstore
xenstore: xenstore_client.o $(LIBXENSTORE) xenstore: xenstore_client.o $(LIBXENSTORE)

6
tools-gdbserver-build.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in Index: xen-3.4.1-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in --- xen-3.4.1-testing.orig/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
+++ xen-3.4.0-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in +++ xen-3.4.1-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
@@ -90,7 +90,7 @@ INCLUDE_CFLAGS = -I. -I${srcdir} -I$(src @@ -90,7 +90,7 @@ INCLUDE_CFLAGS = -I. -I${srcdir} -I$(src
GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS} GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS}
#PROFILE_CFLAGS = -pg #PROFILE_CFLAGS = -pg

36
tools-kboot.diff
View File

@ -13,10 +13,10 @@ Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
tools/kboot/select-kernel | 59 + tools/kboot/select-kernel | 59 +
9 files changed, 2111 insertions(+) 9 files changed, 2111 insertions(+)
Index: xen-3.4.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 Index: xen-3.4.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 +++ xen-3.4.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
@@ -0,0 +1,874 @@ @@ -0,0 +1,874 @@
+# +#
+# Automatically generated make config: don't edit +# Automatically generated make config: don't edit
@ -892,10 +892,10 @@ Index: xen-3.4.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
+CONFIG_X86_NO_TSS=y +CONFIG_X86_NO_TSS=y
+CONFIG_X86_NO_IDT=y +CONFIG_X86_NO_IDT=y
+CONFIG_KTIME_SCALAR=y +CONFIG_KTIME_SCALAR=y
Index: xen-3.4.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 Index: xen-3.4.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 +++ xen-3.4.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
@@ -0,0 +1,653 @@ @@ -0,0 +1,653 @@
+# +#
+# Automatically generated make config: don't edit +# Automatically generated make config: don't edit
@ -1550,17 +1550,17 @@ Index: xen-3.4.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
+# CONFIG_CRC32 is not set +# CONFIG_CRC32 is not set
+# CONFIG_LIBCRC32C is not set +# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_INFLATE=y
Index: xen-3.4.0-testing/buildconfigs/mk.linux-2.6-xenUboot Index: xen-3.4.1-testing/buildconfigs/mk.linux-2.6-xenUboot
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/buildconfigs/mk.linux-2.6-xenUboot +++ xen-3.4.1-testing/buildconfigs/mk.linux-2.6-xenUboot
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+EXTRAVERSION = xenUboot +EXTRAVERSION = xenUboot
+include buildconfigs/mk.linux-2.6-xen +include buildconfigs/mk.linux-2.6-xen
Index: xen-3.4.0-testing/tools/kboot/Makefile Index: xen-3.4.1-testing/tools/kboot/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/kboot/Makefile +++ xen-3.4.1-testing/tools/kboot/Makefile
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+# +#
+# tools/kboot/Makefile +# tools/kboot/Makefile
@ -1585,10 +1585,10 @@ Index: xen-3.4.0-testing/tools/kboot/Makefile
+kboot.initramfs: mkinitramfs init select-kernel ../xcutils/xc_kexec +kboot.initramfs: mkinitramfs init select-kernel ../xcutils/xc_kexec
+ sh ./mkinitramfs | tee $@ + sh ./mkinitramfs | tee $@
+ +
Index: xen-3.4.0-testing/tools/kboot/README Index: xen-3.4.1-testing/tools/kboot/README
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/kboot/README +++ xen-3.4.1-testing/tools/kboot/README
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+ +
+This is a simple kexec-based boot loader +This is a simple kexec-based boot loader
@ -1633,10 +1633,10 @@ Index: xen-3.4.0-testing/tools/kboot/README
+ +
+-- +--
+Gerd Hoffmann <kraxel@suse.de> +Gerd Hoffmann <kraxel@suse.de>
Index: xen-3.4.0-testing/tools/kboot/init Index: xen-3.4.1-testing/tools/kboot/init
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/kboot/init +++ xen-3.4.1-testing/tools/kboot/init
@@ -0,0 +1,309 @@ @@ -0,0 +1,309 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -1947,10 +1947,10 @@ Index: xen-3.4.0-testing/tools/kboot/init
+msg "bye ..." +msg "bye ..."
+banner "boot $guestos" +banner "boot $guestos"
+xc_kexec -e +xc_kexec -e
Index: xen-3.4.0-testing/tools/kboot/mkinitramfs Index: xen-3.4.1-testing/tools/kboot/mkinitramfs
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/kboot/mkinitramfs +++ xen-3.4.1-testing/tools/kboot/mkinitramfs
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -2063,10 +2063,10 @@ Index: xen-3.4.0-testing/tools/kboot/mkinitramfs
+ echo "file $LIB/$(basename $lib) $lib 0755 0 0" + echo "file $LIB/$(basename $lib) $lib 0755 0 0"
+done +done
+echo +echo
Index: xen-3.4.0-testing/tools/kboot/select-kernel Index: xen-3.4.1-testing/tools/kboot/select-kernel
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/kboot/select-kernel +++ xen-3.4.1-testing/tools/kboot/select-kernel
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -2127,10 +2127,10 @@ Index: xen-3.4.0-testing/tools/kboot/select-kernel
+msg "using $kernelname" +msg "using $kernelname"
+echo "$kernelname" +echo "$kernelname"
+ +
Index: xen-3.4.0-testing/make-kboot Index: xen-3.4.1-testing/make-kboot
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/make-kboot +++ xen-3.4.1-testing/make-kboot
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
+#!/bin/sh +#!/bin/sh
+ +

78
tools-xc_kexec.diff
View File

@ -23,10 +23,10 @@ Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
tools/xcutils/xc_kexec.c | 503 +++++++++++++++ tools/xcutils/xc_kexec.c | 503 +++++++++++++++
19 files changed, 4988 insertions(+), 2 deletions(-) 19 files changed, 4988 insertions(+), 2 deletions(-)
Index: xen-3.4.0-testing/tools/xcutils/Makefile Index: xen-3.4.1-testing/tools/xcutils/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xcutils/Makefile --- xen-3.4.1-testing.orig/tools/xcutils/Makefile
+++ xen-3.4.0-testing/tools/xcutils/Makefile +++ xen-3.4.1-testing/tools/xcutils/Makefile
@@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk @@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk
CFLAGS += -Werror CFLAGS += -Werror
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
@ -55,10 +55,10 @@ Index: xen-3.4.0-testing/tools/xcutils/Makefile
+ make -C helper clean + make -C helper clean
-include $(DEPS) -include $(DEPS)
Index: xen-3.4.0-testing/tools/xcutils/helper/Makefile Index: xen-3.4.1-testing/tools/xcutils/helper/Makefile
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/Makefile +++ xen-3.4.1-testing/tools/xcutils/helper/Makefile
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+ +
+XEN_ROOT = ../../.. +XEN_ROOT = ../../..
@ -99,10 +99,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/Makefile
+# dependencies +# dependencies
+ +
+$(XEN_TARGET_ARCH)/entry.o: $(XEN_TARGET_ARCH)/entry.S $(XEN_TARGET_ARCH)/offsets.h +$(XEN_TARGET_ARCH)/entry.o: $(XEN_TARGET_ARCH)/entry.S $(XEN_TARGET_ARCH)/offsets.h
Index: xen-3.4.0-testing/tools/xcutils/helper/console.c Index: xen-3.4.1-testing/tools/xcutils/helper/console.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/console.c +++ xen-3.4.1-testing/tools/xcutils/helper/console.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+#include <inttypes.h> +#include <inttypes.h>
+ +
@ -173,10 +173,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/console.c
+ +
+ return printed_len; + return printed_len;
+} +}
Index: xen-3.4.0-testing/tools/xcutils/helper/ctype.c Index: xen-3.4.1-testing/tools/xcutils/helper/ctype.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/ctype.c +++ xen-3.4.1-testing/tools/xcutils/helper/ctype.c
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+/* +/*
+ * linux/lib/ctype.c + * linux/lib/ctype.c
@ -213,10 +213,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/ctype.c
+_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */ +_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */
+ +
+EXPORT_SYMBOL(_ctype); +EXPORT_SYMBOL(_ctype);
Index: xen-3.4.0-testing/tools/xcutils/helper/ctype.h Index: xen-3.4.1-testing/tools/xcutils/helper/ctype.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/ctype.h +++ xen-3.4.1-testing/tools/xcutils/helper/ctype.h
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
+#ifndef _LINUX_CTYPE_H +#ifndef _LINUX_CTYPE_H
+#define _LINUX_CTYPE_H +#define _LINUX_CTYPE_H
@ -272,10 +272,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/ctype.h
+#define toupper(c) __toupper(c) +#define toupper(c) __toupper(c)
+ +
+#endif +#endif
Index: xen-3.4.0-testing/tools/xcutils/helper/helper.h Index: xen-3.4.1-testing/tools/xcutils/helper/helper.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/helper.h +++ xen-3.4.1-testing/tools/xcutils/helper/helper.h
@@ -0,0 +1,107 @@ @@ -0,0 +1,107 @@
+#include <stdarg.h> +#include <stdarg.h>
+#include <stddef.h> +#include <stddef.h>
@ -384,10 +384,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/helper.h
+int sprintf(char * buf, const char *fmt, ...); +int sprintf(char * buf, const char *fmt, ...);
+int vsscanf(const char * buf, const char * fmt, va_list args); +int vsscanf(const char * buf, const char * fmt, va_list args);
+int sscanf(const char * buf, const char * fmt, ...); +int sscanf(const char * buf, const char * fmt, ...);
Index: xen-3.4.0-testing/tools/xcutils/helper/main.c Index: xen-3.4.1-testing/tools/xcutils/helper/main.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/main.c +++ xen-3.4.1-testing/tools/xcutils/helper/main.c
@@ -0,0 +1,651 @@ @@ -0,0 +1,651 @@
+#include <xenctrl.h> +#include <xenctrl.h>
+#include "hypercall.h" +#include "hypercall.h"
@ -1040,10 +1040,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/main.c
+ printk("\r\n"); + printk("\r\n");
+ start_kernel(); + start_kernel();
+} +}
Index: xen-3.4.0-testing/tools/xcutils/helper/make-offsets.c Index: xen-3.4.1-testing/tools/xcutils/helper/make-offsets.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/make-offsets.c +++ xen-3.4.1-testing/tools/xcutils/helper/make-offsets.c
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
+#include <stdio.h> +#include <stdio.h>
+#include <xenctrl.h> +#include <xenctrl.h>
@ -1073,10 +1073,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/make-offsets.c
+ vcpu_off("cr3", ctrlreg[3]); + vcpu_off("cr3", ctrlreg[3]);
+ return 0; + return 0;
+} +}
Index: xen-3.4.0-testing/tools/xcutils/helper/printk.c Index: xen-3.4.1-testing/tools/xcutils/helper/printk.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/printk.c +++ xen-3.4.1-testing/tools/xcutils/helper/printk.c
@@ -0,0 +1,1051 @@ @@ -0,0 +1,1051 @@
+/* +/*
+ * linux/kernel/printk.c + * linux/kernel/printk.c
@ -2129,10 +2129,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/printk.c
+ printk_ratelimit_burst); + printk_ratelimit_burst);
+} +}
+EXPORT_SYMBOL(printk_ratelimit); +EXPORT_SYMBOL(printk_ratelimit);
Index: xen-3.4.0-testing/tools/xcutils/helper/string.c Index: xen-3.4.1-testing/tools/xcutils/helper/string.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/string.c +++ xen-3.4.1-testing/tools/xcutils/helper/string.c
@@ -0,0 +1,601 @@ @@ -0,0 +1,601 @@
+/* +/*
+ * linux/lib/string.c + * linux/lib/string.c
@ -2735,10 +2735,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/string.c
+} +}
+EXPORT_SYMBOL(memchr); +EXPORT_SYMBOL(memchr);
+#endif +#endif
Index: xen-3.4.0-testing/tools/xcutils/helper/vsprintf.c Index: xen-3.4.1-testing/tools/xcutils/helper/vsprintf.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/vsprintf.c +++ xen-3.4.1-testing/tools/xcutils/helper/vsprintf.c
@@ -0,0 +1,842 @@ @@ -0,0 +1,842 @@
+/* +/*
+ * linux/lib/vsprintf.c + * linux/lib/vsprintf.c
@ -3582,10 +3582,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/vsprintf.c
+} +}
+ +
+EXPORT_SYMBOL(sscanf); +EXPORT_SYMBOL(sscanf);
Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/div64.h Index: xen-3.4.1-testing/tools/xcutils/helper/x86_32/div64.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/x86_32/div64.h +++ xen-3.4.1-testing/tools/xcutils/helper/x86_32/div64.h
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+#ifndef __I386_DIV64 +#ifndef __I386_DIV64
+#define __I386_DIV64 +#define __I386_DIV64
@ -3635,10 +3635,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/div64.h
+ +
+} +}
+#endif +#endif
Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/entry.S Index: xen-3.4.1-testing/tools/xcutils/helper/x86_32/entry.S
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/x86_32/entry.S +++ xen-3.4.1-testing/tools/xcutils/helper/x86_32/entry.S
@@ -0,0 +1,49 @@ @@ -0,0 +1,49 @@
+#include "offsets.h" +#include "offsets.h"
+ +
@ -3689,10 +3689,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/entry.S
+ nop + nop
+ .align 4096 + .align 4096
+hypercall_end: +hypercall_end:
Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/hypercall.h Index: xen-3.4.1-testing/tools/xcutils/helper/x86_32/hypercall.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/x86_32/hypercall.h +++ xen-3.4.1-testing/tools/xcutils/helper/x86_32/hypercall.h
@@ -0,0 +1,359 @@ @@ -0,0 +1,359 @@
+/****************************************************************************** +/******************************************************************************
+ * hypercall.h + * hypercall.h
@ -4053,10 +4053,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/hypercall.h
+ +
+ +
+#endif /* __HYPERCALL_H__ */ +#endif /* __HYPERCALL_H__ */
Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/div64.h Index: xen-3.4.1-testing/tools/xcutils/helper/x86_64/div64.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/x86_64/div64.h +++ xen-3.4.1-testing/tools/xcutils/helper/x86_64/div64.h
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+#ifndef _ASM_GENERIC_DIV64_H +#ifndef _ASM_GENERIC_DIV64_H
+#define _ASM_GENERIC_DIV64_H +#define _ASM_GENERIC_DIV64_H
@ -4115,10 +4115,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/div64.h
+#endif /* BITS_PER_LONG */ +#endif /* BITS_PER_LONG */
+ +
+#endif /* _ASM_GENERIC_DIV64_H */ +#endif /* _ASM_GENERIC_DIV64_H */
Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/entry.S Index: xen-3.4.1-testing/tools/xcutils/helper/x86_64/entry.S
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/x86_64/entry.S +++ xen-3.4.1-testing/tools/xcutils/helper/x86_64/entry.S
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+#include "offsets.h" +#include "offsets.h"
+ +
@ -4170,10 +4170,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/entry.S
+ nop + nop
+ .align 4096 + .align 4096
+hypercall_end: +hypercall_end:
Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/hypercall.h Index: xen-3.4.1-testing/tools/xcutils/helper/x86_64/hypercall.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/helper/x86_64/hypercall.h +++ xen-3.4.1-testing/tools/xcutils/helper/x86_64/hypercall.h
@@ -0,0 +1,354 @@ @@ -0,0 +1,354 @@
+/****************************************************************************** +/******************************************************************************
+ * hypercall.h + * hypercall.h
@ -4529,10 +4529,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/hypercall.h
+} +}
+ +
+#endif /* __HYPERCALL_H__ */ +#endif /* __HYPERCALL_H__ */
Index: xen-3.4.0-testing/tools/xcutils/kexec-syscall.h Index: xen-3.4.1-testing/tools/xcutils/kexec-syscall.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/kexec-syscall.h +++ xen-3.4.1-testing/tools/xcutils/kexec-syscall.h
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+#ifndef KEXEC_SYSCALL_H +#ifndef KEXEC_SYSCALL_H
+#define KEXEC_SYSCALL_H +#define KEXEC_SYSCALL_H
@ -4614,10 +4614,10 @@ Index: xen-3.4.0-testing/tools/xcutils/kexec-syscall.h
+#define KEXEC_MAX_SEGMENTS 16 +#define KEXEC_MAX_SEGMENTS 16
+ +
+#endif /* KEXEC_SYSCALL_H */ +#endif /* KEXEC_SYSCALL_H */
Index: xen-3.4.0-testing/tools/xcutils/xc_kexec.c Index: xen-3.4.1-testing/tools/xcutils/xc_kexec.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/xcutils/xc_kexec.c +++ xen-3.4.1-testing/tools/xcutils/xc_kexec.c
@@ -0,0 +1,503 @@ @@ -0,0 +1,503 @@
+#include <stdio.h> +#include <stdio.h>
+#include <stdlib.h> +#include <stdlib.h>

8
udev-rules.patch
View File

@ -1,8 +1,8 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/xen-backend.rules Index: xen-3.4.1-testing/tools/hotplug/Linux/xen-backend.rules
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/xen-backend.rules --- xen-3.4.1-testing.orig/tools/hotplug/Linux/xen-backend.rules
+++ xen-3.4.0-testing/tools/hotplug/Linux/xen-backend.rules +++ xen-3.4.1-testing/tools/hotplug/Linux/xen-backend.rules
@@ -6,3 +6,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vscsi @@ -7,3 +7,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vscsi
SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
KERNEL=="evtchn", NAME="xen/%k" KERNEL=="evtchn", NAME="xen/%k"
KERNEL=="blktap[0-9]*", NAME="xen/%k" KERNEL=="blktap[0-9]*", NAME="xen/%k"

18
x86-cpufreq-report.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/arch/x86/platform_hypercall.c Index: xen-3.4.1-testing/xen/arch/x86/platform_hypercall.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/platform_hypercall.c --- xen-3.4.1-testing.orig/xen/arch/x86/platform_hypercall.c
+++ xen-3.4.0-testing/xen/arch/x86/platform_hypercall.c +++ xen-3.4.1-testing/xen/arch/x86/platform_hypercall.c
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
#include <xen/acpi.h> #include <xen/acpi.h>
#include <asm/current.h> #include <asm/current.h>
@ -40,10 +40,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/platform_hypercall.c
default: default:
ret = -ENOSYS; ret = -ENOSYS;
Index: xen-3.4.0-testing/xen/arch/x86/x86_64/platform_hypercall.c Index: xen-3.4.1-testing/xen/arch/x86/x86_64/platform_hypercall.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_64/platform_hypercall.c --- xen-3.4.1-testing.orig/xen/arch/x86/x86_64/platform_hypercall.c
+++ xen-3.4.0-testing/xen/arch/x86/x86_64/platform_hypercall.c +++ xen-3.4.1-testing/xen/arch/x86/x86_64/platform_hypercall.c
@@ -23,6 +23,8 @@ DEFINE_XEN_GUEST_HANDLE(compat_platform_ @@ -23,6 +23,8 @@ DEFINE_XEN_GUEST_HANDLE(compat_platform_
#define xen_processor_power_t compat_processor_power_t #define xen_processor_power_t compat_processor_power_t
#define set_cx_pminfo compat_set_cx_pminfo #define set_cx_pminfo compat_set_cx_pminfo
@ -53,10 +53,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_64/platform_hypercall.c
#define xenpf_enter_acpi_sleep compat_pf_enter_acpi_sleep #define xenpf_enter_acpi_sleep compat_pf_enter_acpi_sleep
#define COMPAT #define COMPAT
Index: xen-3.4.0-testing/xen/include/public/platform.h Index: xen-3.4.1-testing/xen/include/public/platform.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/public/platform.h --- xen-3.4.1-testing.orig/xen/include/public/platform.h
+++ xen-3.4.0-testing/xen/include/public/platform.h +++ xen-3.4.1-testing/xen/include/public/platform.h
@@ -312,6 +312,16 @@ struct xenpf_set_processor_pminfo { @@ -312,6 +312,16 @@ struct xenpf_set_processor_pminfo {
typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t; typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t;
DEFINE_XEN_GUEST_HANDLE(xenpf_set_processor_pminfo_t); DEFINE_XEN_GUEST_HANDLE(xenpf_set_processor_pminfo_t);

12
x86-extra-trap-info.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/arch/x86/x86_32/entry.S Index: xen-3.4.1-testing/xen/arch/x86/x86_32/entry.S
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_32/entry.S --- xen-3.4.1-testing.orig/xen/arch/x86/x86_32/entry.S
+++ xen-3.4.0-testing/xen/arch/x86/x86_32/entry.S +++ xen-3.4.1-testing/xen/arch/x86/x86_32/entry.S
@@ -401,21 +401,33 @@ ring1: /* obtain ss/esp from oldss/olde @@ -401,21 +401,33 @@ ring1: /* obtain ss/esp from oldss/olde
movl %eax,UREGS_eip+4(%esp) movl %eax,UREGS_eip+4(%esp)
ret ret
@ -46,10 +46,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_32/entry.S
domain_crash_synchronous: domain_crash_synchronous:
pushl $domain_crash_synchronous_string pushl $domain_crash_synchronous_string
call printk call printk
Index: xen-3.4.0-testing/xen/arch/x86/x86_64/entry.S Index: xen-3.4.1-testing/xen/arch/x86/x86_64/entry.S
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_64/entry.S --- xen-3.4.1-testing.orig/xen/arch/x86/x86_64/entry.S
+++ xen-3.4.0-testing/xen/arch/x86/x86_64/entry.S +++ xen-3.4.1-testing/xen/arch/x86/x86_64/entry.S
@@ -419,17 +419,30 @@ create_bounce_frame: @@ -419,17 +419,30 @@ create_bounce_frame:
movq %rax,UREGS_rip+8(%rsp) movq %rax,UREGS_rip+8(%rsp)
ret ret

38
x86-show-page-walk-early.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/arch/x86/traps.c Index: xen-3.4.1-testing/xen/arch/x86/traps.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/traps.c --- xen-3.4.1-testing.orig/xen/arch/x86/traps.c
+++ xen-3.4.0-testing/xen/arch/x86/traps.c +++ xen-3.4.1-testing/xen/arch/x86/traps.c
@@ -1293,6 +1293,7 @@ asmlinkage void do_early_page_fault(stru @@ -1293,6 +1293,7 @@ asmlinkage void do_early_page_fault(stru
unsigned long *stk = (unsigned long *)regs; unsigned long *stk = (unsigned long *)regs;
printk("Early fatal page fault at %04x:%p (cr2=%p, ec=%04x)\n", printk("Early fatal page fault at %04x:%p (cr2=%p, ec=%04x)\n",
@ -10,10 +10,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/traps.c
printk("Stack dump: "); printk("Stack dump: ");
while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 ) while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 )
printk("%p ", _p(*stk++)); printk("%p ", _p(*stk++));
Index: xen-3.4.0-testing/xen/arch/x86/x86_32/mm.c Index: xen-3.4.1-testing/xen/arch/x86/x86_32/mm.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_32/mm.c --- xen-3.4.1-testing.orig/xen/arch/x86/x86_32/mm.c
+++ xen-3.4.0-testing/xen/arch/x86/x86_32/mm.c +++ xen-3.4.1-testing/xen/arch/x86/x86_32/mm.c
@@ -38,6 +38,7 @@ extern l1_pgentry_t l1_identmap[L1_PAGET @@ -38,6 +38,7 @@ extern l1_pgentry_t l1_identmap[L1_PAGET
unsigned int PAGE_HYPERVISOR = __PAGE_HYPERVISOR; unsigned int PAGE_HYPERVISOR = __PAGE_HYPERVISOR;
unsigned int PAGE_HYPERVISOR_NOCACHE = __PAGE_HYPERVISOR_NOCACHE; unsigned int PAGE_HYPERVISOR_NOCACHE = __PAGE_HYPERVISOR_NOCACHE;
@ -31,10 +31,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_32/mm.c
/* Fill with an obvious debug pattern. */ /* Fill with an obvious debug pattern. */
for ( i = 0; i < (mpt_size / BYTES_PER_LONG); i++) for ( i = 0; i < (mpt_size / BYTES_PER_LONG); i++)
set_gpfn_from_mfn(i, 0x55555555); set_gpfn_from_mfn(i, 0x55555555);
Index: xen-3.4.0-testing/xen/arch/x86/x86_32/traps.c Index: xen-3.4.1-testing/xen/arch/x86/x86_32/traps.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_32/traps.c --- xen-3.4.1-testing.orig/xen/arch/x86/x86_32/traps.c
+++ xen-3.4.0-testing/xen/arch/x86/x86_32/traps.c +++ xen-3.4.1-testing/xen/arch/x86/x86_32/traps.c
@@ -160,7 +160,8 @@ void show_page_walk(unsigned long addr) @@ -160,7 +160,8 @@ void show_page_walk(unsigned long addr)
l3t += (cr3 & 0xFE0UL) >> 3; l3t += (cr3 & 0xFE0UL) >> 3;
l3e = l3t[l3_table_offset(addr)]; l3e = l3t[l3_table_offset(addr)];
@ -65,12 +65,12 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_32/traps.c
printk(" L1[0x%03lx] = %"PRIpte" %08lx\n", printk(" L1[0x%03lx] = %"PRIpte" %08lx\n",
l1_table_offset(addr), l1e_get_intpte(l1e), pfn); l1_table_offset(addr), l1e_get_intpte(l1e), pfn);
unmap_domain_page(l1t); unmap_domain_page(l1t);
Index: xen-3.4.0-testing/xen/arch/x86/x86_64/mm.c Index: xen-3.4.1-testing/xen/arch/x86/x86_64/mm.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_64/mm.c --- xen-3.4.1-testing.orig/xen/arch/x86/x86_64/mm.c
+++ xen-3.4.0-testing/xen/arch/x86/x86_64/mm.c +++ xen-3.4.1-testing/xen/arch/x86/x86_64/mm.c
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
#include <asm/numa.h> #include <asm/msr.h>
#include <public/memory.h> #include <public/memory.h>
+int mpt_valid; +int mpt_valid;
@ -86,10 +86,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_64/mm.c
/* Create user-accessible L2 directory to map the MPT for compat guests. */ /* Create user-accessible L2 directory to map the MPT for compat guests. */
BUILD_BUG_ON(l4_table_offset(RDWR_MPT_VIRT_START) != BUILD_BUG_ON(l4_table_offset(RDWR_MPT_VIRT_START) !=
l4_table_offset(HIRO_COMPAT_MPT_VIRT_START)); l4_table_offset(HIRO_COMPAT_MPT_VIRT_START));
Index: xen-3.4.0-testing/xen/arch/x86/x86_64/traps.c Index: xen-3.4.1-testing/xen/arch/x86/x86_64/traps.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/x86_64/traps.c --- xen-3.4.1-testing.orig/xen/arch/x86/x86_64/traps.c
+++ xen-3.4.0-testing/xen/arch/x86/x86_64/traps.c +++ xen-3.4.1-testing/xen/arch/x86/x86_64/traps.c
@@ -176,7 +176,8 @@ void show_page_walk(unsigned long addr) @@ -176,7 +176,8 @@ void show_page_walk(unsigned long addr)
l4t = mfn_to_virt(mfn); l4t = mfn_to_virt(mfn);
l4e = l4t[l4_table_offset(addr)]; l4e = l4t[l4_table_offset(addr)];
@ -130,10 +130,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_64/traps.c
printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", printk(" L1[0x%03lx] = %"PRIpte" %016lx\n",
l1_table_offset(addr), l1e_get_intpte(l1e), pfn); l1_table_offset(addr), l1e_get_intpte(l1e), pfn);
} }
Index: xen-3.4.0-testing/xen/include/asm-x86/mm.h Index: xen-3.4.1-testing/xen/include/asm-x86/mm.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/asm-x86/mm.h --- xen-3.4.1-testing.orig/xen/include/asm-x86/mm.h
+++ xen-3.4.0-testing/xen/include/asm-x86/mm.h +++ xen-3.4.1-testing/xen/include/asm-x86/mm.h
@@ -412,6 +412,7 @@ TYPE_SAFE(unsigned long,mfn); @@ -412,6 +412,7 @@ TYPE_SAFE(unsigned long,mfn);
#define machine_to_phys_mapping ((unsigned long *)RDWR_MPT_VIRT_START) #define machine_to_phys_mapping ((unsigned long *)RDWR_MPT_VIRT_START)
#define INVALID_M2P_ENTRY (~0UL) #define INVALID_M2P_ENTRY (~0UL)

24
x86_64-5Tb.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/arch/x86/boot/head.S Index: xen-3.4.1-testing/xen/arch/x86/boot/head.S
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/boot/head.S --- xen-3.4.1-testing.orig/xen/arch/x86/boot/head.S
+++ xen-3.4.0-testing/xen/arch/x86/boot/head.S +++ xen-3.4.1-testing/xen/arch/x86/boot/head.S
@@ -33,7 +33,7 @@ ENTRY(start) @@ -33,7 +33,7 @@ ENTRY(start)
/* Checksum: must be the negated sum of the first two fields. */ /* Checksum: must be the negated sum of the first two fields. */
.long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
@ -28,10 +28,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/boot/head.S
#else #else
/* Initialize low and high mappings of memory with 2MB pages */ /* Initialize low and high mappings of memory with 2MB pages */
mov $sym_phys(idle_pg_table_l2),%edi mov $sym_phys(idle_pg_table_l2),%edi
Index: xen-3.4.0-testing/xen/arch/x86/e820.c Index: xen-3.4.1-testing/xen/arch/x86/e820.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/e820.c --- xen-3.4.1-testing.orig/xen/arch/x86/e820.c
+++ xen-3.4.0-testing/xen/arch/x86/e820.c +++ xen-3.4.1-testing/xen/arch/x86/e820.c
@@ -467,15 +467,19 @@ static void __init machine_specific_memo @@ -467,15 +467,19 @@ static void __init machine_specific_memo
"can be accessed by Xen in 32-bit mode."); "can be accessed by Xen in 32-bit mode.");
#else #else
@ -53,10 +53,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/e820.c
if ( limit > pft_limit ) if ( limit > pft_limit )
limit = pft_limit; limit = pft_limit;
clip_to_limit(limit, clip_to_limit(limit,
Index: xen-3.4.0-testing/xen/include/asm-x86/config.h Index: xen-3.4.1-testing/xen/include/asm-x86/config.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/asm-x86/config.h --- xen-3.4.1-testing.orig/xen/include/asm-x86/config.h
+++ xen-3.4.0-testing/xen/include/asm-x86/config.h +++ xen-3.4.1-testing/xen/include/asm-x86/config.h
@@ -124,10 +124,12 @@ extern unsigned int video_mode, video_fl @@ -124,10 +124,12 @@ extern unsigned int video_mode, video_fl
#define PML4_ADDR(_slot) \ #define PML4_ADDR(_slot) \
((((_slot ## UL) >> 8) * 0xffff000000000000UL) | \ ((((_slot ## UL) >> 8) * 0xffff000000000000UL) | \
@ -136,10 +136,10 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/config.h
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
Index: xen-3.4.0-testing/xen/include/asm-x86/x86_64/page.h Index: xen-3.4.1-testing/xen/include/asm-x86/x86_64/page.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/include/asm-x86/x86_64/page.h --- xen-3.4.1-testing.orig/xen/include/asm-x86/x86_64/page.h
+++ xen-3.4.0-testing/xen/include/asm-x86/x86_64/page.h +++ xen-3.4.1-testing/xen/include/asm-x86/x86_64/page.h
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
#define L4_PAGETABLE_ENTRIES (1<<PAGETABLE_ORDER) #define L4_PAGETABLE_ENTRIES (1<<PAGETABLE_ORDER)
#define ROOT_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES #define ROOT_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES

4
xen-3.4.1-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:b6bbe3ebbd1de1bdf1ba15bf8d62e6ef43ad3601836b1b117c38cde6a3c1abe6 oid sha256:390932ccf7df33b05ab3bb693a9b2392f377fa58d5f888bf1589f4e8bd300b46
size 22571644 size 22570595

6
xen-api-auth.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendAuthSessions.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendAuthSessions.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendAuthSessions.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendAuthSessions.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendAuthSessions.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendAuthSessions.py
@@ -84,7 +84,7 @@ class XendAuthSessions: @@ -84,7 +84,7 @@ class XendAuthSessions:
# if PAM doesn't exist, let's ignore it # if PAM doesn't exist, let's ignore it
return False return False

6
xen-changeset.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/xen/Makefile Index: xen-3.4.1-testing/xen/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/Makefile --- xen-3.4.1-testing.orig/xen/Makefile
+++ xen-3.4.0-testing/xen/Makefile +++ xen-3.4.1-testing/xen/Makefile
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+export XEN_CHANGESET = unavailable +export XEN_CHANGESET = unavailable
# This is the correct place to edit the build version. # This is the correct place to edit the build version.

6
xen-config.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/Config.mk Index: xen-3.4.1-testing/Config.mk
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/Config.mk --- xen-3.4.1-testing.orig/Config.mk
+++ xen-3.4.0-testing/Config.mk +++ xen-3.4.1-testing/Config.mk
@@ -124,14 +124,14 @@ QEMU_REMOTE=http://xenbits.xensource.com @@ -124,14 +124,14 @@ QEMU_REMOTE=http://xenbits.xensource.com
# Specify which qemu-dm to use. This may be `ioemu' to use the old # Specify which qemu-dm to use. This may be `ioemu' to use the old
# Mercurial in-tree version, or a local directory, or a git URL. # Mercurial in-tree version, or a local directory, or a git URL.

44
xen-destdir.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/docs/Makefile Index: xen-3.4.1-testing/docs/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/Makefile --- xen-3.4.1-testing.orig/docs/Makefile
+++ xen-3.4.0-testing/docs/Makefile +++ xen-3.4.1-testing/docs/Makefile
@@ -90,7 +90,8 @@ install: all @@ -90,7 +90,8 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(MANDIR) $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
cp -dR man1 $(DESTDIR)$(MANDIR) cp -dR man1 $(DESTDIR)$(MANDIR)
@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/docs/Makefile
+ ln -sf $*.html html.done/$*/index.html + ln -sf $*.html html.done/$*/index.html
+ rm -rf html/ + rm -rf html/
+ +
Index: xen-3.4.0-testing/tools/security/Makefile Index: xen-3.4.1-testing/tools/security/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/security/Makefile --- xen-3.4.1-testing.orig/tools/security/Makefile
+++ xen-3.4.0-testing/tools/security/Makefile +++ xen-3.4.1-testing/tools/security/Makefile
@@ -60,8 +60,8 @@ install: all $(ACM_CONFIG_FILE) @@ -60,8 +60,8 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR) $(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR) $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
@ -37,10 +37,10 @@ Index: xen-3.4.0-testing/tools/security/Makefile
else else
.PHONY: all .PHONY: all
all: all:
Index: xen-3.4.0-testing/tools/pygrub/Makefile Index: xen-3.4.1-testing/tools/pygrub/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/pygrub/Makefile --- xen-3.4.1-testing.orig/tools/pygrub/Makefile
+++ xen-3.4.0-testing/tools/pygrub/Makefile +++ xen-3.4.1-testing/tools/pygrub/Makefile
@@ -11,7 +11,7 @@ build: @@ -11,7 +11,7 @@ build:
.PHONY: install .PHONY: install
install: all install: all
@ -50,10 +50,10 @@ Index: xen-3.4.0-testing/tools/pygrub/Makefile
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
.PHONY: clean .PHONY: clean
Index: xen-3.4.0-testing/tools/python/Makefile Index: xen-3.4.1-testing/tools/python/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/Makefile --- xen-3.4.1-testing.orig/tools/python/Makefile
+++ xen-3.4.0-testing/tools/python/Makefile +++ xen-3.4.1-testing/tools/python/Makefile
@@ -56,7 +56,7 @@ refresh-po: $(POTFILE) @@ -56,7 +56,7 @@ refresh-po: $(POTFILE)
.PHONY: install .PHONY: install
install: install-messages install-dtd install: install-messages install-dtd
@ -63,10 +63,10 @@ Index: xen-3.4.0-testing/tools/python/Makefile
install-dtd: all install-dtd: all
$(INSTALL_DIR) $(DESTDIR)$(DOCDIR) $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
Index: xen-3.4.0-testing/tools/xenstore/Makefile Index: xen-3.4.1-testing/tools/xenstore/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/Makefile --- xen-3.4.1-testing.orig/tools/xenstore/Makefile
+++ xen-3.4.0-testing/tools/xenstore/Makefile +++ xen-3.4.1-testing/tools/xenstore/Makefile
@@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl) @@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
@ -121,11 +121,11 @@ Index: xen-3.4.0-testing/tools/xenstore/Makefile
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
Index: xen-3.4.0-testing/tools/hotplug/Linux/Makefile Index: xen-3.4.1-testing/tools/hotplug/Linux/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/Makefile --- xen-3.4.1-testing.orig/tools/hotplug/Linux/Makefile
+++ xen-3.4.0-testing/tools/hotplug/Linux/Makefile +++ xen-3.4.1-testing/tools/hotplug/Linux/Makefile
@@ -31,18 +31,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent @@ -40,18 +40,6 @@ endif
UDEV_RULES_DIR = /etc/udev UDEV_RULES_DIR = /etc/udev
UDEV_RULES = xen-backend.rules xend.rules UDEV_RULES = xen-backend.rules xend.rules
@ -134,7 +134,7 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/Makefile
-ifeq ($(findstring $(DI),$(DE)),$(DI)) -ifeq ($(findstring $(DI),$(DE)),$(DI))
-HOTPLUGS=install-hotplug install-udev -HOTPLUGS=install-hotplug install-udev
-else -else
-ifeq ($(shell [ -x /usr/bin/udevinfo ] && [ `/usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1) -ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
-HOTPLUGS=install-udev -HOTPLUGS=install-udev
-else -else
-HOTPLUGS=install-hotplug -HOTPLUGS=install-hotplug
@ -144,7 +144,7 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/Makefile
.PHONY: all .PHONY: all
all: all:
@@ -50,15 +38,15 @@ all: @@ -59,15 +47,15 @@ all:
build: build:
.PHONY: install .PHONY: install
@ -163,7 +163,7 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/Makefile
.PHONY: install-scripts .PHONY: install-scripts
install-scripts: install-scripts:
@@ -88,8 +76,7 @@ install-udev: @@ -97,8 +85,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d $(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
set -e; for i in $(UDEV_RULES); \ set -e; for i in $(UDEV_RULES); \
do \ do \

6
xen-disable-qemu-monitor.diff
View File

@ -5,10 +5,10 @@ the "sendkey" command, among other useful things), remove all console
commands that can read/write dom0's state. commands that can read/write dom0's state.
Index: xen-3.4.0-testing/tools/ioemu-remote/monitor.c Index: xen-3.4.1-testing/tools/ioemu-remote/monitor.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/monitor.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/monitor.c
+++ xen-3.4.0-testing/tools/ioemu-remote/monitor.c +++ xen-3.4.1-testing/tools/ioemu-remote/monitor.c
@@ -1481,6 +1481,7 @@ static const term_cmd_t term_cmds[] = { @@ -1481,6 +1481,7 @@ static const term_cmd_t term_cmds[] = {
"device|all", "commit changes to the disk images (if -snapshot is used) or backing files" }, "device|all", "commit changes to the disk images (if -snapshot is used) or backing files" },
{ "info", "s?", do_info, { "info", "s?", do_info,

24
xen-domUloader.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/util/blkif.py Index: xen-3.4.1-testing/tools/python/xen/util/blkif.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/util/blkif.py --- xen-3.4.1-testing.orig/tools/python/xen/util/blkif.py
+++ xen-3.4.0-testing/tools/python/xen/util/blkif.py +++ xen-3.4.1-testing/tools/python/xen/util/blkif.py
@@ -71,23 +71,24 @@ def blkdev_segment(name): @@ -71,23 +71,24 @@ def blkdev_segment(name):
'type' : 'Disk' } 'type' : 'Disk' }
return val return val
@ -32,10 +32,10 @@ Index: xen-3.4.0-testing/tools/python/xen/util/blkif.py
def mount_mode(name): def mount_mode(name):
mode = None mode = None
Index: xen-3.4.0-testing/tools/python/xen/xend/server/DevController.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/DevController.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/DevController.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/DevController.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/DevController.py
@@ -593,6 +593,31 @@ class DevController: @@ -593,6 +593,31 @@ class DevController:
return (Missing, None) return (Missing, None)
@ -68,10 +68,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/DevController.py
def backendPath(self, backdom, devid): def backendPath(self, backdom, devid):
"""Construct backend path given the backend domain and device id. """Construct backend path given the backend domain and device id.
Index: xen-3.4.0-testing/tools/python/xen/xend/XendBootloader.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendBootloader.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendBootloader.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendBootloader.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendBootloader.py
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# #
@ -109,10 +109,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendBootloader.py
log.error(msg) log.error(msg)
raise VmError(msg) raise VmError(msg)
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -35,7 +35,7 @@ from types import StringTypes @@ -35,7 +35,7 @@ from types import StringTypes
import xen.lowlevel.xc import xen.lowlevel.xc

12
xen-fixme-doc.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 Index: xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/man/xmdomain.cfg.pod.5 --- xen-3.4.1-testing.orig/docs/man/xmdomain.cfg.pod.5
+++ xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 +++ xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5
@@ -335,16 +335,10 @@ at hda1, which is the root filesystem. @@ -335,16 +335,10 @@ at hda1, which is the root filesystem.
=item I<NFS Root> =item I<NFS Root>
@ -19,10 +19,10 @@ Index: xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5
=back =back
=head1 SEE ALSO =head1 SEE ALSO
Index: xen-3.4.0-testing/docs/man/xm.pod.1 Index: xen-3.4.1-testing/docs/man/xm.pod.1
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/man/xm.pod.1 --- xen-3.4.1-testing.orig/docs/man/xm.pod.1
+++ xen-3.4.0-testing/docs/man/xm.pod.1 +++ xen-3.4.1-testing/docs/man/xm.pod.1
@@ -297,7 +297,8 @@ scheduling by the Xen hypervisor. @@ -297,7 +297,8 @@ scheduling by the Xen hypervisor.
=item B<s - shutdown> =item B<s - shutdown>

24
xen-hvm-default-bridge.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/net.h Index: xen-3.4.1-testing/tools/ioemu-remote/net.h
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/net.h --- xen-3.4.1-testing.orig/tools/ioemu-remote/net.h
+++ xen-3.4.0-testing/tools/ioemu-remote/net.h +++ xen-3.4.1-testing/tools/ioemu-remote/net.h
@@ -107,8 +107,8 @@ void net_host_device_add(const char *dev @@ -107,8 +107,8 @@ void net_host_device_add(const char *dev
void net_host_device_remove(int vlan_id, const char *device); void net_host_device_remove(int vlan_id, const char *device);
@ -13,10 +13,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/net.h
#endif #endif
#ifdef __sun__ #ifdef __sun__
#define SMBD_COMMAND "/usr/sfw/sbin/smbd" #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
Index: xen-3.4.0-testing/tools/ioemu-remote/net.c Index: xen-3.4.1-testing/tools/ioemu-remote/net.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/net.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/net.c
+++ xen-3.4.0-testing/tools/ioemu-remote/net.c +++ xen-3.4.1-testing/tools/ioemu-remote/net.c
@@ -1759,9 +1759,10 @@ int net_client_init(const char *device, @@ -1759,9 +1759,10 @@ int net_client_init(const char *device,
} }
if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 && if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 &&
@ -30,10 +30,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/net.c
} }
} else } else
#endif #endif
Index: xen-3.4.0-testing/tools/python/xen/xend/image.py Index: xen-3.4.1-testing/tools/python/xen/xend/image.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/image.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.4.0-testing/tools/python/xen/xend/image.py +++ xen-3.4.1-testing/tools/python/xen/xend/image.py
@@ -832,14 +832,16 @@ class HVMImageHandler(ImageHandler): @@ -832,14 +832,16 @@ class HVMImageHandler(ImageHandler):
mac = devinfo.get('mac') mac = devinfo.get('mac')
if mac is None: if mac is None:
@ -54,10 +54,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
if nics == 0: if nics == 0:
ret.append("-net") ret.append("-net")
Index: xen-3.4.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup Index: xen-3.4.1-testing/tools/ioemu-remote/i386-dm/qemu-ifup
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/i386-dm/qemu-ifup --- xen-3.4.1-testing.orig/tools/ioemu-remote/i386-dm/qemu-ifup
+++ xen-3.4.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup +++ xen-3.4.1-testing/tools/ioemu-remote/i386-dm/qemu-ifup
@@ -1,36 +1,22 @@ @@ -1,36 +1,22 @@
#!/bin/sh #!/bin/sh

6
xen-hvm-default-pae.diff
View File

@ -1,9 +1,9 @@
PAE must be on for 64-on-64 to work at all. PAE must be on for 64-on-64 to work at all.
Index: xen-3.4.0-testing/tools/python/xen/xend/image.py Index: xen-3.4.1-testing/tools/python/xen/xend/image.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/image.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.4.0-testing/tools/python/xen/xend/image.py +++ xen-3.4.1-testing/tools/python/xen/xend/image.py
@@ -943,7 +943,7 @@ class X86_HVM_ImageHandler(HVMImageHandl @@ -943,7 +943,7 @@ class X86_HVM_ImageHandler(HVMImageHandl
def configure(self, vmConfig): def configure(self, vmConfig):

6
xen-ioapic-ack-default.diff
View File

@ -1,10 +1,10 @@
Change default IO-APIC ack mode for single IO-APIC systems to old-style. Jan Change default IO-APIC ack mode for single IO-APIC systems to old-style. Jan
Index: xen-3.4.0-testing/xen/arch/x86/io_apic.c Index: xen-3.4.1-testing/xen/arch/x86/io_apic.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/xen/arch/x86/io_apic.c --- xen-3.4.1-testing.orig/xen/arch/x86/io_apic.c
+++ xen-3.4.0-testing/xen/arch/x86/io_apic.c +++ xen-3.4.1-testing/xen/arch/x86/io_apic.c
@@ -1298,7 +1298,7 @@ static unsigned int startup_level_ioapic @@ -1298,7 +1298,7 @@ static unsigned int startup_level_ioapic
return 0; /* don't check for pending */ return 0; /* don't check for pending */
} }

8
xen-ioemu-hvm-pv-support.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_platform.c Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_platform.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_platform.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_platform.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_platform.c +++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_platform.c
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
#include "qemu-xen.h" #include "qemu-xen.h"
#include "net.h" #include "net.h"
@ -11,7 +11,7 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_platform.c
#include <assert.h> #include <assert.h>
#include <xenguest.h> #include <xenguest.h>
@@ -326,11 +328,51 @@ static void xen_platform_ioport_writeb(v @@ -331,11 +333,51 @@ static void xen_platform_ioport_writeb(v
} }
} }

24
xen-max-free-mem.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendNode.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendNode.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendNode.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendNode.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendNode.py
@@ -809,11 +809,35 @@ class XendNode: @@ -809,11 +809,35 @@ class XendNode:
info['cpu_mhz'] = info['cpu_khz'] / 1000 info['cpu_mhz'] = info['cpu_khz'] / 1000
@ -53,10 +53,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendNode.py
'node_to_cpu', 'node_to_cpu',
'node_to_memory' 'node_to_memory'
] ]
Index: xen-3.4.0-testing/tools/python/xen/xend/balloon.py Index: xen-3.4.1-testing/tools/python/xen/xend/balloon.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/balloon.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-3.4.0-testing/tools/python/xen/xend/balloon.py +++ xen-3.4.1-testing/tools/python/xen/xend/balloon.py
@@ -41,6 +41,8 @@ SLEEP_TIME_GROWTH = 0.1 @@ -41,6 +41,8 @@ SLEEP_TIME_GROWTH = 0.1
# label actually shown in the PROC_XEN_BALLOON file. # label actually shown in the PROC_XEN_BALLOON file.
#labels = { 'current' : 'Current allocation', #labels = { 'current' : 'Current allocation',
@ -90,10 +90,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/balloon.py
def free(need_mem, dominfo): def free(need_mem, dominfo):
"""Balloon out memory from the privileged domain so that there is the """Balloon out memory from the privileged domain so that there is the
specified required amount (in KiB) free. specified required amount (in KiB) free.
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -1295,6 +1295,27 @@ class XendDomainInfo: @@ -1295,6 +1295,27 @@ class XendDomainInfo:
dev_str_list = dev_str_list + [dev_str] dev_str_list = dev_str_list + [dev_str]
return dev_str_list return dev_str_list
@ -122,10 +122,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
def setMemoryTarget(self, target): def setMemoryTarget(self, target):
"""Set the memory target of this domain. """Set the memory target of this domain.
@param target: In MiB. @param target: In MiB.
Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py Index: xen-3.4.1-testing/tools/python/xen/xend/server/SrvDomain.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
+++ xen-3.4.0-testing/tools/python/xen/xend/server/SrvDomain.py +++ xen-3.4.1-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -172,7 +172,7 @@ class SrvDomain(SrvDir): @@ -172,7 +172,7 @@ class SrvDomain(SrvDir):

6
xen-no-dummy-nfs-ip.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xm/create.py Index: xen-3.4.1-testing/tools/python/xen/xm/create.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xm/create.py --- xen-3.4.1-testing.orig/tools/python/xen/xm/create.py
+++ xen-3.4.0-testing/tools/python/xen/xm/create.py +++ xen-3.4.1-testing/tools/python/xen/xm/create.py
@@ -1160,9 +1160,8 @@ def preprocess_access_control(vals): @@ -1160,9 +1160,8 @@ def preprocess_access_control(vals):
def preprocess_ip(vals): def preprocess_ip(vals):

18
xen-paths.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xm/create.py Index: xen-3.4.1-testing/tools/python/xen/xm/create.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xm/create.py --- xen-3.4.1-testing.orig/tools/python/xen/xm/create.py
+++ xen-3.4.0-testing/tools/python/xen/xm/create.py +++ xen-3.4.1-testing/tools/python/xen/xm/create.py
@@ -72,7 +72,7 @@ gopts.opt('quiet', short='q', @@ -72,7 +72,7 @@ gopts.opt('quiet', short='q',
use="Quiet.") use="Quiet.")
@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xm/create.py
use="Search path for configuration scripts. " use="Search path for configuration scripts. "
"The value of PATH is a colon-separated directory list.") "The value of PATH is a colon-separated directory list.")
Index: xen-3.4.0-testing/docs/man/xm.pod.1 Index: xen-3.4.1-testing/docs/man/xm.pod.1
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/man/xm.pod.1 --- xen-3.4.1-testing.orig/docs/man/xm.pod.1
+++ xen-3.4.0-testing/docs/man/xm.pod.1 +++ xen-3.4.1-testing/docs/man/xm.pod.1
@@ -77,7 +77,7 @@ in the config file. See L<xmdomain.cfg> @@ -77,7 +77,7 @@ in the config file. See L<xmdomain.cfg>
format, and possible options used in either the configfile or for I<vars>. format, and possible options used in either the configfile or for I<vars>.
@ -33,10 +33,10 @@ Index: xen-3.4.0-testing/docs/man/xm.pod.1
soon as it is run. soon as it is run.
=item I<without config file> =item I<without config file>
Index: xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 Index: xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/man/xmdomain.cfg.pod.5 --- xen-3.4.1-testing.orig/docs/man/xmdomain.cfg.pod.5
+++ xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 +++ xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5
@@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for @@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for
=head1 SYNOPSIS =head1 SYNOPSIS

6
xen-qemu-iscsi-fix.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c --- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c +++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
@@ -313,7 +313,7 @@ void xenstore_parse_domain_config(int hv @@ -313,7 +313,7 @@ void xenstore_parse_domain_config(int hv
char *buf = NULL; char *buf = NULL;
char *fpath = NULL, *bpath = NULL, *btype = NULL, char *fpath = NULL, *bpath = NULL, *btype = NULL,

12
xen-rpmoptflags.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile Index: xen-3.4.1-testing/tools/blktap/drivers/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/blktap/drivers/Makefile --- xen-3.4.1-testing.orig/tools/blktap/drivers/Makefile
+++ xen-3.4.0-testing/tools/blktap/drivers/Makefile +++ xen-3.4.1-testing/tools/blktap/drivers/Makefile
@@ -5,7 +5,6 @@ IBIN = blktapctrl tapdisk @@ -5,7 +5,6 @@ IBIN = blktapctrl tapdisk
QCOW_UTIL = img2qcow qcow2raw qcow-create QCOW_UTIL = img2qcow qcow2raw qcow-create
LIBAIO_DIR = ../../libaio/src LIBAIO_DIR = ../../libaio/src
@ -10,10 +10,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile
CFLAGS += -Wno-unused CFLAGS += -Wno-unused
CFLAGS += -I../lib CFLAGS += -I../lib
CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenctrl)
Index: xen-3.4.0-testing/Config.mk Index: xen-3.4.1-testing/Config.mk
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/Config.mk --- xen-3.4.1-testing.orig/Config.mk
+++ xen-3.4.0-testing/Config.mk +++ xen-3.4.1-testing/Config.mk
@@ -14,7 +14,7 @@ SHELL ?= /bin/sh @@ -14,7 +14,7 @@ SHELL ?= /bin/sh
# Tools to run on system hosting the build # Tools to run on system hosting the build

62
xen-warnings.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/misc/miniterm/miniterm.c Index: xen-3.4.1-testing/tools/misc/miniterm/miniterm.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/misc/miniterm/miniterm.c --- xen-3.4.1-testing.orig/tools/misc/miniterm/miniterm.c
+++ xen-3.4.0-testing/tools/misc/miniterm/miniterm.c +++ xen-3.4.1-testing/tools/misc/miniterm/miniterm.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv) @@ -157,7 +157,7 @@ int main(int argc, char **argv)
case 0: case 0:
close(1); /* stdout not needed */ close(1); /* stdout not needed */
@ -35,10 +35,10 @@ Index: xen-3.4.0-testing/tools/misc/miniterm/miniterm.c
break; break;
} }
Index: xen-3.4.0-testing/tools/libxc/xc_dom_elfloader.c Index: xen-3.4.1-testing/tools/libxc/xc_dom_elfloader.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/libxc/xc_dom_elfloader.c --- xen-3.4.1-testing.orig/tools/libxc/xc_dom_elfloader.c
+++ xen-3.4.0-testing/tools/libxc/xc_dom_elfloader.c +++ xen-3.4.1-testing/tools/libxc/xc_dom_elfloader.c
@@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct @@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct
if ( load ) if ( load )
@ -50,10 +50,10 @@ Index: xen-3.4.0-testing/tools/libxc/xc_dom_elfloader.c
elf_section_start(elf, shdr2), elf_section_start(elf, shdr2),
size); size);
} }
Index: xen-3.4.0-testing/tools/xenstore/Makefile Index: xen-3.4.1-testing/tools/xenstore/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/Makefile --- xen-3.4.1-testing.orig/tools/xenstore/Makefile
+++ xen-3.4.0-testing/tools/xenstore/Makefile +++ xen-3.4.1-testing/tools/xenstore/Makefile
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
MAJOR = 3.0 MAJOR = 3.0
MINOR = 0 MINOR = 0
@ -63,10 +63,10 @@ Index: xen-3.4.0-testing/tools/xenstore/Makefile
CFLAGS += -I. CFLAGS += -I.
CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenctrl)
Index: xen-3.4.0-testing/tools/xenstore/xenstored_core.c Index: xen-3.4.1-testing/tools/xenstore/xenstored_core.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/xenstored_core.c --- xen-3.4.1-testing.orig/tools/xenstore/xenstored_core.c
+++ xen-3.4.0-testing/tools/xenstore/xenstored_core.c +++ xen-3.4.1-testing/tools/xenstore/xenstored_core.c
@@ -77,8 +77,8 @@ static void check_store(void); @@ -77,8 +77,8 @@ static void check_store(void);
int quota_nb_entry_per_domain = 1000; int quota_nb_entry_per_domain = 1000;
@ -91,10 +91,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstored_core.c
break; break;
case 'T': case 'T':
tracefile = optarg; tracefile = optarg;
Index: xen-3.4.0-testing/tools/xenstore/xenstored_domain.c Index: xen-3.4.1-testing/tools/xenstore/xenstored_domain.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/xenstored_domain.c --- xen-3.4.1-testing.orig/tools/xenstore/xenstored_domain.c
+++ xen-3.4.0-testing/tools/xenstore/xenstored_domain.c +++ xen-3.4.1-testing/tools/xenstore/xenstored_domain.c
@@ -212,7 +212,7 @@ void handle_event(void) @@ -212,7 +212,7 @@ void handle_event(void)
{ {
evtchn_port_t port; evtchn_port_t port;
@ -113,10 +113,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstored_domain.c
return -1; return -1;
dom0 = new_domain(NULL, 0, port); dom0 = new_domain(NULL, 0, port);
Index: xen-3.4.0-testing/tools/xenstore/xenstored_transaction.c Index: xen-3.4.1-testing/tools/xenstore/xenstored_transaction.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/xenstored_transaction.c --- xen-3.4.1-testing.orig/tools/xenstore/xenstored_transaction.c
+++ xen-3.4.0-testing/tools/xenstore/xenstored_transaction.c +++ xen-3.4.1-testing/tools/xenstore/xenstored_transaction.c
@@ -82,7 +82,7 @@ struct transaction @@ -82,7 +82,7 @@ struct transaction
struct list_head changed_domains; struct list_head changed_domains;
}; };
@ -126,10 +126,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstored_transaction.c
static unsigned int generation; static unsigned int generation;
/* Return tdb context to use for this connection. */ /* Return tdb context to use for this connection. */
Index: xen-3.4.0-testing/tools/xenstore/xenstore_client.c Index: xen-3.4.1-testing/tools/xenstore/xenstore_client.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xenstore/xenstore_client.c --- xen-3.4.1-testing.orig/tools/xenstore/xenstore_client.c
+++ xen-3.4.0-testing/tools/xenstore/xenstore_client.c +++ xen-3.4.1-testing/tools/xenstore/xenstore_client.c
@@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio @@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio
char **xsval = xs_directory(xsh, xth, path, &xsval_n); char **xsval = xs_directory(xsh, xth, path, &xsval_n);
@ -139,10 +139,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstore_client.c
for (i = 0; i < xsval_n; i++) { for (i = 0; i < xsval_n; i++) {
snprintf(buf, MAX_PATH_LEN, "%s/%s", path, xsval[i]); snprintf(buf, MAX_PATH_LEN, "%s/%s", path, xsval[i]);
Index: xen-3.4.0-testing/tools/libxen/src/xen_common.c Index: xen-3.4.1-testing/tools/libxen/src/xen_common.c
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/libxen/src/xen_common.c --- xen-3.4.1-testing.orig/tools/libxen/src/xen_common.c
+++ xen-3.4.0-testing/tools/libxen/src/xen_common.c +++ xen-3.4.1-testing/tools/libxen/src/xen_common.c
@@ -1057,6 +1057,8 @@ static size_t size_of_member(const abstr @@ -1057,6 +1057,8 @@ static size_t size_of_member(const abstr
default: default:
assert(false); assert(false);
@ -161,3 +161,17 @@ Index: xen-3.4.0-testing/tools/libxen/src/xen_common.c
} }
Index: xen-3.4.1-testing/tools/libxc/xc_core.c
===================================================================
--- xen-3.4.1-testing.orig/tools/libxc/xc_core.c
+++ xen-3.4.1-testing/tools/libxc/xc_core.c
@@ -321,7 +321,8 @@ elfnote_dump_none(void *args, dumpcore_r
struct xen_dumpcore_elfnote_none_desc none;
elfnote_init(&elfnote);
- memset(&none, 0, sizeof(none));
+ if ( sizeof(none) > 0 )
+ memset(&none, 0, sizeof(none));
elfnote.descsz = sizeof(none);
elfnote.type = XEN_ELFNOTE_DUMPCORE_NONE;

6
xen-xm-top-needs-root.diff
View File

@ -1,10 +1,10 @@
From: Charles Coffing <ccoffing@novell.com> From: Charles Coffing <ccoffing@novell.com>
Upstream: no Upstream: no
Index: xen-3.4.0-testing/tools/python/xen/xm/main.py Index: xen-3.4.1-testing/tools/python/xen/xm/main.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xm/main.py --- xen-3.4.1-testing.orig/tools/python/xen/xm/main.py
+++ xen-3.4.0-testing/tools/python/xen/xm/main.py +++ xen-3.4.1-testing/tools/python/xen/xm/main.py
@@ -1917,6 +1917,10 @@ def xm_debug_keys(args): @@ -1917,6 +1917,10 @@ def xm_debug_keys(args):
def xm_top(args): def xm_top(args):
arg_check(args, "top", 0) arg_check(args, "top", 0)

6
xen-xmexample-vti.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/examples/Makefile Index: xen-3.4.1-testing/tools/examples/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/Makefile --- xen-3.4.1-testing.orig/tools/examples/Makefile
+++ xen-3.4.0-testing/tools/examples/Makefile +++ xen-3.4.1-testing/tools/examples/Makefile
@@ -19,7 +19,6 @@ XEN_CONFIGS += xmexample.hvm @@ -19,7 +19,6 @@ XEN_CONFIGS += xmexample.hvm
XEN_CONFIGS += xmexample.hvm-stubdom XEN_CONFIGS += xmexample.hvm-stubdom
XEN_CONFIGS += xmexample.pv-grub XEN_CONFIGS += xmexample.pv-grub

36
xen-xmexample.diff
View File

@ -1,9 +1,9 @@
Change various example paths in the config files to match SUSE. Change various example paths in the config files to match SUSE.
Index: xen-3.4.0-testing/tools/examples/xmexample1 Index: xen-3.4.1-testing/tools/examples/xmexample1
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/xmexample1 --- xen-3.4.1-testing.orig/tools/examples/xmexample1
+++ xen-3.4.0-testing/tools/examples/xmexample1 +++ xen-3.4.1-testing/tools/examples/xmexample1
@@ -7,11 +7,13 @@ @@ -7,11 +7,13 @@
#============================================================================ #============================================================================
@ -43,10 +43,10 @@ Index: xen-3.4.0-testing/tools/examples/xmexample1
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons' # Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-3.4.0-testing/tools/examples/xmexample2 Index: xen-3.4.1-testing/tools/examples/xmexample2
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/xmexample2 --- xen-3.4.1-testing.orig/tools/examples/xmexample2
+++ xen-3.4.0-testing/tools/examples/xmexample2 +++ xen-3.4.1-testing/tools/examples/xmexample2
@@ -35,11 +35,13 @@ xm_vars.var('vmid', @@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check() xm_vars.check()
@ -86,10 +86,10 @@ Index: xen-3.4.0-testing/tools/examples/xmexample2
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons' # Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-3.4.0-testing/tools/examples/xmexample3 Index: xen-3.4.1-testing/tools/examples/xmexample3
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/xmexample3 --- xen-3.4.1-testing.orig/tools/examples/xmexample3
+++ xen-3.4.0-testing/tools/examples/xmexample3 +++ xen-3.4.1-testing/tools/examples/xmexample3
@@ -35,11 +35,13 @@ xm_vars.var('vmid', @@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check() xm_vars.check()
@ -109,10 +109,10 @@ Index: xen-3.4.0-testing/tools/examples/xmexample3
# The domain build function. Default is 'linux'. # The domain build function. Default is 'linux'.
#builder='linux' #builder='linux'
Index: xen-3.4.0-testing/tools/examples/xmexample.hvm Index: xen-3.4.1-testing/tools/examples/xmexample.hvm
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/xmexample.hvm --- xen-3.4.1-testing.orig/tools/examples/xmexample.hvm
+++ xen-3.4.0-testing/tools/examples/xmexample.hvm +++ xen-3.4.1-testing/tools/examples/xmexample.hvm
@@ -81,7 +81,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] @@ -81,7 +81,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
# and MODE is r for read-only, w for read-write. # and MODE is r for read-only, w for read-write.
@ -122,10 +122,10 @@ Index: xen-3.4.0-testing/tools/examples/xmexample.hvm
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons' # Configure the behaviour when a domain exits. There are three 'reasons'
Index: xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 Index: xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/man/xmdomain.cfg.pod.5 --- xen-3.4.1-testing.orig/docs/man/xmdomain.cfg.pod.5
+++ xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 +++ xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5
@@ -38,13 +38,13 @@ file. @@ -38,13 +38,13 @@ file.
The kernel image for the domain. The format of the parameter is the The kernel image for the domain. The format of the parameter is the
@ -161,10 +161,10 @@ Index: xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5
at hda1, which is the root filesystem. at hda1, which is the root filesystem.
=item I<NFS Root> =item I<NFS Root>
Index: xen-3.4.0-testing/docs/man/xm.pod.1 Index: xen-3.4.1-testing/docs/man/xm.pod.1
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/docs/man/xm.pod.1 --- xen-3.4.1-testing.orig/docs/man/xm.pod.1
+++ xen-3.4.0-testing/docs/man/xm.pod.1 +++ xen-3.4.1-testing/docs/man/xm.pod.1
@@ -163,8 +163,8 @@ soon as it is run. @@ -163,8 +163,8 @@ soon as it is run.
=item I<without config file> =item I<without config file>

5
xen.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 28 14:07:42 MDT 2009 - carnold@novell.com
- Update to Xen 3.4.1 RC10 c/s 19711.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 23 11:09:29 MDT 2009 - carnold@novell.com Tue Jun 23 11:09:29 MDT 2009 - carnold@novell.com

6
xen.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package xen (Version 3.4.1_19664_01) # spec file for package xen (Version 3.4.1_19711_01)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -22,7 +22,7 @@ Name: xen
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
%define xvers 3.4 %define xvers 3.4
%define xvermaj 3 %define xvermaj 3
%define changeset 19664 %define changeset 19711
%define xen_build_dir xen-3.4.1-testing %define xen_build_dir xen-3.4.1-testing
%define with_kmp 0 %define with_kmp 0
BuildRequires: LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig BuildRequires: LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig
@ -37,7 +37,7 @@ BuildRequires: glibc-32bit glibc-devel-32bit
%if %{?with_kmp}0 %if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif %endif
Version: 3.4.1_19664_01 Version: 3.4.1_19711_01
Release: 1 Release: 1
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel

6
xenapi-console-protocol.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -3571,6 +3571,14 @@ class XendDomainInfo: @@ -3571,6 +3571,14 @@ class XendDomainInfo:
if not config.has_key('backend'): if not config.has_key('backend'):
config['backend'] = "00000000-0000-0000-0000-000000000000" config['backend'] = "00000000-0000-0000-0000-000000000000"

12
xend-config.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains Index: xen-3.4.1-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains --- xen-3.4.1-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains
+++ xen-3.4.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains +++ xen-3.4.1-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-## Path: System/xen -## Path: System/xen
+## Path: System/Virtualization +## Path: System/Virtualization
@ -27,10 +27,10 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
## Type: integer ## Type: integer
## Default: 300 ## Default: 300
Index: xen-3.4.0-testing/tools/examples/xend-config.sxp Index: xen-3.4.1-testing/tools/examples/xend-config.sxp
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/xend-config.sxp --- xen-3.4.1-testing.orig/tools/examples/xend-config.sxp
+++ xen-3.4.0-testing/tools/examples/xend-config.sxp +++ xen-3.4.1-testing/tools/examples/xend-config.sxp
@@ -58,11 +58,12 @@ @@ -58,11 +58,12 @@

6
xend-core-dump-loc.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -2118,7 +2118,7 @@ class XendDomainInfo: @@ -2118,7 +2118,7 @@ class XendDomainInfo:
if not corefile: if not corefile:

40
xend-domain-lock.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/examples/xend-config.sxp Index: xen-3.4.1-testing/tools/examples/xend-config.sxp
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/examples/xend-config.sxp --- xen-3.4.1-testing.orig/tools/examples/xend-config.sxp
+++ xen-3.4.0-testing/tools/examples/xend-config.sxp +++ xen-3.4.1-testing/tools/examples/xend-config.sxp
@@ -260,4 +260,64 @@ @@ -260,4 +260,64 @@
# Path where persistent domain configuration is stored. # Path where persistent domain configuration is stored.
@ -67,10 +67,10 @@ Index: xen-3.4.0-testing/tools/examples/xend-config.sxp
+# before starting vm1 on HostA. +# before starting vm1 on HostA.
+# +#
+#(xend-domain-lock-utility domain-lock) +#(xend-domain-lock-utility domain-lock)
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -30,11 +30,13 @@ import threading @@ -30,11 +30,13 @@ import threading
import re import re
import copy import copy
@ -181,10 +181,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
def __str__(self): def __str__(self):
return '<domain id=%s name=%s memory=%s state=%s>' % \ return '<domain id=%s name=%s memory=%s state=%s>' % \
(str(self.domid), self.info['name_label'], (str(self.domid), self.info['name_label'],
Index: xen-3.4.0-testing/tools/python/xen/xend/XendOptions.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendOptions.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendOptions.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendOptions.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendOptions.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendOptions.py
@@ -141,6 +141,17 @@ class XendOptions: @@ -141,6 +141,17 @@ class XendOptions:
"""Default rotation count of qemu-dm log file.""" """Default rotation count of qemu-dm log file."""
qemu_dm_logrotate_count = 10 qemu_dm_logrotate_count = 10
@ -228,10 +228,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendOptions.py
class XendOptionsFile(XendOptions): class XendOptionsFile(XendOptions):
Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendCheckpoint.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendCheckpoint.py
@@ -117,6 +117,7 @@ def save(fd, dominfo, network, live, dst @@ -117,6 +117,7 @@ def save(fd, dominfo, network, live, dst
dominfo.shutdown('suspend') dominfo.shutdown('suspend')
dominfo.waitForSuspend() dominfo.waitForSuspend()
@ -248,11 +248,11 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py
return dominfo return dominfo
except: except:
dominfo.destroy() dominfo.destroy()
Index: xen-3.4.0-testing/tools/hotplug/Linux/Makefile Index: xen-3.4.1-testing/tools/hotplug/Linux/Makefile
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/Makefile --- xen-3.4.1-testing.orig/tools/hotplug/Linux/Makefile
+++ xen-3.4.0-testing/tools/hotplug/Linux/Makefile +++ xen-3.4.1-testing/tools/hotplug/Linux/Makefile
@@ -20,6 +20,7 @@ XEN_SCRIPTS += vtpm vtpm-delete @@ -21,6 +21,7 @@ XEN_SCRIPTS += vtpm vtpm-delete
XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += xen-hotplug-cleanup
XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += external-device-migrate
XEN_SCRIPTS += vscsi XEN_SCRIPTS += vscsi
@ -260,10 +260,10 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/Makefile
XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh
XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh
XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
Index: xen-3.4.0-testing/tools/hotplug/Linux/domain-lock Index: xen-3.4.1-testing/tools/hotplug/Linux/domain-lock
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/hotplug/Linux/domain-lock +++ xen-3.4.1-testing/tools/hotplug/Linux/domain-lock
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+#!/bin/bash +#!/bin/bash
+ +
@ -348,10 +348,10 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/domain-lock
+ get_status $vm_path + get_status $vm_path
+ ;; + ;;
+esac +esac
Index: xen-3.4.0-testing/tools/hotplug/Linux/vm-monitor Index: xen-3.4.1-testing/tools/hotplug/Linux/vm-monitor
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ xen-3.4.0-testing/tools/hotplug/Linux/vm-monitor +++ xen-3.4.1-testing/tools/hotplug/Linux/vm-monitor
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+#!/bin/bash +#!/bin/bash
+ +

18
xm-save-check-file.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/python/xen/xend/XendAPI.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendAPI.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendAPI.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendAPI.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendAPI.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendAPI.py
@@ -1817,10 +1817,10 @@ class XendAPI(object): @@ -1817,10 +1817,10 @@ class XendAPI(object):
bool(live), port, node, ssl) bool(live), port, node, ssl)
return xen_api_success_void() return xen_api_success_void()
@ -15,10 +15,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendAPI.py
return xen_api_success_void() return xen_api_success_void()
def VM_restore(self, _, src, paused): def VM_restore(self, _, src, paused):
Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py Index: xen-3.4.1-testing/tools/python/xen/xend/XendDomain.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendDomain.py --- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomain.py
+++ xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py +++ xen-3.4.1-testing/tools/python/xen/xend/XendDomain.py
@@ -1380,7 +1380,7 @@ class XendDomain: @@ -1380,7 +1380,7 @@ class XendDomain:
finally: finally:
sock.close() sock.close()
@ -38,10 +38,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py
if dominfo.getDomid() == DOM0_ID: if dominfo.getDomid() == DOM0_ID:
raise XendError("Cannot save privileged domain %s" % str(domid)) raise XendError("Cannot save privileged domain %s" % str(domid))
if dominfo._stateGet() != DOM_STATE_RUNNING: if dominfo._stateGet() != DOM_STATE_RUNNING:
Index: xen-3.4.0-testing/tools/python/xen/xm/main.py Index: xen-3.4.1-testing/tools/python/xen/xm/main.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/python/xen/xm/main.py --- xen-3.4.1-testing.orig/tools/python/xen/xm/main.py
+++ xen-3.4.0-testing/tools/python/xen/xm/main.py +++ xen-3.4.1-testing/tools/python/xen/xm/main.py
@@ -118,7 +118,7 @@ SUBCOMMAND_HELP = { @@ -118,7 +118,7 @@ SUBCOMMAND_HELP = {
'reset' : ('<Domain>', 'Reset a domain.'), 'reset' : ('<Domain>', 'Reset a domain.'),
'restore' : ('<CheckpointFile> [-p]', 'restore' : ('<CheckpointFile> [-p]',

6
xm-test-cleanup.diff
View File

@ -1,7 +1,7 @@
Index: xen-3.4.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py Index: xen-3.4.1-testing/tools/xm-test/tests/save/01_save_basic_pos.py
=================================================================== ===================================================================
--- xen-3.4.0-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py --- xen-3.4.1-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py
+++ xen-3.4.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py +++ xen-3.4.1-testing/tools/xm-test/tests/save/01_save_basic_pos.py
@@ -35,3 +35,9 @@ if s != 0: @@ -35,3 +35,9 @@ if s != 0:
# Make sure it's gone # Make sure it's gone
if isDomainRunning(domain.getName()): if isDomainRunning(domain.getName()):