From 21a682b65145d5a6359bbd450ba1e2fbc3333e4c Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Fri, 23 Jan 2009 08:15:28 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 emulators/qemu/distinfo 	emulators/qemu/patches/patch-ay

---
 emulators/qemu/distinfo         | 20 +++++++
 emulators/qemu/patches/patch-ay | 92 +++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 emulators/qemu/distinfo
 create mode 100644 emulators/qemu/patches/patch-ay

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
new file mode 100644
index 000000000000..543ad253c922
--- /dev/null
+++ b/emulators/qemu/distinfo
@@ -0,0 +1,20 @@
+$NetBSD: distinfo,v 1.40 2009/01/22 07:27:28 jmmv Exp $
+
+SHA1 (qemu-0.9.1.tar.gz) = 630ea20b5989f0df00128de7f7be661c573ed041
+RMD160 (qemu-0.9.1.tar.gz) = ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5
+Size (qemu-0.9.1.tar.gz) = 2804104 bytes
+SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
+SHA1 (patch-ab) = ba77da578f528ca549c48336b40378dcbb2a2fbb
+SHA1 (patch-ac) = 2f5abda6af41418af0a0f8bed320ebde160832a8
+SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d
+SHA1 (patch-ae) = a82f6c1a02c6bc03f4da9bc2b52f817b260ced8a
+SHA1 (patch-ag) = 3469af1ec2a4f95c09a67c16b1071f0ec27dab74
+SHA1 (patch-ak) = ed5766e36d5a192cf4559142e6ef9e0287e61b43
+SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
+SHA1 (patch-ao) = e515093b6ea99f9cba665de022fd62f3be911569
+SHA1 (patch-au) = 2892cae63796c76014288f4a700acbee5aadc529
+SHA1 (patch-av) = 715e9680d70c1aa1c83bda0270125144a26d6140
+SHA1 (patch-aw) = f3bc77cdec3a876fa69406c91590d02161e80753
+SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
+SHA1 (patch-ay) = f41e230bd0fef6437aa187b346fc06ef4f32a31c
+SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
diff --git a/emulators/qemu/patches/patch-ay b/emulators/qemu/patches/patch-ay
new file mode 100644
index 000000000000..cfb33d090bc3
--- /dev/null
+++ b/emulators/qemu/patches/patch-ay
@@ -0,0 +1,92 @@
+$NetBSD: patch-ay,v 1.8 2009/01/22 07:27:28 jmmv Exp $
+
+--- block-raw-posix.c.orig	2008-01-06 20:38:42.000000000 +0100
++++ block-raw-posix.c
+@@ -28,7 +28,9 @@
+ #endif
+ #include "block_int.h"
+ #include <assert.h>
++#ifdef _POSIX_ASYNCHRONOUS_IO
+ #include <aio.h>
++#endif
+ 
+ #ifdef CONFIG_COCOA
+ #include <paths.h>
+@@ -230,6 +232,7 @@ label__raw_write__success:
+     return ret;
+ }
+ 
++#ifdef _POSIX_ASYNCHRONOUS_IO
+ /***********************************************************/
+ /* Unix AIO using POSIX AIO */
+ 
+@@ -455,6 +458,7 @@ static void raw_aio_cancel(BlockDriverAI
+         pacb = &acb->next;
+     }
+ }
++#endif
+ 
+ static void raw_close(BlockDriverState *bs)
+ {
+@@ -545,6 +549,35 @@ static void raw_flush(BlockDriverState *
+     fsync(s->fd);
+ }
+ 
++#ifndef _POSIX_ASYNCHRONOUS_IO
++void qemu_aio_init(void)
++{
++}
++
++void qemu_aio_poll(void)
++{
++}
++
++void qemu_aio_flush(void)
++{
++}
++
++void qemu_aio_wait_start(void)
++{
++}
++
++void qemu_aio_wait(void)
++{
++#ifndef QEMU_IMG
++    qemu_bh_poll();
++#endif
++}
++
++void qemu_aio_wait_end(void)
++{
++}
++#endif
++
+ BlockDriver bdrv_raw = {
+     "raw",
+     sizeof(BDRVRawState),
+@@ -556,10 +589,12 @@ BlockDriver bdrv_raw = {
+     raw_create,
+     raw_flush,
+ 
++#ifdef _POSIX_ASYNCHRONOUS_IO
+     .bdrv_aio_read = raw_aio_read,
+     .bdrv_aio_write = raw_aio_write,
+     .bdrv_aio_cancel = raw_aio_cancel,
+     .aiocb_size = sizeof(RawAIOCB),
++#endif
+     .protocol_name = "file",
+     .bdrv_pread = raw_pread,
+     .bdrv_pwrite = raw_pwrite,
+@@ -908,10 +943,12 @@ BlockDriver bdrv_host_device = {
+     NULL,
+     raw_flush,
+ 
++#ifdef _POSIX_ASYNCHRONOUS_IO
+     .bdrv_aio_read = raw_aio_read,
+     .bdrv_aio_write = raw_aio_write,
+     .bdrv_aio_cancel = raw_aio_cancel,
+     .aiocb_size = sizeof(RawAIOCB),
++#endif
+     .bdrv_pread = raw_pread,
+     .bdrv_pwrite = raw_pwrite,
+     .bdrv_getlength = raw_getlength,
-- 
2.41.0