Merge commit '1a621c8dc9e4dcc9d385bdd2c24c5b5dbfd0ebe4' into upstream-merge

* commit '1a621c8dc9e4dcc9d385bdd2c24c5b5dbfd0ebe4': (51 commits)
  ram: remove support for loading v1
  move mux focus field from CharDriverState to MuxDriver
  monitor: fix muxing
  qdev: add parser for chardev properties
  Allow -serial chardev:<name>
  convert udp chardev to QemuOpts.
  convert mux chardev to QemuOpts.
  convert vc chardev to QemuOpts.
  convert tty + parport chardevs to QemuOpts.
  convert windows console chardev to QemuOpts.
  convert braille chardev to QemuOpts.
  convert msmouse chardev to QemuOpts.
  convert stdio chardev to QemuOpts.
  convert pty chardev to QemuOpts.
  convert unix+tcp chardevs to QemuOpts.
  sockets: add inet_listen_opts
  sockets: add inet_connect_opts
  sockets: add unix_*_opts for windows.
  sockets: add unix_listen_opts
  sockets: add unix_connect_opts
  ...

Conflicts:
	vl.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/qemu-common.h b/qemu-common.h
index c8fb315d2..875010bd9 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -114,6 +114,7 @@ int stristart(const char *str, const char *val, const char **ptr);
 int qemu_strnlen(const char *s, int max_len);
 time_t mktimegm(struct tm *tm);
 int qemu_fls(int i);
+int qemu_fdatasync(int fd);
 
 /* path.c */
 void init_paths(const char *prefix);
@@ -231,6 +232,7 @@ typedef struct QEMUIOVector {
 void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint);
 void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov);
 void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
+void qemu_iovec_concat(QEMUIOVector *dst, QEMUIOVector *src, size_t size);
 void qemu_iovec_destroy(QEMUIOVector *qiov);
 void qemu_iovec_reset(QEMUIOVector *qiov);
 void qemu_iovec_to_buffer(QEMUIOVector *qiov, void *buf);