-RELEASE=2.0
+RELEASE=2.1
# also update debian/changelog
-KVMVER=1.0
-KVMPKGREL=9
+KVMVER=1.1
+KVMPKGREL=1
KVMPACKAGE=pve-qemu-kvm
KVMDIR=qemu-kvm
+pve-qemu-kvm (1.1-1) unstable; urgency=low
+
+ * update to qemu-kvm-1.1-rc2
+
+ -- Proxmox Support Team <support@proxmox.com> Mon, 21 May 2012 06:15:49 +0200
+
pve-qemu-kvm (1.0-9) unstable; urgency=low
* revert patch to change prefer_msi and share_intx defaults
+++ /dev/null
-http://patchwork.ozlabs.org/patch/144276/
-
-diff --git a/libcacard/vcardt.h b/libcacard/vcardt.h
-index d4d8e2e..d3e9522 100644
---- a/libcacard/vcardt.h
-+++ b/libcacard/vcardt.h
-@@ -26,8 +26,8 @@ typedef struct VCardEmulStruct VCardEmul;
- #define MAX_CHANNEL 4
-
- /* create an ATR with appropriate historical bytes */
--#define VCARD_ATR_PREFIX(size) (0x3b, 0x68+(size), 0x00, 0xff, \
-- 'V', 'C', 'A', 'R', 'D', '_')
-+#define VCARD_ATR_PREFIX(size) 0x3b, 0x68+(size), 0x00, 0xff, \
-+ 'V', 'C', 'A', 'R', 'D', '_'
-
-
- typedef enum {
+++ /dev/null
-Recent changes in userscapce code:
-
-http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commit;h=6919115a8715c34cd80baa08422d90496f11f5d7
-
-requires more recent kernel header:
-
-http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commit;h=16cc190a673f3582bca50b983026915e4811f7ab
-
-so we simply revert for now.
-
-Index: new/hw/device-assignment.c
-===================================================================
---- new.orig/hw/device-assignment.c 2012-04-03 07:23:56.000000000 +0200
-+++ new/hw/device-assignment.c 2012-04-03 07:25:07.000000000 +0200
-@@ -1771,9 +1771,9 @@
- DEFINE_PROP_BIT("iommu", AssignedDevice, features,
- ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
- DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
-- ASSIGNED_DEVICE_PREFER_MSI_BIT, false),
-+ ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
- DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
-- ASSIGNED_DEVICE_SHARE_INTX_BIT, true),
-+ ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
- DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
- DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
- DEFINE_PROP_END_OF_LIST(),
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
--- /dev/null
+From 861cf626eca5abb2fe7bc3be719acbf7086b94bb Mon Sep 17 00:00:00 2001
+From: Derumier Alexandre <aderumier@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@odiso.com>
+---
+ sysconfigs/target/cpus-x86_64.conf | 36 ++++++++++++++++++++++++++++++---
+ 1 files changed, 32 insertions(+), 4 deletions(-)
+
+diff --git a/sysconfigs/target/cpus-x86_64.conf b/sysconfigs/target/cpus-x86_64.conf
+index d050380..39a9a37 100644
+--- a/sysconfigs/target/cpus-x86_64.conf
++++ b/sysconfigs/target/cpus-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
+
+++ /dev/null
-From 861cf626eca5abb2fe7bc3be719acbf7086b94bb Mon Sep 17 00:00:00 2001
-From: Derumier Alexandre <aderumier@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@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
-
configure)
# remove stale /etc/qemu (files are in /etc/kvm)
+ # file is now in /usr/share/kvm/cpus-x86_64.conf
rm -f /etc/qemu/target-x86_64.conf
if test -d /etc/qemu; then rmdir /etc/qemu; fi
+ rm -f /etc/kvm/target-x86_64.conf
# There are three sub-cases:
if test "${2+set}" != set; then
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
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
+ # do not install empty (now in /usr/share/kvm/cpus-x86_64.conf)
+ rm $(destdir)/etc/kvm/target-x86_64.conf
# we do not need openbios files (sparc/ppc)
rm -rf $(destdir)/usr/share/kvm/openbios-*
projects / pve-qemu-kvm.git / commitdiff