For disks larger than 128GB, the LBA capacity reported by IDE disks

should be limited to 128GB, the real size being reported in
LBA48 capacity.
Should fix disk corrution reported by Reinoud Zandijk.
Bump PKGREVISION

3 files changed, 20 insertions, 10 deletions

diff --git a/sysutils/xentools45/Makefile b/sysutils/xentools45/Makefile
index ab4b175df97..39430edde53 100644
--- a/sysutils/xentools45/Makefile
+++ b/sysutils/xentools45/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2015/06/05 18:15:42 khorben Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/11 17:43:58 bouyer Exp $
 
 VERSION=	4.5.0
 VERSION_IPXE=	9a93db3f0947484e30e753bbd61a10b17336e20e
 
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools45-${VERSION}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		sysutils
 MASTER_SITES=		http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools45/distinfo b/sysutils/xentools45/distinfo
index e0eaf2e2a9b..d2a4dd2d9b7 100644
--- a/sysutils/xentools45/distinfo
+++ b/sysutils/xentools45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/06/05 18:15:42 khorben Exp $
+$NetBSD: distinfo,v 1.8 2015/06/11 17:43:58 bouyer Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -48,7 +48,7 @@ SHA1 (patch-qemu-xen-traditional_Makefile) = aac50189b3e359314c5d47745d50113f190
 SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = fb03fe527515424d72758b606ab8d2e5bf8c341b
 SHA1 (patch-qemu-xen-traditional_configure) = a29520d12c229feed85b335e9241dc085427a3db
 SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = d94874baa64a0974d29c8c3a117cf0fae030952d
-SHA1 (patch-qemu-xen-traditional_hw_ide.c) = fb674b326321f4865183eee889967b1a948698e0
+SHA1 (patch-qemu-xen-traditional_hw_ide.c) = 4dc86cfec2d86766293af18b558b6bd5a336e697
 SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = b87481f764e16fb1345c44b4f46fa3837901a4e2
 SHA1 (patch-qemu-xen-traditional_hw_pass-through.h) = 0bf5cbc1d6f5506c1878296fce98ca3e42fc6560
 SHA1 (patch-qemu-xen-traditional_hw_piix4acpi.c) = 432cbbd922a2453d3aab37e49cced767a3f1ad34
diff --git a/sysutils/xentools45/patches/patch-qemu-xen-traditional_hw_ide.c b/sysutils/xentools45/patches/patch-qemu-xen-traditional_hw_ide.c
index 3d8d3d0ca57..55bc3396d2a 100644
--- a/sysutils/xentools45/patches/patch-qemu-xen-traditional_hw_ide.c
+++ b/sysutils/xentools45/patches/patch-qemu-xen-traditional_hw_ide.c
@@ -1,16 +1,26 @@
-$NetBSD: patch-qemu-xen-traditional_hw_ide.c,v 1.1 2015/01/20 16:42:13 bouyer Exp $
+$NetBSD: patch-qemu-xen-traditional_hw_ide.c,v 1.2 2015/06/11 17:43:58 bouyer Exp $
 
---- qemu-xen-traditional/hw/ide.c.orig	2014-10-06 17:50:24.000000000 +0200
-+++ qemu-xen-traditional/hw/ide.c	2015-01-19 13:16:38.000000000 +0100
-@@ -761,6 +761,7 @@
-     put_le16(p + 61, s->nb_sectors >> 16);
+--- qemu-xen-traditional/hw/ide.c.orig	2014-01-09 13:44:42.000000000 +0100
++++ qemu-xen-traditional/hw/ide.c	2015-06-11 16:15:49.000000000 +0200
+@@ -757,10 +757,15 @@
+     put_le16(p + 58, oldsize >> 16);
+     if (s->mult_sectors)
+         put_le16(p + 59, 0x100 | s->mult_sectors);
+-    put_le16(p + 60, s->nb_sectors);
+-    put_le16(p + 61, s->nb_sectors >> 16);
++    if (s->nb_sectors > 0x10000000)
++	oldsize = 0x10000000; /* report only 128GB */
++    else
++	oldsize =  s->nb_sectors;
++    put_le16(p + 60, oldsize);
++    put_le16(p + 61, oldsize >> 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 @@
+@@ -812,13 +817,12 @@
      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 */