Thu Jan 26 11:19:24 2012 UTC ()
Apply patch 79d1d3311319f3390f540f547becaba9d957f84c
from qemu upstream:

Fill in word 64 of IDENTIFY data to indicate support for PIO modes 3 and 4.
This allows NetBSD guests to use UltraDMA modes instead of just PIO mode 0.

With this patch I can no longer reproduce PR 42455.
Bump package revision.


(cegger)
diff -r1.13 -r1.14 pkgsrc/sysutils/xentools41/Makefile
diff -r1.15 -r1.16 pkgsrc/sysutils/xentools41/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/xentools41/patches/patch-df
cvs diff -r1.13 -r1.14 pkgsrc/sysutils/xentools41/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools41/Attic/Makefile 2011/12/06 00:19:25 1.13
+++ pkgsrc/sysutils/xentools41/Attic/Makefile 2012/01/26 11:19:23 1.14
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.13 2011/12/06 00:19:25 sbd Exp $ 1# $NetBSD: Makefile,v 1.14 2012/01/26 11:19:23 cegger Exp $
2# 2#
3# VERSION is set in version.mk as it is shared with other packages 3# VERSION is set in version.mk as it is shared with other packages
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= xen-${VERSION} 6DISTNAME= xen-${VERSION}
7PKGNAME= xentools41-${VERSION} 7PKGNAME= xentools41-${VERSION}
8#PKGREVISION= 1 8PKGREVISION= 2
9PKGREVISION= 1 
10CATEGORIES= sysutils 9CATEGORIES= sysutils
11MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 10MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
12 11
13DISTFILES= ${DISTNAME}.tar.gz 12DISTFILES= ${DISTNAME}.tar.gz
14DISTFILES+= ipxe-git-v1.0.0.tar.gz 13DISTFILES+= ipxe-git-v1.0.0.tar.gz
15SITES.ipxe-git-v1.0.0.tar.gz += http://xenbits.xensource.com/xen-extfiles/ 14SITES.ipxe-git-v1.0.0.tar.gz += http://xenbits.xensource.com/xen-extfiles/
16 15
17MAINTAINER= cegger@NetBSD.org 16MAINTAINER= cegger@NetBSD.org
18HOMEPAGE= http://xen.org/ 17HOMEPAGE= http://xen.org/
19COMMENT= Userland Tools for Xen 4.1.x 18COMMENT= Userland Tools for Xen 4.1.x
20 19
21LICENSE= gnu-gpl-v2 20LICENSE= gnu-gpl-v2
22 21
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/xentools41/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools41/Attic/distinfo 2011/12/14 04:01:37 1.15
+++ pkgsrc/sysutils/xentools41/Attic/distinfo 2012/01/26 11:19:23 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.15 2011/12/14 04:01:37 sbd Exp $ 1$NetBSD: distinfo,v 1.16 2012/01/26 11:19:23 cegger Exp $
2 2
3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
5Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes 5Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
6SHA1 (xen-4.1.2.tar.gz) = db584cb0a0cc614888d7df3b196d514fdb2edd6e 6SHA1 (xen-4.1.2.tar.gz) = db584cb0a0cc614888d7df3b196d514fdb2edd6e
7RMD160 (xen-4.1.2.tar.gz) = 457797ec4be286afbbcad940a9ce04e44f3f40d6 7RMD160 (xen-4.1.2.tar.gz) = 457797ec4be286afbbcad940a9ce04e44f3f40d6
8Size (xen-4.1.2.tar.gz) = 10365786 bytes 8Size (xen-4.1.2.tar.gz) = 10365786 bytes
9SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada 9SHA1 (patch-aa) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada
10SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d 10SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d
11SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb 11SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
12SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 12SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175
13SHA1 (patch-ae) = 400bd6cac23af1e75f45c3e4e88e3130a3517129 13SHA1 (patch-ae) = 400bd6cac23af1e75f45c3e4e88e3130a3517129
14SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510 14SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510
@@ -24,17 +24,18 @@ SHA1 (patch-bc) = 25c99a428fda6dee709888 @@ -24,17 +24,18 @@ SHA1 (patch-bc) = 25c99a428fda6dee709888
24SHA1 (patch-ca) = 36afc7b063f83adfe5b927ed0be586b102684020 24SHA1 (patch-ca) = 36afc7b063f83adfe5b927ed0be586b102684020
25SHA1 (patch-cb) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 25SHA1 (patch-cb) = 5563a72e203e789a86f4166c71ddb3fcff5215c6
26SHA1 (patch-cc) = 24d71f68a93b59bd5c5441c257d34862e7302040 26SHA1 (patch-cc) = 24d71f68a93b59bd5c5441c257d34862e7302040
27SHA1 (patch-cd) = 7b25b3b3a8d58effae395d776f2a4b94d79acfcb 27SHA1 (patch-cd) = 7b25b3b3a8d58effae395d776f2a4b94d79acfcb
28SHA1 (patch-ce) = 613f4c4605af860e5f88b68c49a0e7870ba6ecde 28SHA1 (patch-ce) = 613f4c4605af860e5f88b68c49a0e7870ba6ecde
29SHA1 (patch-cf) = c8740b1c9cfac686f2e4e32c7613b5f02206459d 29SHA1 (patch-cf) = c8740b1c9cfac686f2e4e32c7613b5f02206459d
30SHA1 (patch-cg) = 119029fda1d4ecee90d0a108151596cb3ef0ec74 30SHA1 (patch-cg) = 119029fda1d4ecee90d0a108151596cb3ef0ec74
31SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41 31SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41
32SHA1 (patch-da) = 1a7ecd9536340deac2945786b9faae55680525ca 32SHA1 (patch-da) = 1a7ecd9536340deac2945786b9faae55680525ca
33SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d 33SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d
34SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e 34SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
35SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 35SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3
36SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d 36SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d
 37SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c
37SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0 38SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0
38SHA1 (patch-ocaml-include-path) = 959df25b0aae78d525b25f223190203d3c1185a6 39SHA1 (patch-ocaml-include-path) = 959df25b0aae78d525b25f223190203d3c1185a6
39SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 40SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5
40SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7 41SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7
File Added: pkgsrc/sysutils/xentools41/patches/Attic/patch-df
$NetBSD: patch-df,v 1.1 2012/01/26 11:19:23 cegger Exp $

--- ioemu-qemu-xen/hw/ide.c.orig	2011-02-11 17:54:51.000000000 +0000
+++ ioemu-qemu-xen/hw/ide.c
@@ -761,6 +761,7 @@ static void ide_identify(IDEState *s)
     put_le16(p + 61, s->nb_sectors >> 16);
     put_le16(p + 62, 0x07); /* single word dma0-2 supported */
     put_le16(p + 63, 0x07); /* mdma0-2 supported */
+    put_le16(p + 64, 0x03); /* pio3-4 supported */
     put_le16(p + 65, 120);
     put_le16(p + 66, 120);
     put_le16(p + 67, 120);
@@ -812,13 +813,12 @@ static void ide_atapi_identify(IDEState 
     put_le16(p + 53, 7); /* words 64-70, 54-58, 88 valid */
     put_le16(p + 62, 7);  /* single word dma0-2 supported */
     put_le16(p + 63, 7);  /* mdma0-2 supported */
-    put_le16(p + 64, 0x3f); /* PIO modes supported */
 #else
     put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */
     put_le16(p + 53, 3); /* words 64-70, 54-58 valid */
     put_le16(p + 63, 0x103); /* DMA modes XXX: may be incorrect */
-    put_le16(p + 64, 1); /* PIO modes */
 #endif
+    put_le16(p + 64, 3); /* pio3-4 supported */
     put_le16(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */
     put_le16(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */
     put_le16(p + 67, 0x12c); /* minimum PIO cycle time without flow control */