[pve-devel] [PATCH] update pve-qemu-kvm to last git

[Alexandre Derumier]

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 debian/patches/series                              |    4 +-
 ...ate-target-x86_64.conf-to-rhel6.2-version.patch |   86 --------------------
 debian/postinst                                    |    4 +-
 debian/rules                                       |    8 +--
 4 files changed, 4 insertions(+), 98 deletions(-)
 delete mode 100644 debian/patches/update-target-x86_64.conf-to-rhel6.2-version.patch

diff --git a/debian/patches/series b/debian/patches/series
index 1f92c99..4b5d221 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,4 @@ fairsched.diff
 keymap.diff
 set-max-nics.patch
 pve-auth.patch
-update-target-x86_64.conf-to-rhel6.2-version.patch
-libacard-fix-compilaton-with-gcc.4.7.diff
-revert-prefer_msi-and-share_intx-defaults.diff
+update-cpus-x86_64.conf-to-rhel6.2-version.patch
diff --git a/debian/patches/update-target-x86_64.conf-to-rhel6.2-version.patch b/debian/patches/update-target-x86_64.conf-to-rhel6.2-version.patch
deleted file mode 100644
index 97275db..0000000
--- a/debian/patches/update-target-x86_64.conf-to-rhel6.2-version.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 861cf626eca5abb2fe7bc3be719acbf7086b94bb Mon Sep 17 00:00:00 2001
-From: Derumier Alexandre <aderumier at odiso.com>
-Date: Thu, 1 Mar 2012 17:00:30 +0100
-Subject: [PATCH] update target to rhel 6.2 version
-
-
-Signed-off-by: Derumier Alexandre <aderumier at odiso.com>
----
- sysconfigs/target/target-x86_64.conf |   36 ++++++++++++++++++++++++++++++---
- 1 files changed, 32 insertions(+), 4 deletions(-)
-
-diff --git a/sysconfigs/target/target-x86_64.conf b/sysconfigs/target/target-x86_64.conf
-index d050380..39a9a37 100644
---- a/sysconfigs/target/target-x86_64.conf
-+++ b/sysconfigs/target/target-x86_64.conf
-@@ -1,11 +1,39 @@
- # x86 CPU MODELS
- 
- [cpudef]
-+   name = "cpu64-rhel6"
-+   level = "4"
-+   vendor = "AuthenticAMD"
-+   family = "6"
-+   model = "13"
-+   stepping = "3"
-+   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
-+   feature_ecx = "cx16 sse3 x2apic"
-+   extfeature_edx = "lm fxsr mmx nx pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu"
-+   extfeature_ecx = "sse4a abm svm lahf_lm"
-+   xlevel = "0x8000000A"
-+   model_id = "QEMU Virtual CPU version (cpu64-rhel6)"
-+
-+[cpudef]
-+   name = "cpu64-rhel5"
-+   level = "4"
-+   vendor = "AuthenticAMD"
-+   family = "6"
-+   model = "6"
-+   stepping = "3"
-+   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
-+   feature_ecx = "sse3"
-+   extfeature_edx = "3dnow 3dnowext lm fxsr mmx nx pat cmov pge syscall apic cx8 mce pae msr tsc pse de fpu"
-+   extfeature_ecx = "svm"
-+   xlevel = "0x8000000A"
-+   model_id = "QEMU Virtual CPU version (cpu64-rhel5)"
-+
-+[cpudef]
-    name = "Conroe"
-    level = "2"
-    vendor = "GenuineIntel"
-    family = "6"
--   model = "2"
-+   model = "15"
-    stepping = "3"
-    feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
-    feature_ecx = "ssse3 sse3"
-@@ -19,7 +47,7 @@
-    level = "2"
-    vendor = "GenuineIntel"
-    family = "6"
--   model = "2"
-+   model = "23"
-    stepping = "3"
-    feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
-    feature_ecx = "sse4.1 cx16 ssse3 sse3"
-@@ -33,7 +61,7 @@
-    level = "2"
-    vendor = "GenuineIntel"
-    family = "6"
--   model = "2"
-+   model = "26"
-    stepping = "3"
-    feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu"
-    feature_ecx = "popcnt sse4.2 sse4.1 cx16 ssse3 sse3"
-@@ -44,7 +72,7 @@
- 
- [cpudef]
-    name = "Westmere"
--   level = "11"
-+   level = "2"
-    vendor = "GenuineIntel"
-    family = "6"
-    model = "44"
--- 
-1.7.2.5
-
diff --git a/debian/postinst b/debian/postinst
index a2a508b..be525de 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -7,8 +7,8 @@ case "$1" in
   configure)
 
     # remove stale /etc/qemu (files are in /etc/kvm)
-    rm -f /etc/qemu/target-x86_64.conf
-    if test -d /etc/qemu; then rmdir /etc/qemu; fi
+    rm -rf /etc/qemu
+    rm -rf /etc/kvm
 
     # There are three sub-cases:
     if test "${2+set}" != set; then
diff --git a/debian/rules b/debian/rules
index 474f5ec..fd340d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --enable-vnc-tls --enable-sdl --enable-uuid --enable-linux-aio
+	./configure --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --enable-vnc-tls --enable-sdl --enable-uuid --enable-linux-aio
 
 build: patch build-stamp
 
@@ -82,12 +82,6 @@ install: build
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifup $(destdir)/etc/kvm/kvm-ifup
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
 
-	# move target-x86_64.conf to correct location
-	mv $(destdir)/etc/qemu/target-x86_64.conf $(destdir)/etc/kvm/
-
-	# /etc/qemu should be empty now
-	rmdir $(destdir)/etc/qemu
-
 	# we do not need openbios files (sparc/ppc)
 	rm -rf $(destdir)/usr/share/kvm/openbios-*
 	# remove ppc files
-- 
1.7.2.5