diff options
| author | cegger <cegger> | 2012-01-26 11:19:23 +0000 |
|---|---|---|
| committer | cegger <cegger> | 2012-01-26 11:19:23 +0000 |
| commit | 6457375c453264c4b510dc11c3caaa0a6db7842c (patch) | |
| tree | 925ff1b4fb0f1c71a07e9fbfd9295b8e13c62b36 /sysutils | |
| parent | daad0688bdf90a31663640306aa8bcda731e5229 (diff) | |
| download | pkgsrc-6457375c453264c4b510dc11c3caaa0a6db7842c.tar.gz | |
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.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools41/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/xentools41/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools41/patches/patch-df | 27 |
3 files changed, 31 insertions, 4 deletions
diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile index dba9ac9cefc..cb6b1868ad2 100644 --- a/sysutils/xentools41/Makefile +++ b/sysutils/xentools41/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2011/12/06 00:19:25 sbd Exp $ +# $NetBSD: Makefile,v 1.14 2012/01/26 11:19:23 cegger Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" DISTNAME= xen-${VERSION} PKGNAME= xentools41-${VERSION} -#PKGREVISION= 1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo index 17181c3b9a0..ad0e97ee9c6 100644 --- a/sysutils/xentools41/distinfo +++ b/sysutils/xentools41/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2011/12/14 04:01:37 sbd Exp $ +$NetBSD: distinfo,v 1.16 2012/01/26 11:19:23 cegger Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -34,6 +34,7 @@ SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d +SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0 SHA1 (patch-ocaml-include-path) = 959df25b0aae78d525b25f223190203d3c1185a6 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 diff --git a/sysutils/xentools41/patches/patch-df b/sysutils/xentools41/patches/patch-df new file mode 100644 index 00000000000..9b0c50cb764 --- /dev/null +++ b/sysutils/xentools41/patches/patch-df @@ -0,0 +1,27 @@ +$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 */ |