From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60309 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9Mdj-0000Fb-Fm for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9Mde-0002l1-LH for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:55 -0400 Received: from e3.ny.us.ibm.com ([32.97.182.143]:54351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9Mde-0002kw-IZ for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:50 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e3.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o9MITxXd023679 for ; Fri, 22 Oct 2010 14:29:59 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9MIkofx264874 for ; Fri, 22 Oct 2010 14:46:50 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9MIkntH028196 for ; Fri, 22 Oct 2010 14:46:49 -0400 From: Michael Roth Date: Fri, 22 Oct 2010 13:46:05 -0500 Message-Id: <1287773165-24855-11-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1287773165-24855-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1287773165-24855-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH 10/10] virtproxy: add compat defs for linking against vl.c List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, abeekhof@redhat.com Virtagent depends on basic qemu functions re-implemented by qemu-vp to allow it to be used in output of qemu (in particular, to allow the client code to be used for guest-to-host RPC calls). To build virtagent into qemu we need to define these in terms of the built-in qemu functions. Signed-off-by: Michael Roth --- Makefile.target | 2 +- virtproxy-builtin.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) create mode 100644 virtproxy-builtin.c diff --git a/Makefile.target b/Makefile.target index f8f4c13..d72b2be 100644 --- a/Makefile.target +++ b/Makefile.target @@ -164,7 +164,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o virtagent.o virtagent-common.o +obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o virtagent.o virtagent-common.o virtproxy-builtin.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o diff --git a/virtproxy-builtin.c b/virtproxy-builtin.c new file mode 100644 index 0000000..c3416b3 --- /dev/null +++ b/virtproxy-builtin.c @@ -0,0 +1,30 @@ +/* + * virt-proxy - host/guest communication layer builtin definitions + * + * Copyright IBM Corp. 2010 + * + * Authors: + * Adam Litke + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +/* the following are functions we define in terms of qemu when linked + * against qemu/vl.c. these will be added on an as-needed basis + */ + +#include "qemu-char.h" +#include "virtproxy.h" + +int vp_set_fd_handler(int fd, + IOHandler *fd_read, + IOHandler *fd_write, + void *opaque) +{ + return qemu_set_fd_handler(fd, fd_read, fd_write, opaque); +} + + -- 1.7.0.4