On Wed, 3 Oct 2012 16:36:50 +0200 Paolo Bonzini <pbonz...@redhat.com> wrote:
> They are just wrappers and do not need a Win32-specific version. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> Reviewed-by: Luiz Capitulino <lcapitul...@redhat.com> > --- > qemu-sockets.c | 49 +++++++++++++++++-------------------------------- > 1 file modificato, 17 inserzioni(+), 32 rimozioni(-) > > diff --git a/qemu-sockets.c b/qemu-sockets.c > index 5cf2b32..79c7b66 100644 > --- a/qemu-sockets.c > +++ b/qemu-sockets.c > @@ -731,6 +731,23 @@ int unix_connect_opts(QemuOpts *opts, Error **errp) > return sock; > } > > +#else > + > +int unix_listen_opts(QemuOpts *opts, Error **errp) > +{ > + error_setg(errp, "unix sockets are not available on windows"); > + errno = ENOTSUP; > + return -1; > +} > + > +int unix_connect_opts(QemuOpts *opts, Error **errp) > +{ > + error_setg(errp, "unix sockets are not available on windows"); > + errno = ENOTSUP; > + return -1; > +} > +#endif > + > /* compatibility wrapper */ > int unix_listen(const char *str, char *ostr, int olen, Error **errp) > { > @@ -773,38 +790,6 @@ int unix_connect(const char *path, Error **errp) > return sock; > } > > -#else > - > -int unix_listen_opts(QemuOpts *opts, Error **errp) > -{ > - error_setg(errp, "unix sockets are not available on windows"); > - errno = ENOTSUP; > - return -1; > -} > - > -int unix_connect_opts(QemuOpts *opts, Error **errp) > -{ > - error_setg(errp, "unix sockets are not available on windows"); > - errno = ENOTSUP; > - return -1; > -} > - > -int unix_listen(const char *path, char *ostr, int olen, Error **errp) > -{ > - error_setg(errp, "unix sockets are not available on windows"); > - errno = ENOTSUP; > - return -1; > -} > - > -int unix_connect(const char *path, Error **errp) > -{ > - error_setg(errp, "unix sockets are not available on windows"); > - errno = ENOTSUP; > - return -1; > -} > - > -#endif > - > #ifdef _WIN32 > static void socket_cleanup(void) > {