From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 28 Oct 2016 14:30:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01b601f06154c0d35f945b1321ddb3f39530cc43;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging

Merge qio 2016/10/27 v1

# gpg: Signature made Thu 27 Oct 2016 13:54:03 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2016-10-27-1:
  main: set names for main loop sources created
  vnc: set name for all I/O channels created
  migration: set name for all I/O channels created
  char: set name for all I/O channels created
  nbd: set name for all I/O channels created
  io: add ability to set a name for IO channels
  io: Add a QIOChannelSocket cleanup test
  io: set LISTEN flag explicitly for listen sockets
  io: Introduce a qio_channel_set_feature() helper
  io: Use qio_channel_has_feature() where applicable
  io: Fix double shift usages on QIOChannel features

Conflicts:
	qemu-char.c

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

01b601f06154c0d35f945b1321ddb3f39530cc43
diff --cc qemu-char.c
index 6dd779fc3c,4d0986ced3..1e5a0e8cb9
--- a/qemu-char.c
+++ b/qemu-char.c
@@@ -1649,11 -1524,14 +1668,14 @@@ static CharDriverState *qemu_chr_open_p
      chr->opaque = s;
      chr->chr_write = pty_chr_write;
      chr->chr_update_read_handler = pty_chr_update_read_handler;
 -    chr->chr_close = pty_chr_close;
 +    chr->chr_free = pty_chr_free;
      chr->chr_add_watch = pty_chr_add_watch;
 -    chr->explicit_be_open = true;
 +    *be_opened = false;
  
      s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
+     name = g_strdup_printf("chardev-pty-%s", chr->label);
+     qio_channel_set_name(QIO_CHANNEL(s->ioc), name);
+     g_free(name);
      s->timer_tag = 0;
  
      return chr;
@@@ -4742,7 -4654,13 +4799,13 @@@ static CharDriverState *qmp_chardev_ope
          object_unref(OBJECT(sioc));
          return NULL;
      }
-     return qemu_chr_open_udp(sioc, common, be_opened, errp);
 -    chr = qemu_chr_open_udp(sioc, common, errp);
++    chr = qemu_chr_open_udp(sioc, common, be_opened, errp);
+ 
+     name = g_strdup_printf("chardev-udp-%s", chr->label);
+     qio_channel_set_name(QIO_CHANNEL(sioc), name);
+     g_free(name);
+ 
+     return chr;
  }