Commit 67a70840 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-base-2015-12-18-1' into staging 



Merge I/O channels base classes

# gpg: Signature made Fri 18 Dec 2015 12:18:38 GMT 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/pull-io-channel-base-2015-12-18-1:
  io: add QIOChannelBuffer class
  io: add QIOChannelCommand class
  io: add QIOChannelWebsock class
  io: add QIOChannelTLS class
  io: add QIOChannelFile class
  io: add QIOChannelSocket class
  io: add QIOTask class for async operations
  io: add helper module for creating watches on FDs
  io: add abstract QIOChannel classes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6a653321 d98e4eb7

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,13 @@ S: Odd fixes 
F: util/buffer.c

F: include/qemu/buffer.h



I/O Channels

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

S: Maintained

F: io/

F: include/io/

F: tests/test-io-*



Usermode Emulation

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

Overall

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ dummy := $(call unnest-vars,, \ 
                crypto-obj-y \

                crypto-aes-obj-y \

                qom-obj-y \

                io-obj-y \

                common-obj-y \

                common-obj-m)
@@ -178,6 +179,7 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) 


$(SOFTMMU_SUBDIR_RULES): $(block-obj-y)

$(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y)

$(SOFTMMU_SUBDIR_RULES): $(io-obj-y)

$(SOFTMMU_SUBDIR_RULES): config-all-devices.mak



subdir-%:

Makefile.objs

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ crypto-aes-obj-y = crypto/ 


qom-obj-y = qom/



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

# io-obj-y is code used by both qemu system emulation and qemu-img



io-obj-y = io/



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

# Target independent part of system emulation. The long term path is to

# suppress *all* target specific code in case of system emulation, i.e. a

Makefile.target

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ dummy := $(call unnest-vars,.., \ 
               crypto-obj-y \

               crypto-aes-obj-y \

               qom-obj-y \

               io-obj-y \

               common-obj-y \

               common-obj-m)

target-obj-y := $(target-obj-y-save)
@@ -185,6 +186,7 @@ all-obj-y += $(qom-obj-y) 
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)

all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)



$(QEMU_PROG_BUILD): config-devices.mak

configure

+11 −0
Original line number Diff line number Diff line
@@ -2426,6 +2426,14 @@ else 
fi





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

# getifaddrs (for tests/test-io-channel-socket )



have_ifaddrs_h=yes

if ! check_include "ifaddrs.h" ; then

  have_ifaddrs_h=no

fi



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

# VTE probe
@@ -5137,6 +5145,9 @@ fi 
if test "$tasn1" = "yes" ; then

  echo "CONFIG_TASN1=y" >> $config_host_mak

fi

if test "$have_ifaddrs_h" = "yes" ; then

    echo "HAVE_IFADDRS_H=y" >> $config_host_mak

fi

if test "$vte" = "yes" ; then

  echo "CONFIG_VTE=y" >> $config_host_mak

  echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak