diff --git a/pv-driver-build.patch b/pv-driver-build.patch deleted file mode 100644 index 3bebe7d..0000000 --- a/pv-driver-build.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: xen-4.2.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild -=================================================================== ---- xen-4.2.0-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild -+++ xen-4.2.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild -@@ -3,3 +3,4 @@ include $(M)/overrides.mk - obj-m += xen-vbd.o - - xen-vbd-objs := blkfront.o vbd.o -+xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c))) diff --git a/xen-max-free-mem.diff b/xen-max-free-mem.diff index 2c17d03..7d5a0e5 100644 --- a/xen-max-free-mem.diff +++ b/xen-max-free-mem.diff @@ -71,7 +71,7 @@ Index: xen-4.2.0-testing/tools/python/xen/xend/balloon.py +def get_dom0_min_target(): + """Returns the minimum amount of memory (in KiB) that dom0 will accept.""" + -+ kb = _get_proc_balloon(labels['min-target']) ++ kb = _get_proc_balloon('min-target') + if kb == None: + raise VmError('Failed to query minimum target memory allocation of dom0.') + return kb @@ -80,7 +80,7 @@ Index: xen-4.2.0-testing/tools/python/xen/xend/balloon.py + """Returns the maximum amount of memory (in KiB) that is potentially + visible to dom0.""" + -+ kb = _get_proc_balloon(labels['max-target']) ++ kb = _get_proc_balloon('max-target') + if kb == None: + raise VmError('Failed to query maximum target memory allocation of dom0.') + return kb @@ -133,3 +133,16 @@ Index: xen-4.2.0-testing/tools/python/xen/xend/server/SrvDomain.py [['target', 'int']], req) +Index: xen-4.2.0-testing/tools/python/xen/xend/osdep.py +=================================================================== +--- xen-4.2.0-testing.orig/tools/python/xen/xend/osdep.py ++++ xen-4.2.0-testing/tools/python/xen/xend/osdep.py +@@ -42,6 +42,8 @@ def _linux_balloon_stat_proc(label): + + xend2linux_labels = { 'current' : 'Current allocation', + 'target' : 'Requested target', ++ 'min-target' : 'Minimum target', ++ 'max-target' : 'Maximum target', + 'low-balloon' : 'Low-mem balloon', + 'high-balloon' : 'High-mem balloon', + 'limit' : 'Xen hard limit' } diff --git a/xen.changes b/xen.changes index 8a38c64..e655021 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 21 20:57:56 CET 2012 - ohering@suse.de + +- remove obsolete pv-driver-build.patch to fix build + ------------------------------------------------------------------- Sat Nov 17 10:51:05 UTC 2012 - aj@suse.de @@ -10,6 +15,19 @@ Tue Nov 13 16:35:55 MST 2012 - jfehlig@suse.com - bnc#777628 - guest "disappears" after live migration Updated block-dmmd script +------------------------------------------------------------------- +Fri Nov 9 10:29:51 MST 2012 - carnold@novell.com + +- Fix exception in balloon.py and osdep.py + xen-max-free-mem.diff + +------------------------------------------------------------------- +Tue Nov 6 17:41:34 MDT 2012 - carnold@novell.com + +- fate#311966: Fix XEN VNC implementation to correctly map keyboard + layouts + VNC-Support-for-ExtendedKeyEvent-client-message.patch + ------------------------------------------------------------------- Tue Oct 30 15:28:27 CET 2012 - ohering@suse.de diff --git a/xen.spec b/xen.spec index 5f8a77e..c610f7e 100644 --- a/xen.spec +++ b/xen.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 4.2 @@ -343,7 +342,6 @@ Patch504: pvdrv-import-shared-info.patch Patch505: x86-extra-trap-info.patch Patch506: pvdrv_emulation_control.patch Patch507: blktap-pv-cdrom.patch -Patch510: pv-driver-build.patch Patch511: supported_module.diff Patch512: magic_ioport_compat.patch Patch513: xen.sles11sp1.fate311487.xen_platform_pci.dmistring.patch @@ -865,9 +863,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools %patch505 -p1 %patch506 -p1 %patch507 -p1 -%if %suse_version < 1220 -%patch510 -p1 -%endif %patch511 -p1 %patch512 -p1 %patch513 -p1