cleanup cpu types

Remove: rhel specific types cpu64-rhel6 cpu64-rhel5
Add: SandyBridge Haswell Opteron_G4 Opteron_G5

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 3f19030065a04e9c950c3abf36942318d4904dc9..81cc682f7c7b5b4461baa4a5ce1834f331550dae 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -388,7 +388,7 @@ EODESCR
        optional => 1,
        description => "Emulated CPU type.",
        type => 'string',
-       enum => [ qw(486 athlon pentium pentium2 pentium3 coreduo core2duo kvm32 kvm64 qemu32 qemu64 phenom cpu64-rhel6 cpu64-rhel5 Conroe Penryn Nehalem Westmere Opteron_G1 Opteron_G2 Opteron_G3 host) ],
+       enum => [ qw(486 athlon pentium pentium2 pentium3 coreduo core2duo kvm32 kvm64 qemu32 qemu64 phenom Conroe Penryn Nehalem Westmere SandyBridge Haswell Opteron_G1 Opteron_G2 Opteron_G3 Opteron_G4 Opteron_G5 host) ],
        default => 'qemu64',
     },
     parent => get_standard_option('pve-snapshot-name', {

diff --git a/changelog.Debian b/changelog.Debian
index 9bd702e4722e71f119d00b5693bbcb9bb37f5260..3ad8cd3984fc0382bd0971272c48ae2ad9cd1eb7 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -2,6 +2,10 @@ qemu-server (2.0-70) unstable; urgency=low
 
   * fix version parser for qemu 1.3
 
+  * add new cpu types: SandyBridge Haswell Opteron_G4 Opteron_G5
+
+  * remove rhel specific cpu types: cpu64-rhel6 cpu64-rhel5
+
  -- Proxmox Support Team <support@proxmox.com>  Fri, 23 Nov 2012 07:45:19 +0100
 
 qemu-server (2.0-69) unstable; urgency=low