* [gentoo-commits] dev/dev-zero:master commit in: app-emulation/qemu-kvm/, app-emulation/qemu-kvm/files/patches-from-fedora/
@ 2011-07-18 6:28 Tiziano Müller
0 siblings, 0 replies; only message in thread
From: Tiziano Müller @ 2011-07-18 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 8b432fb20ca45183fcda3671f325afb95c37db35
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 06:26:30 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 06:26:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=8b432fb2
Bumped.
---
app-emulation/qemu-kvm/Manifest | 7 +--
.../0000-qemu-fix-non-PCI-target-build.patch | 53 --------------------
.../0000-qemu-vhost-fix-dirty-page-handling.patch | 31 -----------
...kvm-0.14.0.ebuild => qemu-kvm-0.14.1-r2.ebuild} | 33 +++++++++----
4 files changed, 26 insertions(+), 98 deletions(-)
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index e81f2a3..74bcae3 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,5 +1,3 @@
-AUX patches-from-fedora/0000-qemu-fix-non-PCI-target-build.patch 1748 RMD160 6b74c349fa036728a38fe1ee56bf2ed567da2fb8 SHA1 08563c7e311d1c350065a6e4790e2abddc71c3d4 SHA256 9bd9e44061763aae606ee4cc19a0a54dc1c88830fe59432693be6a3a32a65328
-AUX patches-from-fedora/0000-qemu-vhost-fix-dirty-page-handling.patch 1045 RMD160 abbfe09dd7136ff2e89d0a4aee12903ac07dd38f SHA1 d544c845b2f782327babcfc8167d8fb4974db5d8 SHA256 9f78073f23657feef5e0bf017315476356d9cf6a0b953e39e54199e0a5e0c7b5
AUX patches-from-fedora/0001-qxl-spice-display-move-pipe-to-ssd.patch 4618 RMD160 f8bee2614fd8791cf478b09cb0babbf5c113ff4b SHA1 29bbe1bd0b1d5bd54e4d22aa062ed5fe9d7b80e7 SHA256 22152847a75d9f14d4d73f5f2042d83e0de2d882c066bf7524827127230b7d2d
AUX patches-from-fedora/0002-qxl-implement-get_command-in-vga-mode-without-locks.patch 10176 RMD160 316ed43c95137c49c25ef0d1d8faca736850f0b2 SHA1 61663c85a06ae2aaeff12887e609fcd76cbc1b31 SHA256 c788c617ee226716657dbfd778790f6b87734235e5d9fe702099bdd6e7147edb
AUX patches-from-fedora/0003-qxl-spice-remove-qemu_mutex_-un-lock_iothread-around.patch 5073 RMD160 3ce5594c2144edaff73a929c47260674724c3bbd SHA1 17844d9a38ef837098a492a994a60c7d06aeb007 SHA256 a656f4b0faac207578edf0171676799680da4427d2e332c144350dec2699bced
@@ -20,5 +18,6 @@ AUX patches-from-fedora/0017-spice-chardev-listen-to-frontend-guest-open-close.p
AUX patches-from-fedora/0018-spice-qemu-char-Fix-flow-control-in-client-guest-dir.patch 1784 RMD160 25fe156aafa2070905476ccdd0e4f2946729bec8 SHA1 7ed5fa3d92ed45d2e0d95247cc5d437304419074 SHA256 68215f7f55f749aa8333d840e40c0c58e957c12c90b47eb8b0c5cad3f6249fec
AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
-EBUILD qemu-kvm-0.14.0.ebuild 8262 RMD160 cea3db6007a7ddf1f274b95b7cfc67091d99dc64 SHA1 cdfd9bd633b2f2453b613a99796b0e6dd97bad2b SHA256 52ec87addca7e8db2164dc09b02116c3335aa9eac49c2b2744dfe5b480559d88
-DIST qemu-kvm-0.14.0.tar.gz 5320696 RMD160 9b55c252390ece716295fdc6a012eaa6091f7b90 SHA1 dba0b9484084374b6191608051f40e1991c54ea0 SHA256 2f62aff3655c7b904ccd088e80927b021126d91125e9d9515ee9dda8835c0635
+EBUILD qemu-kvm-0.14.1-r2.ebuild 8699 RMD160 0fb62c998fed745f3879d443715bf047a220ab97 SHA1 e6ec074f8459e81409f1a31a90a346269367299b SHA256 0f4c87eb7d3f01400c8ff4901dc350422746f8642f3c2d0db977b2760a06125e
+DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
+DIST qemu-kvm-0.14.1-backports-1.tar.bz2 1127 RMD160 7868908c1328cfcbc3e2c60124155f64fb8688e0 SHA1 a4ce58828516b60596c8fea878d6f2cb6bab40d0 SHA256 e636759e1a04aacc49247c1d1eb40d0f2c9e5c642b5404441990f1445483370a
diff --git a/app-emulation/qemu-kvm/files/patches-from-fedora/0000-qemu-fix-non-PCI-target-build.patch b/app-emulation/qemu-kvm/files/patches-from-fedora/0000-qemu-fix-non-PCI-target-build.patch
deleted file mode 100644
index b479efa..0000000
--- a/app-emulation/qemu-kvm/files/patches-from-fedora/0000-qemu-fix-non-PCI-target-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 1a8364456c2f3946b4feb8fc78eaf00d974f4c03
-Author: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Wed Feb 23 09:28:53 2011 +0100
-
- qemu-kvm: Fix non-PCI target build
-
- Replace obsolete qemu-kvm.h with kvm.h in pci.c and build that module
- just like upstream does. This fixes non-x86 targets which have no PCI
- support.
-
- Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
- Signed-off-by: Avi Kivity <avi@redhat.com>
-
-diff --git a/Makefile.objs b/Makefile.objs
-index f5702eb..3ec7121 100644
---- a/Makefile.objs
-+++ b/Makefile.objs
-@@ -170,7 +170,7 @@ hw-obj-y =
- hw-obj-y += loader.o
- hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
- hw-obj-y += fw_cfg.o
--hw-obj-$(CONFIG_PCI) += pci_bridge.o
-+hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
- hw-obj-$(CONFIG_PCI) += msix.o msi.o
- hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
- hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
-diff --git a/Makefile.target b/Makefile.target
-index 6e9a024..23367eb 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -195,7 +195,7 @@ endif #CONFIG_BSD_USER
- # System emulator target
- ifdef CONFIG_SOFTMMU
-
--obj-y = arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o balloon.o
-+obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o
- # virtio has to be here due to weird dependency between PCI and virtio-net.
- # need to fix this properly
- obj-$(CONFIG_NO_PCI) += pci-stub.o
-diff --git a/hw/pci.c b/hw/pci.c
-index 0c44939..1f6cebe 100644
---- a/hw/pci.c
-+++ b/hw/pci.c
-@@ -29,8 +29,8 @@
- #include "net.h"
- #include "sysemu.h"
- #include "loader.h"
--#include "qemu-kvm.h"
- #include "hw/pc.h"
-+#include "kvm.h"
- #include "device-assignment.h"
- #include "qemu-objects.h"
- #include "range.h"
diff --git a/app-emulation/qemu-kvm/files/patches-from-fedora/0000-qemu-vhost-fix-dirty-page-handling.patch b/app-emulation/qemu-kvm/files/patches-from-fedora/0000-qemu-vhost-fix-dirty-page-handling.patch
deleted file mode 100644
index e3fabb7..0000000
--- a/app-emulation/qemu-kvm/files/patches-from-fedora/0000-qemu-vhost-fix-dirty-page-handling.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-vhost was passing a physical address to cpu_physical_memory_set_dirty,
-which is wrong: we need to translate to ram address first.
-
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-
-Note: this lead to crashes during migration, so the patch
-is needed on the stable branch too.
-
----
- hw/vhost.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/hw/vhost.c b/hw/vhost.c
-index aaa34e4..97a1299 100644
---- a/hw/vhost.c
-+++ b/hw/vhost.c
-@@ -49,8 +49,10 @@ static void vhost_dev_sync_region(struct vhost_dev *dev,
- log = __sync_fetch_and_and(from, 0);
- while ((bit = sizeof(log) > sizeof(int) ?
- ffsll(log) : ffs(log))) {
-+ ram_addr_t ram_addr;
- bit -= 1;
-- cpu_physical_memory_set_dirty(addr + bit * VHOST_LOG_PAGE);
-+ ram_addr = cpu_get_physical_page_desc(addr + bit * VHOST_LOG_PAGE);
-+ cpu_physical_memory_set_dirty(ram_addr);
- log &= ~(0x1ull << bit);
- }
- addr += VHOST_LOG_CHUNK;
---
-1.7.3.2.91.g446ac
-
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.14.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
similarity index 89%
rename from app-emulation/qemu-kvm/qemu-kvm-0.14.0.ebuild
rename to app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
index 7324273..e26fdc3 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.14.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
@@ -2,6 +2,8 @@
# 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.16 2011/03/28 03:31:46 flameeyes Exp $
+BACKPORTS=1
+
EAPI="2"
if [[ ${PV} = *9999* ]]; then
@@ -16,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
KEYWORDS=""
else
SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
- ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+ ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
@@ -26,8 +28,11 @@ HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2"
SLOT="0"
# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
-png pulseaudio qemu-ifup rbd sasl sdl ssl spice static vde vhost-net xen"
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
++vhost-net xen"
+# static, depends on libsdl being built with USE=static-libs, which can not
+# be expressed in current EAPI's
COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
@@ -101,7 +106,8 @@ pkg_setup() {
kvm_kern_warn
fi
if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
- ewarn "You have to enable CONFIG_VHOST_NET in the kernel to get vhost-net support."
+ ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
+ ewarn "to have vhost-net support."
fi
fi
@@ -120,7 +126,14 @@ src_prepare() {
# remove part to make udev happy
sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
+ # ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
+ # to the qemu-devel ml - bug 337988
epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+ epatch
+
EPATCH_SOURCE="${FILESDIR}/patches-from-fedora" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
}
@@ -155,7 +168,10 @@ src_configure() {
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
# Add support for static builds
- use static && conf_opts="${conf_opts} --static"
+ #use static && conf_opts="${conf_opts} --static"
+
+ # Support debug USE flag
+ use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
# Fix the $(prefix)/etc issue
conf_opts="${conf_opts} --sysconfdir=/etc"
@@ -173,8 +189,9 @@ src_configure() {
conf_opts="${conf_opts} $(use_enable rbd)"
conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
conf_opts="${conf_opts} $(use_enable sdl)"
- conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
conf_opts="${conf_opts} $(use_enable spice)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
conf_opts="${conf_opts} $(use_enable vde)"
conf_opts="${conf_opts} $(use_enable vhost-net)"
conf_opts="${conf_opts} $(use_enable xen)"
@@ -206,10 +223,6 @@ src_configure() {
# --enable-io-thread \
}
-src_compile() {
- # Restricting parallel build until we get a patch to fix this
- emake -j1 || die
-}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-18 6:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-18 6:28 [gentoo-commits] dev/dev-zero:master commit in: app-emulation/qemu-kvm/, app-emulation/qemu-kvm/files/patches-from-fedora/ Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox