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 <mdr...@linux.vnet.ibm.com> --- 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 <agli...@linux.vnet.ibm.com> + * Michael Roth <mdr...@linux.vnet.ibm.com> + * + * 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