This commit was manufactured by cvs2svn to create tag 'RELEASE_7_0_0'.release/7.0.0

1 files changed, 34 insertions, 17 deletions

diff --git a/emulators/qemu/files/patch-vl.c b/emulators/qemu/files/patch-vl.c
index 437dafe471b2..8f920b047bed 100644
--- a/emulators/qemu/files/patch-vl.c
+++ b/emulators/qemu/files/patch-vl.c
@@ -1,21 +1,4 @@
 Index: qemu/vl.c
-@@ -1510,7 +1510,7 @@
-     return chr;
- }
- 
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD__)
- static CharDriverState *qemu_chr_open_pty(void)
- {
-     struct termios tty;
-@@ -1665,6 +1665,7 @@
-     return chr;
- }
- 
-+#if defined(__linux__)
- static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
- {
-     int fd = (int)chr->opaque;
 @@ -1727,6 +1728,7 @@
      chr->chr_ioctl = pp_ioctl;
      return chr;
@@ -24,3 +7,37 @@ Index: qemu/vl.c
  
  #else
  CharDriverState *qemu_chr_open_pty(void)
+@@ -1771,14 +1771,14 @@
+     return chr;
+ }
+ 
+-#if defined(__linux__) || defined(__sun__)
++#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)
+ static CharDriverState *qemu_chr_open_pty(void)
+ {
+     struct termios tty;
+     char slave_name[1024];
+     int master_fd, slave_fd;
+  
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__FreeBSD__)
+     /* Not satisfying */
+     if (openpty(&master_fd, &slave_fd, slave_name, NULL, NULL) < 0) {
+         return NULL;
+@@ -3036,7 +3036,7 @@
+         return qemu_chr_open_pp(filename);
+     } else 
+ #endif
+-#if defined(__linux__) || defined(__sun__)
++#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)
+     if (strstart(filename, "/dev/", NULL)) {
+         return qemu_chr_open_tty(filename);
+     } else
+@@ -8784,6 +8784,7 @@
+ #ifdef TARGET_ARM
+             case QEMU_OPTION_old_param:
+                 old_param = 1;
++                break;
+ #endif
+             case QEMU_OPTION_clock:
+                 configure_alarms(optarg);