Hello community,
here is the log from the commit of package yast2-vm
checked in at Sat Apr 29 14:03:14 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-04-26 21:04:17.000000000 +0200
+++ STABLE/yast2-vm/yast2-vm.changes 2006-04-28 22:42:30.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Apr 27 16:15:37 MDT 2006 - mgfritch@novell.com
+
+- If AMD Pacifica (svm) processor, architecture is x86_64 and full
+ virtualization, always write out 'cpus=0' (#169855)
+- Don't reset all of the proposal settings when the virtualization
+ mode changes (#170028)
+- 2.13.41
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.40.tar.bz2
New:
----
yast2-vm-2.13.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.z3M82Q/_old 2006-04-29 14:03:08.000000000 +0200
+++ /var/tmp/diff_new_pack.z3M82Q/_new 2006-04-29 14:03:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.40)
+# spec file for package yast2-vm (Version 2.13.41)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.13.40
+Version: 2.13.41
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.40.tar.bz2
+Source0: yast2-vm-2.13.41.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak
%prep
-%setup -n yast2-vm-2.13.40
+%setup -n yast2-vm-2.13.41
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,12 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Thu Apr 27 2006 - mgfritch@novell.com
+- If AMD Pacifica (svm) processor, architecture is x86_64 and full
+ virtualization, always write out 'cpus=0' (#169855)
+- Don't reset all of the proposal settings when the virtualization
+ mode changes (#170028)
+- 2.13.41
* Wed Apr 26 2006 - mgfritch@novell.com
- Specify the CD-ROM device name in the URL to be used for
extracting the kernel/initrd from a SUSE CD/DVD media.
++++++ yast2-vm-2.13.40.tar.bz2 -> yast2-vm-2.13.41.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/VERSION new/yast2-vm-2.13.41/VERSION
--- old/yast2-vm-2.13.40/VERSION 2006-04-26 20:02:43.000000000 +0200
+++ new/yast2-vm-2.13.41/VERSION 2006-04-28 00:16:34.000000000 +0200
@@ -1 +1 @@
-2.13.40
+2.13.41
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/configure new/yast2-vm-2.13.41/configure
--- old/yast2-vm-2.13.40/configure 2006-04-26 20:04:49.000000000 +0200
+++ new/yast2-vm-2.13.41/configure 2006-04-28 22:29:53.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.40.
+# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.41.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-vm'
PACKAGE_TARNAME='yast2-vm'
-PACKAGE_VERSION='2.13.40'
-PACKAGE_STRING='yast2-vm 2.13.40'
+PACKAGE_VERSION='2.13.41'
+PACKAGE_STRING='yast2-vm 2.13.41'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-vm 2.13.40 to adapt to many kinds of systems.
+\`configure' configures yast2-vm 2.13.41 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-vm 2.13.40:";;
+ short | recursive ) echo "Configuration of yast2-vm 2.13.41:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-vm configure 2.13.40
+yast2-vm configure 2.13.41
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-vm $as_me 2.13.40, which was
+It was created by yast2-vm $as_me 2.13.41, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-vm'
- VERSION='2.13.40'
+ VERSION='2.13.41'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.40"
+VERSION="2.13.41"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
@@ -2654,7 +2654,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-vm $as_me 2.13.40, which was
+This file was extended by yast2-vm $as_me 2.13.41, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2709,7 +2709,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-vm config.status 2.13.40
+yast2-vm config.status 2.13.41
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/configure.in new/yast2-vm-2.13.41/configure.in
--- old/yast2-vm-2.13.40/configure.in 2006-04-26 20:04:33.000000000 +0200
+++ new/yast2-vm-2.13.41/configure.in 2006-04-28 22:29:44.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.13.40, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.41, http://www.suse.de/feedback, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.40"
+VERSION="2.13.41"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/src/VM_Common.ycp new/yast2-vm-2.13.41/src/VM_Common.ycp
--- old/yast2-vm-2.13.40/src/VM_Common.ycp 2006-04-19 23:52:20.000000000 +0200
+++ new/yast2-vm-2.13.41/src/VM_Common.ycp 2006-04-28 02:33:55.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Ladislav Slezak
* Michael G. Fritch
*
- * $Id: VM_Common.ycp 30262 2006-04-19 21:52:08Z mgfritch $
+ * $Id: VM_Common.ycp 30557 2006-04-28 00:33:15Z mgfritch $
*/
{
module "VM_Common";
@@ -112,6 +112,24 @@
string default_type = "para";
string virtualization_type = default_type; // currently "para" or "full"
+ global define list<string> CPUflags()
+ {
+ // check only the first processor (assume the same processors)
+ string cpuinfo_flags = (string) SCR::Read(.proc.cpuinfo.value."0"."flags");
+ list<string> cpuflags = (size(cpuinfo_flags) > 0) ? splitstring(cpuinfo_flags, " ") : [];
+
+ y2milestone("Detected CPU flags: %1", cpuflags);
+ return cpuflags;
+ }
+
+ global define boolean VirtualizationCPU()
+ {
+ list<string> cpuflags = CPUflags();
+
+ // vmx = Intel VT-x, svm = AMD Pacifica
+ return contains(cpuflags, "vmx") || contains(cpuflags, "svm");
+ }
+
global define string GetVirtualizationType()
{
return virtualization_type;
@@ -132,7 +150,10 @@
global boolean ResetVirtualizationType()
{
- return SetVirtualizationType(default_type);
+ string virt_type = default_type;
+ // FIXME: when full virt hardware is supported the following line should be uncommented.
+ // if (VirtualizationCPU()) virt_type = "full"; // full virt hardware detected, default all vm's to full virtualization
+ return SetVirtualizationType(virt_type);
}
global string GetVirtualizationProposal()
@@ -251,24 +272,6 @@
return autoyast_profile;
}
- global define list<string> CPUflags()
- {
- // check only the first processor (assume the same processors)
- string cpuinfo_flags = (string) SCR::Read(.proc.cpuinfo.value."0"."flags");
- list<string> cpuflags = (size(cpuinfo_flags) > 0) ? splitstring(cpuinfo_flags, " ") : [];
-
- y2milestone("Detected CPU flags: %1", cpuflags);
- return cpuflags;
- }
-
- global define boolean VirtualizationCPU()
- {
- list<string> cpuflags = CPUflags();
-
- // vmx = Intel VT-x, svm = AMD Pacifica
- return contains(cpuflags, "vmx") || contains(cpuflags, "svm");
- }
-
global map restart_mapping = $[
// restart mode - when the virtual machine is restarted
"always" : _("Always"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/src/VM_XEN.ycp new/yast2-vm-2.13.41/src/VM_XEN.ycp
--- old/yast2-vm-2.13.40/src/VM_XEN.ycp 2006-04-26 20:14:41.000000000 +0200
+++ new/yast2-vm-2.13.41/src/VM_XEN.ycp 2006-04-28 02:33:55.000000000 +0200
@@ -3,7 +3,7 @@
* Package: XEN specific functions and values
* Authors: Ladislav Slezak
* Michael G. Fritch
- * $Id: VM_XEN.ycp 30513 2006-04-26 18:14:00Z mgfritch $
+ * $Id: VM_XEN.ycp 30557 2006-04-28 00:33:15Z mgfritch $
*/
{
module "VM_XEN";
@@ -99,7 +99,10 @@
global boolean resetNumberOfCpus()
{
- VM_Common::number_of_cpus = VM_Common::default_number_of_cpus;
+ if (VM_Common::GetVirtualizationType() == "full")
+ VM_Common::number_of_cpus = 1; // full virtualization requires this value to be set to 1
+ else
+ VM_Common::number_of_cpus = VM_Common::default_number_of_cpus;
return true;
}
@@ -1115,6 +1118,12 @@
if (VM_Common::GetVirtualizationType() == "full")
{
+ // If AMD Pacifica (svm) processor, architecture is x86_64 and full virtualization, always write out 'cpus=0'.
+ list<string> cpuflags = VM_Common::CPUflags();
+ if (contains(cpuflags, "svm") && Arch::x86_64()) {
+ ret = ret && WriteOption(configpath, "cpus", "0");
+ }
+
// use hvm builder for full virtualized hosts
ret = ret && WriteStringOption(configpath, "builder", "hvm");
@@ -2179,7 +2188,7 @@
resetExtraArgs();
resetHiddenArgs();
-
+
SetModified(false);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/src/inst_vm_source.ycp new/yast2-vm-2.13.41/src/inst_vm_source.ycp
--- old/yast2-vm-2.13.40/src/inst_vm_source.ycp 2006-04-25 21:21:15.000000000 +0200
+++ new/yast2-vm-2.13.41/src/inst_vm_source.ycp 2006-04-28 02:33:55.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Ask the user for installation source for the virtual machine.
*
- * $Id: inst_vm_source.ycp 30476 2006-04-25 19:20:34Z mgfritch $
+ * $Id: inst_vm_source.ycp 30557 2006-04-28 00:33:15Z mgfritch $
*
*/
{
@@ -727,7 +727,10 @@
Wizard::SetContents (caption, contents, help_text, true, true);
- UI::ChangeWidget(`id(`rb_group), `CurrentButton, `cdrom);
+ if (contains(cd_devs, cd))
+ UI::ChangeWidget(`id(`rb_group), `CurrentButton, `cdrom);
+ else
+ UI::ChangeWidget(`id(`rb_group), `CurrentButton, `iso);
symbol ret = nil;
@@ -745,7 +748,8 @@
}
else if (ret == `next) {
symbol bootdev_symbol = (symbol)(UI::QueryWidget(`id(`rb_group), `CurrentButton));
- string bootdev = (bootdev_symbol == `disk) ? "c" : "d";
+// string bootdev = (bootdev_symbol == `disk) ? "c" : "d";
+ string bootdev = (VM_Common::proposal_type == "install") ? "d" : "c";
y2milestone("bootdev_symbol: %1", bootdev_symbol);
y2milestone("bootdev: %1", bootdev);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.40/src/inst_xen_mode.ycp new/yast2-vm-2.13.41/src/inst_xen_mode.ycp
--- old/yast2-vm-2.13.40/src/inst_xen_mode.ycp 2006-04-07 07:12:49.000000000 +0200
+++ new/yast2-vm-2.13.41/src/inst_xen_mode.ycp 2006-04-28 02:33:55.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Ask user for network settings.
*
- * $Id: inst_xen_mode.ycp 29839 2006-04-07 05:12:29Z mgfritch $
+ * $Id: inst_xen_mode.ycp 30557 2006-04-28 00:33:15Z mgfritch $
*
*/
@@ -83,7 +83,9 @@
if (selected != VM::GetVirtualizationType()) {
VM_Common::SetModified(true);
VM::SetVirtualizationType(selected);
- VM::ResetAllSettings();
+ //VM::ResetAllSettings();
+ VM::ResetNumberOfCpus();
+ VM::ResetSource();
}
break;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...