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

9 files changed, 60 insertions, 30 deletions

diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile
index 0a8e141a49e..e2143dbc7c9 100644
--- a/sysutils/xentools41/Makefile
+++ b/sysutils/xentools41/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2015/04/19 13:13:21 spz Exp $
+# $NetBSD: Makefile,v 1.51 2015/06/11 17:42:43 bouyer Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include		"version.mk"
 
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools41-${VERSION}
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index 65da55b1c44..359ec2b5804 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2015/04/19 13:13:21 spz Exp $
+$NetBSD: distinfo,v 1.39 2015/06/11 17:42:43 bouyer Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -43,7 +43,7 @@ SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d
 SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
 SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3
 SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d
-SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c
+SHA1 (patch-df) = e7b41242fcb4a0d4fb9e22376af6a50d1081f96c
 SHA1 (patch-firmware_hvmloader_Makefile) = b2914e4988ba004d45403d67f1580b1f9725d006
 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989
 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886
diff --git a/sysutils/xentools41/patches/patch-df b/sysutils/xentools41/patches/patch-df
index 9b0c50cb764..7d117eeb23f 100644
--- a/sysutils/xentools41/patches/patch-df
+++ b/sysutils/xentools41/patches/patch-df
@@ -1,16 +1,26 @@
-$NetBSD: patch-df,v 1.1 2012/01/26 11:19:23 cegger Exp $
+$NetBSD: patch-df,v 1.2 2015/06/11 17:42:43 bouyer 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);
+--- ioemu-qemu-xen/hw/ide.c.orig	2014-01-09 13:44:42.000000000 +0100
++++ ioemu-qemu-xen/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 @@ static void ide_atapi_identify(IDEState 
+@@ -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 */
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile
index 0aecacda610..08cefa62f1d 100644
--- a/sysutils/xentools42/Makefile
+++ b/sysutils/xentools42/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2015/06/05 18:41:18 khorben Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/11 17:43:21 bouyer Exp $
 
 VERSION=	4.2.5
 VERSION_IPXE=	1.0.0
 
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools42-${VERSION}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		sysutils
 MASTER_SITES=		http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo
index 76a23bafaba..25301b74bee 100644
--- a/sysutils/xentools42/distinfo
+++ b/sysutils/xentools42/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/06/05 18:41:18 khorben Exp $
+$NetBSD: distinfo,v 1.18 2015/06/11 17:43:21 bouyer Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -61,7 +61,7 @@ SHA1 (patch-qemu-xen-traditional_Makefile) = 0fcd7d5342269e87f14ff76be05d8757151
 SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = 6376edcc57313c2ffe9bb3d88043d160d1f644ec
 SHA1 (patch-qemu-xen-traditional_configure) = 0f09a0128762dc7d083e5986908fed5b7746a981
 SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a8faf95491867c19471690ae98df93ff1d73114a
-SHA1 (patch-qemu-xen-traditional_hw_ide.c) = d562c36627e861658e7a1d52514e59368871cbdb
+SHA1 (patch-qemu-xen-traditional_hw_ide.c) = 4dc86cfec2d86766293af18b558b6bd5a336e697
 SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = d1f3a1842c595e2d261b997bac02bb71de41eaac
 SHA1 (patch-qemu-xen-traditional_hw_pass-through.h) = 765cfbb30bdcf9c212bd7f9aa00d19d723da496e
 SHA1 (patch-qemu-xen-traditional_hw_piix4acpi.c) = bd89d2da04e2b816a097d4eb6d18936e5fe6bceb
diff --git a/sysutils/xentools42/patches/patch-qemu-xen-traditional_hw_ide.c b/sysutils/xentools42/patches/patch-qemu-xen-traditional_hw_ide.c
index 30e9af3af8a..3d0bd9fcd94 100644
--- a/sysutils/xentools42/patches/patch-qemu-xen-traditional_hw_ide.c
+++ b/sysutils/xentools42/patches/patch-qemu-xen-traditional_hw_ide.c
@@ -1,16 +1,26 @@
-$NetBSD: patch-qemu-xen-traditional_hw_ide.c,v 1.1 2013/05/15 06:58:50 jnemeth Exp $
+$NetBSD: patch-qemu-xen-traditional_hw_ide.c,v 1.2 2015/06/11 17:43:21 bouyer Exp $
 
---- qemu-xen-traditional/hw/ide.c.orig	2011-02-11 17:54:51.000000000 +0000
-+++ qemu-xen-traditional/hw/ide.c
-@@ -761,6 +761,7 @@ static void ide_identify(IDEState *s)
-     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 @@ static void ide_atapi_identify(IDEState 
+@@ -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 */
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 */