diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-05-08 11:40:58 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-05-08 13:12:09 +0000 |
| commit | 74e64b68edb45d03b5e8d5ab8399d61f592c1b9e (patch) | |
| tree | fde94c15e9f8813fb4001546269aae7209f3d06a | |
| parent | dc95e50802edfa2bb6daa4254807d575213b9a9f (diff) | |
| download | aports-74e64b68edb45d03b5e8d5ab8399d61f592c1b9e.tar.bz2 aports-74e64b68edb45d03b5e8d5ab8399d61f592c1b9e.tar.xz | |
main/qemu: upgrade to 0.14.1
| -rw-r--r-- | main/qemu/APKBUILD | 8 | ||||
| -rw-r--r-- | main/qemu/qemu-vhost-fix-dirty-page-handling.patch | 31 |
2 files changed, 3 insertions, 36 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index abf3c855a..30cd47525 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=0.14.0 -pkgrel=1 +pkgver=0.14.1 +pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://www.nongnu.org/qemu/" arch="all" @@ -30,7 +30,6 @@ $pkgname-img " source="http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz qemu-libm.patch - qemu-vhost-fix-dirty-page-handling.patch 80-kvm.rules " @@ -106,7 +105,6 @@ img() { "$subpkgdir"/usr/bin/ } -md5sums="f9d145d5c09de9f0984ffe9bd1229970 qemu-0.14.0.tar.gz +md5sums="b6c713a8db638e173af53a62d5178640 qemu-0.14.1.tar.gz 70a4336c31600ce00838b056f0d08452 qemu-libm.patch -07ac0525259a8a5a98c441cbbdceceef qemu-vhost-fix-dirty-page-handling.patch 66660f143235201249dc0648b39b86ee 80-kvm.rules" diff --git a/main/qemu/qemu-vhost-fix-dirty-page-handling.patch b/main/qemu/qemu-vhost-fix-dirty-page-handling.patch deleted file mode 100644 index e3fabb74a..000000000 --- a/main/qemu/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 - |