Hello community, here is the log from the commit of package xen checked in at Fri Sep 29 01:05:10 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-09-27 00:02:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2006-09-28 19:19:36.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 28 11:18:17 MDT 2006 - ccoffing@novell.com + +- Only "eval" disks once in domUloader, to match current Xen. + +------------------------------------------------------------------- +Wed Sep 27 10:47:16 MDT 2006 - ccoffing@novell.com + +- Switch to xen-3.0.3-testing tree; changeset 11633. +- Update (but disable) paravirtualized framebuffer patches. + +------------------------------------------------------------------- Old: ---- vfb-backend.diff vfb-frontend.diff vfb-viewer.diff vncfb-makefile.diff vncfb.diff xen-shutdown-wait.diff xen-unstable-src.tar.bz2 New: ---- xen-3.0.3-testing-src.tar.bz2 xen-pvfb-2.patch xen-pvfb-3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.hUEHod/_old 2006-09-29 01:04:15.000000000 +0200 +++ /var/tmp/diff_new_pack.hUEHod/_new 2006-09-29 01:04:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 3.0.3_11623) +# spec file for package xen (Version 3.0.3_11633) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,18 +14,18 @@ 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 11623 +%define changeset 11633 %define with_pygrub 1 -%define with_vfb 1 -%define xen_build_dir xen-unstable -Version: 3.0.3_11623 +%define with_pvfb 0 +%define xen_build_dir xen-3.0.3-testing +Version: 3.0.3_11633 Release: 1 License: GPL Group: System/Kernel Autoreqprov: on PreReq: %insserv_prereq %fillup_prereq Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) -Source: xen-unstable-src.tar.bz2 +Source: xen-3.0.3-testing-src.tar.bz2 Source2: README.SuSE Source3: boot.xen Source4: boot.local.xenU @@ -64,18 +64,14 @@ Patch22: xen-hvm-rep-movs.diff Patch23: xen-lowmem-emergency-pool.diff Patch24: xen-console.diff -Patch26: xen-shutdown-wait.diff Patch27: block-losetup-retry.diff Patch28: block-sync.diff Patch29: xen-blktap.diff Patch30: xen-io-register-context.diff Patch31: xen-removable.diff ## Upstream (or upstream soon): -Patch100: vncfb.diff -Patch101: vfb-frontend.diff -Patch102: vfb-backend.diff -Patch103: vncfb-makefile.diff -Patch104: vfb-viewer.diff +Patch100: xen-pvfb-2.patch +Patch101: xen-pvfb-3.patch ## Patches for bug 184175: Patch106: xen-no-incdec-writable-pte-prediction.patch Patch107: xen-no-pgt-score.patch @@ -406,12 +402,9 @@ %prep %setup -q -n %xen_build_dir # Apply upstream patches first... -%if %{?with_vfb}0 +%if %{?with_pvfb}0 %patch100 -p1 %patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 %endif ## need to forward-port #%patch106 -p1 @@ -445,7 +438,6 @@ %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch26 -p1 %patch27 -p1 %patch28 -p1 %patch29 -p1 @@ -513,9 +505,9 @@ %ifarch x86_64 mkdir -p $RPM_BUILD_ROOT/usr/lib/xen/bin/ ln -s %{_libdir}/xen/bin/qemu-dm $RPM_BUILD_ROOT/usr/lib/xen/bin/qemu-dm -%if %{?with_vfb}0 -ln -s %{_libdir}/xen/bin/sdlfb $RPM_BUILD_ROOT/usr/lib/xen/bin/sdlfb -ln -s %{_libdir}/xen/bin/vncfb $RPM_BUILD_ROOT/usr/lib/xen/bin/vncfb +%if %{?with_pvfb}0 +ln -s %{_libdir}/xen/bin/xen-sdlfb $RPM_BUILD_ROOT/usr/lib/xen/bin/xen-sdlfb +ln -s %{_libdir}/xen/bin/xen-vncfb $RPM_BUILD_ROOT/usr/lib/xen/bin/xen-vncfb %endif %endif # docs @@ -633,9 +625,9 @@ %dir /usr/lib/xen/boot %{_libdir}/libblktap.so* %{_libdir}/xen/bin/readnotes -%if %{?with_vfb}0 -%{_libdir}/xen/bin/sdlfb -%{_libdir}/xen/bin/vncfb +%if %{?with_pvfb}0 +%{_libdir}/xen/bin/xen-sdlfb +%{_libdir}/xen/bin/xen-vncfb %endif #%{_libdir}/xen/bin/xc_kexec %{_libdir}/xen/bin/xc_restore @@ -691,9 +683,9 @@ %{_libdir}/xen/bin/qemu-dm %ifarch x86_64 /usr/lib/xen/bin/qemu-dm -%if %{?with_vfb}0 -/usr/lib/xen/bin/sdlfb -/usr/lib/xen/bin/vncfb +%if %{?with_pvfb}0 +/usr/lib/xen/bin/xen-sdlfb +/usr/lib/xen/bin/xen-vncfb %endif %endif /usr/lib/xen/boot/hvmloader @@ -749,6 +741,11 @@ %{insserv_cleanup} %changelog -n xen +* Thu Sep 28 2006 - ccoffing@novell.com +- Only "eval" disks once in domUloader, to match current Xen. +* Wed Sep 27 2006 - ccoffing@novell.com +- Switch to xen-3.0.3-testing tree; changeset 11633. +- Update (but disable) paravirtualized framebuffer patches. * Tue Sep 26 2006 - ccoffing@novell.com - Update to xen-unstable changeset 11623. - Fix domUloader typo introduced in last update. ++++++ domUloader.py ++++++ ++++ 892 lines (skipped) ++++ between domUloader.py ++++ and /mounts/work_src_done/STABLE/xen/domUloader.py ++++++ xen-pvfb-2.patch ++++++ ++++ 1122 lines (skipped) ++++++ xen-pvfb-3.patch ++++++ Index: xen-unstable/tools/python/xen/xend/image.py =================================================================== --- xen-unstable.orig/tools/python/xen/xend/image.py +++ xen-unstable/tools/python/xen/xend/image.py @@ -20,8 +20,10 @@ import os, string import re import math +import signal import xen.lowlevel.xc +import xen.util.auxbin from xen.xend import sxp from xen.xend.XendError import VmError from xen.xend.XendLogging import log @@ -205,6 +207,68 @@ class LinuxImageHandler(ImageHandler): ramdisk = self.ramdisk, features = self.vm.getFeatures()) + def configure(self, imageConfig, deviceConfig): + ImageHandler.configure(self, imageConfig, deviceConfig) + + self.pid = 0 + log.info("configuring linux guest") + + # set up the graphics bits. + # FIXME: this is much like what we do for HVM, should it be + # for all image types now? + self.display = sxp.child_value(imageConfig, 'display') + self.xauthority = sxp.child_value(imageConfig, 'xauthority') + self.vncconsole = sxp.child_value(imageConfig, 'vncconsole') + self.vnc = sxp.child_value(imageConfig, 'vnc') + self.sdl = sxp.child_value(imageConfig, 'sdl') + if self.vnc: + self.vncdisplay = sxp.child_value(imageConfig, 'vncdisplay', + int(self.vm.getDomid())) + self.vncunused = sxp.child_value(imageConfig, 'vncunused') + self.vnclisten = sxp.child_value(imageConfig, 'vnclisten') + if self.vnc or self.sdl: + log.info("setting use_graphics") + self.vm.writeDom("console/use_graphics", "1") + else: + self.vm.writeDom("console/use_graphics", "0") + + def createDeviceModel(self): + if self.pid: + return + # Execute device model (for us, it's just the fb frontend) + if not self.vnc and not self.sdl: + return + + if self.vnc: + args = [xen.util.auxbin.pathTo("xen-vncfb")] + if self.vncunused: + args += ['--unused'] + elif self.vncdisplay: + args += [ "--vncport", "%d" %(5900 + self.vncdisplay,) ] + if self.vnclisten: + args += [ "--listen", self.vnclisten ] + if self.vncconsole: + args += [ "--vncviewer" ] + elif self.sdl: + args = [xen.util.auxbin.pathTo("xen-sdlfb")] + args = args + [ "--domid", "%d" % self.vm.getDomid(), + "--title", self.vm.info['name'] ] + env = dict(os.environ) + if self.display: + env['DISPLAY'] = self.display + if self.xauthority: + env['XAUTHORITY'] = self.xauthority + log.info("spawning video: %s", args) + self.pid = os.spawnve(os.P_NOWAIT, args[0], args, env) + log.info("device model pid: %d", self.pid) + + def destroy(self): + if not self.pid: + return + os.kill(self.pid, signal.SIGKILL) + os.waitpid(self.pid, 0) + self.pid = 0 + class PPC_LinuxImageHandler(LinuxImageHandler): ostype = "linux" @@ -382,7 +446,6 @@ class HVMImageHandler(ImageHandler): def destroy(self): self.unregister_shutdown_watch(); - import signal if not self.pid: return os.kill(self.pid, signal.SIGKILL) Index: xen-unstable/tools/python/xen/xm/create.py =================================================================== --- xen-unstable.orig/tools/python/xen/xm/create.py +++ xen-unstable/tools/python/xen/xm/create.py @@ -481,6 +481,8 @@ def configure_image(vals): if vals.builder == 'hvm': configure_hvm(config_image, vals) + + configure_graphics(config_image, vals) return config_image @@ -627,14 +629,21 @@ def configure_vifs(config_devs, vals): map(f, d.keys()) config_devs.append(['device', config_vif]) +def configure_graphics(config_image, vals): + """Create the config for graphic consoles. + """ + args = [ 'vnc', 'vncdisplay', 'vncconsole', 'vncunused', + 'sdl', 'display', 'xauthority' ] + for a in args: + if (vals.__dict__[a]): + config_image.append([a, vals.__dict__[a]]) def configure_hvm(config_image, vals): """Create the config for HVM devices. """ args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', - 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'sdl', 'display', - 'acpi', 'apic', 'xauthority', 'usb', 'usbdevice' ] + 'acpi', 'apic', 'usb', 'usbdevice' ] for a in args: if (vals.__dict__[a]): config_image.append([a, vals.__dict__[a]]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org