On Wed, Sep 16, 2015 at 08:08:35AM -0600, Eric Blake wrote:
> On 09/16/2015 07:52 AM, Daniel P. Berrange wrote:
> > The qemu-nbd program currently uses a QemuOpts objects
> > when setting up sockets. Switch it over to use the
> > QAPI SocketAddress objects instead.
> >
> > Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
> > ---
> > qemu-nbd.c | 102
> > +++++++++++++++++++++++--------------------------------------
> > 1 file changed, 38 insertions(+), 64 deletions(-)
> >
>
> > +static SocketAddress *nbd_build_socket_address(const char *sockpath,
> > + const char *bindto,
> > + const char *port)
> > +{
> > + SocketAddress *saddr;
> > +
> > + saddr = g_new0(SocketAddress, 1);
> > + if (sockpath) {
> > + saddr->kind = SOCKET_ADDRESS_KIND_UNIX;
>
> More minor conflicts with my qapi cleanups. Not a show-stopper.
>
> > + saddr->q_unix = g_new0(UnixSocketAddress, 1);
> > + saddr->q_unix->path = g_strdup(sockpath);
> > + } else {
> > + saddr->kind = SOCKET_ADDRESS_KIND_INET;
> > + saddr->inet = g_new0(InetSocketAddress, 1);
> > + saddr->inet->host = g_strdup(bindto);
> > + if (port) {
> > + saddr->inet->port = g_strdup(port);
> > + } else {
> > + saddr->inet->port = g_strdup_printf("%d", NBD_DEFAULT_PORT);
>
> The qapi type is gross for requiring port as a string. But we have plans
> to clean that up, not a showstopper for this patch.
On the contrary - QAPI is correct in requiring this, as it lets you
provide a service name (as defined in /etc/services) instead of a
numeric port, and getaddrinfo() will look that up and convert to
numeric format.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
