Message ID | 1289870175-14880-6-git-send-email-mdroth@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
> +static int vp_channel_send_all(VPDriver *drv, uint8_t *buf, int count) > +{ > + int ret; > + CharDriverState *chr = drv->chr; > + > + if (drv->chr != NULL) { > + /* send data to guest via channel device's read handler */ > + vp_chr_read(chr, buf, count); > + /* TODO: we assume here the full buffer was written to device > + * due to the dev write handler being a void function. > + * can we confirm? Do we need to? > + */ > + ret = count; > + } else if (drv->channel_fd != -1) { > + /* send data to host via channel fd */ > + ret = vp_send_all(drv->channel_fd, buf, count); > + if (ret == -1) { > + LOG("error sending data"); > + goto out_bad; > + } > + } else { > + LOG("driver in unknown state"); > + goto out_bad; > + } > + > + return ret; > +out_bad: > + LOG("unable to send to channel"); > + return -1; > +} > + Propagate the error return value? Currently this function discards the specific error and also doesn't LOG() its value. Stefan
diff --git a/virtproxy.c b/virtproxy.c index 2cfd905..edca62e 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -152,6 +152,37 @@ static QemuOptsList vp_socket_opts = { }, }; +static int vp_channel_send_all(VPDriver *drv, uint8_t *buf, int count) +{ + int ret; + CharDriverState *chr = drv->chr; + + if (drv->chr != NULL) { + /* send data to guest via channel device's read handler */ + vp_chr_read(chr, buf, count); + /* TODO: we assume here the full buffer was written to device + * due to the dev write handler being a void function. + * can we confirm? Do we need to? + */ + ret = count; + } else if (drv->channel_fd != -1) { + /* send data to host via channel fd */ + ret = vp_send_all(drv->channel_fd, buf, count); + if (ret == -1) { + LOG("error sending data"); + goto out_bad; + } + } else { + LOG("driver in unknown state"); + goto out_bad; + } + + return ret; +out_bad: + LOG("unable to send to channel"); + return -1; +} + /* get VPConn by fd, "client" denotes whether to look for client or server */ static VPConn *get_conn(const VPDriver *drv, int fd, bool client) { diff --git a/virtproxy.h b/virtproxy.h index 0203421..1a5e56a 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -30,5 +30,6 @@ int vp_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque); +void vp_chr_read(CharDriverState *s, uint8_t *buf, int len); #endif /* VIRTPROXY_H */
This handles sending of data to channel fd (qemu-vp in guest) or the device associated with the virtproxy chardev for the host depending on the context. vp_chr_read() wraps qemu_chr_read(), it'll be defined later in virtproxy-builtin.c, and noop'd in the guest agent via qemu-vp.c. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- virtproxy.c | 31 +++++++++++++++++++++++++++++++ virtproxy.h | 1 + 2 files changed, 32 insertions(+), 0 deletions(-)