* Remove obsolete comments from patch-ej.

* Add * to pointer to function.

No functional change.
Thanks for tsustui@

3 files changed, 9 insertions, 23 deletions

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 7b97110ddb6..5e5a7197702 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: distinfo,v 1.67 2011/08/04 12:20:54 ryoon Exp $
 
 SHA1 (qemu-0.14.1.tar.gz) = 1a5003a03004b62b52562d1cbb8f50c5f135e0b8
 RMD160 (qemu-0.14.1.tar.gz) = 0601ff4e613fea0a6ce80907e2bfa11704048b36
@@ -11,8 +11,8 @@ SHA1 (patch-ef) = f05a2b2a394114ea039bd8be5bd4d9a1fac8be76
 SHA1 (patch-eg) = d78fdb8fb5a0cc6b7e5c41ffc749285866bb5243
 SHA1 (patch-eh) = 3d2c69d52bfa1ef0a64427db09a27a63f281ea58
 SHA1 (patch-ei) = f575651f2f5653e3e24649c4c9dbd1a627cdee77
-SHA1 (patch-ej) = 6d0904ab75d57bfcf8abae1518b1dee4033eac65
+SHA1 (patch-ej) = 2ac3bd790d66f0a4bbf94df9a33caee54e6f6bfe
 SHA1 (patch-el) = 3e2dd725ca3cf658b43a9ec07dc8d596f65bf3c9
 SHA1 (patch-en) = 9ea3b764e0bb7161d593ac830a0e24b598a179b6
 SHA1 (patch-et) = 09129c2eac330f83af7ac27a43fc7f19dbca8859
-SHA1 (patch-ioport.c) = 438f0437df17585daf8edc346dffa9b3024fff2d
+SHA1 (patch-ioport.c) = 184b7e1d68f255cab1aa1133404a7644ed8c09c5
diff --git a/emulators/qemu/patches/patch-ej b/emulators/qemu/patches/patch-ej
index b8c2c6d9071..89ce8af6d83 100644
--- a/emulators/qemu/patches/patch-ej
+++ b/emulators/qemu/patches/patch-ej
@@ -1,20 +1,6 @@
-$NetBSD: patch-ej,v 1.4 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ej,v 1.5 2011/08/04 12:20:54 ryoon Exp $
 
-1) bswap_NN() variants are not available in CONFIG_MACHINE_BSWAP_H case
-   (fixed in upstream master but not in stable-0.13 branch)
-http://git.qemu.org/qemu.git/commit/?id=ba5e7f82169f32ab8163c707d97c799ca09f8924
-
-2) don't use -1 against uint8_t
-   (fixed in upstream master but not in stable-0.13 branch)
-http://git.qemu.org/qemu.git/commit/?id=7bccf57383cca60a778d5c543ac80c9f62d89ef2
-http://git.qemu.org/qemu.git/commit/?id=aee474ebc62686ae8827747b0b1aed85b8122979
-
-3) fix uninitialized warning
-   (fixed in upstream master but not in stable-0.13 branch)
-http://git.qemu.org/qemu.git/commit/?id=d167f9bc06a577d6c85b8ed6991c1efe175aae7d
-http://git.qemu.org/qemu.git/commit/?id=ad7ee4ad6c3a5388acf94dd532d291ea6d3a5972
-
-4) include <sys/types.h> to fix build on Mac OS X
+* include <sys/types.h> to fix build on Mac OS X
 
 --- ui/vnc-enc-tight.c.orig	2011-05-06 19:01:44.000000000 +0000
 +++ ui/vnc-enc-tight.c
diff --git a/emulators/qemu/patches/patch-ioport.c b/emulators/qemu/patches/patch-ioport.c
index c1743a967e1..0277fb879d6 100644
--- a/emulators/qemu/patches/patch-ioport.c
+++ b/emulators/qemu/patches/patch-ioport.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-ioport.c,v 1.1 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ioport.c,v 1.2 2011/08/04 12:20:54 ryoon Exp $
 
 --- ioport.c.orig	2011-05-06 19:01:44.000000000 +0000
 +++ ioport.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ioport.c,v 1.1 2011/07/11 09:57:18 ryoon Exp $
      uint64_t data;
  
 -    ioport->ops->read(ioport, addr - ioport->base, 1, &data);
-+    (ioport->ops->read)(ioport, addr - ioport->base, 1, &data);
++    (*ioport->ops->read)(ioport, addr - ioport->base, 1, &data);
      return data;
  }
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ioport.c,v 1.1 2011/07/11 09:57:18 ryoon Exp $
      uint64_t data;
  
 -    ioport->ops->read(ioport, addr - ioport->base, 2, &data);
-+    (ioport->ops->read)(ioport, addr - ioport->base, 2, &data);
++    (*ioport->ops->read)(ioport, addr - ioport->base, 2, &data);
      return data;
  }
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ioport.c,v 1.1 2011/07/11 09:57:18 ryoon Exp $
      uint64_t data;
  
 -    ioport->ops->read(ioport, addr - ioport->base, 4, &data);
-+    (ioport->ops->read)(ioport, addr - ioport->base, 4, &data);
++    (*ioport->ops->read)(ioport, addr - ioport->base, 4, &data);
      return data;
  }