Commit 426c0df9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/io-channel-3-for-upstream' into staging 



Merge io-channels-3 partial branch

# gpg: Signature made Tue 20 Oct 2015 16:36:10 BST using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/io-channel-3-for-upstream:
  util: pull Buffer code out of VNC module
  coroutine: move into libqemuutil.a library
  osdep: add qemu_fork() wrapper for safely handling signals
  ui: convert VNC startup code to use SocketAddress
  sockets: allow port to be NULL when listening on IP address
  sockets: move qapi_copy_SocketAddress into qemu-sockets.c
  sockets: add helpers for creating SocketAddress from a socket

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ee9dfed2 88c5f205

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,19 @@ F: crypto/ 
F: include/crypto/

F: tests/test-crypto-*



Coroutines

M: Stefan Hajnoczi <stefanha@redhat.com>

M: Kevin Wolf <kwolf@redhat.com>

F: util/*coroutine*

F: include/qemu/coroutine*

F: tests/test-coroutine.c



Buffers

M: Daniel P. Berrange <berrange@redhat.com>

S: Odd fixes

F: util/buffer.c

F: include/qemu/buffer.h



Usermode Emulation

------------------

Overall

Makefile.objs

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ block-obj-$(CONFIG_WIN32) += aio-win32.o 
block-obj-y += block/

block-obj-y += qemu-io-cmds.o



block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o

block-obj-y += qemu-coroutine-sleep.o

block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o



block-obj-m = block/



#######################################################################

block.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/sysemu.h"

#include "qemu/notify.h"

#include "block/coroutine.h"

#include "qemu/coroutine.h"

#include "block/qapi.h"

#include "qmp-commands.h"

#include "qemu/timer.h"

block/qcow2.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define BLOCK_QCOW2_H



#include "crypto/cipher.h"

#include "block/coroutine.h"

#include "qemu/coroutine.h"



//#define DEBUG_ALLOC

//#define DEBUG_ALLOC2

block/vdi.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include "block/block_int.h"

#include "qemu/module.h"

#include "migration/migration.h"

#include "block/coroutine.h"

#include "qemu/coroutine.h"



#if defined(CONFIG_UUID)

#include <uuid/uuid.h>