set default cpu model to kvm64

To avoid problems with windows activation.

diff --git a/Makefile b/Makefile
index 434c90273cd1fd45df08fbe32becbbb6299b641c..402756dbeea8b10e630ae9203cceb4cc810cdd8f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.3
 
 # also update debian/changelog
 KVMVER=1.4
-KVMPKGREL=5
+KVMPKGREL=6
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm

diff --git a/debian/changelog b/debian/changelog
index a757358ff0a3d8b3b3a52c1a98aa2fd02c2a72f8..dcce665668dd644bd55f5457866c6c6d342e7c0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-qemu-kvm (1.4-6) unstable; urgency=low
+
+  * set default cpu model to kvm64 (to avoid problems with windows activation)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 25 Feb 2013 06:55:23 +0100
+
 pve-qemu-kvm (1.4-5) unstable; urgency=low
 
   * update backup patches to v5

diff --git a/debian/patches/series b/debian/patches/series
index da1cba255691b38ace7c40a7dcdb0930f0167cb0..50721ad631d61a08a083c6d81bc595fd34051be7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ enable-kvm-by-default.patch
 0006-add-vm-state-to-backups.patch
 # always-update-expected-downtime.patch
 virtio-balloon-fix-query.patch
+set-cpu-model-to-kvm64.patch

diff --git a/debian/patches/set-cpu-model-to-kvm64.patch b/debian/patches/set-cpu-model-to-kvm64.patch
new file mode 100644 (file)
index 0000000..55302ff
--- /dev/null
+++ b/debian/patches/set-cpu-model-to-kvm64.patch
@@ -0,0 +1,16 @@
+Index: new/hw/pc.c
+===================================================================
+--- new.orig/hw/pc.c   2013-02-25 06:53:21.000000000 +0100
++++ new/hw/pc.c        2013-02-25 06:53:37.000000000 +0100
+@@ -868,9 +868,9 @@
+     /* init CPUs */
+     if (cpu_model == NULL) {
+ #ifdef TARGET_X86_64
+-        cpu_model = "qemu64";
++        cpu_model = "kvm64";
+ #else
+-        cpu_model = "qemu32";
++        cpu_model = "kvm32";
+ #endif
+     }
+