diff options
| author | Shahar Havivi | 2010-03-14 21:41:15 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2010-03-31 18:17:29 +0200 |
| commit | d3f822d241d673103046a07874f8a3f37d1cb41b (patch) | |
| tree | 17e826d53dcda3dfd67c948a93a5365a198cdada | |
| parent | Don't check for bus master for old guests (diff) | |
| download | qemu-d3f822d241d673103046a07874f8a3f37d1cb41b.tar.gz qemu-d3f822d241d673103046a07874f8a3f37d1cb41b.tar.xz qemu-d3f822d241d673103046a07874f8a3f37d1cb41b.zip | |
Restore terminal monitor attributes - addition
Patch 2d753894c7553d6a05e8fdbed5f4704398919a35 was missing this check,
when running monitor as /dev/tty and other serial device, i.e:
qemu -monitor /dev/tty -serial /dev/pts/1
Without this patch any serial device will override the monitor stored
attributes. (monitor is called in main() before any serial device).
Signed-off-by: Shahar Havivi <shaharh@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qemu-char.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c index 3e4df8d56c..048da3fec1 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1002,7 +1002,9 @@ static void tty_serial_init(int fd, int speed, speed, parity, data_bits, stop_bits); #endif tcgetattr (fd, &tty); - oldtty = tty; + if (!term_atexit_done) { + oldtty = tty; + } #define check_speed(val) if (speed <= val) { spd = B##val; break; } speed = speed * 10 / 11; |