From b4c780fd71753d9558d88919c6357b91b7aebc2743fa98b03a7e52a83462fc84 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 1 Aug 2009 09:53:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=76 --- 32on64-extra-mem.patch | 6 +- bdrv_open2_fix_flags.patch | 25 +++--- bdrv_open2_flags_2.patch | 14 ++-- blktap-pv-cdrom.patch | 44 +++++------ blktap.patch | 12 +-- blktapctrl-default-to-ioemu.patch | 6 +- block-flags.diff | 6 +- block-losetup-retry.diff | 6 +- bridge-bonding.diff | 6 +- bridge-opensuse.patch | 6 +- bridge-record-creation.patch | 6 +- bridge-vlan.diff | 6 +- build-tapdisk-ioemu.patch | 24 +++--- cdrom-removable.patch | 20 ++--- checkpoint-rename.patch | 6 +- dom-print.patch | 6 +- dump-exec-state.patch | 24 +++--- hv_tools.patch | 30 +++---- hv_xen_base.patch | 36 ++++----- hv_xen_extension.patch | 28 +++---- ...7615-qcow2-fix-alloc_cluster_link_l2.patch | 6 +- ioemu-blktap-barriers.patch | 6 +- ioemu-blktap-fv-init.patch | 6 +- ioemu-blktap-image-format.patch | 12 +-- ioemu-blktap-zero-size.patch | 12 +-- ioemu-debuginfo.patch | 12 +-- ioemu-vnc-resize.patch | 6 +- libxen_permissive.patch | 6 +- network-nat-open-SuSEfirewall2-FORWARD.patch | 9 ++- network-nat.patch | 6 +- network-route.patch | 6 +- pv-driver-build.patch | 6 +- pvdrv_emulation_control.patch | 8 +- qemu-dm-segfault.patch | 6 +- qemu-security-etch1.diff | 12 +-- serial-split.patch | 8 +- snapshot-ioemu-delete.patch | 18 ++--- snapshot-ioemu-restore.patch | 24 +++--- snapshot-ioemu-save.patch | 24 +++--- snapshot-xend.patch | 50 ++++++------ supported_module.diff | 4 +- tapdisk-ioemu-shutdown-fix.patch | 12 +-- tmp_build.patch | 6 +- tools-gdbserver-build.diff | 6 +- tools-kboot.diff | 36 ++++----- tools-xc_kexec.diff | 78 +++++++++---------- udev-rules.patch | 8 +- x86-cpufreq-report.patch | 18 ++--- x86-extra-trap-info.patch | 12 +-- x86-show-page-walk-early.patch | 38 ++++----- x86_64-5Tb.patch | 24 +++--- xen-3.4.1-testing-src.tar.bz2 | 4 +- xen-api-auth.patch | 6 +- xen-changeset.diff | 6 +- xen-config.diff | 6 +- xen-destdir.diff | 44 +++++------ xen-disable-qemu-monitor.diff | 6 +- xen-domUloader.diff | 24 +++--- xen-fixme-doc.diff | 12 +-- xen-hvm-default-bridge.diff | 24 +++--- xen-hvm-default-pae.diff | 6 +- xen-ioapic-ack-default.diff | 6 +- xen-ioemu-hvm-pv-support.diff | 8 +- xen-max-free-mem.diff | 24 +++--- xen-no-dummy-nfs-ip.diff | 6 +- xen-paths.diff | 18 ++--- xen-qemu-iscsi-fix.patch | 6 +- xen-rpmoptflags.diff | 12 +-- xen-warnings.diff | 62 +++++++++------ xen-xm-top-needs-root.diff | 6 +- xen-xmexample-vti.diff | 6 +- xen-xmexample.diff | 36 ++++----- xen.changes | 5 ++ xen.spec | 6 +- xenapi-console-protocol.patch | 6 +- xend-config.diff | 12 +-- xend-core-dump-loc.diff | 6 +- xend-domain-lock.patch | 40 +++++----- xm-save-check-file.patch | 18 ++--- xm-test-cleanup.diff | 6 +- 80 files changed, 627 insertions(+), 602 deletions(-) diff --git a/32on64-extra-mem.patch b/32on64-extra-mem.patch index 2df2ae9..1f215ff 100644 --- a/32on64-extra-mem.patch +++ b/32on64-extra-mem.patch @@ -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.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -2560,7 +2560,7 @@ class XendDomainInfo: vtd_mem = ((vtd_mem + 1023) / 1024) * 1024 diff --git a/bdrv_open2_fix_flags.patch b/bdrv_open2_fix_flags.patch index 0659c3f..aa6ae44 100644 --- a/bdrv_open2_fix_flags.patch +++ b/bdrv_open2_fix_flags.patch @@ -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 ---- 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 +Index: xen-3.4.1-testing/tools/ioemu-remote/block.c +=================================================================== +--- 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 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); if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) { 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 ---- 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 +Index: xen-3.4.1-testing/tools/ioemu-remote/hw/usb-msd.c +=================================================================== +--- 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 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; s->bs = 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 ---- 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 +Index: xen-3.4.1-testing/tools/ioemu-remote/qemu-img.c +=================================================================== +--- 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 @@ #endif @@ -51,7 +54,7 @@ diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-img.c xen-3.4.0-testin static void QEMU_NORETURN error(const char *fmt, ...) { -@@ -185,7 +185,7 @@ static int read_password(char *buf, int +@@ -185,7 +185,7 @@ static int read_password(char *buf, int #endif static BlockDriverState *bdrv_new_open(const char *filename, @@ -115,7 +118,7 @@ diff -uNrp xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-img.c xen-3.4.0-testin error("Could not open '%s'", filename); } bdrv_get_format(bs, fmt_name, sizeof(fmt_name)); -@@ -810,7 +811,7 @@ static void img_snapshot(int argc, char +@@ -810,7 +811,7 @@ static void img_snapshot(int argc, char if (!bs) error("Not enough memory"); diff --git a/bdrv_open2_flags_2.patch b/bdrv_open2_flags_2.patch index c2d566e..9a9a213 100644 --- a/bdrv_open2_flags_2.patch +++ b/bdrv_open2_flags_2.patch @@ -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 ---- 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 +Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c +=================================================================== +--- 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, BlockDriver* drv; 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); 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 ---- 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 +Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c +=================================================================== +--- 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) for (i = 0; i < MAX_DRIVES + 1; i++) { bs = drives_table[i].bdrv; diff --git a/blktap-pv-cdrom.patch b/blktap-pv-cdrom.patch index 5b6e759..5050436 100644 --- a/blktap-pv-cdrom.patch +++ b/blktap-pv-cdrom.patch @@ -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 -+++ 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 @@ +/* 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_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 -+++ 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 @@ +/****************************************************************************** + * 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)) + +#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.0-testing/tools/blktap/drivers/Makefile +--- xen-3.4.1-testing.orig/tools/blktap/drivers/Makefile ++++ xen-3.4.1-testing/tools/blktap/drivers/Makefile @@ -20,8 +20,9 @@ CRYPT_LIB := -lcrypto $(warning === libgcrypt not installed: falling back to libcrypto ===) endif @@ -688,10 +688,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile BLK-OBJS-y += aes.o BLK-OBJS-y += tapaio.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.0-testing/tools/blktap/drivers/tapdisk.h +--- xen-3.4.1-testing.orig/tools/blktap/drivers/tapdisk.h ++++ xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h @@ -137,6 +137,9 @@ struct tap_disk { int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id); 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 { -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.0-testing/tools/blktap/lib/blktaplib.h +--- xen-3.4.1-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-3.4.1-testing/tools/blktap/lib/blktaplib.h @@ -220,6 +220,7 @@ typedef struct msg_pid { #define DISK_TYPE_RAM 3 #define DISK_TYPE_QCOW 4 @@ -748,10 +748,10 @@ Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h /* xenstore/xenbus: */ #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.0-testing/xen/include/public/io/blkif.h +--- xen-3.4.1-testing.orig/xen/include/public/io/blkif.h ++++ xen-3.4.1-testing/xen/include/public/io/blkif.h @@ -76,6 +76,10 @@ * "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. -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.0-testing/tools/blktap/drivers/tapdisk.c +--- xen-3.4.1-testing.orig/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 goto out; } @@ -790,10 +790,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/tapdisk.c default: DPRINTF("Unknown block operation\n"); 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.0-testing/tools/python/xen/xend/server/BlktapController.py +--- xen-3.4.1-testing.orig/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 = [ 'ram', 'qcow', diff --git a/blktap.patch b/blktap.patch index 7ae2031..4947a8b 100644 --- a/blktap.patch +++ b/blktap.patch @@ -1,10 +1,10 @@ bug #239173 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.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -2940,7 +2940,7 @@ class XendDomainInfo: (fn, BOOTLOADER_LOOPBACK_DEVICE)) @@ -14,10 +14,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py '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.0-testing/tools/ioemu-remote/xenstore.c +--- xen-3.4.1-testing.orig/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 { char **e_danger = NULL; diff --git a/blktapctrl-default-to-ioemu.patch b/blktapctrl-default-to-ioemu.patch index 07eed79..3719937 100644 --- a/blktapctrl-default-to-ioemu.patch +++ b/blktapctrl-default-to-ioemu.patch @@ -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.0-testing/tools/blktap/drivers/tapdisk.h +--- xen-3.4.1-testing.orig/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 = { "raw image (aio)", "aio", diff --git a/block-flags.diff b/block-flags.diff index 69a666f..4267f04 100644 --- a/block-flags.diff +++ b/block-flags.diff @@ -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.0-testing/tools/hotplug/Linux/block +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/block ++++ xen-3.4.1-testing/tools/hotplug/Linux/block @@ -225,11 +225,14 @@ case "$command" in ;; diff --git a/block-losetup-retry.diff b/block-losetup-retry.diff index ca40a47..b8fa650 100644 --- a/block-losetup-retry.diff +++ b/block-losetup-retry.diff @@ -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.0-testing/tools/hotplug/Linux/block +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/block ++++ xen-3.4.1-testing/tools/hotplug/Linux/block @@ -241,107 +241,111 @@ case "$command" in mount it read-write in a guest domain." fi diff --git a/bridge-bonding.diff b/bridge-bonding.diff index 307bccb..8a6c1a1 100644 --- a/bridge-bonding.diff +++ b/bridge-bonding.diff @@ -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.0-testing/tools/hotplug/Linux/network-bridge +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge @@ -241,6 +241,9 @@ op_start () { return fi diff --git a/bridge-opensuse.patch b/bridge-opensuse.patch index 7015561..43727c5 100644 --- a/bridge-opensuse.patch +++ b/bridge-opensuse.patch @@ -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.0-testing/tools/hotplug/Linux/network-bridge +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge @@ -262,18 +262,18 @@ op_stop () { transfer_addrs ${bridge} ${pdev} if ! ifdown ${bridge}; then diff --git a/bridge-record-creation.patch b/bridge-record-creation.patch index ca6d6bb..31946b3 100644 --- a/bridge-record-creation.patch +++ b/bridge-record-creation.patch @@ -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.0-testing/tools/hotplug/Linux/network-bridge +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge @@ -249,6 +249,11 @@ op_start () { create_bridge ${tdev} diff --git a/bridge-vlan.diff b/bridge-vlan.diff index a2b24bd..500587b 100644 --- a/bridge-vlan.diff +++ b/bridge-vlan.diff @@ -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.0-testing/tools/hotplug/Linux/network-bridge +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-3.4.1-testing/tools/hotplug/Linux/network-bridge @@ -191,6 +191,28 @@ antispoofing () { iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT } diff --git a/build-tapdisk-ioemu.patch b/build-tapdisk-ioemu.patch index 1da2592..01d7e96 100644 --- a/build-tapdisk-ioemu.patch +++ b/build-tapdisk-ioemu.patch @@ -15,10 +15,10 @@ Signed-off-by: Kevin Wolf tapdisk-ioemu.c | 17 ----------------- 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.0-testing/tools/ioemu-remote/Makefile +--- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile ++++ xen-3.4.1-testing/tools/ioemu-remote/Makefile @@ -46,13 +46,6 @@ $(filter %-user,$(SUBDIR_RULES)): libqem 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 # 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.0-testing/tools/ioemu-remote/configure +--- xen-3.4.1-testing.orig/tools/ioemu-remote/configure ++++ xen-3.4.1-testing/tools/ioemu-remote/configure @@ -1508,7 +1508,7 @@ bsd) ;; esac @@ -68,10 +68,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/configure if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then tools="qemu-img\$(EXESUF) $tools" 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.0-testing/tools/ioemu-remote/qemu-tool.c +--- xen-3.4.1-testing.orig/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) qemu_free(bh); } @@ -81,10 +81,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c IOCanRWHandler *fd_read_poll, IOHandler *fd_read, 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.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c ++++ xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c @@ -12,34 +12,12 @@ extern void qemu_aio_init(void); diff --git a/cdrom-removable.patch b/cdrom-removable.patch index 6967ce3..401f98d 100644 --- a/cdrom-removable.patch +++ b/cdrom-removable.patch @@ -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 -+++ 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 @@ +#!/usr/bin/env python +# -*- mode: python; -*- @@ -246,10 +246,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/HalDaemon.py + 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 -+++ 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 @@ +#============================================================================ +# 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() + time.sleep(10) + 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.0-testing/tools/python/xen/xend/server/SrvServer.py +--- xen-3.4.1-testing.orig/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 from SrvRoot import SrvRoot @@ -397,10 +397,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvServer.py def create(): 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.0-testing/tools/ioemu-remote/xenstore.c +--- xen-3.4.1-testing.orig/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 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"); diff --git a/checkpoint-rename.patch b/checkpoint-rename.patch index 46940e4..6561947 100644 --- a/checkpoint-rename.patch +++ b/checkpoint-rename.patch @@ -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.0-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-3.4.1-testing.orig/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 dominfo.destroy() dominfo.testDeviceComplete() diff --git a/dom-print.patch b/dom-print.patch index ec48722..298ac84 100644 --- a/dom-print.patch +++ b/dom-print.patch @@ -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.0-testing/xen/arch/x86/domain.c +--- xen-3.4.1-testing.orig/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 * printk("Memory pages belonging to domain %u:\n", d->domain_id); diff --git a/dump-exec-state.patch b/dump-exec-state.patch index 210a4e4..2409402 100644 --- a/dump-exec-state.patch +++ b/dump-exec-state.patch @@ -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.0-testing/xen/arch/ia64/linux-xen/smp.c +--- xen-3.4.1-testing.orig/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 * At this point the structure may be gone unless * 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. */ 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.0-testing/xen/arch/x86/smp.c +--- xen-3.4.1-testing.orig/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 if ( call_data->wait ) @@ -33,10 +33,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/smp.c } 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.0-testing/xen/common/keyhandler.c +--- xen-3.4.1-testing.orig/xen/common/keyhandler.c ++++ xen-3.4.1-testing/xen/common/keyhandler.c @@ -91,14 +91,25 @@ static void show_handlers(unsigned char 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); } -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.0-testing/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.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h @@ -278,7 +278,7 @@ struct switch_stack { # define ia64_task_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1) # define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr) diff --git a/hv_tools.patch b/hv_tools.patch index 18bf7b2..78e7cca 100644 --- a/hv_tools.patch +++ b/hv_tools.patch @@ -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.0-testing/tools/python/xen/lowlevel/xc/xc.c +--- xen-3.4.1-testing.orig/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 int i; #endif @@ -31,10 +31,10 @@ Index: xen-3.4.0-testing/tools/python/xen/lowlevel/xc/xc.c 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.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-3.4.1-testing.orig/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 = { 'monitor': int, 'nographic': int, @@ -43,11 +43,11 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendConfig.py 'rtc_timeoffset': int, 'serial': str, '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.0-testing/tools/python/xen/xend/image.py -@@ -764,6 +764,7 @@ class HVMImageHandler(ImageHandler): +--- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-3.4.1-testing/tools/python/xen/xend/image.py +@@ -762,6 +762,7 @@ class HVMImageHandler(ImageHandler): self.apic = int(vmConfig['platform'].get('apic', 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') -@@ -880,6 +881,7 @@ class HVMImageHandler(ImageHandler): +@@ -878,6 +879,7 @@ class HVMImageHandler(ImageHandler): log.debug("memsize = %d", memmax_mb) log.debug("target = %d", mem_mb) 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("apic = %d", self.apic) -@@ -888,6 +890,7 @@ class HVMImageHandler(ImageHandler): +@@ -886,6 +888,7 @@ class HVMImageHandler(ImageHandler): memsize = memmax_mb, target = mem_mb, vcpus = self.vm.getVCpuCount(), @@ -71,10 +71,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py acpi = self.acpi, apic = self.apic) 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.0-testing/tools/python/xen/xm/create.py +--- xen-3.4.1-testing.orig/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', use="""Expose Viridian interface to x86 HVM guest? (Default is 0).""") diff --git a/hv_xen_base.patch b/hv_xen_base.patch index 1a497c0..8818e48 100644 --- a/hv_xen_base.patch +++ b/hv_xen_base.patch @@ -1,8 +1,8 @@ %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.0-testing/xen/include/asm-x86/hvm/domain.h +--- xen-3.4.1-testing.orig/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 { struct vmx_domain vmx; 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__ */ -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.0-testing/xen/arch/x86/hvm/Makefile +--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/Makefile ++++ xen-3.4.1-testing/xen/arch/x86/hvm/Makefile @@ -1,5 +1,6 @@ subdir-y += svm subdir-y += vmx @@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/Makefile obj-y += emulate.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.0-testing/xen/arch/x86/hvm/hvm.c +--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/hvm.c ++++ xen-3.4.1-testing/xen/arch/x86/hvm/hvm.c @@ -46,6 +46,7 @@ #include #include @@ -136,10 +136,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hvm.c } 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.0-testing/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.1-testing/xen/include/public/arch-x86/hvm/save.h @@ -432,9 +432,26 @@ 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 #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.0-testing/xen/arch/x86/hvm/vlapic.c +--- xen-3.4.1-testing.orig/xen/arch/x86/hvm/vlapic.c ++++ xen-3.4.1-testing/xen/arch/x86/hvm/vlapic.c @@ -34,6 +34,7 @@ #include #include @@ -188,10 +188,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/vlapic.c 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.0-testing/xen/include/public/hvm/params.h +--- xen-3.4.1-testing.orig/xen/include/public/hvm/params.h ++++ xen-3.4.1-testing/xen/include/public/hvm/params.h @@ -106,6 +106,8 @@ /* Boolean: Enable aligning all periodic vpts to reduce interrupts */ #define HVM_PARAM_VPT_ALIGN 16 diff --git a/hv_xen_extension.patch b/hv_xen_extension.patch index e963a41..e24db36 100644 --- a/hv_xen_extension.patch +++ b/hv_xen_extension.patch @@ -1,8 +1,8 @@ %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 -+++ 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 @@ +/**************************************************************************** + | @@ -169,17 +169,17 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/hvm/hvm_extensions.h +int hyperx_initialize(struct domain *d); + +#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 -+++ 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 @@ +obj-y += hv_intercept.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 -+++ 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 @@ +/**************************************************************************** + | @@ -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_1024PAGES 0x0104 +#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 -+++ 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 @@ +/**************************************************************************** + | @@ -401,10 +401,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c + 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 -+++ 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 @@ +/**************************************************************************** + | @@ -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 + +#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 -+++ 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 @@ +/**************************************************************************** + | @@ -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); + 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 -+++ 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 @@ +/**************************************************************************** + | diff --git a/ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch b/ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch index c5e920a..63d06d1 100644 --- a/ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch +++ b/ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch @@ -17,10 +17,10 @@ qcow2 image (the header is gone after three loop iterations): Signed-off-by: Kevin Wolf -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.0-testing/tools/ioemu-remote/block-qcow2.c +--- xen-3.4.1-testing.orig/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 goto err; diff --git a/ioemu-blktap-barriers.patch b/ioemu-blktap-barriers.patch index fe03736..8fdcd21 100644 --- a/ioemu-blktap-barriers.patch +++ b/ioemu-blktap-barriers.patch @@ -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.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- 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 @@ -362,6 +362,15 @@ static void qemu_send_responses(void* op } diff --git a/ioemu-blktap-fv-init.patch b/ioemu-blktap-fv-init.patch index d958728..36ee82b 100644 --- a/ioemu-blktap-fv-init.patch +++ b/ioemu-blktap-fv-init.patch @@ -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.0-testing/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.1-testing/tools/ioemu-remote/hw/xen_machine_fv.c @@ -266,6 +266,7 @@ void qemu_invalidate_entry(uint8_t *buff #endif /* defined(MAPCACHE) */ diff --git a/ioemu-blktap-image-format.patch b/ioemu-blktap-image-format.patch index a0d8ec4..0601d40 100644 --- a/ioemu-blktap-image-format.patch +++ b/ioemu-blktap-image-format.patch @@ -15,10 +15,10 @@ Signed-off-by: Kevin Wolf hw/xen_blktap.h | 14 ++++++++++++++ 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.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- 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 @@ -220,9 +220,10 @@ static int map_new_dev(struct td_state * return -1; } @@ -64,10 +64,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c msglen = sizeof(msg_hdr_t); msg->type = CTLMSG_IMG_FAIL; 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.0-testing/tools/ioemu-remote/hw/xen_blktap.h +--- xen-3.4.1-testing.orig/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 { int init_blktap(void); diff --git a/ioemu-blktap-zero-size.patch b/ioemu-blktap-zero-size.patch index c1ff6b7..a362af3 100644 --- a/ioemu-blktap-zero-size.patch +++ b/ioemu-blktap-zero-size.patch @@ -12,10 +12,10 @@ Signed-off-by: Kevin Wolf hw/xen_blktap.c | 6 ++++++ 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.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- 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 @@ -258,6 +258,12 @@ static int open_disk(struct td_state *s, s->size = bs->total_sectors; 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); #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.0-testing/tools/python/xen/xend/server/DevController.py +--- xen-3.4.1-testing.orig/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: (devid, self.deviceClass)) diff --git a/ioemu-debuginfo.patch b/ioemu-debuginfo.patch index bb664d0..db33c1c 100644 --- a/ioemu-debuginfo.patch +++ b/ioemu-debuginfo.patch @@ -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.0-testing/tools/ioemu-remote/Makefile +--- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile ++++ xen-3.4.1-testing/tools/ioemu-remote/Makefile @@ -242,7 +242,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" @@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile endif ifneq ($(BLOBS),) 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.0-testing/tools/ioemu-remote/Makefile.target +--- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile.target ++++ xen-3.4.1-testing/tools/ioemu-remote/Makefile.target @@ -754,7 +754,7 @@ clean: install: all install-hook diff --git a/ioemu-vnc-resize.patch b/ioemu-vnc-resize.patch index bbe5a6d..db60e73 100644 --- a/ioemu-vnc-resize.patch +++ b/ioemu-vnc-resize.patch @@ -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.0-testing/tools/ioemu-remote/vnc.c +--- xen-3.4.1-testing.orig/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 } diff --git a/libxen_permissive.patch b/libxen_permissive.patch index de06fa7..87b037e 100644 --- a/libxen_permissive.patch +++ b/libxen_permissive.patch @@ -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.0-testing/tools/libxen/src/xen_common.c +--- xen-3.4.1-testing.orig/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 0 != strcmp((char *)value_node->children->name, "struct") || value_node->children->children == NULL) diff --git a/network-nat-open-SuSEfirewall2-FORWARD.patch b/network-nat-open-SuSEfirewall2-FORWARD.patch index 088eea3..0428203 100644 --- a/network-nat-open-SuSEfirewall2-FORWARD.patch +++ b/network-nat-open-SuSEfirewall2-FORWARD.patch @@ -1,8 +1,9 @@ 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 ---- 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 +Index: xen-3.4.1-testing/tools/hotplug/Linux/network-nat +=================================================================== +--- 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() op_start() { echo 1 >/proc/sys/net/ipv4/ip_forward @@ -15,7 +16,7 @@ diff -uNrp xen-3.4.0-testing/tools/hotplug/Linux/network-nat xen-3.4.0-testing/t op_stop() { [ "$dhcp" != 'no' ] && dhcp_stop iptables -t nat -D POSTROUTING -o ${netdev} -j MASQUERADE -+ iptables -P FORWARD DROP ++ iptables -P FORWARD DROP } diff --git a/network-nat.patch b/network-nat.patch index 434c6e7..3321371 100644 --- a/network-nat.patch +++ b/network-nat.patch @@ -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.0-testing/tools/hotplug/Linux/network-nat +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-nat ++++ xen-3.4.1-testing/tools/hotplug/Linux/network-nat @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash diff --git a/network-route.patch b/network-route.patch index 6219590..7a15a2c 100644 --- a/network-route.patch +++ b/network-route.patch @@ -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.0-testing/tools/hotplug/Linux/network-route +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/network-route ++++ xen-3.4.1-testing/tools/hotplug/Linux/network-route @@ -21,7 +21,7 @@ dir=$(dirname "$0") evalVariables "$@" diff --git a/pv-driver-build.patch b/pv-driver-build.patch index 221a30e..51f4637 100644 --- a/pv-driver-build.patch +++ b/pv-driver-build.patch @@ -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.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild +--- xen-3.4.1-testing.orig/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 obj-m += xen-vbd.o diff --git a/pvdrv_emulation_control.patch b/pvdrv_emulation_control.patch index 13b758b..e65190f 100644 --- a/pvdrv_emulation_control.patch +++ b/pvdrv_emulation_control.patch @@ -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.0-testing/tools/ioemu-remote/hw/xen_platform.c -@@ -356,6 +356,19 @@ static void platform_ioport_write(void * +--- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_platform.c ++++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_platform.c +@@ -361,6 +361,19 @@ static void platform_ioport_write(void * net_tap_shutdown_all(); fprintf(logfile, "Done.\n"); break; diff --git a/qemu-dm-segfault.patch b/qemu-dm-segfault.patch index d4a7811..23a1912 100644 --- a/qemu-dm-segfault.patch +++ b/qemu-dm-segfault.patch @@ -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.0-testing/tools/ioemu-remote/hw/ide.c +--- xen-3.4.1-testing.orig/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( static inline void ide_set_irq(IDEState *s) diff --git a/qemu-security-etch1.diff b/qemu-security-etch1.diff index 8492d6b..c737f7a 100644 --- a/qemu-security-etch1.diff +++ b/qemu-security-etch1.diff @@ -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.0-testing/tools/ioemu-remote/hw/ne2000.c +--- xen-3.4.1-testing.orig/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 NE2000State *s = opaque; @@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/ne2000.c 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.0-testing/tools/ioemu-remote/hw/pc.c +--- xen-3.4.1-testing.orig/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 case 0x400: case 0x401: diff --git a/serial-split.patch b/serial-split.patch index 17def81..fc90f3c 100644 --- a/serial-split.patch +++ b/serial-split.patch @@ -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 -+++ xen-3.4.0-testing/tools/misc/serial-split/Makefile ++++ xen-3.4.1-testing/tools/misc/serial-split/Makefile @@ -0,0 +1,20 @@ +CC ?= gcc +CFLAGS ?= -Wall -Os @@ -23,10 +23,10 @@ Index: xen-3.4.0-testing/tools/misc/serial-split/Makefile + +%.o: %.c Makefile + $(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 -+++ 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 @@ +/* + * serial-split.c diff --git a/snapshot-ioemu-delete.patch b/snapshot-ioemu-delete.patch index 044ab14..496dc2e 100644 --- a/snapshot-ioemu-delete.patch +++ b/snapshot-ioemu-delete.patch @@ -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.0-testing/tools/ioemu-remote/xenstore.c +--- xen-3.4.1-testing.orig/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_ } @@ -21,10 +21,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); 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.0-testing/tools/ioemu-remote/savevm.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/savevm.c ++++ xen-3.4.1-testing/tools/ioemu-remote/savevm.c @@ -1096,6 +1096,35 @@ the_end: return ret; } @@ -61,10 +61,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c #ifndef CONFIG_DM 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.0-testing/tools/ioemu-remote/qemu-xen.h +--- xen-3.4.1-testing.orig/tools/ioemu-remote/qemu-xen.h ++++ xen-3.4.1-testing/tools/ioemu-remote/qemu-xen.h @@ -42,6 +42,7 @@ enum { /* xen-vl-extra.c */ diff --git a/snapshot-ioemu-restore.patch b/snapshot-ioemu-restore.patch index 0af9992..84436bd 100644 --- a/snapshot-ioemu-restore.patch +++ b/snapshot-ioemu-restore.patch @@ -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.0-testing/tools/blktap/drivers/blktapctrl.c +--- xen-3.4.1-testing.orig/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 msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); msg_dev->devnum = blkif->minor; @@ -10,10 +10,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c 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.0-testing/tools/blktap/lib/blktaplib.h +--- xen-3.4.1-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-3.4.1-testing/tools/blktap/lib/blktaplib.h @@ -189,6 +189,7 @@ typedef struct msg_hdr { typedef struct msg_newdev { uint8_t devnum; @@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h } msg_newdev_t; 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.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- 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 @@ -67,6 +67,8 @@ int write_fd; static pid_t process; 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); 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.0-testing/tools/ioemu-remote/xenstore.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c ++++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c @@ -38,6 +38,8 @@ static QEMUTimer *insert_timer = NULL; #define UWAIT_MAX (30*1000000) /* thirty seconds */ #define UWAIT (100000) /* 1/10th second */ diff --git a/snapshot-ioemu-save.patch b/snapshot-ioemu-save.patch index cb5067d..de33755 100644 --- a/snapshot-ioemu-save.patch +++ b/snapshot-ioemu-save.patch @@ -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.0-testing/tools/ioemu-remote/savevm.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/savevm.c ++++ xen-3.4.1-testing/tools/ioemu-remote/savevm.c @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu-timer.h" @@ -97,10 +97,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c #ifndef CONFIG_DM 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.0-testing/tools/ioemu-remote/i386-dm/helper2.c +--- xen-3.4.1-testing.orig/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; #define NR_CPUS 32 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 */ 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.0-testing/tools/ioemu-remote/qemu-xen.h +--- xen-3.4.1-testing.orig/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) #define mapcache_lock() ((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_write_vncport(int vnc_display); 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.0-testing/tools/ioemu-remote/xenstore.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c ++++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c @@ -24,6 +24,7 @@ #include "exec-all.h" diff --git a/snapshot-xend.patch b/snapshot-xend.patch index 4f24522..d906e8d 100644 --- a/snapshot-xend.patch +++ b/snapshot-xend.patch @@ -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.0-testing/tools/python/xen/xend/image.py -@@ -447,7 +447,7 @@ class ImageHandler: +--- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-3.4.1-testing/tools/python/xen/xend/image.py +@@ -445,7 +445,7 @@ class ImageHandler: # have a callback but sadly we don't have Twisted in xend 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: return # Signal the device model to for action -@@ -470,10 +470,17 @@ class ImageHandler: +@@ -468,10 +468,17 @@ class ImageHandler: while state != ret: state = xstransact.Read("/local/domain/0/device-model/%i/state" % self.vm.getDomid()) @@ -32,7 +32,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py #resotre orig state xstransact.Store("/local/domain/0/device-model/%i" -@@ -498,6 +505,10 @@ class ImageHandler: +@@ -496,6 +503,10 @@ class ImageHandler: except: pass @@ -43,10 +43,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py def recreate(self): if self.device_model is None: 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.0-testing/tools/python/xen/xend/server/blkif.py +--- xen-3.4.1-testing.orig/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): if bootable != None: 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: 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.0-testing/tools/python/xen/xend/server/SrvDomain.py +--- xen-3.4.1-testing.orig/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): def do_save(self, _, req): 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) # -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.0-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-3.4.1-testing.orig/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): return @@ -192,7 +192,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py + if hvm: + dominfo.image.saveDeviceModel() + if name: -+ dominfo.image.resumeDeviceModel() ++ dominfo.image.resumeDeviceModel() + + if line == "suspend": + tochild.write("done\n") @@ -323,10 +323,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py if not paused: 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.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendConfig.py @@ -220,6 +220,7 @@ XENAPI_CFG_TYPES = { 'machine_address_size': int, '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 -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.0-testing/tools/python/xen/xend/XendDomain.py +--- xen-3.4.1-testing.orig/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 from xen.xend.xenstore.xswatch import xswatch 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): """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.0-testing/tools/python/xen/xm/main.py +--- xen-3.4.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-3.4.1-testing/tools/python/xen/xm/main.py @@ -120,6 +120,14 @@ SUBCOMMAND_HELP = { 'Restore a domain from a saved state.'), 'save' : ('[-c|-f] ', diff --git a/supported_module.diff b/supported_module.diff index 2028ea7..0019950 100644 --- a/supported_module.diff +++ b/supported_module.diff @@ -2,10 +2,10 @@ Make our PV drivers "Novell supported modules" Signed-off-by: K. Y. Srinivasan -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 -+++ 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 @@ +xen-vbd +xen-platform-pci diff --git a/tapdisk-ioemu-shutdown-fix.patch b/tapdisk-ioemu-shutdown-fix.patch index 8c3e1d9..c4d47cc 100644 --- a/tapdisk-ioemu-shutdown-fix.patch +++ b/tapdisk-ioemu-shutdown-fix.patch @@ -16,10 +16,10 @@ Signed-off-by: Kevin Wolf tapdisk-ioemu.c | 13 ++++++++++--- 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.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- 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 @@ -65,6 +65,7 @@ int read_fd; int write_fd; @@ -46,10 +46,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c case CTLMSG_PID: 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.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +--- xen-3.4.1-testing.orig/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); extern void qemu_aio_poll(void); diff --git a/tmp_build.patch b/tmp_build.patch index 33a02f1..ffbdf06 100644 --- a/tmp_build.patch +++ b/tmp_build.patch @@ -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.0-testing/tools/xenstore/Makefile +--- xen-3.4.1-testing.orig/tools/xenstore/Makefile ++++ xen-3.4.1-testing/tools/xenstore/Makefile @@ -56,6 +56,7 @@ $(CLIENTS_DOMU): xenstore xenstore: xenstore_client.o $(LIBXENSTORE) diff --git a/tools-gdbserver-build.diff b/tools-gdbserver-build.diff index 83ca78b..2aafe56 100644 --- a/tools-gdbserver-build.diff +++ b/tools-gdbserver-build.diff @@ -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.0-testing/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.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 GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS} #PROFILE_CFLAGS = -pg diff --git a/tools-kboot.diff b/tools-kboot.diff index 5237815..6160aa9 100644 --- a/tools-kboot.diff +++ b/tools-kboot.diff @@ -13,10 +13,10 @@ Signed-off-by: Gerd Hoffmann tools/kboot/select-kernel | 59 + 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 -+++ 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 @@ +# +# 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_IDT=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 -+++ 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 @@ +# +# 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_LIBCRC32C is not set +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 -+++ 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 @@ +EXTRAVERSION = xenUboot +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 -+++ xen-3.4.0-testing/tools/kboot/Makefile ++++ xen-3.4.1-testing/tools/kboot/Makefile @@ -0,0 +1,23 @@ +# +# 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 + sh ./mkinitramfs | tee $@ + -Index: xen-3.4.0-testing/tools/kboot/README +Index: xen-3.4.1-testing/tools/kboot/README =================================================================== --- /dev/null -+++ xen-3.4.0-testing/tools/kboot/README ++++ xen-3.4.1-testing/tools/kboot/README @@ -0,0 +1,43 @@ + +This is a simple kexec-based boot loader @@ -1633,10 +1633,10 @@ Index: xen-3.4.0-testing/tools/kboot/README + +-- +Gerd Hoffmann -Index: xen-3.4.0-testing/tools/kboot/init +Index: xen-3.4.1-testing/tools/kboot/init =================================================================== --- /dev/null -+++ xen-3.4.0-testing/tools/kboot/init ++++ xen-3.4.1-testing/tools/kboot/init @@ -0,0 +1,309 @@ +#!/bin/sh + @@ -1947,10 +1947,10 @@ Index: xen-3.4.0-testing/tools/kboot/init +msg "bye ..." +banner "boot $guestos" +xc_kexec -e -Index: xen-3.4.0-testing/tools/kboot/mkinitramfs +Index: xen-3.4.1-testing/tools/kboot/mkinitramfs =================================================================== --- /dev/null -+++ xen-3.4.0-testing/tools/kboot/mkinitramfs ++++ xen-3.4.1-testing/tools/kboot/mkinitramfs @@ -0,0 +1,111 @@ +#!/bin/sh + @@ -2063,10 +2063,10 @@ Index: xen-3.4.0-testing/tools/kboot/mkinitramfs + echo "file $LIB/$(basename $lib) $lib 0755 0 0" +done +echo -Index: xen-3.4.0-testing/tools/kboot/select-kernel +Index: xen-3.4.1-testing/tools/kboot/select-kernel =================================================================== --- /dev/null -+++ xen-3.4.0-testing/tools/kboot/select-kernel ++++ xen-3.4.1-testing/tools/kboot/select-kernel @@ -0,0 +1,59 @@ +#!/bin/sh + @@ -2127,10 +2127,10 @@ Index: xen-3.4.0-testing/tools/kboot/select-kernel +msg "using $kernelname" +echo "$kernelname" + -Index: xen-3.4.0-testing/make-kboot +Index: xen-3.4.1-testing/make-kboot =================================================================== --- /dev/null -+++ xen-3.4.0-testing/make-kboot ++++ xen-3.4.1-testing/make-kboot @@ -0,0 +1,37 @@ +#!/bin/sh + diff --git a/tools-xc_kexec.diff b/tools-xc_kexec.diff index 3a257cb..4bd34e6 100644 --- a/tools-xc_kexec.diff +++ b/tools-xc_kexec.diff @@ -23,10 +23,10 @@ Signed-off-by: Gerd Hoffmann tools/xcutils/xc_kexec.c | 503 +++++++++++++++ 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.0-testing/tools/xcutils/Makefile +--- xen-3.4.1-testing.orig/tools/xcutils/Makefile ++++ xen-3.4.1-testing/tools/xcutils/Makefile @@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) @@ -55,10 +55,10 @@ Index: xen-3.4.0-testing/tools/xcutils/Makefile + make -C helper clean -include $(DEPS) -Index: xen-3.4.0-testing/tools/xcutils/helper/Makefile +Index: xen-3.4.1-testing/tools/xcutils/helper/Makefile =================================================================== --- /dev/null -+++ xen-3.4.0-testing/tools/xcutils/helper/Makefile ++++ xen-3.4.1-testing/tools/xcutils/helper/Makefile @@ -0,0 +1,39 @@ + +XEN_ROOT = ../../.. @@ -99,10 +99,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/Makefile +# dependencies + +$(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 -+++ xen-3.4.0-testing/tools/xcutils/helper/console.c ++++ xen-3.4.1-testing/tools/xcutils/helper/console.c @@ -0,0 +1,69 @@ +#include + @@ -173,10 +173,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/console.c + + 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 -+++ xen-3.4.0-testing/tools/xcutils/helper/ctype.c ++++ xen-3.4.1-testing/tools/xcutils/helper/ctype.c @@ -0,0 +1,35 @@ +/* + * 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 */ + +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 -+++ xen-3.4.0-testing/tools/xcutils/helper/ctype.h ++++ xen-3.4.1-testing/tools/xcutils/helper/ctype.h @@ -0,0 +1,54 @@ +#ifndef _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) + +#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 -+++ xen-3.4.0-testing/tools/xcutils/helper/helper.h ++++ xen-3.4.1-testing/tools/xcutils/helper/helper.h @@ -0,0 +1,107 @@ +#include +#include @@ -384,10 +384,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/helper.h +int sprintf(char * buf, const char *fmt, ...); +int vsscanf(const char * buf, const char * fmt, va_list args); +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 -+++ xen-3.4.0-testing/tools/xcutils/helper/main.c ++++ xen-3.4.1-testing/tools/xcutils/helper/main.c @@ -0,0 +1,651 @@ +#include +#include "hypercall.h" @@ -1040,10 +1040,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/main.c + printk("\r\n"); + 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 -+++ 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 @@ +#include +#include @@ -1073,10 +1073,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/make-offsets.c + vcpu_off("cr3", ctrlreg[3]); + 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 -+++ xen-3.4.0-testing/tools/xcutils/helper/printk.c ++++ xen-3.4.1-testing/tools/xcutils/helper/printk.c @@ -0,0 +1,1051 @@ +/* + * linux/kernel/printk.c @@ -2129,10 +2129,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/printk.c + printk_ratelimit_burst); +} +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 -+++ xen-3.4.0-testing/tools/xcutils/helper/string.c ++++ xen-3.4.1-testing/tools/xcutils/helper/string.c @@ -0,0 +1,601 @@ +/* + * linux/lib/string.c @@ -2735,10 +2735,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/string.c +} +EXPORT_SYMBOL(memchr); +#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 -+++ xen-3.4.0-testing/tools/xcutils/helper/vsprintf.c ++++ xen-3.4.1-testing/tools/xcutils/helper/vsprintf.c @@ -0,0 +1,842 @@ +/* + * linux/lib/vsprintf.c @@ -3582,10 +3582,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/vsprintf.c +} + +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 -+++ 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 @@ +#ifndef __I386_DIV64 +#define __I386_DIV64 @@ -3635,10 +3635,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/div64.h + +} +#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 -+++ 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 @@ +#include "offsets.h" + @@ -3689,10 +3689,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/entry.S + nop + .align 4096 +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 -+++ 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 @@ +/****************************************************************************** + * hypercall.h @@ -4053,10 +4053,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_32/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 -+++ 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 @@ +#ifndef _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 /* _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 -+++ 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 @@ +#include "offsets.h" + @@ -4170,10 +4170,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/entry.S + nop + .align 4096 +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 -+++ 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 @@ +/****************************************************************************** + * hypercall.h @@ -4529,10 +4529,10 @@ Index: xen-3.4.0-testing/tools/xcutils/helper/x86_64/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 -+++ xen-3.4.0-testing/tools/xcutils/kexec-syscall.h ++++ xen-3.4.1-testing/tools/xcutils/kexec-syscall.h @@ -0,0 +1,80 @@ +#ifndef 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 + +#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 -+++ xen-3.4.0-testing/tools/xcutils/xc_kexec.c ++++ xen-3.4.1-testing/tools/xcutils/xc_kexec.c @@ -0,0 +1,503 @@ +#include +#include diff --git a/udev-rules.patch b/udev-rules.patch index 6b3fbad..1995cd0 100644 --- a/udev-rules.patch +++ b/udev-rules.patch @@ -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.0-testing/tools/hotplug/Linux/xen-backend.rules -@@ -6,3 +6,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vscsi +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/xen-backend.rules ++++ xen-3.4.1-testing/tools/hotplug/Linux/xen-backend.rules +@@ -7,3 +7,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vscsi SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" KERNEL=="blktap[0-9]*", NAME="xen/%k" diff --git a/x86-cpufreq-report.patch b/x86-cpufreq-report.patch index 4ac74e3..8118a25 100644 --- a/x86-cpufreq-report.patch +++ b/x86-cpufreq-report.patch @@ -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.0-testing/xen/arch/x86/platform_hypercall.c +--- xen-3.4.1-testing.orig/xen/arch/x86/platform_hypercall.c ++++ xen-3.4.1-testing/xen/arch/x86/platform_hypercall.c @@ -21,7 +21,7 @@ #include #include @@ -40,10 +40,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/platform_hypercall.c default: 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.0-testing/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.1-testing/xen/arch/x86/x86_64/platform_hypercall.c @@ -23,6 +23,8 @@ DEFINE_XEN_GUEST_HANDLE(compat_platform_ #define xen_processor_power_t compat_processor_power_t #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 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.0-testing/xen/include/public/platform.h +--- xen-3.4.1-testing.orig/xen/include/public/platform.h ++++ xen-3.4.1-testing/xen/include/public/platform.h @@ -312,6 +312,16 @@ struct xenpf_set_processor_pminfo { typedef struct xenpf_set_processor_pminfo xenpf_set_processor_pminfo_t; DEFINE_XEN_GUEST_HANDLE(xenpf_set_processor_pminfo_t); diff --git a/x86-extra-trap-info.patch b/x86-extra-trap-info.patch index d4dd526..7715fd6 100644 --- a/x86-extra-trap-info.patch +++ b/x86-extra-trap-info.patch @@ -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.0-testing/xen/arch/x86/x86_32/entry.S +--- xen-3.4.1-testing.orig/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 movl %eax,UREGS_eip+4(%esp) ret @@ -46,10 +46,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/x86_32/entry.S domain_crash_synchronous: pushl $domain_crash_synchronous_string 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.0-testing/xen/arch/x86/x86_64/entry.S +--- xen-3.4.1-testing.orig/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: movq %rax,UREGS_rip+8(%rsp) ret diff --git a/x86-show-page-walk-early.patch b/x86-show-page-walk-early.patch index 16680a0..14af53e 100644 --- a/x86-show-page-walk-early.patch +++ b/x86-show-page-walk-early.patch @@ -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.0-testing/xen/arch/x86/traps.c +--- xen-3.4.1-testing.orig/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 unsigned long *stk = (unsigned long *)regs; 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: "); while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 ) 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.0-testing/xen/arch/x86/x86_32/mm.c +--- xen-3.4.1-testing.orig/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 unsigned int PAGE_HYPERVISOR = __PAGE_HYPERVISOR; 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. */ for ( i = 0; i < (mpt_size / BYTES_PER_LONG); i++) 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.0-testing/xen/arch/x86/x86_32/traps.c +--- xen-3.4.1-testing.orig/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) l3t += (cr3 & 0xFE0UL) >> 3; 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", l1_table_offset(addr), l1e_get_intpte(l1e), pfn); 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.0-testing/xen/arch/x86/x86_64/mm.c +--- xen-3.4.1-testing.orig/xen/arch/x86/x86_64/mm.c ++++ xen-3.4.1-testing/xen/arch/x86/x86_64/mm.c @@ -33,6 +33,7 @@ - #include + #include #include +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. */ BUILD_BUG_ON(l4_table_offset(RDWR_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.0-testing/xen/arch/x86/x86_64/traps.c +--- xen-3.4.1-testing.orig/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) l4t = mfn_to_virt(mfn); 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", 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.0-testing/xen/include/asm-x86/mm.h +--- xen-3.4.1-testing.orig/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); #define machine_to_phys_mapping ((unsigned long *)RDWR_MPT_VIRT_START) #define INVALID_M2P_ENTRY (~0UL) diff --git a/x86_64-5Tb.patch b/x86_64-5Tb.patch index fb1c669..5a1b1b3 100644 --- a/x86_64-5Tb.patch +++ b/x86_64-5Tb.patch @@ -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.0-testing/xen/arch/x86/boot/head.S +--- xen-3.4.1-testing.orig/xen/arch/x86/boot/head.S ++++ xen-3.4.1-testing/xen/arch/x86/boot/head.S @@ -33,7 +33,7 @@ ENTRY(start) /* Checksum: must be the negated sum of the first two fields. */ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) @@ -28,10 +28,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/boot/head.S #else /* Initialize low and high mappings of memory with 2MB pages */ 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.0-testing/xen/arch/x86/e820.c +--- xen-3.4.1-testing.orig/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 "can be accessed by Xen in 32-bit mode."); #else @@ -53,10 +53,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/e820.c if ( limit > pft_limit ) limit = pft_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.0-testing/xen/include/asm-x86/config.h +--- xen-3.4.1-testing.orig/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 #define PML4_ADDR(_slot) \ ((((_slot ## UL) >> 8) * 0xffff000000000000UL) | \ @@ -136,10 +136,10 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/config.h #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.0-testing/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.1-testing/xen/include/asm-x86/x86_64/page.h @@ -16,8 +16,8 @@ #define L4_PAGETABLE_ENTRIES (1< @@ -19,10 +19,10 @@ Index: xen-3.4.0-testing/docs/man/xmdomain.cfg.pod.5 =back =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.0-testing/docs/man/xm.pod.1 +--- xen-3.4.1-testing.orig/docs/man/xm.pod.1 ++++ xen-3.4.1-testing/docs/man/xm.pod.1 @@ -297,7 +297,8 @@ scheduling by the Xen hypervisor. =item B diff --git a/xen-hvm-default-bridge.diff b/xen-hvm-default-bridge.diff index a6f75cb..b986720 100644 --- a/xen-hvm-default-bridge.diff +++ b/xen-hvm-default-bridge.diff @@ -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.0-testing/tools/ioemu-remote/net.h +--- xen-3.4.1-testing.orig/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 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 #ifdef __sun__ #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.0-testing/tools/ioemu-remote/net.c +--- xen-3.4.1-testing.orig/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, } 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 #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.0-testing/tools/python/xen/xend/image.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-3.4.1-testing/tools/python/xen/xend/image.py @@ -832,14 +832,16 @@ class HVMImageHandler(ImageHandler): mac = devinfo.get('mac') if mac is None: @@ -54,10 +54,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py if nics == 0: 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.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup +--- xen-3.4.1-testing.orig/tools/ioemu-remote/i386-dm/qemu-ifup ++++ xen-3.4.1-testing/tools/ioemu-remote/i386-dm/qemu-ifup @@ -1,36 +1,22 @@ #!/bin/sh diff --git a/xen-hvm-default-pae.diff b/xen-hvm-default-pae.diff index 7083f25..ae3cc6b 100644 --- a/xen-hvm-default-pae.diff +++ b/xen-hvm-default-pae.diff @@ -1,9 +1,9 @@ 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.0-testing/tools/python/xen/xend/image.py +--- xen-3.4.1-testing.orig/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 def configure(self, vmConfig): diff --git a/xen-ioapic-ack-default.diff b/xen-ioapic-ack-default.diff index 08a422b..26fa176 100644 --- a/xen-ioapic-ack-default.diff +++ b/xen-ioapic-ack-default.diff @@ -1,10 +1,10 @@ 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.0-testing/xen/arch/x86/io_apic.c +--- xen-3.4.1-testing.orig/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 return 0; /* don't check for pending */ } diff --git a/xen-ioemu-hvm-pv-support.diff b/xen-ioemu-hvm-pv-support.diff index db2bd08..1a81fa4 100644 --- a/xen-ioemu-hvm-pv-support.diff +++ b/xen-ioemu-hvm-pv-support.diff @@ -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.0-testing/tools/ioemu-remote/hw/xen_platform.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_platform.c ++++ xen-3.4.1-testing/tools/ioemu-remote/hw/xen_platform.c @@ -30,6 +30,8 @@ #include "qemu-xen.h" #include "net.h" @@ -11,7 +11,7 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_platform.c #include #include -@@ -326,11 +328,51 @@ static void xen_platform_ioport_writeb(v +@@ -331,11 +333,51 @@ static void xen_platform_ioport_writeb(v } } diff --git a/xen-max-free-mem.diff b/xen-max-free-mem.diff index a6b684f..0c2c493 100644 --- a/xen-max-free-mem.diff +++ b/xen-max-free-mem.diff @@ -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.0-testing/tools/python/xen/xend/XendNode.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendNode.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendNode.py @@ -809,11 +809,35 @@ class XendNode: 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_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.0-testing/tools/python/xen/xend/balloon.py +--- xen-3.4.1-testing.orig/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 # label actually shown in the PROC_XEN_BALLOON file. #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): """Balloon out memory from the privileged domain so that there is the 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.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -1295,6 +1295,27 @@ class XendDomainInfo: dev_str_list = dev_str_list + [dev_str] return dev_str_list @@ -122,10 +122,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py def setMemoryTarget(self, target): """Set the memory target of this domain. @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.0-testing/tools/python/xen/xend/server/SrvDomain.py +--- xen-3.4.1-testing.orig/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): diff --git a/xen-no-dummy-nfs-ip.diff b/xen-no-dummy-nfs-ip.diff index 4c37026..1762ac0 100644 --- a/xen-no-dummy-nfs-ip.diff +++ b/xen-no-dummy-nfs-ip.diff @@ -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.0-testing/tools/python/xen/xm/create.py +--- xen-3.4.1-testing.orig/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): def preprocess_ip(vals): diff --git a/xen-paths.diff b/xen-paths.diff index 40ada2c..454bc05 100644 --- a/xen-paths.diff +++ b/xen-paths.diff @@ -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.0-testing/tools/python/xen/xm/create.py +--- xen-3.4.1-testing.orig/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', use="Quiet.") @@ -11,10 +11,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xm/create.py use="Search path for configuration scripts. " "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.0-testing/docs/man/xm.pod.1 +--- xen-3.4.1-testing.orig/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 format, and possible options used in either the configfile or for I. @@ -33,10 +33,10 @@ Index: xen-3.4.0-testing/docs/man/xm.pod.1 soon as it is run. =item I -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.0-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-3.4.1-testing.orig/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 =head1 SYNOPSIS diff --git a/xen-qemu-iscsi-fix.patch b/xen-qemu-iscsi-fix.patch index f5fc198..2a0e983 100644 --- a/xen-qemu-iscsi-fix.patch +++ b/xen-qemu-iscsi-fix.patch @@ -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.0-testing/tools/ioemu-remote/xenstore.c +--- xen-3.4.1-testing.orig/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 char *buf = NULL; char *fpath = NULL, *bpath = NULL, *btype = NULL, diff --git a/xen-rpmoptflags.diff b/xen-rpmoptflags.diff index 7cf8773..ef10a4f 100644 --- a/xen-rpmoptflags.diff +++ b/xen-rpmoptflags.diff @@ -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.0-testing/tools/blktap/drivers/Makefile +--- xen-3.4.1-testing.orig/tools/blktap/drivers/Makefile ++++ xen-3.4.1-testing/tools/blktap/drivers/Makefile @@ -5,7 +5,6 @@ IBIN = blktapctrl tapdisk QCOW_UTIL = img2qcow qcow2raw qcow-create LIBAIO_DIR = ../../libaio/src @@ -10,10 +10,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/Makefile CFLAGS += -Wno-unused CFLAGS += -I../lib 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.0-testing/Config.mk +--- xen-3.4.1-testing.orig/Config.mk ++++ xen-3.4.1-testing/Config.mk @@ -14,7 +14,7 @@ SHELL ?= /bin/sh # Tools to run on system hosting the build diff --git a/xen-warnings.diff b/xen-warnings.diff index ef5c676..33abba1 100644 --- a/xen-warnings.diff +++ b/xen-warnings.diff @@ -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.0-testing/tools/misc/miniterm/miniterm.c +--- xen-3.4.1-testing.orig/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) case 0: close(1); /* stdout not needed */ @@ -35,10 +35,10 @@ Index: xen-3.4.0-testing/tools/misc/miniterm/miniterm.c 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.0-testing/tools/libxc/xc_dom_elfloader.c +--- xen-3.4.1-testing.orig/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 if ( load ) @@ -50,10 +50,10 @@ Index: xen-3.4.0-testing/tools/libxc/xc_dom_elfloader.c elf_section_start(elf, shdr2), 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.0-testing/tools/xenstore/Makefile +--- xen-3.4.1-testing.orig/tools/xenstore/Makefile ++++ xen-3.4.1-testing/tools/xenstore/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 3.0 MINOR = 0 @@ -63,10 +63,10 @@ Index: xen-3.4.0-testing/tools/xenstore/Makefile CFLAGS += -I. 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.0-testing/tools/xenstore/xenstored_core.c +--- xen-3.4.1-testing.orig/tools/xenstore/xenstored_core.c ++++ xen-3.4.1-testing/tools/xenstore/xenstored_core.c @@ -77,8 +77,8 @@ static void check_store(void); int quota_nb_entry_per_domain = 1000; @@ -91,10 +91,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstored_core.c break; case 'T': 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.0-testing/tools/xenstore/xenstored_domain.c +--- xen-3.4.1-testing.orig/tools/xenstore/xenstored_domain.c ++++ xen-3.4.1-testing/tools/xenstore/xenstored_domain.c @@ -212,7 +212,7 @@ void handle_event(void) { evtchn_port_t port; @@ -113,10 +113,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstored_domain.c return -1; 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.0-testing/tools/xenstore/xenstored_transaction.c +--- xen-3.4.1-testing.orig/tools/xenstore/xenstored_transaction.c ++++ xen-3.4.1-testing/tools/xenstore/xenstored_transaction.c @@ -82,7 +82,7 @@ struct transaction struct list_head changed_domains; }; @@ -126,10 +126,10 @@ Index: xen-3.4.0-testing/tools/xenstore/xenstored_transaction.c static unsigned int generation; /* 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.0-testing/tools/xenstore/xenstore_client.c +--- xen-3.4.1-testing.orig/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 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++) { 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.0-testing/tools/libxen/src/xen_common.c +--- xen-3.4.1-testing.orig/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 default: 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; diff --git a/xen-xm-top-needs-root.diff b/xen-xm-top-needs-root.diff index e65700e..208f6f4 100644 --- a/xen-xm-top-needs-root.diff +++ b/xen-xm-top-needs-root.diff @@ -1,10 +1,10 @@ From: Charles Coffing 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.0-testing/tools/python/xen/xm/main.py +--- xen-3.4.1-testing.orig/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): def xm_top(args): arg_check(args, "top", 0) diff --git a/xen-xmexample-vti.diff b/xen-xmexample-vti.diff index 1d460f0..d1494a3 100644 --- a/xen-xmexample-vti.diff +++ b/xen-xmexample-vti.diff @@ -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.0-testing/tools/examples/Makefile +--- xen-3.4.1-testing.orig/tools/examples/Makefile ++++ xen-3.4.1-testing/tools/examples/Makefile @@ -19,7 +19,6 @@ XEN_CONFIGS += xmexample.hvm XEN_CONFIGS += xmexample.hvm-stubdom XEN_CONFIGS += xmexample.pv-grub diff --git a/xen-xmexample.diff b/xen-xmexample.diff index 686e9fb..da2f289 100644 --- a/xen-xmexample.diff +++ b/xen-xmexample.diff @@ -1,9 +1,9 @@ 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.0-testing/tools/examples/xmexample1 +--- xen-3.4.1-testing.orig/tools/examples/xmexample1 ++++ xen-3.4.1-testing/tools/examples/xmexample1 @@ -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' -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.0-testing/tools/examples/xmexample2 +--- xen-3.4.1-testing.orig/tools/examples/xmexample2 ++++ xen-3.4.1-testing/tools/examples/xmexample2 @@ -35,11 +35,13 @@ xm_vars.var('vmid', 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' -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.0-testing/tools/examples/xmexample3 +--- xen-3.4.1-testing.orig/tools/examples/xmexample3 ++++ xen-3.4.1-testing/tools/examples/xmexample3 @@ -35,11 +35,13 @@ xm_vars.var('vmid', xm_vars.check() @@ -109,10 +109,10 @@ Index: xen-3.4.0-testing/tools/examples/xmexample3 # The domain build function. Default is '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.0-testing/tools/examples/xmexample.hvm +--- xen-3.4.1-testing.orig/tools/examples/xmexample.hvm ++++ xen-3.4.1-testing/tools/examples/xmexample.hvm @@ -81,7 +81,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] # 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' -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.0-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-3.4.1-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-3.4.1-testing/docs/man/xmdomain.cfg.pod.5 @@ -38,13 +38,13 @@ file. 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. =item I -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.0-testing/docs/man/xm.pod.1 +--- xen-3.4.1-testing.orig/docs/man/xm.pod.1 ++++ xen-3.4.1-testing/docs/man/xm.pod.1 @@ -163,8 +163,8 @@ soon as it is run. =item I diff --git a/xen.changes b/xen.changes index ab4a30b..5d12ad4 100644 --- a/xen.changes +++ b/xen.changes @@ -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 diff --git a/xen.spec b/xen.spec index d3aca90..bcaed39 100644 --- a/xen.spec +++ b/xen.spec @@ -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. # @@ -22,7 +22,7 @@ Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 3.4 %define xvermaj 3 -%define changeset 19664 +%define changeset 19711 %define xen_build_dir xen-3.4.1-testing %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 @@ -37,7 +37,7 @@ BuildRequires: glibc-32bit glibc-devel-32bit %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 3.4.1_19664_01 +Version: 3.4.1_19711_01 Release: 1 License: GPL v2 only Group: System/Kernel diff --git a/xenapi-console-protocol.patch b/xenapi-console-protocol.patch index 73e8a43..57204be 100644 --- a/xenapi-console-protocol.patch +++ b/xenapi-console-protocol.patch @@ -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.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -3571,6 +3571,14 @@ class XendDomainInfo: if not config.has_key('backend'): config['backend'] = "00000000-0000-0000-0000-000000000000" diff --git a/xend-config.diff b/xend-config.diff index bd97ece..5019ae7 100644 --- a/xend-config.diff +++ b/xend-config.diff @@ -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.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains ++++ xen-3.4.1-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains @@ -1,4 +1,4 @@ -## Path: System/xen +## Path: System/Virtualization @@ -27,10 +27,10 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains ## Type: integer ## 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.0-testing/tools/examples/xend-config.sxp +--- xen-3.4.1-testing.orig/tools/examples/xend-config.sxp ++++ xen-3.4.1-testing/tools/examples/xend-config.sxp @@ -58,11 +58,12 @@ diff --git a/xend-core-dump-loc.diff b/xend-core-dump-loc.diff index 9a64fd9..cf03fdf 100644 --- a/xend-core-dump-loc.diff +++ b/xend-core-dump-loc.diff @@ -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.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -2118,7 +2118,7 @@ class XendDomainInfo: if not corefile: diff --git a/xend-domain-lock.patch b/xend-domain-lock.patch index 397d64f..3e486f8 100644 --- a/xend-domain-lock.patch +++ b/xend-domain-lock.patch @@ -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.0-testing/tools/examples/xend-config.sxp +--- xen-3.4.1-testing.orig/tools/examples/xend-config.sxp ++++ xen-3.4.1-testing/tools/examples/xend-config.sxp @@ -260,4 +260,64 @@ # 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. +# +#(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.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -30,11 +30,13 @@ import threading import re import copy @@ -181,10 +181,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py def __str__(self): return '' % \ (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.0-testing/tools/python/xen/xend/XendOptions.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendOptions.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendOptions.py @@ -141,6 +141,17 @@ class XendOptions: """Default rotation count of qemu-dm log file.""" qemu_dm_logrotate_count = 10 @@ -228,10 +228,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendOptions.py 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.0-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-3.4.1-testing.orig/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 dominfo.shutdown('suspend') dominfo.waitForSuspend() @@ -248,11 +248,11 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendCheckpoint.py return dominfo except: 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.0-testing/tools/hotplug/Linux/Makefile -@@ -20,6 +20,7 @@ XEN_SCRIPTS += vtpm vtpm-delete +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-3.4.1-testing/tools/hotplug/Linux/Makefile +@@ -21,6 +21,7 @@ XEN_SCRIPTS += vtpm vtpm-delete XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate 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-hotplug-common.sh xen-network-common.sh vif-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 -+++ xen-3.4.0-testing/tools/hotplug/Linux/domain-lock ++++ xen-3.4.1-testing/tools/hotplug/Linux/domain-lock @@ -0,0 +1,83 @@ +#!/bin/bash + @@ -348,10 +348,10 @@ Index: xen-3.4.0-testing/tools/hotplug/Linux/domain-lock + get_status $vm_path + ;; +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 -+++ xen-3.4.0-testing/tools/hotplug/Linux/vm-monitor ++++ xen-3.4.1-testing/tools/hotplug/Linux/vm-monitor @@ -0,0 +1,41 @@ +#!/bin/bash + diff --git a/xm-save-check-file.patch b/xm-save-check-file.patch index 547c9c3..3d8fa83 100644 --- a/xm-save-check-file.patch +++ b/xm-save-check-file.patch @@ -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.0-testing/tools/python/xen/xend/XendAPI.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendAPI.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendAPI.py @@ -1817,10 +1817,10 @@ class XendAPI(object): bool(live), port, node, ssl) 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() 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.0-testing/tools/python/xen/xend/XendDomain.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendDomain.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendDomain.py @@ -1380,7 +1380,7 @@ class XendDomain: finally: sock.close() @@ -38,10 +38,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomain.py if dominfo.getDomid() == DOM0_ID: raise XendError("Cannot save privileged domain %s" % str(domid)) 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.0-testing/tools/python/xen/xm/main.py +--- xen-3.4.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-3.4.1-testing/tools/python/xen/xm/main.py @@ -118,7 +118,7 @@ SUBCOMMAND_HELP = { 'reset' : ('', 'Reset a domain.'), 'restore' : (' [-p]', diff --git a/xm-test-cleanup.diff b/xm-test-cleanup.diff index 1198721..fae83b0 100644 --- a/xm-test-cleanup.diff +++ b/xm-test-cleanup.diff @@ -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.0-testing/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.1-testing/tools/xm-test/tests/save/01_save_basic_pos.py @@ -35,3 +35,9 @@ if s != 0: # Make sure it's gone if isDomainRunning(domain.getName()):