- update to 20061031 cvs snapshot (now uses aio and supports acpi and a new

  qcow2 image format)
- properly respect NOPORTDOCS
- make -serial /dev/cuadX work (modified patch from this post:
  http://lists.gnu.org/archive/html/qemu-devel/2006-09/msg00201.html , and hi
  Michael! :)
- add WITHOUT_SDL (hi joshe! :) and WITHOUT_CDROM_DMA knobs (the latter to work
  around atapicam problems in FreeBSD guests with the now by default enabled
  ide cdrom dma patch)
- use OPTIONS

PR:		ports/104989
Submitted by:	Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)

4 files changed, 50 insertions, 0 deletions

diff --git a/emulators/qemu-devel/files/cdrom-dma-patch b/emulators/qemu-devel/files/cdrom-dma-patch
new file mode 100644
index 000000000000..7b6bed2e6adc
--- /dev/null
+++ b/emulators/qemu-devel/files/cdrom-dma-patch
@@ -0,0 +1,10 @@
+Index: hw/ide.c
+@@ -27,7 +27,7 @@
+ //#define DEBUG_IDE
+ //#define DEBUG_IDE_ATAPI
+ //#define DEBUG_AIO
+-#define USE_DMA_CDROM
++// #define USE_DMA_CDROM
+ 
+ /* Bits of HD_STATUS */
+ #define ERR_STAT		0x01
diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile
new file mode 100644
index 000000000000..1dfcc6d21caf
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-Makefile
@@ -0,0 +1,11 @@
+Index: qemu/Makefile
+@@ -28,7 +28,8 @@
+ ifndef CONFIG_DARWIN
+ ifndef CONFIG_WIN32
+ ifndef CONFIG_SOLARIS
+-LIBS+=-lrt
++# XXX need ifndef CONFIG_BSD
++# LIBS+=-lrt
+ endif
+ endif
+ endif
diff --git a/emulators/qemu-devel/files/patch-vl.c-serial b/emulators/qemu-devel/files/patch-vl.c-serial
new file mode 100644
index 000000000000..76c290e28abb
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-vl.c-serial
@@ -0,0 +1,17 @@
+Index: qemu/vl.c
+@@ -1606,10 +1606,13 @@
+     cfsetospeed(&tty, spd);
+ 
+     tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
+-                          |INLCR|IGNCR|ICRNL|IXON);
+-    tty.c_oflag |= OPOST;
++                          |INLCR|IGNCR|ICRNL|IXON|IMAXBEL);
++    tty.c_oflag &= ~OPOST; /* Don't do any output processing! */
+     tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN|ISIG);
+     tty.c_cflag &= ~(CSIZE|PARENB|PARODD|CRTSCTS|CSTOPB);
++#ifdef __FreeBSD__
++    cfmakeraw(&tty);
++#endif
+     switch(data_bits) {
+     default:
+     case 8:
diff --git a/emulators/qemu-devel/files/patch-vl.h b/emulators/qemu-devel/files/patch-vl.h
new file mode 100644
index 000000000000..8307eee09785
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-vl.h
@@ -0,0 +1,12 @@
+Index: qemu/vl.h
+@@ -73,6 +73,10 @@
+ #define PRIo64 "I64o"
+ #endif
+ 
++#ifndef ENOMEDIUM
++#define ENOMEDIUM 4097
++#endif
++
+ #ifdef QEMU_TOOL
+ 
+ /* we use QEMU_TOOL in the command line tools which do not depend on