qemu: 1.7.1 -> 2.0.0

This commit is contained in:
Thomas Penteker 2014-04-17 23:50:08 +02:00
parent 6b8753fdaa
commit 1d3cc2113e
4 changed files with 6 additions and 20 deletions

View File

@ -23,9 +23,11 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz -rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz
drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/qemu/ drwxr-xr-x root/root usr/share/qemu/
-rw-r--r-- root/root usr/share/qemu/QEMU,cgthree.bin
-rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin -rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin
-rw-r--r-- root/root usr/share/qemu/acpi-dsdt.aml -rw-r--r-- root/root usr/share/qemu/acpi-dsdt.aml
-rw-r--r-- root/root usr/share/qemu/bamboo.dtb -rw-r--r-- root/root usr/share/qemu/bamboo.dtb
-rw-r--r-- root/root usr/share/qemu/bios-256k.bin
-rw-r--r-- root/root usr/share/qemu/bios.bin -rw-r--r-- root/root usr/share/qemu/bios.bin
-rw-r--r-- root/root usr/share/qemu/efi-e1000.rom -rw-r--r-- root/root usr/share/qemu/efi-e1000.rom
-rw-r--r-- root/root usr/share/qemu/efi-eepro100.rom -rw-r--r-- root/root usr/share/qemu/efi-eepro100.rom

View File

@ -1,2 +1 @@
0afe916c82b3ec2ed4ff8ee2590c0f5c ide-smart.diff 2790f44fd76da5de5024b4aafeb594c2 qemu-2.0.0.tar.bz2
9541063d999cf9659ed7fdce71314f31 qemu-1.7.1.tar.bz2

View File

@ -6,16 +6,14 @@
# Nice to have: libseccomp libiscsi libusb usbredir # Nice to have: libseccomp libiscsi libusb usbredir
name=qemu name=qemu
version=1.7.1 version=2.0.0
release=2 release=1
source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 ide-smart.diff) source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2)
build() { build() {
cd $name-$version cd $name-$version
patch -p1 -i $SRC/ide-smart.diff
./configure --prefix=/usr \ ./configure --prefix=/usr \
--cc="${CC:=gcc}" \ --cc="${CC:=gcc}" \
--host-cc="${CC:=gcc}" \ --host-cc="${CC:=gcc}" \

View File

@ -1,13 +0,0 @@
diff --git a/hw/ide/core.c b/hw/ide/core.c
index e1dfe54..c943a4d 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd)
case 2: /* extended self test */
s->smart_selftest_count++;
if (s->smart_selftest_count > 21) {
- s->smart_selftest_count = 0;
+ s->smart_selftest_count = 1;
}
n = 2 + (s->smart_selftest_count - 1) * 24;
s->smart_selftest_data[n] = s->sector;