From: Dietmar Maurer Date: Mon, 21 May 2012 05:27:29 +0000 (+0200) Subject: update to qemu-kvm-1.1-rc2 X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=commitdiff_plain;h=b259b74275981c9dacc88dcd3f8eda04b032081f;hp=64a8f6ec201398791a94a78edff794225edfc684 update to qemu-kvm-1.1-rc2 --- diff --git a/Makefile b/Makefile index 238241d..10a502d 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -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 diff --git a/debian/changelog b/debian/changelog index 2a02b32..f60a600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pve-qemu-kvm (1.1-1) unstable; urgency=low + + * update to qemu-kvm-1.1-rc2 + + -- Proxmox Support Team 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 diff --git a/debian/patches/libacard-fix-compilaton-with-gcc.4.7.diff b/debian/patches/libacard-fix-compilaton-with-gcc.4.7.diff deleted file mode 100644 index e46a126..0000000 --- a/debian/patches/libacard-fix-compilaton-with-gcc.4.7.diff +++ /dev/null @@ -1,17 +0,0 @@ -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 { diff --git a/debian/patches/revert-prefer_msi-and-share_intx-defaults.diff b/debian/patches/revert-prefer_msi-and-share_intx-defaults.diff deleted file mode 100644 index 5f0e3f0..0000000 --- a/debian/patches/revert-prefer_msi-and-share_intx-defaults.diff +++ /dev/null @@ -1,26 +0,0 @@ -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(), 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-cpus-x86_64.conf-to-rhel6.2-version.patch b/debian/patches/update-cpus-x86_64.conf-to-rhel6.2-version.patch new file mode 100644 index 0000000..6bacc67 --- /dev/null +++ b/debian/patches/update-cpus-x86_64.conf-to-rhel6.2-version.patch @@ -0,0 +1,86 @@ +From 861cf626eca5abb2fe7bc3be719acbf7086b94bb Mon Sep 17 00:00:00 2001 +From: Derumier Alexandre +Date: Thu, 1 Mar 2012 17:00:30 +0100 +Subject: [PATCH] update target to rhel 6.2 version + + +Signed-off-by: Derumier Alexandre +--- + 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 + 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 -Date: Thu, 1 Mar 2012 17:00:30 +0100 -Subject: [PATCH] update target to rhel 6.2 version - - -Signed-off-by: Derumier Alexandre ---- - 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..ddf9452 100755 --- a/debian/postinst +++ b/debian/postinst @@ -7,8 +7,10 @@ case "$1" in 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 diff --git a/debian/rules b/debian/rules index 474f5ec..ca4fb28 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,11 +82,8 @@ 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 + # 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-* diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz index 7dc52f8..065f9dd 100644 Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ