Hello community, here is the log from the commit of package xen checked in at Tue Sep 26 02:51:54 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-09-13 00:15:27.000000000 +0200 +++ xen/xen.changes 2006-09-25 23:53:49.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 25 10:11:31 MDT 2006 - ccoffing@novell.com + +- Update to xen-unstable changeset 11616. + +------------------------------------------------------------------- Old: ---- check-python.diff xen-read-port-0x61.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:26.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 3.0.3_11440) +# spec file for package xen (Version 3.0.3_11616) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,12 +14,12 @@ BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 dev86 glibc-devel-32bit gtk2-devel latex2html libjpeg-devel libreiserfs-devel openssl openssl-devel python-devel te_ams te_latex tetex transfig %define xvers 3.0 %define xvermaj 3 -%define changeset 11440 +%define changeset 11616 %define with_pygrub 1 %define with_vfb 1 %define xen_build_dir xen-unstable -Version: 3.0.3_11440 -Release: 2 +Version: 3.0.3_11616 +Release: 1 License: GPL Group: System/Kernel Autoreqprov: on @@ -64,7 +64,6 @@ Patch22: xen-hvm-rep-movs.diff Patch23: xen-lowmem-emergency-pool.diff Patch24: xen-console.diff -Patch25: xen-read-port-0x61.diff Patch26: xen-shutdown-wait.diff Patch27: block-losetup-retry.diff Patch28: block-sync.diff @@ -77,7 +76,6 @@ Patch102: vfb-backend.diff Patch103: vncfb-makefile.diff Patch104: vfb-viewer.diff -Patch105: check-python.diff ## Patches for bug 184175: Patch106: xen-no-incdec-writable-pte-prediction.patch Patch107: xen-no-pgt-score.patch @@ -415,7 +413,6 @@ %patch102 -p1 %patch103 -p1 %patch104 -p1 -%patch105 -p1 %endif ## need to forward-port #%patch106 -p1 @@ -449,7 +446,6 @@ %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 @@ -571,6 +567,8 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.* # broken on 64 bit; not worth packaging: rm $RPM_BUILD_ROOT/usr/lib*/xen/bin/qemu-dm.debug +# Python 2.5 feature; unneeded in an RPM +rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info %if ! %{?with_pygrub}0 rm -rf $RPM_BUILD_ROOT/%pysite/grub rm $RPM_BUILD_ROOT/usr/bin/pygrub @@ -757,6 +755,8 @@ %{insserv_cleanup} %changelog -n xen +* Mon Sep 25 2006 - ccoffing@novell.com +- Update to xen-unstable changeset 11616. * Tue Sep 12 2006 - ccoffing@novell.com - Update check_python script to identify Python 2.5 RCs as valid. * Mon Sep 11 2006 - ccoffing@novell.com ++++++ vfb-frontend.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -68,7 +68,7 @@ =================================================================== --- xen-unstable.orig/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +++ xen-unstable/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c -@@ -1867,8 +1867,12 @@ void __init setup_arch(char **cmdline_p) +@@ -1850,8 +1850,12 @@ void __init setup_arch(char **cmdline_p) #endif #endif } else { ++++++ vfb-viewer.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-unstable/tools/python/xen/xend/XendDomainInfo.py -@@ -1500,7 +1500,7 @@ class XendDomainInfo: +@@ -1515,7 +1515,7 @@ class XendDomainInfo: self.createDevice(n, c) if self.image: @@ -126,7 +126,7 @@ self.dmargs += self.configVNC(imageConfig) -@@ -364,25 +398,18 @@ class HVMImageHandler(ImageHandler): +@@ -360,25 +394,18 @@ class HVMImageHandler(ImageHandler): ret += ['-vncunused'] return ret @@ -160,7 +160,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xm/create.py +++ xen-unstable/tools/python/xen/xm/create.py -@@ -481,6 +481,11 @@ def configure_image(vals): +@@ -479,6 +479,11 @@ def configure_image(vals): if vals.extra: config_image.append(['args', vals.extra]) @@ -172,7 +172,7 @@ if vals.builder == 'hvm': configure_hvm(config_image, vals) -@@ -636,8 +641,8 @@ def configure_hvm(config_image, vals): +@@ -633,8 +638,8 @@ def configure_hvm(config_image, vals): """ args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', ++++++ xen-blktap.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -12,7 +12,7 @@ + (typ, fn) = values + else: + (typ, subtyp, fn) = values - if typ == "phy" and not fn.startswith("/dev/"): + if typ == "phy" and not fn.startswith("/"): fn = "/dev/%s" %(fn,) return fn Index: xen-unstable/tools/blktap/drivers/blktapctrl.c ++++++ xen-changeset.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -10,7 +10,7 @@ export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -@@ -101,7 +102,7 @@ include/xen/compile.h: include/xen/compi +@@ -100,7 +101,7 @@ include/xen/compile.h: include/xen/compi -e 's/@@version@@/$(XEN_VERSION)/g' \ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ ++++++ xen-destdir.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -111,15 +111,15 @@ =================================================================== --- xen-unstable.orig/tools/pygrub/Makefile +++ xen-unstable/tools/pygrub/Makefile -@@ -14,7 +14,7 @@ install: all - CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" +@@ -15,7 +15,7 @@ install: all + $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen else install: all - CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" + CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr" + $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen endif - .PHONY: clean Index: xen-unstable/tools/python/Makefile =================================================================== --- xen-unstable.orig/tools/python/Makefile ++++++ xen-domUloader.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -2,29 +2,21 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xm/create.py +++ xen-unstable/tools/python/xen/xm/create.py -@@ -655,13 +655,19 @@ def run_bootloader(vals, config_image): - (uname, dev, mode, backend) = vals.disk[0] - file = blkif.blkdev_uname_to_file(uname) - -+ bootargs=[] -+ if vals.bootargs: -+ bootargs.extend(vals.bootargs.split()) - if vals.bootentry: +@@ -656,9 +656,12 @@ def run_bootloader(vals, config_image): warn("The bootentry option is deprecated. Use bootargs and pass " "--entry= directly.") -- vals.bootargs = "--entry=%s" %(vals.bootentry,) -+ bootargs.append("--entry=%s" % vals.bootentry) + vals.bootargs = "--entry=%s" %(vals.bootentry,) + if vals.root: -+ bootargs.append("--root=%s" % vals.root.split()[0]) -+ bootargs.append("--disks=\"%s\"" % str(vals.disk)) ++ vals.bootargs += " --root=%s" % vals.root.split()[0]) ++ vals.bootargs += " --disks=\"%s\"" % str(vals.disk)) return bootloader(vals.bootloader, file, not vals.console_autoconnect, - vals.bootargs, config_image) -+ vals.dryrun, bootargs, config_image) ++ vals.dryrun, vals.bootargs, config_image) def make_config(vals): """Create the domain configuration. -@@ -677,7 +683,7 @@ def make_config(vals): +@@ -674,7 +677,7 @@ def make_config(vals): map(add_conf, ['name', 'memory', 'maxmem', 'shadow_memory', 'restart', 'on_poweroff', 'on_reboot', 'on_crash', @@ -33,7 +25,7 @@ if vals.uuid is not None: config.append(['uuid', vals.uuid]) -@@ -695,13 +701,15 @@ def make_config(vals): +@@ -692,13 +695,15 @@ def make_config(vals): config.append(['backend', ['tpmif']]) if vals.localtime: config.append(['localtime', vals.localtime]) @@ -54,29 +46,25 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xend/XendBootloader.py +++ xen-unstable/tools/python/xen/xend/XendBootloader.py -@@ -19,7 +19,7 @@ import sxp +@@ -20,7 +20,7 @@ import shlex from XendLogging import log from XendError import VmError -def bootloader(blexec, disk, quiet = 0, blargs = None, imgcfg = None): -+def bootloader(blexec, disk, quiet = 0, dryrun = 0, blargs = [], imgcfg = None): ++def bootloader(blexec, disk, quiet = 0, dryrun = 0, blargs = None, imgcfg = None): """Run the boot loader executable on the given disk and return a config image. @param blexec Binary to use as the boot loader -@@ -47,9 +47,10 @@ def bootloader(blexec, disk, quiet = 0, +@@ -48,6 +48,8 @@ def bootloader(blexec, disk, quiet = 0, args = [ blexec ] if quiet: args.append("-q") + if dryrun: + args.append("--dryrun") args.append("--output=%s" %(fifo,)) -- if blargs is not None: -- args.extend(blargs.split()) -+ args.extend(blargs) - args.append(disk) - - try: -@@ -67,6 +68,7 @@ def bootloader(blexec, disk, quiet = 0, + if blargs is not None: + args.extend(shlex.split(blargs)) +@@ -68,6 +70,7 @@ def bootloader(blexec, disk, quiet = 0, continue break ret = "" @@ -88,7 +76,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-unstable/tools/python/xen/xend/XendDomainInfo.py -@@ -136,6 +136,7 @@ ROUNDTRIPPING_CONFIG_ENTRIES = [ +@@ -137,6 +137,7 @@ ROUNDTRIPPING_CONFIG_ENTRIES = [ ('maxmem', int), ('bootloader', str), ('bootloader_args', str), @@ -96,7 +84,7 @@ ('features', str), ('localtime', int), ] -@@ -579,6 +580,7 @@ class XendDomainInfo: +@@ -580,6 +581,7 @@ class XendDomainInfo: defaultInfo('maxmem', lambda: 0) defaultInfo('bootloader', lambda: None) defaultInfo('bootloader_args', lambda: None) @@ -104,7 +92,7 @@ defaultInfo('backend', lambda: []) defaultInfo('device', lambda: []) defaultInfo('image', lambda: None) -@@ -1724,6 +1726,7 @@ class XendDomainInfo: +@@ -1744,6 +1746,7 @@ class XendDomainInfo: return blcfg = None # FIXME: this assumes that we want to use the first disk device @@ -112,7 +100,7 @@ for (n,c) in self.info['device']: if not n or not c or n != "vbd": continue -@@ -1731,10 +1734,16 @@ class XendDomainInfo: +@@ -1751,10 +1754,16 @@ class XendDomainInfo: if disk is None: continue fn = blkdev_uname_to_file(disk) ++++++ xen-hvm-rep-movs.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -5,7 +5,7 @@ =================================================================== --- xen-unstable.orig/xen/arch/x86/hvm/platform.c +++ xen-unstable/xen/arch/x86/hvm/platform.c -@@ -898,7 +898,7 @@ void handle_mmio(unsigned long va, unsig +@@ -910,7 +910,7 @@ void handle_mmio(unsigned long va, unsig unsigned long count = GET_REPEAT_COUNT(); unsigned long size = mmio_inst.op_size; int sign = regs->eflags & EF_DF ? -1 : 1; @@ -14,7 +14,7 @@ int dir; /* determine non-MMIO address */ -@@ -919,6 +919,13 @@ void handle_mmio(unsigned long va, unsig +@@ -931,6 +931,13 @@ void handle_mmio(unsigned long va, unsig addr = regs->edi; } } @@ -28,7 +28,7 @@ mmio_opp->flags = mmio_inst.flags; mmio_opp->instr = mmio_inst.instr; -@@ -944,13 +951,13 @@ void handle_mmio(unsigned long va, unsig +@@ -956,13 +963,13 @@ void handle_mmio(unsigned long va, unsig hvm_copy(&value, addr, size, HVM_COPY_IN); send_mmio_req(IOREQ_TYPE_COPY, gpa, 1, size, value, dir, 0); } else { ++++++ xen-io-register-context.diff ++++++ ++++ 1239 lines (skipped) ++++ between arch/i386/xen/xen-io-register-context.diff ++++ and xen/xen-io-register-context.diff ++++++ xen-ioapic-ack-default.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -5,7 +5,7 @@ =================================================================== --- xen-unstable.orig/xen/arch/x86/io_apic.c +++ xen-unstable/xen/arch/x86/io_apic.c -@@ -1341,7 +1341,7 @@ static unsigned int startup_level_ioapic +@@ -1342,7 +1342,7 @@ static unsigned int startup_level_ioapic return 0; /* don't check for pending */ } @@ -14,7 +14,7 @@ static void setup_ioapic_ack(char *s) { if ( !strcmp(s, "old") ) -@@ -1773,6 +1773,8 @@ void __init setup_IO_APIC(void) +@@ -1779,6 +1779,8 @@ void __init setup_IO_APIC(void) else io_apic_irqs = ~PIC_IRQS; ++++++ xen-lost-mouse.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -9,7 +9,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xend/image.py +++ xen-unstable/tools/python/xen/xend/image.py -@@ -416,7 +416,7 @@ class HVMImageHandler(ImageHandler): +@@ -412,7 +412,7 @@ class HVMImageHandler(ImageHandler): import signal if not self.pid: return ++++++ xen-max-free-mem.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -78,7 +78,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-unstable/tools/python/xen/xend/XendDomainInfo.py -@@ -994,6 +994,27 @@ class XendDomainInfo: +@@ -1005,6 +1005,27 @@ class XendDomainInfo: ## public: ++++++ xen-messages.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -22,7 +22,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xend/XendDomain.py +++ xen-unstable/tools/python/xen/xend/XendDomain.py -@@ -451,6 +451,8 @@ class XendDomain: +@@ -467,6 +467,8 @@ class XendDomain: if dominfo.getDomid() == PRIV_DOMAIN: raise XendError("Cannot save privileged domain %s" % domid) ++++++ xen-no-dummy-nfs-ip.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xm/create.py +++ xen-unstable/tools/python/xen/xm/create.py -@@ -814,9 +814,8 @@ def preprocess_access_control(vals): +@@ -808,9 +808,8 @@ def preprocess_access_control(vals): def preprocess_ip(vals): if vals.ip or vals.dhcp != 'off': ++++++ xen-paths.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -8,8 +8,8 @@ gopts.opt('path', val='PATH', - fn=set_value, default='.:/etc/xen', + fn=set_value, default='.:/etc/xen/vm', - use="""Search path for configuration scripts. - The value of PATH is a colon-separated directory list.""") + use="Search path for configuration scripts. " + "The value of PATH is a colon-separated directory list.") Index: xen-unstable/docs/man/xm.pod.1 =================================================================== ++++++ xen-tightvnc-args.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:29.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xm/create.py +++ xen-unstable/tools/python/xen/xm/create.py -@@ -910,8 +910,7 @@ def spawn_vnc(display): +@@ -902,8 +902,7 @@ def spawn_vnc(display): returns the port that the vncviewer is listening on and sets the global vncpid. On failure, returns 0. Note that vncviewer is daemonized. """ ++++++ xen-unstable-src.tar.bz2 ++++++ ++++ 34938 lines of diff (skipped) ++++++ xen-warnings.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:39.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:39.000000000 +0200 @@ -40,16 +40,19 @@ } wait(NULL); /* wait for child to die or it will become a zombie */ break; -Index: xen-unstable/tools/ioemu/vnc.c +Index: xen-unstable/xen/common/gdbstub.c =================================================================== ---- xen-unstable.orig/tools/ioemu/vnc.c -+++ xen-unstable/tools/ioemu/vnc.c -@@ -1269,7 +1269,7 @@ int vnc_start_viewer(int port) - exit(1); - - case 0: /* child */ -- execlp("vncviewer", "vncviewer", s, 0); -+ execlp("vncviewer", "vncviewer", s, NULL); - fprintf(stderr, "vncviewer execlp failed\n"); - exit(1); +--- xen-unstable.orig/xen/common/gdbstub.c ++++ xen-unstable/xen/common/gdbstub.c +@@ -357,10 +357,10 @@ gdb_cmd_write_mem(unsigned long addr, un + gdb_send_packet(ctx); + } ++static void gdbstub_console_puts(const char *str); + static void + gdbstub_attach(struct gdb_context *ctx) + { +- static void gdbstub_console_puts(const char *str); + if ( ctx->currently_attached ) + return; + ctx->currently_attached = 1; ++++++ xen-xm-top-needs-root.diff ++++++ --- /var/tmp/diff_new_pack.EU3h7a/_old 2006-09-26 02:50:39.000000000 +0200 +++ /var/tmp/diff_new_pack.EU3h7a/_new 2006-09-26 02:50:39.000000000 +0200 @@ -5,7 +5,7 @@ =================================================================== --- xen-unstable.orig/tools/python/xen/xm/main.py +++ xen-unstable/tools/python/xen/xm/main.py -@@ -865,6 +865,10 @@ def xm_uptime(args): +@@ -1018,6 +1018,10 @@ def xm_sysrq(args): def xm_top(args): arg_check(args, "top", 0) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org