On Tue, Nov 10, 2009 at 04:43:02PM +0000, Daniel P. Berrange wrote:
On Tue, Nov 10, 2009 at 01:00:36PM +0100, Daniel Veillard wrote:
> commit 680ced4bde478006a2e6445801993e110a3687be
> Author: Daniel Veillard <veillard(a)redhat.com>
> Date: Tue Nov 10 12:56:11 2009 +0100
>
> diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
> index 35cd330..ab1fb9a 100644
> --- a/src/qemu/qemu_monitor_text.c
> +++ b/src/qemu/qemu_monitor_text.c
> @@ -159,6 +159,7 @@ qemuMonitorSendUnix(const virDomainObjPtr vm,
> size_t cmdlen,
> int scm_fd)
> {
> + char control[CMSG_SPACE(sizeof(int))];
> struct msghdr msg;
> struct iovec iov[1];
> ssize_t ret;
> @@ -172,7 +173,6 @@ qemuMonitorSendUnix(const virDomainObjPtr vm,
> msg.msg_iovlen = 1;
>
> if (scm_fd != -1) {
> - char control[CMSG_SPACE(sizeof(int))];
> struct cmsghdr *cmsg;
>
> msg.msg_control = control;
[...]
ACK
Okay, both pushed except for the diff above which has disapeard in the
refactoring.
thanks,
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit
http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine
http://rpmfind.net/
http://veillard.com/ | virtualization library
http://libvirt.org/