August 2009 - openSUSE Commits - openSUSE Mailing Lists

commit telepathy-butterfly for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package telepathy-butterfly for openSUSE:Factory checked in at Sat Aug 1 13:15:56 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/telepathy-butterfly/telepathy-butterfly.changes 2009-07-30 05:58:09.000000000 +0200 @@ -0,0 +1,19 @@ +------------------------------------------------------------------- +Thu Jul 30 05:43:00 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.5.0: + + Enhancements: + - Migrate from pymsn to papyon as the MSN backend library + - Implement the Requests connection interface + + Fixes: + - Use the presence type busy for busy presence (fdo#22619) + - Fix crash on nudge reception (fdo#22350) + - Trigger "Name in use" error when another client logged in + using the same account (fdo#22555) +- Change python-msn Requires to papyon. + +------------------------------------------------------------------- +Wed Jun 17 20:48:05 CEST 2009 - vuntz(a)novell.com + +- Initial package. + calling whatdependson for head-i586 New: ---- telepathy-butterfly-0.5.0.tar.bz2 telepathy-butterfly.changes telepathy-butterfly.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-butterfly.spec ++++++ # # spec file for package telepathy-butterfly (Version 0.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: telepathy-butterfly Version: 0.5.0 Release: 1 License: GPL v2 or later Summary: MSN (butterfly) connection manager for Telepathy Url: http://telepathy.freedesktop.org/wiki/ Group: Productivity/Networking/Instant Messenger Source0: %{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: python Requires: papyon Requires: python-telepathy # For directory ownership: BuildRequires: dbus-1 Requires: dbus-1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %description Butterfly is a connection manager for Telepathy that provide support for MSN, via the papyon library. %prep %setup -q %build # PYTHONDIR is to work-around a waf bug that ignores libdir for python export PYTHONDIR=%{py_sitedir} # configure macro fails to work because waf does not support --host ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} %__make %{?jobs:-j%jobs} %install %makeinstall %fdupes %{buildroot}/%{py_sitedir} %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS %{_libdir}/telepathy-butterfly %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.butterfly.service %dir %{_datadir}/telepathy %dir %{_datadir}/telepathy/managers %{_datadir}/telepathy/managers/butterfly.manager %{py_sitedir}/butterfly %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-telepathy for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package python-telepathy for openSUSE:Factory checked in at Sat Aug 1 13:14:31 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-telepathy/python-telepathy.changes 2009-07-30 14:56:57.000000000 +0200 @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Thu Jul 30 14:55:18 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.15.10: + + Actually include server/channelmanager.py in the tarball. + +------------------------------------------------------------------- +Thu Jul 30 05:43:10 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.15.9: + + Enhancements: + - Add service side helper code to implement + Connection.Interface.Requests. This breaks the old request + channel API so be sure to upgrade telepathy-butterfly at the + same time as telepathy-python. Client side code is not + affected by this change. + + Fixes: + - Call get_handle_type() in ListChannels avoiding an error if + the handle is null. + +------------------------------------------------------------------- +Wed Jun 17 20:38:46 CEST 2009 - vuntz(a)novell.com + +- Initial package. + calling whatdependson for head-i586 New: ---- python-telepathy.changes python-telepathy.spec telepathy-python-0.15.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-telepathy.spec ++++++ # # spec file for package python-telepathy (Version 0.15.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python-telepathy %define _name telepathy-python Version: 0.15.10 Release: 1 License: LGPL v2.1 or later Summary: Python library for Telepathy Url: http://telepathy.freedesktop.org/wiki/Telepathy%20Python Group: Development/Libraries/Python Source0: %{_name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: libxslt BuildRequires: python Requires: dbus-1-python BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %description The Telepathy project aims to provide a unified framework for all forms of real time conversations, including instant messaging, IRC, voice calls and video calls. It uses the DBus messaging system to provide a simple interface for client applications, allowing them to quickly benefit from Telepathy's functionality. %prep %setup -q -n %{_name}-%{version} %build %{__python} setup.py build %install %{__python} setup.py install --skip-build --root="%{buildroot}" --prefix="%{_prefix}" %fdupes %{buildroot}/%{py_sitedir} %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README examples/ %{py_sitedir}/telepathy %{py_sitedir}/*.egg-info %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit papyon for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package papyon for openSUSE:Factory checked in at Sat Aug 1 13:13:10 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/papyon/papyon.changes 2009-07-30 05:59:39.000000000 +0200 @@ -0,0 +1,26 @@ +------------------------------------------------------------------- +Thu Jul 30 05:51:25 CEST 2009 - vuntz(a)novell.com + +- Update to version 0.4.1: + + Added handling of OUT commands (fdo#13004) + + Implemented missing member types for address book (fdo#22558) + + Fixed connection to new account without any contact (fdo#19228) + + Fixed crash when a contact from address book don't have a + display name (fdo#19920) + + Added support to cancel login anytime (fdo#14089) + + Fixed crash when receiving an offline message (fdo#14623) + + Replaced deprecated modules (md5 and sha) (fdo#21885) + + Fixed logging of binary data (non-ascii characters) (fdo#22722) + + Added handling for some address book errors (fdo#15869) +- Changes from version 0.4.0: + + Forked pymsn to create papyon + + Added webcam sessions support + + Fixed reception of P2P data from WLM 2009 users +- Renamed python-msn package to papyon, following the upstream + rename. + +------------------------------------------------------------------- +Wed Jun 17 20:20:19 CEST 2009 - vuntz(a)novell.com + +- Initial package. + calling whatdependson for head-i586 New: ---- papyon-0.4.1.tar.bz2 papyon.changes papyon.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ papyon.spec ++++++ # # spec file for package papyon (Version 0.4.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: papyon Version: 0.4.1 Release: 1 License: GPL v2 or later Summary: Python client library for the MSN protocol Url: http://telepathy.freedesktop.org/wiki/Papyon Group: Development/Libraries/Python Source0: %{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: python BuildRequires: python-crypto BuildRequires: python-gobject2 BuildRequires: python-openssl BuildRequires: python-xml Requires: python-crypto Requires: python-gobject2 Requires: python-openssl Requires: python-xml # The package was named python-msn before Provides: python-msn = 0.3.3 Obsoletes: python-msn <= 0.3.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires %description papyon is an MSN client library, that tries to abstract the MSN protocol gory details. %prep %setup -q %build %{__python} setup.py build %install %{__python} setup.py install --skip-build --root="%{buildroot}" --prefix="%{_prefix}" %fdupes %{buildroot}/%{py_sitedir} %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README %{py_sitedir}/papyon %{py_sitedir}/*.egg-info %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mutter for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at Sat Aug 1 13:11:52 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/mutter/mutter.changes 2009-07-21 21:12:25.000000000 +0200 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Tue Jul 21 21:12:15 CEST 2009 - vuntz(a)novell.com + +- Update to version 2.27.1, first official tarball. +- Add mutter-build-fix.patch to fix build. + +------------------------------------------------------------------- +Thu May 14 14:38:54 CEST 2009 - vuntz(a)novell.com + +- Update to git version as of May 14th. + +------------------------------------------------------------------- +Mon May 4 02:36:08 CEST 2009 - vuntz(a)novell.com + +- Add tarball created from git, and mutter-rename.patch.bz2 to make + mutter parallel-installable with metacity. + +------------------------------------------------------------------- +Fri May 1 19:12:10 CEST 2009 - vuntz(a)novell.com + +- Initial package, based on the metacity package. + calling whatdependson for head-i586 New: ---- mutter-2.27.1.tar.bz2 mutter-build-fix.patch mutter.changes mutter.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ # # spec file for package mutter (Version 2.27.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: mutter BuildRequires: clutter-devel BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: startup-notification-devel BuildRequires: update-desktop-files BuildRequires: zenity # Needed by the patch BuildRequires: gnome-common License: GPL v2 or later Group: System/GUI/GNOME Version: 2.27.1 Release: 1 Summary: Window and compositing manager based on Clutter Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM mutter-build-fix.patch vuntz(a)novell.com -- Taken from git Patch0: mutter-build-fix.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity Requires: %{name}-lang = %{version} Provides: windowmanager %gconf_schemas_prereq %description Mutter is a window and compositing manager based on Clutter, forked from Metacity. %package devel License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: clutter-devel Requires: gtk2-devel %description devel This package contains all necessary include files and libraries needed to develop applications that require these. %lang_package %prep %setup -q %patch0 -p1 %build NOCONFIGURE=1 gnome-autogen.sh %configure \ --libexecdir=%{_prefix}/lib/%{name} \ --disable-static \ --disable-schemas-install %__make %{?jobs:-j%jobs} %install %makeinstall %{__rm} %{buildroot}/%{_libdir}/*.la %suse_update_desktop_file %{name} %find_lang %{name} %find_gconf_schemas %fdupes %{buildroot} %clean rm -rf %{buildroot} %pre -f %{name}.schemas_pre %post -p /sbin/ldconfig %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun %postun -p /sbin/ldconfig %files -f %{name}.schemas_list %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS rationales.txt README %{_bindir}/* %{_libdir}/*.so.* %{_libdir}/mutter %{_datadir}/applications/mutter.desktop %{_datadir}/mutter # Do not depend on libgnome just for a directory %dir %{_datadir}/gnome %dir %{_datadir}/gnome/wm-properties %{_datadir}/gnome/wm-properties/mutter-wm.desktop %doc %{_mandir}/man*/* %files lang -f %{name}.lang %if %suse_version <= 1110 # exclude locales which don't exist on old versions of openSUSE %exclude %{_datadir}/locale/ha/LC_MESSAGES/* %exclude %{_datadir}/locale/ig/LC_MESSAGES/* %exclude %{_datadir}/locale/la/LC_MESSAGES/* %endif %files devel %defattr (-, root, root) %{_includedir}/mutter %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog ++++++ mutter-build-fix.patch ++++++ commit ec2c197e1fa12698850b655da054e5528ce8a727 Author: Owen W. Taylor <otaylor(a)fishsoup.net> Date: Fri Jul 17 07:51:21 2009 -0400 Fix confusion about MetaPreview in introspection build MetaPreview is only built into libmutter-private, and not included in the mutter executable. Linking mutter against libmutter-private was inadvertently added when the introspection build process was set up, but isn't actually needed, and if -Wl,-as-needed is added during the build process, then the libmutter-private dependency will be skipped. * Don't link mutter (or the test programs) against libmutter-private * Exclude meta-preview.h from the set of headers we feed into the introspection build process Reported by Patryk Zawadzki http://bugzilla.gnome.org/show_bug.cgi?id=587975 diff --git a/src/Makefile.am b/src/Makefile.am index c51a339..b675ab8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -147,6 +147,8 @@ libmutter_private_la_LIBADD = @MUTTER_LIBS@ libmutterincludedir = $(includedir)/mutter/mutter-private +# Headers installed for plugins; introspected information will +# be extracted into Mutter-<version>.gir libmutterinclude_base_headers = \ include/alttabhandler.h \ include/boxes.h \ @@ -154,7 +156,6 @@ libmutterinclude_base_headers = \ include/main.h \ include/util.h \ include/common.h \ - ui/preview-widget.h \ ui/theme-parser.h \ ui/theme.h \ include/prefs.h \ @@ -171,7 +172,10 @@ libmutterinclude_base_headers = \ include/mutter-window.h # Excluded from scanning for introspection but installed +# preview-widget.h: only part of libmutter-private +# atomnames.h: macros cause problems for scanning process libmutterinclude_extra_headers = \ + ui/preview-widget.h \ include/atomnames.h libmutterinclude_HEADERS = \ @@ -221,7 +225,7 @@ Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir endif EFENCE= -mutter_LDADD=@MUTTER_LIBS@ libmutter-private.la $(EFENCE) +mutter_LDADD=@MUTTER_LIBS@ $(EFENCE) mutter_LDFLAGS=-export-dynamic mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la @@ -232,9 +236,9 @@ testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyn noinst_PROGRAMS=testboxes testgradient testasyncgetprop -testboxes_LDADD= @MUTTER_LIBS@ libmutter-private.la -testgradient_LDADD= @MUTTER_LIBS@ libmutter-private.la -testasyncgetprop_LDADD= @MUTTER_LIBS@ libmutter-private.la +testboxes_LDADD= @MUTTER_LIBS@ +testgradient_LDADD= @MUTTER_LIBS@ +testasyncgetprop_LDADD= @MUTTER_LIBS@ @INTLTOOL_DESKTOP_RULE@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit CodeAnalyst for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package CodeAnalyst for openSUSE:Factory checked in at Sat Aug 1 12:31:10 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/CodeAnalyst/CodeAnalyst.changes 2009-07-30 20:27:30.000000000 +0200 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Thu Jul 30 20:24:50 CEST 2009 - jblunck(a)suse.de + +- Rename package. + +------------------------------------------------------------------- +Thu Jul 30 18:04:17 CEST 2009 - tonyj(a)novell.com + +- Fix error in specfile. +- Create this changes file. + calling whatdependson for head-i586 New: ---- CodeAnalyst-gui-2.8.54.tar.bz2 CodeAnalyst.changes CodeAnalyst.desktop CodeAnalyst.spec DiffAnalyst.desktop ca-da-online-help.patch ca-fix-basename.patch ca-fix-oprofile-ibs-check.patch ca-use-dynamic-feature-check.patch ca-use-oprofile-default-buffersize.patch destdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CodeAnalyst.spec ++++++ # # spec file for package CodeAnalyst (Version 2.8.54) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Summary: CodeAnalyst is a Performance Analysis Suite for AMD-based System Name: CodeAnalyst Version: 2.8.54 Release: 1 License: GPL v2 only Group: Development/Tools/Other Url: http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux Source0: http://ftp-developer.amd.com/user/ssuthiku/CALinuxSnapshots/%{name}-gui-%{v… Source1: CodeAnalyst.desktop Source2: DiffAnalyst.desktop # Use oprofile default cpu/watershed/event-buffer size # since using stock oprofile daemon/driver Patch0: ca-use-oprofile-default-buffersize.patch # Use on-line help Patch1: ca-da-online-help.patch # Fix basename issue when building Patch2: ca-fix-basename.patch # Fix basename issue when building Patch3: ca-fix-oprofile-ibs-check.patch # Use dynamic feature check Patch4: ca-use-dynamic-feature-check.patch Requires: binutils Requires: oprofile >= 0.9.4 PreReq: %insserv_prereq %fillup_prereq pwdutils BuildRequires: automake BuildRequires: libtool BuildRequires: popt-devel BuildRequires: binutils-devel BuildRequires: libelf-devel BuildRequires: qt3-devel >= 3.3 BuildRequires: qt3-designer >= 3.3 BuildRequires: oprofile >= 0.9.4 BuildRequires: libdwarf-devel BuildRequires: update-desktop-files BuildRequires: unzip BuildRequires: pwdutils BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build # Unsupported architecture list due to non-AMD based system. ExcludeArch: ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64 %description CodeAnalyst is a performance analysis suite. It provids graphical utilitys for running Oprofile, and analyzing result on AMD-based systems. CodeAnalyst includes several features to aid profile analysis such as inline-function analysis, code-block analysis, and a utility for profile comparison, DiffAnalayst. %prep %setup -q -n %{name}-gui-%{version} %patch0 -p1 -b .ca-use-oprofile-default-buffersize %patch1 -p1 -b .ca-da-online-help %patch2 -p1 -b .ca-fix-basename %patch3 -p0 -b .ca-fix-oprofile-ibs-check %patch4 -p1 -b .ca-use-dynamic-feature-check %build ./autogen.sh %configure \ --with-oprofile=%{_prefix} \ --disable-oprofile-lib \ --disable-static \ --with-libdwarf-includes=%{_includedir}/libdwarf \ --with-libdwarf-libraries=%{_libdir} make %{?jobs:-j%jobs} %install make -C src/ca/libs install DESTDIR=${RPM_BUILD_ROOT} make -C src/ca/gui install DESTDIR=${RPM_BUILD_ROOT} make -C src/ca/diffgui install DESTDIR=${RPM_BUILD_ROOT} make -C src/ca/utils install DESTDIR=${RPM_BUILD_ROOT} make -C src/ca/scripts install DESTDIR=${RPM_BUILD_ROOT} # These are help documents and images which # the GUIs is using for the "Help" on toolbar. # GUI will not run correctly if these are not available # make -C doc install DESTDIR=${RPM_BUILD_ROOT} install -D -m 755 src/ca/scripts/codeanalyst ${RPM_BUILD_ROOT}%{_initrddir}/codeanalyst ln -sf %{_initrddir}/codeanalyst ${RPM_BUILD_ROOT}%{_sbindir}/rccodeanalyst install -D -m 755 careport.sh ${RPM_BUILD_ROOT}%{_bindir} # Remove these unnecessary files from the installation rm -rf ${RPM_BUILD_ROOT}%{_libdir}/lib*.{la,so} # install icons install -D -m 644 src/ca/gui/CodeAnalyst-gui.xpm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/CodeAnalyst.xpm install -D -m 644 src/ca/diffgui/DiffAnalyst-gui.xpm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/DiffAnalyst.xpm # create hardlinks for duplicate files %fdupes ${RPM_BUILD_ROOT}%{_datadir}/ # Install CodeAnalyst-gui.desktop file %suse_update_desktop_file -i CodeAnalyst -u # Install DiffAnalyst-gui.desktop file %suse_update_desktop_file -i DiffAnalyst -u %clean rm -rf ${RPM_BUILD_ROOT} %pre # Adding "amdca" user group getent group amdca >/dev/null || /usr/sbin/groupadd -r amdca exit 0 %post /sbin/ldconfig %fillup_and_insserv -y codeanalyst %preun %stop_on_removal codeanalyst %postun %restart_on_update codeanalyst %insserv_cleanup /sbin/ldconfig %files %defattr(-,root,root,-) %doc README COPYING INSTALLATION %{_bindir}/CodeAnalyst %{_bindir}/DiffAnalyst %{_bindir}/careport.sh %{_bindir}/capackage.sh %{_sbindir}/ca_user_manager %{_sbindir}/ca_oprofile_controller %{_sbindir}/rccodeanalyst %{_libdir}/lib*.so.* %dir %{_datadir}/codeanalyst %{_datadir}/codeanalyst/* %{_datadir}/applications/CodeAnalyst.desktop %{_datadir}/applications/DiffAnalyst.desktop %{_datadir}/pixmaps/* %{_initrddir}/codeanalyst %changelog ++++++ CodeAnalyst.desktop ++++++ [Desktop Entry] Name=CodeAnalyst GenericName=Profiler Comment=Open .caw files Exec=CodeAnalyst Icon=CodeAnalyst Terminal=false Type=Application Categories=Development;Profiling; ++++++ DiffAnalyst.desktop ++++++ [Desktop Entry] Name=DiffAnalyst GenericName=Profile Diff Tool Comment=Open .daw files Exec=DiffAnalyst Icon=DiffAnalyst Terminal=false Type=Application Categories=Development;Profiling; ++++++ ca-da-online-help.patch ++++++ diff -paurN CodeAnalyst-gui-2.8.54/Makefile.am CodeAnalyst-gui-2.8.54-online-help//Makefile.am --- CodeAnalyst-gui-2.8.54/Makefile.am 2009-05-21 11:02:48.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-online-help//Makefile.am 2009-07-27 17:34:43.797273893 -0500 @@ -1,6 +1,5 @@ SUBDIRS = \ - src \ - doc + src dist_bin_SCRIPTS = careport.sh diff -paurN CodeAnalyst-gui-2.8.54/configure.ac CodeAnalyst-gui-2.8.54-online-help//configure.ac --- CodeAnalyst-gui-2.8.54/configure.ac 2009-07-06 15:27:20.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-online-help//configure.ac 2009-07-27 17:34:59.360319078 -0500 @@ -533,8 +533,5 @@ AC_OUTPUT(Makefile \ src/ca/libs/libcabba/bbatest/Makefile \ src/ca/libs/liboutput/Makefile \ src/ca/utils/Makefile \ - src/ca/scripts/Makefile \ - doc/Makefile \ - doc/cadoc/Makefile \ - doc/dadoc/Makefile + src/ca/scripts/Makefile ) diff -paurN CodeAnalyst-gui-2.8.54/src/ca/diffgui/DiffAnalystWindow.cpp CodeAnalyst-gui-2.8.54-online-help//src/ca/diffgui/DiffAnalystWindow.cpp --- CodeAnalyst-gui-2.8.54/src/ca/diffgui/DiffAnalystWindow.cpp 2009-03-23 12:03:41.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-online-help//src/ca/diffgui/DiffAnalystWindow.cpp 2009-07-27 15:38:24.626453501 -0500 @@ -528,7 +528,8 @@ void DiffAnalystWindow::onHelpAbout() void DiffAnalystWindow::onHelpContents() { // TODO: Need to fix the path to point to DiffAnalyst Help Document - QString invoke = LAUNCH_BROWSER + CA_DATA_DIR "/doc/dadoc/whnjs.htm"; + //QString invoke = LAUNCH_BROWSER + CA_DATA_DIR "/doc/dadoc/whnjs.htm"; + QString invoke = LAUNCH_BROWSER + "http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux/Documents/DiffAna…"; qApp->setOverrideCursor (QCursor (Qt::WaitCursor)); system (invoke.data()); diff -paurN CodeAnalyst-gui-2.8.54/src/ca/gui/application.cpp CodeAnalyst-gui-2.8.54-online-help//src/ca/gui/application.cpp --- CodeAnalyst-gui-2.8.54/src/ca/gui/application.cpp 2009-06-18 06:54:47.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-online-help//src/ca/gui/application.cpp 2009-07-27 15:37:11.528321176 -0500 @@ -1282,7 +1282,8 @@ void ApplicationWindow::onHelpAbout () void ApplicationWindow::onHelpContents () { - QString invoke = LAUNCH_BROWSER + CA_DATA_DIR "/doc/cadoc/whnjs.htm"; + //QString invoke = LAUNCH_BROWSER + CA_DATA_DIR "/doc/cadoc/whnjs.htm"; + QString invoke = LAUNCH_BROWSER + "http://developer.amd.com/cpu/CodeAnalyst/codeanalystlinux/Documents/CodeAna…"; qApp->setOverrideCursor (QCursor (Qt::WaitCursor)); system (invoke.data()); ++++++ ca-fix-basename.patch ++++++ --- CodeAnalyst-gui-2.8.54/configure.ac 2009-07-06 15:27:20.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-fix-basename/configure.ac 2009-07-17 16:43:50.905147989 -0500 @@ -35,6 +35,9 @@ AC_PREREQ(2.13) #Initialize Libtool AM_PROG_LIBTOOL +# Fix issue with basename in gcc-4.4 +AC_CHECK_DECLS([basename], [], [], [[#include <libgen.h>]]) + AM_INIT_AUTOMAKE #Default installation directory ++++++ ca-fix-oprofile-ibs-check.patch ++++++ Fix BUG163976: Cannot profile IBS when build with OProfile-0.9.5 with option --with-oprofile --- Index: src/ca/gui/oprofile_interface.cpp =================================================================== --- src/ca/gui/oprofile_interface.cpp (revision 16837) +++ src/ca/gui/oprofile_interface.cpp (working copy) @@ -1144,15 +1144,16 @@ #if (OP_VERSION_BASE == 0x00903) command = QString(OP_BINDIR) + - "opcontrol --help 2>&1 " + + "/opcontrol --help 2>&1 " + "| grep ibs-fetch 2> /dev/null > /dev/null"; ret = (system(command.ascii()) == 0)? true: false; #endif #if (OP_VERSION_BASE >= 0x00905) + command = QString(OP_BINDIR) + - "oprofiled --help 2>&1 " + + "/oprofiled --help 2>&1 " + "| grep ext-feature 2> /dev/null > /dev/null"; ret = (system(command.ascii()) == 0)? true: false; #endif ++++++ ca-use-dynamic-feature-check.patch ++++++ diff -paurN CodeAnalyst-gui-2.8.54/src/ca/gui/application.cpp CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/application.cpp --- CodeAnalyst-gui-2.8.54/src/ca/gui/application.cpp 2009-06-18 06:54:47.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/application.cpp 2009-07-29 10:27:48.000000000 -0500 @@ -863,7 +863,7 @@ void ApplicationWindow::onSamplingStart return; } - if (!m_opIf.checkIbsSupportInDaemon()) + if (m_opIf.checkIbsSupportInDaemon() < 0 ) { QMessageBox::critical (this, "CodeAnalyst Error", QString("Current OProfile daemon does not supported IBS profile\n") @@ -1482,14 +1482,15 @@ void ApplicationWindow:: enumerateAllIbs if (pIbsSession->opSample && (*ev_it).op_name.contains("IBS_OP_")) { bypass = false; QString t = QString::number(pIbsSession->opInterval, 10); -#if (OPD_NO_DISPATCH_OP_OPTION == 1) - op_name = QString("event:") + (*ev_it).op_name + - " count:" + t + " unit-mask:0"; -#else - op_name = QString("event:") + (*ev_it).op_name + - " count:" + t + " unit-mask:" - + ((pIbsSession->opCycleCount)? "0" : "1") ; -#endif + + if (m_opIf.checkDispatchOpInDaemon() > 0) { + op_name = QString("event:") + (*ev_it).op_name + + " count:" + t + " unit-mask:" + + ((pIbsSession->opCycleCount)? "0" : "1") ; + } else { + op_name = QString("event:") + (*ev_it).op_name + + " count:" + t + " unit-mask:0"; + } } if (bypass) @@ -1506,13 +1507,12 @@ void ApplicationWindow:: enumerateAllIbs if (pIbsSession->fetchSample && (*ev_it).op_name.contains("IBS_FETCH_")) { -#if (OP_VERSION_BASE >= 0x00905) - // If specify list and not found - if (pIbsSession->fetchList.size() != 0 - && pIbsSession->fetchList.find((*ev_it).value) == pIbsSession->fetchList.end()) - continue; -#endif - + if (m_opIf.checkIbsSupportInDaemon() >= 2) { + // If specify list and not found + if (pIbsSession->fetchList.size() != 0 + && pIbsSession->fetchList.find((*ev_it).value) == pIbsSession->fetchList.end()) + continue; + } eet.eventCount = pIbsSession->fetchInterval; eet.eventMask = (*ev_it).value; @@ -1524,13 +1524,12 @@ void ApplicationWindow:: enumerateAllIbs if (pIbsSession->opSample && (*ev_it).op_name.contains("IBS_OP_")) { -#if (OP_VERSION_BASE >= 0x00905) - // If specify list and not found - if (pIbsSession->opList.size() != 0 - && pIbsSession->opList.find((*ev_it).value) == pIbsSession->opList.end()) - continue; -#endif - + if (m_opIf.checkIbsSupportInDaemon() >= 2) { + // If specify list and not found + if (pIbsSession->opList.size() != 0 + && pIbsSession->opList.find((*ev_it).value) == pIbsSession->opList.end()) + continue; + } eet.eventCount = pIbsSession->opInterval; eet.eventMask = EncodeEventMask((*ev_it).value, @@ -2911,64 +2910,64 @@ bool ApplicationWindow::runIbs () ibs_prop.dispatched_ops = 1; } -#if (OP_VERSION_BASE >= 0x00905) - // NOTE: If the fetchList or opList is empty while it is being enabled, - // we would add all fetch/op events to the list. - // This would help keep the old IBS DCCOnfig compatible. - bool fixFetchList = false; - bool fixOpList = false; - - if (pIbsSession->fetchSample && pIbsSession->fetchList.size() == 0 ) - fixFetchList = true; - - if (pIbsSession->opSample && pIbsSession->opList.size() == 0 ) - fixOpList = true; - - if (fixFetchList || fixOpList) { - EventList evList; - m_eventFile.findIbsEvent(evList); - - EventList::iterator ev_it = evList.begin(); - EventList::iterator ev_end = evList.end(); - for(;ev_it != ev_end; ev_it++) { - if (0xF000 <= (*ev_it).value && (*ev_it).value < 0xF100 && fixFetchList) { - //fetch - pIbsSession->fetchList.append((*ev_it).value); - } else if (0xF100 <= (*ev_it).value && fixOpList) { - //op - pIbsSession->opList.append((*ev_it).value); + if (m_opIf.checkIbsSupportInDaemon() >= 2) { + // NOTE: If the fetchList or opList is empty while it is being enabled, + // we would add all fetch/op events to the list. + // This would help keep the old IBS DCCOnfig compatible. + bool fixFetchList = false; + bool fixOpList = false; + + if (pIbsSession->fetchSample && pIbsSession->fetchList.size() == 0 ) + fixFetchList = true; + + if (pIbsSession->opSample && pIbsSession->opList.size() == 0 ) + fixOpList = true; + + if (fixFetchList || fixOpList) { + EventList evList; + m_eventFile.findIbsEvent(evList); + + EventList::iterator ev_it = evList.begin(); + EventList::iterator ev_end = evList.end(); + for(;ev_it != ev_end; ev_it++) { + if (0xF000 <= (*ev_it).value && (*ev_it).value < 0xF100 && fixFetchList) { + //fetch + pIbsSession->fetchList.append((*ev_it).value); + } else if (0xF100 <= (*ev_it).value && fixOpList) { + //op + pIbsSession->opList.append((*ev_it).value); + } } - } - } + } + + // Convert list of IBS Fetch event number to op-name for oprofiled + QValueList<unsigned int>::iterator it = pIbsSession->fetchList.begin(); + QValueList<unsigned int>::iterator it_end = pIbsSession->fetchList.end(); + for (; it != it_end; it++) + { + CpuEvent event; + m_eventFile.findEventByValue(*it, event); - // Convert list of IBS Fetch event number to op-name for oprofiled - QValueList<unsigned int>::iterator it = pIbsSession->fetchList.begin(); - QValueList<unsigned int>::iterator it_end = pIbsSession->fetchList.end(); - for (; it != it_end; it++) - { - CpuEvent event; - m_eventFile.findEventByValue(*it, event); - - if (0xF000 <= *it && *it < 0xF100) { - //fetch - ibs_prop.fetch_strList.append(event.op_name); + if (0xF000 <= *it && *it < 0xF100) { + //fetch + ibs_prop.fetch_strList.append(event.op_name); + } } - } - - // Convert list of IBS Op event number to op-name for oprofiled - it = pIbsSession->opList.begin(); - it_end = pIbsSession->opList.end(); - for (; it != it_end; it++) - { - CpuEvent event; - m_eventFile.findEventByValue(*it, event); + + // Convert list of IBS Op event number to op-name for oprofiled + it = pIbsSession->opList.begin(); + it_end = pIbsSession->opList.end(); + for (; it != it_end; it++) + { + CpuEvent event; + m_eventFile.findEventByValue(*it, event); - if (0xF100 <= *it) { - //op - ibs_prop.op_strList.append(event.op_name); + if (0xF100 <= *it) { + //op + ibs_prop.op_strList.append(event.op_name); + } } } -#endif ibs_prop.dcMissInfoEnabled = pIbsSession->dcMissInfoEnabled; diff -paurN CodeAnalyst-gui-2.8.54/src/ca/gui/CfgIbs.cpp CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/CfgIbs.cpp --- CodeAnalyst-gui-2.8.54/src/ca/gui/CfgIbs.cpp 2009-06-23 16:41:21.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/CfgIbs.cpp 2009-07-29 10:27:48.000000000 -0500 @@ -21,6 +21,7 @@ #include "CfgIbs.h" #include "iruncontrol.h" #include "atuneoptions.h" +#include "oprofile_interface.h" #include <qbuttongroup.h> #include "xp.h" @@ -213,11 +214,11 @@ void IbsCfgDlg::setProfile (ProfileColle m_pOpInterval->setText (QString::number (ibsOptions.opInterval)); m_pOp->setChecked (ibsOptions.opSample); -#if (OPD_NO_DCMISSINFO_OPTION == 0) - m_pDcMissInfoEnabled->setChecked (ibsOptions.dcMissInfoEnabled); -#else - m_pDcMissInfoEnabled->hide(); -#endif + oprofile_interface opIf; + if (opIf.checkDCMissInfoInDaemon() > 0) + m_pDcMissInfoEnabled->setChecked (ibsOptions.dcMissInfoEnabled); + else + m_pDcMissInfoEnabled->hide(); // Check REV C support char VendorId[15]; @@ -242,24 +243,24 @@ void IbsCfgDlg::setProfile (ProfileColle m_pOpDispatch->setChecked (false); } -#if (OP_VERSION_BASE >= 0x00905) - // Load events to IBS Fetch List - QString file = helpGetEventFile(Family, Model); - if( !m_eventsFile.open (file) ) - { - QMessageBox::information( this, "Error", - "Unable to open the events file: " + file); - } - addIbsEventFromFileToList(Model); + if (opIf.checkIbsSupportInDaemon() >= 2) { + // Load events to IBS Fetch List + QString file = helpGetEventFile(Family, Model); + if( !m_eventsFile.open (file) ) + { + QMessageBox::information( this, "Error", + "Unable to open the events file: " + file); + } + addIbsEventFromFileToList(Model); - selectIbsEvents(&ibsOptions); -#else - m_pFetchList->hide(); - m_pSelectAllFetch->hide(); - m_pOpList->hide(); - m_pSelectAllOp->hide(); - this->resize(0,0); -#endif + selectIbsEvents(&ibsOptions); + } else { + m_pFetchList->hide(); + m_pSelectAllFetch->hide(); + m_pOpList->hide(); + m_pSelectAllOp->hide(); + this->resize(0,0); + } m_pLaunchBox->hide(); m_modified = false; diff -paurN CodeAnalyst-gui-2.8.54/src/ca/gui/oprofile_interface.cpp CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/oprofile_interface.cpp --- CodeAnalyst-gui-2.8.54/src/ca/gui/oprofile_interface.cpp 2009-07-29 10:28:41.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/oprofile_interface.cpp 2009-07-29 10:27:48.000000000 -0500 @@ -71,6 +71,9 @@ oprofile_interface::oprofile_interface ( m_isDaemonStarted = false; m_daemon_pid = 0; m_numEventCountersAvailable = 0; + m_ibsVersion = 0; + m_hasDispatchOpInDaemon = 0; + m_hasDCMissInfoInDaemon = 0; CA_OPROFILE_CONTROLLER = simplifyPath(CA_OPROFILE_CONTROLLER); } @@ -290,63 +293,62 @@ int oprofile_interface::help_start_daemo opd_args.append (event_args); } - //******************************************************** -#if (OP_VERSION_BASE >= 0x00905) - // IBS2 stuff - // --ext-feature=ibs:fetch:ev1,ev2,...,evN:fetch_count:fetch_um|op:ev1,ev2,...,evN:op_count:op_um - - buf = ""; - if( (active_profiling & OP_IBS_FETCH) - || (active_profiling & OP_IBS_OP)) - opd_args.append("--ext-feature=ibs:"); - - if (active_profiling & OP_IBS_FETCH) { - buf = QString("fetch:") + - m_pIbsProperties->fetch_strList.join(",") + ":" + - QString::number(m_pIbsProperties->fetch_count) + ":" + - QString::number(m_pIbsProperties->fetch_um); - } - - if (active_profiling & OP_IBS_OP) { - if (active_profiling & OP_IBS_FETCH) - buf = buf + QString("\\|"); - - buf = buf + QString("op:") + - m_pIbsProperties->op_strList.join(",") + ":" + - QString::number(m_pIbsProperties->op_count) + ":" + - QString::number(m_pIbsProperties->op_um); - } - opd_args.append (buf); + if (checkIbsSupportInDaemon() == 2) { + //******************************************************** + // IBS2 stuff + // --ext-feature=ibs:fetch:ev1,ev2,...,evN:fetch_count:fetch_um|op:ev1,ev2,...,evN:op_count:op_um + + buf = ""; + if( (active_profiling & OP_IBS_FETCH) + || (active_profiling & OP_IBS_OP)) + opd_args.append("--ext-feature=ibs:"); -#else //(OP_VERSION_BASE >= 0x00905) + if (active_profiling & OP_IBS_FETCH) { + buf = QString("fetch:") + + m_pIbsProperties->fetch_strList.join(",") + ":" + + QString::number(m_pIbsProperties->fetch_count) + ":" + + QString::number(m_pIbsProperties->fetch_um); + } - // IBS1 stuff - buf = ""; - if( (active_profiling & OP_IBS_FETCH) - || (active_profiling & OP_IBS_OP)) - opd_args.append("--events= "); + if (active_profiling & OP_IBS_OP) { + if (active_profiling & OP_IBS_FETCH) + buf = buf + QString("\\|"); - if (active_profiling & OP_IBS_FETCH) { - buf.sprintf("--ibs-fetch=%ld ", m_pIbsProperties->fetch_count); + buf = buf + QString("op:") + + m_pIbsProperties->op_strList.join(",") + ":" + + QString::number(m_pIbsProperties->op_count) + ":" + + QString::number(m_pIbsProperties->op_um); + } opd_args.append (buf); - } + } + else if (checkIbsSupportInDaemon() == 1) { + // IBS1 stuff + buf = ""; + if( (active_profiling & OP_IBS_FETCH) + || (active_profiling & OP_IBS_OP)) + opd_args.append("--events= "); - if (active_profiling & OP_IBS_OP) { - buf.sprintf("--ibs-op=%ld ", m_pIbsProperties->op_count); - opd_args.append (buf); + if (active_profiling & OP_IBS_FETCH) { + buf.sprintf("--ibs-fetch=%ld ", m_pIbsProperties->fetch_count); + opd_args.append (buf); + } -#if (OPD_NO_DISPATCH_OP_OPTION == 0) - if(m_pIbsProperties->dispatched_ops) - opd_args.append ("--ibs-op-dispatch-op "); -#endif - -#if (OPD_NO_DCMISSINFO_OPTION == 0) - if(m_pIbsProperties->dcMissInfoEnabled) - opd_args.append ("--ibs-op-dcmissinfo-enable "); -#endif + if (active_profiling & OP_IBS_OP) { + buf.sprintf("--ibs-op=%ld ", m_pIbsProperties->op_count); + opd_args.append (buf); + + if (checkDispatchOpInDaemon() > 0) { + if(m_pIbsProperties->dispatched_ops) + opd_args.append ("--ibs-op-dispatch-op "); + } + + if (checkDCMissInfoInDaemon() > 0) { + if(m_pIbsProperties->dcMissInfoEnabled) + opd_args.append ("--ibs-op-dcmissinfo-enable "); + } + } } -#endif //(OP_VERSION_BASE >= 0x00905) // END CMD LINE APPENDING. @@ -1137,29 +1139,84 @@ bool oprofile_interface::havePermissionT } -bool oprofile_interface::checkIbsSupportInDaemon() +int oprofile_interface::checkIbsSupportInDaemon() { - bool ret = false; QString command; + + if (m_ibsVersion != 0) + goto out; -#if (OP_VERSION_BASE == 0x00903) + // CA-OProfile-0.9.3 command = QString(OP_BINDIR) + "/opcontrol --help 2>&1 " + "| grep ibs-fetch 2> /dev/null > /dev/null"; - ret = (system(command.ascii()) == 0)? true: false; -#endif + if (system(command.ascii()) == 0) { + m_ibsVersion = 1; + goto out; + } -#if (OP_VERSION_BASE >= 0x00905) - + // OProfile-0.9.5 command = QString(OP_BINDIR) + "/oprofiled --help 2>&1 " + "| grep ext-feature 2> /dev/null > /dev/null"; - ret = (system(command.ascii()) == 0)? true: false; -#endif - return ret; + if (system(command.ascii()) == 0) { + m_ibsVersion = 2; + goto out; + } + + m_ibsVersion = -1; +out: + return m_ibsVersion; } + +int oprofile_interface::checkDispatchOpInDaemon() +{ + bool ret = false; + QString command; + + if (m_hasDispatchOpInDaemon != 0) + goto out; + + // CA-OProfile-0.9.3 + command = QString(OP_BINDIR) + + "/opcontrol --help 2>&1 " + + "| grep ibs-op-dispatch-op 2> /dev/null > /dev/null"; + + ret = (system(command.ascii()) == 0)? true: false; + if (ret) + m_hasDispatchOpInDaemon = 1; + else + m_hasDispatchOpInDaemon = -1; +out: + return m_hasDispatchOpInDaemon; +} + + +int oprofile_interface::checkDCMissInfoInDaemon() +{ + bool ret = false; + QString command; + + if (m_hasDCMissInfoInDaemon != 0) + goto out; + + // CA-OProfile-0.9.3 + command = QString(OP_BINDIR) + + "/opcontrol --help 2>&1 " + + "| grep ibs-op-dcmissinfo-enable 2> /dev/null > /dev/null"; + + ret = (system(command.ascii()) == 0)? true: false; + if (ret) + m_hasDCMissInfoInDaemon = 1; + else + m_hasDCMissInfoInDaemon = -1; +out: + return m_hasDCMissInfoInDaemon; +} + + bool oprofile_interface::checkMuxSupportInDaemon() { // NOTE: This check allows only the CodeAnalyst Oprofile diff -paurN CodeAnalyst-gui-2.8.54/src/ca/gui/oprofile_interface.h CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/oprofile_interface.h --- CodeAnalyst-gui-2.8.54/src/ca/gui/oprofile_interface.h 2009-06-10 15:45:23.000000000 -0500 +++ CodeAnalyst-gui-2.8.54-user-dynamic-feature-check/src/ca/gui/oprofile_interface.h 2009-07-29 10:27:48.000000000 -0500 @@ -94,7 +94,11 @@ public: bool codeanalyst_service_status(); - bool checkIbsSupportInDaemon(); + int checkIbsSupportInDaemon(); + + int checkDispatchOpInDaemon(); + + int checkDCMissInfoInDaemon(); bool checkMuxSupportInDaemon(); @@ -134,19 +138,18 @@ private: QString simplifyPath(QString path); private: - op_ibs_property * m_pIbsProperties; - - op_event_property m_EventProperties[MAX_EVENTNUM_MULTIPLEXING]; - - QProcess * m_proc; - - QString m_StdErr; - QString m_StdOut; + QProcess * m_proc; + op_ibs_property * m_pIbsProperties; + op_event_property m_EventProperties[MAX_EVENTNUM_MULTIPLEXING]; + QString m_StdErr; + QString m_StdOut; + int m_numEventCountersAvailable; + bool m_isDaemonStarted; + unsigned int m_daemon_pid; + int m_ibsVersion; + int m_hasDispatchOpInDaemon; + int m_hasDCMissInfoInDaemon; - int m_numEventCountersAvailable; - - bool m_isDaemonStarted; - unsigned int m_daemon_pid; }; #endif ++++++ ca-use-oprofile-default-buffersize.patch ++++++ diff -paurN CodeAnalyst-gui-2.8.54-org/src/ca/gui/atuneoptions.h CodeAnalyst-gui-2.8.54/src/ca/gui/atuneoptions.h --- CodeAnalyst-gui-2.8.54-org/src/ca/gui/atuneoptions.h 2009-06-10 15:45:23.000000000 -0500 +++ CodeAnalyst-gui-2.8.54/src/ca/gui/atuneoptions.h 2009-07-08 22:04:40.000000000 -0500 @@ -117,9 +117,9 @@ enum ChartDensityShownType enum BuffDefaultSizeType { - OP_DEFAULT_BUFFER_SIZE = 4194304, - OP_DEFAULT_WATERSHED_SIZE = 131072, - OP_DEFAULT_CPU_BUFFER_SIZE = 32768 + OP_DEFAULT_BUFFER_SIZE = 131072, + OP_DEFAULT_WATERSHED_SIZE = 32768, + OP_DEFAULT_CPU_BUFFER_SIZE = 8192 }; #define OPT_IMPORT_TYPE OPT_DATA_PREFIX "/ImportType" ++++++ destdir.patch ++++++ --- src/ca/Makefile.am +++ src/ca/Makefile.am @@ -8,11 +8,11 @@ install-exec-hook: @if test -e "scripts/Setup.sh"; then \ - scripts/Setup.sh $(prefix); \ + scripts/Setup.sh $(DESTDIR)$(prefix); \ fi uninstall-hook: @if test -e "scripts/Uninstall.sh"; then \ - scripts/Uninstall.sh $(prefix);\ + scripts/Uninstall.sh $(DESTDIR)$(prefix);\ fi --- src/ca/gui/Makefile.am +++ src/ca/gui/Makefile.am @@ -226,11 +226,11 @@ $(UIC) -o $@ -impl $*.h $*.ui install-exec-hook: - mkdir -p $(prefix)/share/codeanalyst/Configs/DCConfig - cp -r ../Configs/DCConfig $(prefix)/share/codeanalyst/Configs/ - mkdir -p $(prefix)/share/codeanalyst/Configs/ViewConfig - cp -r ../Configs/ViewConfig $(prefix)/share/codeanalyst/Configs/ - rm -rf `find $(prefix)/share/codeanalyst/Configs -name .svn` + mkdir -p $(DESTDIR)$(prefix)/share/codeanalyst/Configs/DCConfig + cp -r ../Configs/DCConfig $(DESTDIR)$(prefix)/share/codeanalyst/Configs/ + mkdir -p $(DESTDIR)$(prefix)/share/codeanalyst/Configs/ViewConfig + cp -r ../Configs/ViewConfig $(DESTDIR)$(prefix)/share/codeanalyst/Configs/ + rm -rf `find $(DESTDIR)$(prefix)/share/codeanalyst/Configs -name .svn` uninstall-hook: - rm -rf $(prefix)/share/codeanalyst/Configs + rm -rf $(DESTDIR)$(prefix)/share/codeanalyst/Configs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Sat Aug 1 11:53:34 CEST 2009. -------- --- xen/xen.changes 2009-06-23 20:46:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2009-07-31 22:06:34.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 14:07:42 MDT 2009 - carnold(a)novell.com + +- Update to Xen 3.4.1 RC10 c/s 19711. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:12.000000000 +0200 @@ -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 @@ 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 @@ %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 ++++++ 32on64-extra-mem.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:12.000000000 +0200 @@ -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 ++++++ bdrv_open2_fix_flags.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:12.000000000 +0200 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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"); ++++++ bdrv_open2_flags_2.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:12.000000000 +0200 @@ -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 @@ 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; ++++++ blktap-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:12.000000000 +0200 @@ -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 @@ + .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 @@ + 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 @@ 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 @@ }; 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 @@ /* 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 @@ /* * 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 @@ 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', ++++++ blktap.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 @@ '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; ++++++ blktapctrl-default-to-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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", ++++++ block-flags.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 ;; ++++++ block-losetup-retry.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 ++++++ bridge-bonding.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 ++++++ bridge-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 ++++++ bridge-record-creation.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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} ++++++ bridge-vlan.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 } ++++++ build-tapdisk-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -15,10 +15,10 @@ 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 @@ ###################################################################### # 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 @@ 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 @@ 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); ++++++ cdrom-removable.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 @@ + 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 @@ + 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 @@ 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"); ++++++ checkpoint-rename.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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() ++++++ dom-print.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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); ++++++ dump-exec-state.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 @@ /* 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 @@ } 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 @@ 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) ++++++ hv_tools.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 @@ 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 @@ '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 @@ 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 @@ 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 @@ 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).""") ++++++ hv_xen_base.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 @@ }; #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 @@ 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 <asm/mc146818rtc.h> #include <asm/spinlock.h> @@ -136,10 +136,10 @@ } 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 @@ +#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 <asm/hvm/hvm.h> #include <asm/hvm/io.h> @@ -188,10 +188,10 @@ 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 ++++++ hv_xen_extension.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:13.000000000 +0200 @@ -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 @@ +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 @@ +#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 @@ + 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 @@ +#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 @@ + 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 @@ +/**************************************************************************** + | ++++++ ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -17,10 +17,10 @@ Signed-off-by: Kevin Wolf <kwolf(a)redhat.com> -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; ++++++ ioemu-blktap-barriers.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 } ++++++ ioemu-blktap-fv-init.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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) */ ++++++ ioemu-blktap-image-format.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -15,10 +15,10 @@ 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 @@ 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); ++++++ ioemu-blktap-zero-size.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -12,10 +12,10 @@ 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 @@ 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)) ++++++ ioemu-debuginfo.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ 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 ++++++ ioemu-vnc-resize.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 } ++++++ libxen_permissive.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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) ++++++ network-nat-open-SuSEfirewall2-FORWARD.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ op_stop() { [ "$dhcp" != 'no' ] && dhcp_stop iptables -t nat -D POSTROUTING -o ${netdev} -j MASQUERADE -+ iptables -P FORWARD DROP ++ iptables -P FORWARD DROP } ++++++ network-nat.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 ++++++ network-route.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 "$@" ++++++ pv-driver-build.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 ++++++ pvdrv_emulation_control.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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; ++++++ qemu-dm-segfault.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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) ++++++ qemu-security-etch1.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ 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: ++++++ serial-split.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ + +%.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 ++++++ snapshot-ioemu-delete.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ } 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 @@ #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 */ ++++++ snapshot-ioemu-restore.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ 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 @@ } 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 @@ 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 */ ++++++ snapshot-ioemu-save.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ #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 @@ /* 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 @@ 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" ++++++ snapshot-xend.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -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 @@ 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 @@ #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 @@ 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 @@ 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 @@ 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 @@ + if hvm: + dominfo.image.saveDeviceModel() + if name: -+ dominfo.image.resumeDeviceModel() ++ dominfo.image.resumeDeviceModel() + + if line == "suspend": + tochild.write("done\n") @@ -323,10 +323,10 @@ 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 @@ } # 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 @@ 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] <Domain> <CheckpointFile>', ++++++ supported_module.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:14.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:14.000000000 +0200 @@ -2,10 +2,10 @@ Signed-off-by: K. Y. Srinivasan <ksrinivasan(a)novell.com> -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 ++++++ tapdisk-ioemu-shutdown-fix.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -16,10 +16,10 @@ 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 @@ 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); ++++++ tmp_build.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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) ++++++ tools-gdbserver-build.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 ++++++ tools-kboot.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -13,10 +13,10 @@ 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 @@ +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 @@ +# 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 @@ +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 @@ + +-- +Gerd Hoffmann <kraxel(a)suse.de> -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 @@ +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 @@ + 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 @@ +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 + ++++++ tools-xc_kexec.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -23,10 +23,10 @@ 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 @@ + 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 @@ +# 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 <inttypes.h> + @@ -173,10 +173,10 @@ + + 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 @@ +_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 @@ +#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 <stdarg.h> +#include <stddef.h> @@ -384,10 +384,10 @@ +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 <xenctrl.h> +#include "hypercall.h" @@ -1040,10 +1040,10 @@ + 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 <stdio.h> +#include <xenctrl.h> @@ -1073,10 +1073,10 @@ + 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 @@ + 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 @@ +} +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 @@ +} + +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 @@ + +} +#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 @@ + 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 @@ + + +#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 @@ +#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 @@ + 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 @@ +} + +#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 @@ +#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 <stdio.h> +#include <stdlib.h> ++++++ udev-rules.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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" ++++++ x86-cpufreq-report.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 <xen/acpi.h> #include <asm/current.h> @@ -40,10 +40,10 @@ 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 @@ #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); ++++++ x86-extra-trap-info.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 @@ 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 ++++++ x86-show-page-walk-early.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 @@ 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 @@ /* 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 @@ 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 <asm/numa.h> + #include <asm/msr.h> #include <public/memory.h> +int mpt_valid; @@ -86,10 +86,10 @@ /* 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 @@ 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) ++++++ x86_64-5Tb.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 @@ #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 @@ 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 @@ #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<<PAGETABLE_ORDER) #define ROOT_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES ++++++ xen-3.4.1-testing-src.tar.bz2 ++++++ xen/xen-3.4.1-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-3.4.1-testing-src.tar.bz2 differ: char 11, line 1 ++++++ xen-api-auth.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-3.4.0-testing/tools/python/xen/xend/XendAuthSessions.py +Index: xen-3.4.1-testing/tools/python/xen/xend/XendAuthSessions.py =================================================================== ---- xen-3.4.0-testing.orig/tools/python/xen/xend/XendAuthSessions.py -+++ xen-3.4.0-testing/tools/python/xen/xend/XendAuthSessions.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendAuthSessions.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendAuthSessions.py @@ -84,7 +84,7 @@ class XendAuthSessions: # if PAM doesn't exist, let's ignore it return False ++++++ xen-changeset.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-3.4.0-testing/xen/Makefile +Index: xen-3.4.1-testing/xen/Makefile =================================================================== ---- xen-3.4.0-testing.orig/xen/Makefile -+++ xen-3.4.0-testing/xen/Makefile +--- xen-3.4.1-testing.orig/xen/Makefile ++++ xen-3.4.1-testing/xen/Makefile @@ -1,3 +1,4 @@ +export XEN_CHANGESET = unavailable # This is the correct place to edit the build version. ++++++ xen-config.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -1,7 +1,7 @@ -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 @@ -124,14 +124,14 @@ QEMU_REMOTE=http://xenbits.xensource.com # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. ++++++ xen-destdir.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-3.4.0-testing/docs/Makefile +Index: xen-3.4.1-testing/docs/Makefile =================================================================== ---- xen-3.4.0-testing.orig/docs/Makefile -+++ xen-3.4.0-testing/docs/Makefile +--- xen-3.4.1-testing.orig/docs/Makefile ++++ xen-3.4.1-testing/docs/Makefile @@ -90,7 +90,8 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(MANDIR) cp -dR man1 $(DESTDIR)$(MANDIR) @@ -22,10 +22,10 @@ + ln -sf $*.html html.done/$*/index.html + rm -rf html/ + -Index: xen-3.4.0-testing/tools/security/Makefile +Index: xen-3.4.1-testing/tools/security/Makefile =================================================================== ---- xen-3.4.0-testing.orig/tools/security/Makefile -+++ xen-3.4.0-testing/tools/security/Makefile +--- xen-3.4.1-testing.orig/tools/security/Makefile ++++ xen-3.4.1-testing/tools/security/Makefile @@ -60,8 +60,8 @@ install: all $(ACM_CONFIG_FILE) $(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR) $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR) @@ -37,10 +37,10 @@ else .PHONY: all all: -Index: xen-3.4.0-testing/tools/pygrub/Makefile +Index: xen-3.4.1-testing/tools/pygrub/Makefile =================================================================== ---- xen-3.4.0-testing.orig/tools/pygrub/Makefile -+++ xen-3.4.0-testing/tools/pygrub/Makefile +--- xen-3.4.1-testing.orig/tools/pygrub/Makefile ++++ xen-3.4.1-testing/tools/pygrub/Makefile @@ -11,7 +11,7 @@ build: .PHONY: install install: all @@ -50,10 +50,10 @@ $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot .PHONY: clean -Index: xen-3.4.0-testing/tools/python/Makefile +Index: xen-3.4.1-testing/tools/python/Makefile =================================================================== ---- xen-3.4.0-testing.orig/tools/python/Makefile -+++ xen-3.4.0-testing/tools/python/Makefile +--- xen-3.4.1-testing.orig/tools/python/Makefile ++++ xen-3.4.1-testing/tools/python/Makefile @@ -56,7 +56,7 @@ refresh-po: $(POTFILE) .PHONY: install install: install-messages install-dtd @@ -63,10 +63,10 @@ install-dtd: all $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) -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 @@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod @@ -121,11 +121,11 @@ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) -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 -@@ -31,18 +31,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent +--- xen-3.4.1-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-3.4.1-testing/tools/hotplug/Linux/Makefile +@@ -40,18 +40,6 @@ endif UDEV_RULES_DIR = /etc/udev UDEV_RULES = xen-backend.rules xend.rules @@ -134,7 +134,7 @@ -ifeq ($(findstring $(DI),$(DE)),$(DI)) -HOTPLUGS=install-hotplug install-udev -else --ifeq ($(shell [ -x /usr/bin/udevinfo ] && [ `/usr/bin/udevinfo -V | sed -e 's/^[^0-9]* $[0-9]\{1,\}$[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1) +-ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1) -HOTPLUGS=install-udev -else -HOTPLUGS=install-hotplug @@ -144,7 +144,7 @@ .PHONY: all all: -@@ -50,15 +38,15 @@ all: +@@ -59,15 +47,15 @@ all: build: .PHONY: install @@ -163,7 +163,7 @@ .PHONY: install-scripts install-scripts: -@@ -88,8 +76,7 @@ install-udev: +@@ -97,8 +85,7 @@ install-udev: $(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d set -e; for i in $(UDEV_RULES); \ do \ ++++++ xen-disable-qemu-monitor.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -5,10 +5,10 @@ commands that can read/write dom0's state. -Index: xen-3.4.0-testing/tools/ioemu-remote/monitor.c +Index: xen-3.4.1-testing/tools/ioemu-remote/monitor.c =================================================================== ---- xen-3.4.0-testing.orig/tools/ioemu-remote/monitor.c -+++ xen-3.4.0-testing/tools/ioemu-remote/monitor.c +--- xen-3.4.1-testing.orig/tools/ioemu-remote/monitor.c ++++ xen-3.4.1-testing/tools/ioemu-remote/monitor.c @@ -1481,6 +1481,7 @@ static const term_cmd_t term_cmds[] = { "device|all", "commit changes to the disk images (if -snapshot is used) or backing files" }, { "info", "s?", do_info, ++++++ xen-domUloader.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-3.4.0-testing/tools/python/xen/util/blkif.py +Index: xen-3.4.1-testing/tools/python/xen/util/blkif.py =================================================================== ---- xen-3.4.0-testing.orig/tools/python/xen/util/blkif.py -+++ xen-3.4.0-testing/tools/python/xen/util/blkif.py +--- xen-3.4.1-testing.orig/tools/python/xen/util/blkif.py ++++ xen-3.4.1-testing/tools/python/xen/util/blkif.py @@ -71,23 +71,24 @@ def blkdev_segment(name): 'type' : 'Disk' } return val @@ -32,10 +32,10 @@ def mount_mode(name): mode = None -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 @@ -593,6 +593,31 @@ class DevController: return (Missing, None) @@ -68,10 +68,10 @@ def backendPath(self, backdom, devid): """Construct backend path given the backend domain and device id. -Index: xen-3.4.0-testing/tools/python/xen/xend/XendBootloader.py +Index: xen-3.4.1-testing/tools/python/xen/xend/XendBootloader.py =================================================================== ---- xen-3.4.0-testing.orig/tools/python/xen/xend/XendBootloader.py -+++ xen-3.4.0-testing/tools/python/xen/xend/XendBootloader.py +--- xen-3.4.1-testing.orig/tools/python/xen/xend/XendBootloader.py ++++ xen-3.4.1-testing/tools/python/xen/xend/XendBootloader.py @@ -12,7 +12,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # @@ -109,10 +109,10 @@ log.error(msg) raise VmError(msg) -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 @@ -35,7 +35,7 @@ from types import StringTypes import xen.lowlevel.xc ++++++ xen-fixme-doc.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -1,7 +1,7 @@ -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 @@ -335,16 +335,10 @@ at hda1, which is the root filesystem. =item I<NFS Root> @@ -19,10 +19,10 @@ =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<s - shutdown> ++++++ xen-hvm-default-bridge.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 @@ #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 @@ } } 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 @@ 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 ++++++ xen-hvm-default-pae.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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): ++++++ xen-ioapic-ack-default.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 */ } ++++++ xen-ioemu-hvm-pv-support.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:15.000000000 +0200 @@ -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 @@ #include <assert.h> #include <xenguest.h> -@@ -326,11 +328,51 @@ static void xen_platform_ioport_writeb(v +@@ -331,11 +333,51 @@ static void xen_platform_ioport_writeb(v } } ++++++ xen-max-free-mem.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ '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 @@ 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 @@ 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): ++++++ xen-no-dummy-nfs-ip.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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): ++++++ xen-paths.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ 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<xmdomain.cfg> format, and possible options used in either the configfile or for I<vars>. @@ -33,10 +33,10 @@ soon as it is run. =item I<without config file> -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 ++++++ xen-qemu-iscsi-fix.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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, ++++++ xen-rpmoptflags.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ 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 ++++++ xen-warnings.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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.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; ++++++ xen-xm-top-needs-root.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -1,10 +1,10 @@ From: Charles Coffing <ccoffing(a)novell.com> 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) ++++++ xen-xmexample-vti.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 ++++++ xen-xmexample.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ #---------------------------------------------------------------------------- # 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 @@ #---------------------------------------------------------------------------- # 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 @@ # 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 @@ #---------------------------------------------------------------------------- # 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 @@ at hda1, which is the root filesystem. =item I<NFS Root> -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<without config file> ++++++ xenapi-console-protocol.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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" ++++++ xend-config.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ ## 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 @@ ++++++ xend-core-dump-loc.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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: ++++++ xend-domain-lock.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ +# 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 @@ def __str__(self): return '<domain id=%s name=%s memory=%s state=%s>' % \ (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 @@ 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 @@ 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 @@ 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 @@ + 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 + ++++++ xm-save-check-file.patch ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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 @@ 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 @@ 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' : ('<Domain>', 'Reset a domain.'), 'restore' : ('<CheckpointFile> [-p]', ++++++ xm-test-cleanup.diff ++++++ --- /var/tmp/diff_new_pack.2KOrd3/_old 2009-08-01 11:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.2KOrd3/_new 2009-08-01 11:53:16.000000000 +0200 @@ -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()): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-manager for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Sat Aug 1 11:46:04 CEST 2009. -------- --- virt-manager/virt-manager.changes 2009-06-12 20:19:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2009-07-31 04:01:22.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 30 20:03:21 MDT 2009 - carnold(a)novell.com + +- Update to virt-manager version 0.8.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- virt-manager-0.7.0.tar.bz2 virtinst-0.400.3.tar.bz2 New: ---- virt-manager-0.8.0.tar.bz2 virtinst-0.500.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:04.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.7.0) +# spec file for package virt-manager (Version 0.8.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,11 +22,11 @@ %define gsysconfdir /etc %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 -%define virtinst_min 400 -%define virtinst_rel 3 +%define virtinst_min 500 +%define virtinst_rel 0 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1 Summary: Virtual Machine Manager Group: System/Monitoring License: LGPL v2.1 or later @@ -123,7 +123,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 +#%patch6 -p1 %patch7 -p1 %patch8 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} @@ -156,15 +156,16 @@ rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/sr(a)latin/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/es/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-clone.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-image.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5 -# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.400.3-py2.?.egg-info +# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.500.3-py2.?.egg-info popd -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la +#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a +#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la # Unsupport languages: rm -rf $RPM_BUILD_ROOT/usr/share/locale/or %find_gconf_schemas @@ -184,6 +185,7 @@ %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun + %posttrans -f %{name}.schemas_posttrans %files -f %{name}.lst @@ -191,11 +193,12 @@ %doc COPYING AUTHORS ChangeLog # %dir %attr(775,root,root) /etc/gconf # %dir %attr(775,root,root) /etc/gconf/schemas -#%config %{gsysconfdir}/gconf/schemas/%{name}.schemas +# %config %{gsysconfdir}/gconf/schemas/%{name}.schemas +%dir %{_datadir}/gconf +%dir %{_datadir}/gconf/schemas %config %{_datadir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_libexecdir}/%{name}-launch -%{_libdir}/%{name}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %dir %{_datadir}/%{name}/pixmaps @@ -223,9 +226,7 @@ %dir %{_datadir}/%{name}/virtconv/parsers %{_datadir}/%{name}/virtconv/parsers/*.py %{_datadir}/%{name}/virtconv/parsers/*.pyc -%{_datadir}/%{name}/virtinst-0.400.3-py2.6.egg-info -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/* +%{_datadir}/%{name}/virtinst-0.500.0-py2.6.egg-info %doc %{_datadir}/gnome/help/%{name}/C/figures/*.png %doc %{_datadir}/gnome/help/%{name}/C/*.xml # FIXME: autobuild complains that these are unowned (not true...) ++++++ virt-manager-0.7.0.tar.bz2 -> virt-manager-0.8.0.tar.bz2 ++++++ ++++ 281388 lines of diff (skipped) ++++++ virtinst-0.400.3.tar.bz2 -> virtinst-0.500.0.tar.bz2 ++++++ ++++ 42053 lines of diff (skipped) ++++++ virtman-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,12 +1,12 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/addhardware.py virt-manager-0.7.0//src/virtManager/addhardware.py ---- virt-manager-0.7.0.orig//src/virtManager/addhardware.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/addhardware.py 2009-04-21 10:07:18.000000000 -0600 -@@ -1021,6 +1021,8 @@ - model.append(["virtio", virtinst.VirtualDisk.DEVICE_DISK, - gtk.STOCK_HARDDISK, "Virtio Disk"]) +Index: virt-manager-0.8.0/src/virtManager/addhardware.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.0/src/virtManager/addhardware.py +@@ -1301,6 +1301,7 @@ class vmmAddHardware(gobject.GObject): + if self.vm.get_hv_type().lower() == "kvm": + add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") if self.vm.get_connection().get_type().lower() == "xen": -+ model.append(["xen", virtinst.VirtualDisk.DEVICE_CDROM, -+ gtk.STOCK_CDROM, "Virtual disk (read only)"]) - model.append(["xen", virtinst.VirtualDisk.DEVICE_DISK, - gtk.STOCK_HARDDISK, "Virtual disk"]) ++ add_dev("xen", virtinst.VirtualDisk.DEVICE_CDROM, "Virtual disk (read only)") + add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk") + def populate_input_model(self, model): ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/Makefile.am virt-manager-0.7.0//src/Makefile.am ---- virt-manager-0.7.0.orig//src/Makefile.am 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/Makefile.am 2009-04-16 16:31:18.000000000 -0600 -@@ -14,7 +14,7 @@ +Index: virt-manager-0.8.0/src/Makefile.am +=================================================================== +--- virt-manager-0.8.0.orig/src/Makefile.am ++++ virt-manager-0.8.0/src/Makefile.am +@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -10,10 +11,11 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -diff -Nuar virt-manager-0.7.0.orig//src/Makefile.in virt-manager-0.7.0//src/Makefile.in ---- virt-manager-0.7.0.orig//src/Makefile.in 2009-03-09 21:39:01.000000000 -0600 -+++ virt-manager-0.7.0//src/Makefile.in 2009-04-16 16:31:47.000000000 -0600 -@@ -248,7 +248,7 @@ +Index: virt-manager-0.8.0/src/Makefile.in +=================================================================== +--- virt-manager-0.8.0.orig/src/Makefile.in ++++ virt-manager-0.8.0/src/Makefile.in +@@ -258,7 +258,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -22,9 +24,10 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -diff -Nuar virt-manager-0.7.0.orig//src/virt-manager.desktop.in.in virt-manager-0.7.0//src/virt-manager.desktop.in.in ---- virt-manager-0.7.0.orig//src/virt-manager.desktop.in.in 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virt-manager.desktop.in.in 2009-04-16 16:35:46.000000000 -0600 +Index: virt-manager-0.8.0/src/virt-manager.desktop.in.in +=================================================================== +--- virt-manager-0.8.0.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.8.0/src/virt-manager.desktop.in.in @@ -1,9 +1,16 @@ [Desktop Entry] _Name=Virtual Machine Manager ++++++ virtman-help.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,6 +1,7 @@ -diff -Nuar virt-manager-0.7.0.orig//help/virt-manager/C/virt-manager.xml virt-manager-0.7.0//help/virt-manager/C/virt-manager.xml ---- virt-manager-0.7.0.orig//help/virt-manager/C/virt-manager.xml 2009-03-09 21:38:36.000000000 -0600 -+++ virt-manager-0.7.0//help/virt-manager/C/virt-manager.xml 2009-04-24 17:02:36.000000000 -0600 +Index: virt-manager-0.8.0/help/virt-manager/C/virt-manager.xml +=================================================================== +--- virt-manager-0.8.0.orig/help/virt-manager/C/virt-manager.xml ++++ virt-manager-0.8.0/help/virt-manager/C/virt-manager.xml @@ -821,218 +821,9 @@ <title>The Create Wizard</title> <para>The Create Wizard helps you gather the information necessary to create ++++++ virtman-kvm.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virt-manager.py.in virt-manager-0.7.0//src/virt-manager.py.in ---- virt-manager-0.7.0.orig//src/virt-manager.py.in 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virt-manager.py.in 2009-04-21 14:24:51.000000000 -0600 -@@ -192,7 +192,8 @@ +Index: virt-manager-0.8.0/src/virt-manager.py.in +=================================================================== +--- virt-manager-0.8.0.orig/src/virt-manager.py.in ++++ virt-manager-0.8.0/src/virt-manager.py.in +@@ -196,7 +196,8 @@ def default_uri(): tryuri = "xen:///" elif (os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or ++++++ virtman-manager.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/manager.py virt-manager-0.7.0//src/virtManager/manager.py ---- virt-manager-0.7.0.orig//src/virtManager/manager.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/manager.py 2009-04-24 15:14:21.000000000 -0600 -@@ -656,6 +656,15 @@ +Index: virt-manager-0.8.0/src/virtManager/manager.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/manager.py ++++ virt-manager-0.8.0/src/virtManager/manager.py +@@ -624,6 +624,15 @@ class vmmManager(gobject.GObject): vmlist = self.window.get_widget("vm-list") selection = vmlist.get_selection() active = selection.get_selected() @@ -17,7 +18,7 @@ if active[1] != None: parent = active[0].iter_parent(active[1]) # return the connection of the currently selected vm, or the -@@ -810,7 +819,14 @@ +@@ -768,7 +777,14 @@ class vmmManager(gobject.GObject): return False def new_vm(self, ignore=None): ++++++ virtman-netcat.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7.0//src/virtManager/details.py ---- virt-manager-0.7.0.orig//src/virtManager/details.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/details.py 2009-04-20 10:13:49.000000000 -0600 -@@ -1233,7 +1233,7 @@ +Index: virt-manager-0.8.0/src/virtManager/details.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/details.py ++++ virt-manager-0.8.0/src/virtManager/details.py +@@ -1308,7 +1308,7 @@ class vmmDetails(gobject.GObject): argv = ["ssh", "ssh", "-p", sshport] if username: argv += ['-l', username] ++++++ virtman-pointer.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7.0//src/virtManager/details.py ---- virt-manager-0.7.0.orig//src/virtManager/details.py 2009-04-20 10:21:46.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/details.py 2009-04-20 10:27:37.000000000 -0600 -@@ -218,10 +218,10 @@ +Index: virt-manager-0.8.0/src/virtManager/details.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/details.py ++++ virt-manager-0.8.0/src/virtManager/details.py +@@ -205,10 +205,10 @@ class vmmDetails(gobject.GObject): self.window.get_widget("console-vnc-viewport").add(self.vncViewer) self.vncViewer.realize() self.vncTunnel = None @@ -15,4 +16,4 @@ + self.vncViewer.set_keyboard_grab(False) self.vncViewer.set_pointer_grab(True) - self.scale_type = self.config.get_console_scaling() + self.scale_type = self.vm.get_console_scaling() ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.cGwaPU/_old 2009-08-01 11:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.cGwaPU/_new 2009-08-01 11:44:07.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/engine.py virt-manager-0.7.0//src/virtManager/engine.py ---- virt-manager-0.7.0.orig//src/virtManager/engine.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/engine.py 2009-04-17 11:48:12.000000000 -0600 -@@ -33,7 +33,8 @@ +Index: virt-manager-0.8.0/src/virtManager/engine.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/engine.py ++++ virt-manager-0.8.0/src/virtManager/engine.py +@@ -37,7 +37,8 @@ from virtManager.preferences import vmmP from virtManager.manager import vmmManager from virtManager.details import vmmDetails from virtManager.asyncjob import vmmAsyncJob @@ -10,8 +11,8 @@ +from vminstall.gtk.interface import VMCreate as vmmCreate from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog - import virtManager.util as util -@@ -341,13 +342,24 @@ + from virtManager.systray import vmmSystray +@@ -390,13 +391,24 @@ class vmmEngine(gobject.GObject): return False return True @@ -38,4 +39,4 @@ + message_box.destroy() def add_connection(self, uri, readOnly=None, autoconnect=False): - conn = vmmConnection(self.get_config(), uri, readOnly) + conn = vmmConnection(self.get_config(), uri, readOnly, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit samba for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Sat Aug 1 11:43:49 CEST 2009. -------- --- samba/samba-doc.changes 2009-06-08 21:07:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba-doc.changes 2009-07-08 16:59:02.000000000 +0200 @@ -14 +14 @@ -- Remove NoSource tags from samba-doc spec file; [#351370]. +- Remove NoSource tags from samba-doc spec file; [bnc#351370]. --- samba/samba.changes 2009-07-03 19:41:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2009-07-27 16:12:36.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Jul 27 13:45:04 CEST 2009 - boyang(a)suse.de + +- lookupname failed, cannot find domain when attempt to change password; + (bnc#520645); (bso#6560). + +------------------------------------------------------------------- +Thu Jul 16 16:09:48 CEST 2009 - lmuelle(a)suse.de + +- Don't link with --as-needed flag on post-11.1 systems. + +------------------------------------------------------------------- +Tue Jul 14 23:50:08 CEST 2009 - lmuelle(a)suse.de + +- Stop the smbfs service if an interface goes down; (bnc#517768). + +------------------------------------------------------------------- +Wed Jul 8 19:45:21 CEST 2009 - lmuelle(a)suse.de + +- Disable build of static libraries on post-11.1 systems; (bnc#509945). + +------------------------------------------------------------------- +Wed Jul 8 15:35:20 CEST 2009 - jmcdonough(a)suse.de + +- Fix missing zlibs for cifs.upcall and test_shlibs. + +------------------------------------------------------------------- @@ -23,0 +50,5 @@ + +------------------------------------------------------------------- +Tue Jun 30 13:26:32 CEST 2009 - jmcdonough(a)suse.de + +- Fix net ads leave; (bnc#511695). calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.b9u6z9/_old 2009-08-01 11:40:02.000000000 +0200 +++ /var/tmp/diff_new_pack.b9u6z9/_new 2009-08-01 11:40:02.000000000 +0200 @@ -55,7 +55,7 @@ %endif Url: http://www.samba.org/ Version: 3.4.0 -Release: 1 +Release: 2 License: GPL v3 or later Summary: Samba Documentation Group: Documentation/Other @@ -85,6 +85,11 @@ %else %define make_cifsupcall 0 %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1111 +%define link_static_libs 1 +%else +%define link_static_libs 0 +%endif # Define some global directories ################################ %define DOCDIR %{_defaultdocdir}/samba @@ -175,6 +180,9 @@ # use the default optimization unset OPTIMIZATION %endif +%if 0%{suse_version} > 1110 + export SUSE_ASNEEDED=0 +%endif export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if %{use_ccache} export CC="ccache gcc" @@ -197,7 +205,11 @@ --with-rootsbindir=/sbin \ --enable-cups \ --enable-debug \ +%if %{link_static_libs} --enable-static \ +%else + --disable-static \ +%endif --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -349,19 +361,10 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 -Branch : trunk - -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk -Source Timestamp: 2165 +Source Timestamp: 2180 Branch : trunk %changelog ++++++ samba.spec ++++++ ++++ 660 lines (skipped) ++++ between samba/samba.spec ++++ and /mounts/work_src_done/STABLE/samba/samba.spec ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.b9u6z9/_old 2009-08-01 11:40:02.000000000 +0200 +++ /var/tmp/diff_new_pack.b9u6z9/_new 2009-08-01 11:40:02.000000000 +0200 @@ -1,2 +1,2 @@ -2165 +2180 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 new/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 --- old/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 2009-07-09 11:20:30.000000000 +0200 @@ -0,0 +1,19 @@ +commit 6f64937ab835adbe0fea2ff38a8bd03941fc9543 +Author: Jim McDonough <jmcd(a)samba.org> +Date: Wed Jul 8 08:02:04 2009 -0400 + + Fix cifs.upcall builds on some platforms (zlib) + +Index: source3/Makefile.in +=================================================================== +--- source3/Makefile.in.orig ++++ source3/Makefile.in +@@ -1470,7 +1470,7 @@ bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQ + @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \ + -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \ + $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \ +- $(LIBTDB_LIBS) $(NSCD_LIBS) ++ $(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) + + bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ + @echo Linking $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 new/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 --- old/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 2009-07-09 11:20:30.000000000 +0200 @@ -0,0 +1,28 @@ +commit 7fd42d51c8b13d273b55823ee146967afacd7c88 +Author: Jim McDonough <jmcd(a)samba.org> +Date: Wed Jul 8 13:12:26 2009 -0400 + + Fix make test_shlibs for libnss_wins and libnetapi (zlib) + +Index: source3/Makefile.in +=================================================================== +--- source3/Makefile.in.orig ++++ source3/Makefile.in +@@ -2050,7 +2050,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BIN + @echo Linking shared library $@ + @$(SHLD_DSO) $(LIBNETAPI_OBJ) \ + $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \ +- $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ ++ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \ + @SONAMEFLAG@`basename $@` + + $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) +@@ -2385,7 +2385,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP + @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ + @echo "Linking $@" + @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \ +- $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \ ++ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \ + @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ + + bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_TARGET@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c new/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c --- old/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/9acc670541031414d0cb5df39d18866c4c96b37c 2009-07-30 16:06:40.000000000 +0200 @@ -0,0 +1,76 @@ +commit 9acc670541031414d0cb5df39d18866c4c96b37c +Author: Bo Yang <boyang(a)samba.org> +Date: Thu Jul 23 10:23:21 2009 +0800 + + s3: To correctly handle upn + + lookupname failed, cannot find domain when attempt + to change password. + + This addresses bug #6560. + + Signed-off-by: Bo Yang <boyang(a)samba.org> + +Index: nsswitch/pam_winbind.c +=================================================================== +--- nsswitch/pam_winbind.c.orig ++++ nsswitch/pam_winbind.c +@@ -2284,6 +2284,7 @@ static char* winbind_upn_to_username(str + enum wbcSidType type; + char *domain; + char *name; ++ char *p; + + /* This cannot work when the winbind separator = @ */ + +@@ -2292,9 +2293,19 @@ static char* winbind_upn_to_username(str + return NULL; + } + ++ name = talloc_strdup(ctx, upn); ++ if (!name) { ++ return NULL; ++ } ++ ++ if ((p = strchr(name, '@')) != NULL) { ++ *p = 0; ++ domain = p + 1; ++ } ++ + /* Convert the UPN to a SID */ + +- wbc_status = wbcLookupName("", upn, &sid, &type); ++ wbc_status = wbcLookupName(domain, name, &sid, &type); + if (!WBC_ERROR_IS_OK(wbc_status)) { + return NULL; + } +Index: source3/winbindd/winbindd_sid.c +=================================================================== +--- source3/winbindd/winbindd_sid.c.orig ++++ source3/winbindd/winbindd_sid.c +@@ -93,6 +93,11 @@ void winbindd_lookupname(struct winbindd + *p = 0; + name_domain = state->request.data.name.name; + name_user = p+1; ++ } else if ((p = strchr(state->request.data.name.name, '@')) != NULL) { ++ /* upn */ ++ name_domain = p + 1; ++ *p = 0; ++ name_user = state->request.data.name.name; + } else { + name_domain = state->request.data.name.dom_name; + name_user = state->request.data.name.name; +Index: source3/winbindd/winbindd_util.c +=================================================================== +--- source3/winbindd/winbindd_util.c.orig ++++ source3/winbindd/winbindd_util.c +@@ -1144,7 +1144,8 @@ bool parse_domain_user(const char *domus + if ( assume_domain(lp_workgroup())) { + fstrcpy(domain, lp_workgroup()); + } else if ((p = strchr(domuser, '@')) != NULL) { +- fstrcpy(domain, ""); ++ fstrcpy(domain, p + 1); ++ user[PTR_DIFF(p, domuser)] = 0; + } else { + return False; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2009-06-12 23:08:16.000000000 +0200 +++ new/patches/series 2009-07-30 16:06:40.000000000 +0200 @@ -5,6 +5,9 @@ # allows quilt to work in the usual way (= outside of our RPM spec file). # Samba patches from upstream, svnanon.Samba.org +samba.org/6f64937ab835adbe0fea2ff38a8bd03941fc9543 -p0 # Fix cifs.upcall builds +samba.org/7fd42d51c8b13d273b55823ee146967afacd7c88 -p0 # Fix test_shlib +samba.org/9acc670541031414d0cb5df39d18866c4c96b37c -p0 # bnc 520645, bso 6560 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2009-07-03 19:37:50.000000000 +0200 +++ new/vendor-files/tools/package-data 2009-07-31 23:06:02.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2165" +SAMBA_PACKAGE_SVN_VERSION="2180" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/smbfs new/vendor-files/tools/smbfs --- old/vendor-files/tools/smbfs 2009-01-27 22:24:19.000000000 +0100 +++ new/vendor-files/tools/smbfs 2009-07-15 00:16:08.000000000 +0200 @@ -67,7 +67,7 @@ ;; *if-down.d*) if rc_active smbfs; then - log_msg=$( rcsmbfs restart 2>&1) + log_msg=$( rcsmbfs stop 2>&1) log_dbg "${log_msg}" fi ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-kde4 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at Sat Aug 1 11:39:31 CEST 2009. -------- --- KDE/qtcurve-kde4/qtcurve-kde4.changes 2009-06-29 11:23:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2009-08-01 10:07:28.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 1 09:56:28 CEST 2009 - beineri(a)opensuse.org + +- update to 0.67.1: fixed configuration dialog (bnc#526795) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-KDE4-0.65.1.tar.bz2 New: ---- QtCurve-KDE4-0.67.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.WqVfw7/_old 2009-08-01 11:38:02.000000000 +0200 +++ /var/tmp/diff_new_pack.WqVfw7/_new 2009-08-01 11:38:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde4 (Version 0.65.1) +# spec file for package qtcurve-kde4 (Version 0.67.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ License: GPL v2 or later Group: System/GUI/KDE Summary: QtCurve style for KDE 4 -Version: 0.65.1 +Version: 0.67.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE4-%{version}.tar.bz2 @@ -47,14 +47,16 @@ %make_jobs %install - cd build + pushd build %makeinstall + popd + %find_lang qtcurve %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f qtcurve.lang %defattr(-,root,root) %doc ChangeLog COPYING README TODO /usr/%_lib/kde4/kstyle_qtcurve_config.so ++++++ QtCurve-KDE4-0.65.1.tar.bz2 -> QtCurve-KDE4-0.67.1.tar.bz2 ++++++ ++++ 11390 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kvpnc for openSUSE:Factory
by root＠Hilbert.suse.de 01 Aug '09

01 Aug '09

Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at Sat Aug 1 11:36:49 CEST 2009. -------- --- KDE/kvpnc/kvpnc.changes 2009-07-23 15:35:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kvpnc/kvpnc.changes 2009-07-29 16:29:37.000000000 +0200 @@ -1 +1,18 @@ --------------------------------------------------------------------- +------------------------------------------------------------------- +Wed Jul 29 14:24:40 UTC 2009 - tittiatcoke(a)gmail.com + +- update to svn1004178 + * several bugfixes + * ask user password on each connect option added + +------------------------------------------------------------------- +Tue Jul 28 17:42:09 UTC 2009 - tittiatcoke(a)gmail.com + +- update to svn1003701 + * replace all q3process and k3process with qt4/kde4 replacement + * profiletype on profilemanger fixed + * path to tail after change in profilemanger fixed + * interface detection fixed + * racoon specific page moved to connection specific in profilemanger + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kvpnc-svn994994.tar.bz2 New: ---- kvpnc-svn1004178.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvpnc.spec ++++++ --- /var/tmp/diff_new_pack.i1dLxv/_old 2009-08-01 11:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.i1dLxv/_new 2009-08-01 11:36:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kvpnc (Version 0.9.1+svn994994) +# spec file for package kvpnc (Version 0.9.1+svn1004178) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define sversion svn994994 +%define sversion svn1004178 Name: kvpnc BuildRequires: kdebase4-workspace-devel libkde4-devel update-desktop-files ++++++ kvpnc-svn994994.tar.bz2 -> kvpnc-svn1004178.tar.bz2 ++++++ ++++ 25643 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0