qemu-all: 2.1.0 -> 2.1.1

This commit is contained in:
Thomas Penteker 2014-09-15 11:28:14 +02:00
parent ae8d563edb
commit 71a8bac608
4 changed files with 4 additions and 36 deletions

View File

@ -1,2 +1 @@
4d032f7e42c4f75dc71701f92077a85a fix-trim-ide.patch
6726977292b448cbc7f89998fac6983b qemu-2.1.0.tar.bz2
78b1b51bfa2eee424e1bfdf3b66daa64 qemu-2.1.1.tar.bz2

View File

@ -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}" \

View File

@ -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;

View File

@ -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;