Update patch against current upstream.

Package-Manager: portage-2.2.0_alpha84_p47/cvs/Linux x86_64

3 files changed, 13 insertions, 10 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index cacfe5e9161d..3ae03518e2c4 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.94 2012/01/29 12:44:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.95 2012/01/30 06:32:59 slyfox Exp $
+
+  30 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  files/qemu-kvm-9999-fix-nonkvm-arches.patch, qemu-kvm-9999.ebuild:
+  Update patch against current upstream.
 
   29 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-kvm-9999.ebuild:
   Respect user's decision whether to generate debug info when build stuff
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index c35f98fea5c5..50145c344cfe 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -11,7 +11,7 @@ AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 RMD160
 AUX qemu-kvm-1.0-fix-nonkvm-arches.patch 742 RMD160 112937dafa2847d6d388ed33e539502d238ad098 SHA1 3f0a72d5441606b142907c41d47ec356483588e7 SHA256 3f2bf2def429453a8a9adbc2adf9d4f2e1d4c1f505ce0ade8f3810b74c281f02
 AUX qemu-kvm-1.0-fix-qemu-system-ppc.patch 1071 RMD160 113a121abf72c9378f0c231e2e7739db3f2d5126 SHA1 64d55f9a7b56a523caa597c77b699eb02acbb81e SHA256 22a9e989806477e943a09a3ada01c9a6a739d3fdcf6226275c064db1037cb02f
 AUX qemu-kvm-1.0-per-target-i8259.patch 2765 RMD160 53208c75291cf9d16eab990bacdc18e28ec44a13 SHA1 c347ff7fc737af004245d3671ae87c7869b95198 SHA256 42b5905f4e2f0bb5bcdca1e14a669941c2d70ffb1e0b6969b69fc4435772abb2
-AUX qemu-kvm-9999-fix-nonkvm-arches.patch 932 RMD160 8313ef828bfe7236b8f2e4d5094cb20949164fcb SHA1 7817b5fba72d685e66bf2a68380eb391aea828e4 SHA256 fd14ba9808274e38a5776abc608a6c4263becd0b72f919f4685d30042e413e2b
+AUX qemu-kvm-9999-fix-nonkvm-arches.patch 917 RMD160 e3ef75fa1807b98343e9eeda8d4113d2f783ec86 SHA1 f8545c30d4e083830b6a057af216cc8f881f9d51 SHA256 e471faa99d90058be593dcbc82284f395913b4484b0d96e8054150e68b4d9ad6
 AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 RMD160 7bc186c283b0eb220a47895f7cab50e191f1a3ea SHA1 00f36fd0197fa9d359e28a9ef2f56a1ee860fddf SHA256 d3068a419d69dbe44758830509fc13460d1497b14a5a10ffad910552da0c86b3
 DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982
 DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
@@ -21,12 +21,12 @@ EBUILD qemu-kvm-0.14.1-r2.ebuild 9077 RMD160 7d9801a9213e1f28e7f8a4124231fc09091
 EBUILD qemu-kvm-0.15.1-r1.ebuild 9645 RMD160 e3524ee32ab3eeca04aab58152277d48704213e7 SHA1 9f8f8e31950fd8d736ec4b7dbc666f1f3717b62f SHA256 92f90d761adaf317eeed54c1cdd8672e354ca92aa4fb65b1bb270284ad4a235d
 EBUILD qemu-kvm-1.0-r2.ebuild 11369 RMD160 9d258c343ea0e82993bd497e047925ac7c46b53d SHA1 e35973305add07591820981a1fbe6aa342c7fe22 SHA256 aef1aee37f4abb7c27298d7a218249564436fa0d09dfcced0e3beda244e8a061
 EBUILD qemu-kvm-9999.ebuild 10629 RMD160 f57e19d7ecf1969610c69e4d65b5354d358a2e01 SHA1 e747d70656eb8ae82ec64b3c34c044e8c2b12a4b SHA256 560934c222cfec36855f99fb10301d7c076392480a36ef6f120210732fecaf8e
-MISC ChangeLog 19870 RMD160 34f08c1d0d36ee76f2795cea8f18e4542d6c831a SHA1 31c8a73fd0007108dc141187e6c45042163a13ae SHA256 8288ad2008704b8e582178d5000db32c399385057d2e4f591d499f6bef6cfe81
+MISC ChangeLog 20035 RMD160 90e24da29e83bb7f2893dc137fa666790a8b745e SHA1 e82c22d6ced6aca5e437e6e53e6e2a2678ba4e3f SHA256 68bb716e5b9bf1dd7d2e801af191e7a8659c4440de112cb9aaa48c7e30a0e7a1
 MISC metadata.xml 1918 RMD160 9aeb9149cd322870ce6948a06def34c1d00418fa SHA1 c5f5a1921552afcad74d263920baac136b2d066f SHA256 5fdbde62a8fa400e9b7a9b0a5d5b5c8c398543dccb0ff6837bed23bf37887741
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8lQCAACgkQcaHudmEf86rGQQCghlbUFz2FARTQt++9PClGtbre
-8HgAn1jnJ3X3hVWq+DeDhje+So0kujTp
-=GYw3
+iEYEARECAAYFAk8mOaQACgkQcaHudmEf86pmdQCghI6q/5XqwrpdpLk0lkev6/Kr
+LxkAoIIwFVnRJ0T9KXoMK0njPtc7MwEo
+=14lz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch b/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
index 2c36e7e303a6..2fd4ec7ec648 100644
--- a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
@@ -3,7 +3,7 @@ Fix build failure caused by KVM-specific code in arches not supporting KVM:
 i8259.o: In function `kvm_i8259_set_irq':
 /tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
 diff --git a/hw/i8259.c b/hw/i8259.c
-index 0632ea2..2f6789d 100644
+index 21a4efc..bb3bb18 100644
 --- a/hw/i8259.c
 +++ b/hw/i8259.c
 @@ -21,6 +21,7 @@
@@ -14,15 +14,14 @@ index 0632ea2..2f6789d 100644
  #include "hw.h"
  #include "pc.h"
  #include "isa.h"
-@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
+@@ -591,11 +592,13 @@ static int kvm_kernel_pic_load_from_user(PICCommonState *s)
  
  static void kvm_i8259_set_irq(void *opaque, int irq, int level)
  {
 +#ifdef CONFIG_KVM
      int pic_ret;
      if (kvm_set_irq(irq, level, &pic_ret)) {
-         if (pic_ret != 0)
-             apic_set_irq_delivered();
+         apic_report_irq_delivered(pic_ret);
          return;
      }
 +#endif