From 5a31fb984285c92fa1d5441ccff2afac3daf062ff9fd51c8afad858cc99197b9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 24 May 2007 22:45:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=14 --- xen-messages.diff | 57 ----------------------------- xen.changes | 5 +++ xen.spec | 92 +++++++++++++++++++++++------------------------ 3 files changed, 51 insertions(+), 103 deletions(-) delete mode 100644 xen-messages.diff diff --git a/xen-messages.diff b/xen-messages.diff deleted file mode 100644 index e171a6a..0000000 --- a/xen-messages.diff +++ /dev/null @@ -1,57 +0,0 @@ -Index: xen-3.1-testing/tools/misc/xend -=================================================================== ---- xen-3.1-testing.orig/tools/misc/xend -+++ xen-3.1-testing/tools/misc/xend -@@ -50,22 +50,6 @@ def hline(): - def msg(message): - print >>sys.stderr, "*" * 3, message - --def check_logging(): -- """Check python logging is installed and raise an error if not. -- Logging is standard from Python 2.3 on. -- """ -- try: -- import logging -- except ImportError: -- hline() -- msg("Python logging is not installed.") -- msg("Use 'make install-logging' at the xen root to install.") -- msg("") -- msg("Alternatively download and install from") -- msg("http://www.red-dove.com/python_logging.html") -- hline() -- raise CheckError("logging is not installed") -- - def check_user(): - """Check that the effective user id is 0 (root). - """ -@@ -92,7 +76,6 @@ def start_blktapctrl(): - - def main(): - try: -- check_logging() - check_user() - except CheckError: - sys.exit(1) -Index: xen-3.1-testing/tools/python/xen/xend/XendDomain.py -=================================================================== ---- xen-3.1-testing.orig/tools/python/xen/xend/XendDomain.py -+++ xen-3.1-testing/tools/python/xen/xend/XendDomain.py -@@ -827,6 +827,8 @@ class XendDomain: - - if dominfo.getDomid() == DOM0_ID: - raise XendError("Cannot save privileged domain %s" % domname) -+ if dominfo._readVm('image/ostype') == "hvm": -+ raise XendError("Cannot save fully virtualized domains") - - if dominfo._stateGet() != DOM_STATE_RUNNING: - raise VMBadState("Domain is not running", -@@ -1245,6 +1247,8 @@ class XendDomain: - - if dominfo.getDomid() == DOM0_ID: - raise XendError("Cannot save privileged domain %i" % domid) -+ if dominfo._readVm('image/ostype') == "hvm": -+ raise XendError("Cannot save fully virtualized domains") - - oflags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC - if hasattr(os, "O_LARGEFILE"): diff --git a/xen.changes b/xen.changes index afc6575..4b2b1bc 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 23 16:36:54 MDT 2007 - ccoffing@novell.com + +- Drop xen-messages.diff; Xen now supports HVM save/restore. + ------------------------------------------------------------------- Tue May 22 09:52:50 MDT 2007 - ccoffing@novell.com diff --git a/xen.spec b/xen.spec index e157686..15ddaa7 100644 --- a/xen.spec +++ b/xen.spec @@ -35,7 +35,7 @@ BuildRequires: glibc-32bit glibc-devel-32bit BuildRequires: kernel-source kernel-syms xorg-x11 %endif Version: 3.1.0_15040 -Release: 7 +Release: 9 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -72,41 +72,40 @@ Patch107: xen-paths.diff Patch108: xen-xmexample.diff Patch109: xen-xmexample-nbd.diff Patch110: xen-bootloader-dryrun.diff -Patch112: xen-domUloader.diff -Patch113: xen-linguas.diff -Patch114: xen-messages.diff -Patch115: xen-network-bridge.diff -Patch116: xen-no-dummy-nfs-ip.diff -Patch117: serial-split.patch -Patch118: xen-xm-top-needs-root.diff -Patch119: xen-tightvnc-args.diff -Patch120: xen-max-free-mem.diff -Patch121: xen-bonding.diff -Patch122: xen-ioapic-ack-default.diff -Patch123: xen-lowmem-emergency-pool.diff -Patch124: block-losetup-retry.diff -Patch125: block-flags.diff -Patch126: xen-hvm-default-bridge.diff -Patch127: xen-hvm-netfront.diff -Patch128: xen-hvm-default-pae.diff -Patch129: xm-test-cleanup.diff -Patch130: cross-build-fix.diff -Patch131: bridge-hostonly.diff -Patch132: xen-generate-foreign-headers.diff -Patch133: tools-xc_kexec.diff -Patch134: tools-kboot.diff -Patch135: libxen_permissive.patch -Patch136: xend_multiple_create.patch -Patch137: xen-ioemu-hvm-pv-support.diff -Patch138: xenapi-console-protocol.patch -Patch139: xen-disable-qemu-monitor.diff -Patch140: supported_module.diff -Patch141: disable_emulated_device.diff -Patch142: pv-driver-build.patch -Patch143: qemu-security-etch1.diff -Patch144: netfront_mac.patch -Patch145: vnc-i18n-keys.diff -Patch146: rpmlint.diff +Patch111: xen-domUloader.diff +Patch112: xen-linguas.diff +Patch113: xen-network-bridge.diff +Patch114: xen-no-dummy-nfs-ip.diff +Patch115: serial-split.patch +Patch116: xen-xm-top-needs-root.diff +Patch117: xen-tightvnc-args.diff +Patch118: xen-max-free-mem.diff +Patch119: xen-bonding.diff +Patch120: xen-ioapic-ack-default.diff +Patch121: xen-lowmem-emergency-pool.diff +Patch122: block-losetup-retry.diff +Patch123: block-flags.diff +Patch124: xen-hvm-default-bridge.diff +Patch125: xen-hvm-netfront.diff +Patch126: xen-hvm-default-pae.diff +Patch127: xm-test-cleanup.diff +Patch128: cross-build-fix.diff +Patch129: bridge-hostonly.diff +Patch130: xen-generate-foreign-headers.diff +Patch131: tools-xc_kexec.diff +Patch132: tools-kboot.diff +Patch133: libxen_permissive.patch +Patch134: xend_multiple_create.patch +Patch135: xen-ioemu-hvm-pv-support.diff +Patch136: xenapi-console-protocol.patch +Patch137: xen-disable-qemu-monitor.diff +Patch138: supported_module.diff +Patch139: disable_emulated_device.diff +Patch140: pv-driver-build.patch +Patch141: qemu-security-etch1.diff +Patch142: netfront_mac.patch +Patch143: vnc-i18n-keys.diff +Patch144: rpmlint.diff # Patches from Jan Patch170: inval-sh-ldt.patch Patch171: 32on64-cpuid.patch @@ -530,8 +529,9 @@ cd .. %patch108 -p1 %patch109 -p1 %patch110 -p1 -%patch112 -p1 -#%patch113 -p1 # po files are misnamed upstream +%patch111 -p1 +#%patch112 -p1 # po files are misnamed upstream +%patch113 -p1 %patch114 -p1 %patch115 -p1 %patch116 -p1 @@ -552,19 +552,17 @@ cd .. %patch131 -p1 %patch132 -p1 %patch133 -p1 -%patch134 -p1 -%patch135 -p1 -#%patch136 -p1 # check if bug still exists in 3.1.0 -#%patch137 -p1 # re-port +#%patch134 -p1 # check if bug still exists in 3.1.0 +#%patch135 -p1 # re-port +%patch136 -p1 +%patch137 -p1 %patch138 -p1 -%patch139 -p1 +#%patch139 -p1 # Currently not disabling FV devices when loading PV drivers %patch140 -p1 -#%patch141 -p1 # Currently not disabling FV devices when loading PV drivers +%patch141 -p1 %patch142 -p1 %patch143 -p1 %patch144 -p1 -%patch145 -p1 -%patch146 -p1 %patch170 -p1 %patch171 -p1 %patch172 -p1 @@ -922,6 +920,8 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info /sbin/ldconfig %changelog +* Wed May 23 2007 - ccoffing@novell.com +- Drop xen-messages.diff; Xen now supports HVM save/restore. * Tue May 22 2007 - ccoffing@novell.com - Update Ron Terry's network-multi script. - Drop xen-doc-ps. (#267948)