commit 71a8bac608ef3ca05a801beb3c3fad46b574174b Author: Thomas Penteker <tek@serverop.de> Date: Mon Sep 15 11:28:14 2014 +0200 qemu-all: 2.1.0 -> 2.1.1 diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum index 132400b..bb54534 100644 --- a/qemu-all/.md5sum +++ b/qemu-all/.md5sum @@ -1,2 +1 @@ -4d032f7e42c4f75dc71701f92077a85a fix-trim-ide.patch -6726977292b448cbc7f89998fac6983b qemu-2.1.0.tar.bz2 +78b1b51bfa2eee424e1bfdf3b66daa64 qemu-2.1.1.tar.bz2 diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile index 106aad0..ebbc57f 100644 --- a/qemu-all/Pkgfile +++ b/qemu-all/Pkgfile @@ -6,16 +6,13 @@ # Nice to have: libseccomp libiscsi libusb usbredir name=qemu-all -version=2.1.0 -release=2 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 fix-trim-ide.patch) +version=2.1.1 +release=1 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) build() { cd qemu-$version - cd $name-$version - # fix TRIM passthrough for IDE devices - patch -p1 -i $SRC/fix-trim-ide.patch ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ diff --git a/qemu-all/fix-trim-ide.patch b/qemu-all/fix-trim-ide.patch deleted file mode 100644 index 65714e0..0000000 --- a/qemu-all/fix-trim-ide.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/hw/ide/core.c b/hw/ide/core.c -index db191a6..7256592 100644 ---- a/hw/ide/core.c -+++ b/hw/ide/core.c -@@ -688,7 +688,8 @@ void ide_dma_cb(void *opaque, int ret) - sector_num, n, s->dma_cmd); - #endif - -- if (!ide_sect_range_ok(s, sector_num, n)) { -+ if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) && -+ !ide_sect_range_ok(s, sector_num, n)) { - dma_buf_commit(s); - ide_dma_error(s); - return; diff --git a/qemu/fix-trim-ide.patch b/qemu/fix-trim-ide.patch deleted file mode 100644 index 65714e0..0000000 --- a/qemu/fix-trim-ide.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/hw/ide/core.c b/hw/ide/core.c -index db191a6..7256592 100644 ---- a/hw/ide/core.c -+++ b/hw/ide/core.c -@@ -688,7 +688,8 @@ void ide_dma_cb(void *opaque, int ret) - sector_num, n, s->dma_cmd); - #endif - -- if (!ide_sect_range_ok(s, sector_num, n)) { -+ if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) && -+ !ide_sect_range_ok(s, sector_num, n)) { - dma_buf_commit(s); - ide_dma_error(s); - return;