Merge branch 'qemu-cvs'

Conflicts:
	qemu/Makefile.target
	qemu/hw/cirrus_vga.c
	qemu/hw/ide.c
	qemu/pc-bios/bios.bin
	qemu/vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/gdbstub.c b/gdbstub.c
index ce3ea490b..4f3bbbc94 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2298,7 +2298,7 @@ int gdbserver_start(const char *port)
         port = gdbstub_port_name;
     }
 
-    chr = qemu_chr_open("gdb", port);
+    chr = qemu_chr_open("gdb", port, NULL);
     if (!chr)
         return -1;