diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-13 06:55:33 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-03-13 06:55:33 +0000 |
| commit | 28e9f86d0dd7a2e1b9cf736adadb6f9b18e78d30 (patch) | |
| tree | 4fda12dd3bb48ba092f7d443d0d5ea9b574e9f0c /app-emulation/qemu-kvm | |
| parent | Remove old. (diff) | |
| download | gentoo-2-28e9f86d0dd7a2e1b9cf736adadb6f9b18e78d30.tar.gz gentoo-2-28e9f86d0dd7a2e1b9cf736adadb6f9b18e78d30.tar.bz2 gentoo-2-28e9f86d0dd7a2e1b9cf736adadb6f9b18e78d30.zip | |
Drop outdated patch.
(Portage version: 2.2.0_alpha90_p19/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu-kvm')
| -rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch | 30 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-9999.ebuild | 4 |
3 files changed, 6 insertions, 34 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index f8335cb67bc2..7bb8e398d0c4 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.110 2012/03/08 23:05:08 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.111 2012/03/13 06:55:33 slyfox Exp $ + + 13 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> + -files/qemu-kvm-9999-fix-nonkvm-arches.patch, qemu-kvm-9999.ebuild: + Drop outdated patch. 08 Mar 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.0-r3.ebuild: Only warn about the lack of kvm-amd or kvm-intel on amd64 and x86. 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 deleted file mode 100644 index 2fd4ec7ec648..000000000000 --- a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix build failure caused by KVM-specific code in arches not supporting KVM: - LINK alpha-softmmu/qemu-system-alpha -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 21a4efc..bb3bb18 100644 ---- a/hw/i8259.c -+++ b/hw/i8259.c -@@ -21,6 +21,7 @@ - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -+#include "apic.h" - #include "hw.h" - #include "pc.h" - #include "isa.h" -@@ -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)) { - apic_report_irq_delivered(pic_ret); - return; - } -+#endif - } - - device_init(pic_register) diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild index 5832fd6c7ea6..a5a8373e2801 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.34 2012/03/06 23:34:29 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.35 2012/03/13 06:55:33 slyfox Exp $ #BACKPORTS=1 @@ -195,8 +195,6 @@ src_prepare() { # to the qemu-devel ml - bug 337988 epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" - epatch "${FILESDIR}"/${PN}-9999-fix-nonkvm-arches.patch - [[ -n ${BACKPORTS} ]] && \ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ epatch |