Merge commit '93db66850d99fd9885edeff6af5679be51e1c610' into upstream-merge

* commit '93db66850d99fd9885edeff6af5679be51e1c610': (81 commits)
  ne2k_isa: use qdev properties for configuration.
  qdev/net: common nic property bits
  qdev: add vlan property
  qdev: add netdev property
  qdev: mac addr property fixups
  net: add macaddr type.
  Send a RARP packet after migration.
  multiboot.S patch for old as(1) (was: Re: [Qemu-devel] Some OpenBSD/amd64 build fixes)
  raw/linux-aio: Also initialize POSIX AIO
  qcow2: Fix grow_refcount_table error handling
  usb-linux: return USB_RET_STALL on -EPIPE
  Makefile: Change make to be quiet again when doing nothing
  eepro100: Restructure code
  target-arm: use native tcg-ops for ror/bic/vorn
  target-arm: fix neon shift helper functions
  target-arm: fix neon vsri, vshl and vsli ops
  target-arm: allow modifying vfp fpexc en bit only
  target-arm: add support for neon vld1.64/vst1.64 instructions
  target-arm: fix neon vshrn/vrshrn ops
  target-arm: fix incorrect temporary variable freeing
  ...

Signed-off-by: Mark McLoughlin <markmc@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/gdbstub.c b/gdbstub.c
index ecf98c343..ad7cdca85 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2448,7 +2448,7 @@ static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size)
 static void gdb_chr_event(void *opaque, int event)
 {
     switch (event) {
-    case CHR_EVENT_RESET:
+    case CHR_EVENT_OPENED:
         vm_stop(EXCP_INTERRUPT);
         gdb_has_xml = 0;
         break;