[Qemu-commits] [qemu/qemu] 680d16: error: add error_set_errno and error_setg_errno

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 680d16dcb79f999fad3a652c5190d6a5c6ea10dd
      
https://github.com/qemu/qemu/commit/680d16dcb79f999fad3a652c5190d6a5c6ea10dd
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M error.c
    M error.h

  Log Message:
  -----------
  error: add error_set_errno and error_setg_errno

These functions help maintaining homogeneous formatting of error
messages that include strerror values.

Acked-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7fc4e63ec018a0ef6d420ddb7f6cbf68387d4995
      
https://github.com/qemu/qemu/commit/7fc4e63ec018a0ef6d420ddb7f6cbf68387d4995
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M nbd.c
    M qemu-char.c
    M qemu-sockets.c
    M qemu_socket.h
    M qga/channel-posix.c
    M ui/vnc.c

  Log Message:
  -----------
  qemu-sockets: add Error ** to all functions

This lets me adjust the clients to do proper error propagation first,
thus avoiding temporary regressions in the quality of the error messages.

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0c814709471ac8a9617406e1e2cbd7015e97bfe9
      
https://github.com/qemu/qemu/commit/0c814709471ac8a9617406e1e2cbd7015e97bfe9
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: unix_listen and unix_connect are portable

They are just wrappers and do not need a Win32-specific version.

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1fc05adfa0f79a1268f7c2b7fb324f15eb63dceb
      
https://github.com/qemu/qemu/commit/1fc05adfa0f79a1268f7c2b7fb324f15eb63dceb
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-char.c
    M qemu-sockets.c
    M qemu_socket.h

  Log Message:
  -----------
  qemu-sockets: add nonblocking connect for Unix sockets

This patch mostly mimics what was done to TCP sockets, but simpler
because there is only one address to try.  It also includes a free EINTR
bug fix.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: be7059cd7f8998d41f0b44ec13907359d04c63d2
      
https://github.com/qemu/qemu/commit/be7059cd7f8998d41f0b44ec13907359d04c63d2
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M migration-tcp.c
    M migration.c

  Log Message:
  -----------
  migration: avoid using error_is_set and thus relying on errp != NULL

The migration code is using errp to detect "internal" errors, this means
that it relies on errp being non-NULL.

No impact so far because our only QMP clients (the QMP marshaller and HMP)
never pass a NULL Error **.  But if we had others, this patch would make
sure that migration can work with a NULL Error **.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1
      
https://github.com/qemu/qemu/commit/342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M migration-tcp.c
    M migration-unix.c
    M migration.c

  Log Message:
  -----------
  migration: centralize call to migrate_fd_error()

The call to migrate_fd_error() was missing for non-socket backends, so
centralize it in qmp_migrate().

Before:

    (qemu) migrate fd:ffff
    migrate: An undefined error has occurred
    (qemu) info migrate
    (qemu)

After:

    (qemu) migrate fd:ffff
    migrate: An undefined error has occurred
    (qemu) info migrate
    capabilities: xbzrle: off
    Migration status: failed
    total time: 0 milliseconds

(The awful error message will be fixed later in the series).

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e08c95ce8d66276198704f21ed9df6d99b3477e0
      
https://github.com/qemu/qemu/commit/e08c95ce8d66276198704f21ed9df6d99b3477e0
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M migration-unix.c
    M migration.c
    M migration.h

  Log Message:
  -----------
  migration: use qemu-sockets to establish Unix sockets

This makes migration-unix.c again a cut-and-paste job from migration-tcp.c,
exactly as it was in the beginning. :)

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f37afb5ab1921f42043b5527a517eef95c36acf8
      
https://github.com/qemu/qemu/commit/f37afb5ab1921f42043b5527a517eef95c36acf8
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M migration-exec.c
    M migration-fd.c
    M migration-tcp.c
    M migration-unix.c
    M migration.c
    M migration.h

  Log Message:
  -----------
  migration (outgoing): add error propagation for all protocols

Error propagation is already there for socket backends.  Add it to other
protocols, simplifying code that tests for errors that will never happen.
With all protocols understanding Error, the code can be simplified
further by removing the return value.

Unfortunately, the quality of error messages varies depending
on where the error is detected, because no Error is passed to the
NonBlockingConnectHandler.  Thus, the exact error message still cannot
be sent to the user if the OS reports it asynchronously via SO_ERROR.
If NonBlockingConnectHandler received an Error**, we could for
example report the error class and/or message via a new field of the
query-migration command even if it is reported asynchronously.

Before:

    (qemu) migrate fd:ffff
    migrate: An undefined error has occurred
    (qemu) info migrate
    (qemu)

After:

    (qemu) migrate fd:ffff
    migrate: File descriptor named 'ffff' has not been found
    (qemu) info migrate
    capabilities: xbzrle: off
    Migration status: failed
    total time: 0 milliseconds

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 43eaae28e0394f8fb80848fb40aa5d28c6360321
      
https://github.com/qemu/qemu/commit/43eaae28e0394f8fb80848fb40aa5d28c6360321
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M migration-exec.c
    M migration-fd.c
    M migration-tcp.c
    M migration-unix.c
    M migration.c
    M migration.h
    M vl.c

  Log Message:
  -----------
  migration (incoming): add error propagation to fd and exec protocols

And remove the superfluous integer return value.

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 87d5f24f3f5edc4b69d071d5966cea0aec7b571d
      
https://github.com/qemu/qemu/commit/87d5f24f3f5edc4b69d071d5966cea0aec7b571d
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-char.c

  Log Message:
  -----------
  qemu-char: ask and print error information from qemu-sockets

Before:

    $ qemu-system-x86_64 -monitor tcp:localhost:6000
    (starts despite error)

    $ qemu-system-x86_64 -monitor tcp:foo.bar:12345
    getaddrinfo(foo.bar,12345): Name or service not known
    chardev: opening backend "socket" failed

    $ qemu-system-x86_64 -monitor tcp:localhost:443,server=on
    inet_listen_opts: bind(ipv4,127.0.0.1,443): Permission denied
    inet_listen_opts: FAILED
    chardev: opening backend "socket" failed

After:

    $ x86_64-softmmu/qemu-system-x86_64 -monitor tcp:localhost:6000
    x86_64-softmmu/qemu-system-x86_64: -monitor tcp:localhost:6000: Failed to 
connect to socket: Connection refused
    chardev: opening backend "socket" failed

    $ x86_64-softmmu/qemu-system-x86_64 -monitor tcp:foo.bar:12345
    qemu-system-x86_64: -monitor tcp:foo.bar:12345: address resolution failed 
for foo.bar:12345: Name or service not known
    chardev: opening backend "socket" failed

    $ x86_64-softmmu/qemu-system-x86_64 -monitor tcp:localhost:443,server=on
    qemu-system-x86_64: -monitor tcp:localhost:443,server=on: Failed to bind 
socket: Permission denied
    chardev: opening backend "socket" failed

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f8430e7621b3319f6b94c735c811b2a2448cd6ea
      
https://github.com/qemu/qemu/commit/f8430e7621b3319f6b94c735c811b2a2448cd6ea
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M nbd.c

  Log Message:
  -----------
  nbd: ask and print error information from qemu-sockets

Before:

    $ qemu-system-x86_64 nbd:localhost:12345
    inet_connect_opts: connect(ipv4,yakj.usersys.redhat.com,127.0.0.1,12345): 
Connection refused
    qemu-system-x86_64: could not open disk image nbd:localhost:12345: 
Connection refused

After:

    $ x86_64-softmmu/qemu-system-x86_64 nbd:localhost:12345
    qemu-system-x86_64: Failed to connect to socket: Connection refused
    qemu-system-x86_64: could not open disk image nbd:localhost:12345: 
Connection refused

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 90119816e36ba019650214e7efeccdac1d4a9e32
      
https://github.com/qemu/qemu/commit/90119816e36ba019650214e7efeccdac1d4a9e32
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qga/channel-posix.c

  Log Message:
  -----------
  qemu-ga: ask and print error information from qemu-sockets

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c1c1619c8b100f675bc97198218f3fcb0a740921
      
https://github.com/qemu/qemu/commit/c1c1619c8b100f675bc97198218f3fcb0a740921
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: avoid Yoda conditionals

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1ce52c78ab90c4303bcb110f2c614410386d79a2
      
https://github.com/qemu/qemu/commit/1ce52c78ab90c4303bcb110f2c614410386d79a2
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: introduce a single label for error returns

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 007fcd3ee9673b3d00baacf3765bd501296155cd
      
https://github.com/qemu/qemu/commit/007fcd3ee9673b3d00baacf3765bd501296155cd
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M console.h
    M qmp.c
    M ui/vnc.c

  Log Message:
  -----------
  vnc: reorganize code for reverse mode

Avoid the dance between csock and vs->lsock.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2d55f0e817b6fa260282f5b5c533bcd470c75a32
      
https://github.com/qemu/qemu/commit/2d55f0e817b6fa260282f5b5c533bcd470c75a32
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  vnc: add error propagation to vnc_display_open

Before:

    $ qemu-system-x86_64 -vnc foo.bar:12345
    getaddrinfo(foo.bar,18245): Name or service not known
    Failed to start VNC server on `foo.bar:12345'

    $ qemu-system-x86_64 -vnc localhost:12345,reverse=on
    inet_connect_opts: connect(ipv4,yakj.usersys.redhat.com,127.0.0.1,12345): 
Connection refused
    Failed to start VNC server on `localhost:12345,reverse=on'

After:

    $ x86_64-softmmu/qemu-system-x86_64 -vnc foo.bar:12345
    Failed to start VNC server on `foo.bar:12345': address resolution failed 
for foo.bar:18245: Name or service not known

    $ x86_64-softmmu/qemu-system-x86_64 -vnc localhost:12345,reverse=on
    Failed to start VNC server on `localhost:12345,reverse=on': Failed to 
connect to socket: Connection refused

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a12fb8ad5b444174ecf3c3270f93ec59ad177bf3
      
https://github.com/qemu/qemu/commit/a12fb8ad5b444174ecf3c3270f93ec59ad177bf3
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: include strerror or gai_strerror output in error messages

Among others, before:

    $ qemu-system-x86_64 -chardev socket,port=12345,id=char
    inet_connect: host and/or port not specified
    chardev: opening backend "socket" failed

After:

    $ x86_64-softmmu/qemu-system-x86_64 -chardev socket,port=12345,id=char
    qemu-system-x86_64: -chardev socket,port=12345,id=char: host and/or port 
not specified
    chardev: opening backend "socket" failed

perror and fprintf can be removed because all clients can now
consume Errors properly.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 11663b553b0815b266b6a9060ab9702cf7a5334c
      
https://github.com/qemu/qemu/commit/11663b553b0815b266b6a9060ab9702cf7a5334c
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: add error propagation to inet_connect_addr

perror and fprintf can be removed because all clients can now consume
Errors properly.  However, we'll need to change the non-blocking connect
handlers to take an Error, in order to improve error handling for
migration with the TCP protocol.

This is a minor degradation in error reporting for outgoing migration.
However, until 1.2 this case just failed without even attempting to
connect, so it is still an improvement as far as overall QoI is
concerned.

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 4f085c822947068c785be8c1f27d1ad4e3215149
      
https://github.com/qemu/qemu/commit/4f085c822947068c785be8c1f27d1ad4e3215149
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-char.c
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: add error propagation to inet_dgram_opts

Before:

    $ qemu-system-x86_64 -monitor udp:localhost:address@hidden:631
    inet_dgram_opts: bind(ipv4,127.0.0.1,631): OK
    inet_dgram_opts failed
    chardev: opening backend "udp" failed

After:

    $ x86_64-softmmu/qemu-system-x86_64 -monitor 
udp:localhost:address@hidden:631
    qemu-system-x86_64: -monitor udp:localhost:address@hidden:631: Failed to 
bind socket: Address already in use
    chardev: opening backend "udp" failed

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2f002c43ebded28604c26787c9215c4d3594f0ec
      
https://github.com/qemu/qemu/commit/2f002c43ebded28604c26787c9215c4d3594f0ec
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: add error propagation to inet_parse

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 58899664de29c250229f8d306fcf04f852cf5cc6
      
https://github.com/qemu/qemu/commit/58899664de29c250229f8d306fcf04f852cf5cc6
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: add error propagation to Unix socket functions

Before:

    $ qemu-system-x86_64 -monitor unix:/vvv,server=off
    connect(unix:/vvv): No such file or directory
    chardev: opening backend "socket" failed

After:

    $ x86_64-softmmu/qemu-system-x86_64 -monitor unix:/vvv,server=off
    qemu-system-x86_64: -monitor unix:/vvv,server=off: Failed to connect to 
socket: No such file or directory
    chardev: opening backend "socket" failed

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3f8b11bc7d86a1952311565f089063d544d5a2f7
      
https://github.com/qemu/qemu/commit/3f8b11bc7d86a1952311565f089063d544d5a2f7
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qerror.h
    M ui/vnc.c

  Log Message:
  -----------
  vnc: drop QERR_VNC_SERVER_FAILED

We now always return "nice" error messages in errp when we goto fail.
Drop the default error message.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 69758c22e0814f77c7a286ce65a68270ce71284e
      
https://github.com/qemu/qemu/commit/69758c22e0814f77c7a286ce65a68270ce71284e
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M Makefile
    M Makefile.objs

  Log Message:
  -----------
  build: add QAPI files to the tools

We need them because qemu-sockets will soon be using SocketAddress.

Acked-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 5be8c759f008947514fbf7d8df9a30eebe496b6d
      
https://github.com/qemu/qemu/commit/5be8c759f008947514fbf7d8df9a30eebe496b6d
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  qapi: add socket address types

Acked-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 879e45c72da1569e07fbbc6a1aa2a708ea796044
      
https://github.com/qemu/qemu/commit/879e45c72da1569e07fbbc6a1aa2a708ea796044
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: return InetSocketAddress from inet_parse

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0ef3dd6c2de1fa4f80c5aa71fb5fdada0f35cc9a
      
https://github.com/qemu/qemu/commit/0ef3dd6c2de1fa4f80c5aa71fb5fdada0f35cc9a
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M tests/Makefile

  Log Message:
  -----------
  tests: do not include tools-obj-y
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 101f9cbc2b73340197ec610c095fd69f0b1413ed
      
https://github.com/qemu/qemu/commit/101f9cbc2b73340197ec610c095fd69f0b1413ed
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M Makefile
    M qemu-sockets.c
    M qemu-tool.c
    M qemu_socket.h

  Log Message:
  -----------
  qemu-sockets: add socket_listen, socket_connect, socket_parse

These are QAPI-friendly versions of the qemu-sockets functions.  They
support IP sockets, Unix sockets, and named file descriptors, using a
QAPI union to dispatch to the correct function.

Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3cbc002c34aa85ea952ee9b169a3ff97d350516a
      
https://github.com/qemu/qemu/commit/3cbc002c34aa85ea952ee9b169a3ff97d350516a
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: prepare code for adding block notifiers

There is no reason in principle to skip job cancellation and draining
of pending I/O when there is no medium in the disk.  Do these unconditionally,
which also prepares the code for the next patch.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d7d512f60979681c27597f1b1277e03505c1de08
      
https://github.com/qemu/qemu/commit/d7d512f60979681c27597f1b1277e03505c1de08
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M Makefile.objs
    M block.c
    M block.h
    M block_int.h

  Log Message:
  -----------
  block: add close notifiers

The first user of close notifiers will be the embedded NBD server.
It would be possible to use them to do some of the ad hoc processing
(e.g. for block jobs and I/O limits) that is currently done by
bdrv_close.

Acked-by: Kevin Wolf <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6dd844db4a49a367cc15cd0e8bfb72cfc6652766
      
https://github.com/qemu/qemu/commit/6dd844db4a49a367cc15cd0e8bfb72cfc6652766
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M Makefile.objs
    A blockdev-nbd.c
    M qapi-schema.json
    M qmp-commands.hx

  Log Message:
  -----------
  qmp: add NBD server commands

Adding an NBD server inside QEMU is trivial, since all the logic is
in nbd.c and can be shared easily between qemu-nbd and QEMU itself.
The main difference is that qemu-nbd serves a single unnamed export,
while QEMU serves named exports.

Acked-by: Luiz Capitulino <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c6b8141b84e1b80eff1f04e2a5feb38decae65d8
      
https://github.com/qemu/qemu/commit/c6b8141b84e1b80eff1f04e2a5feb38decae65d8
  Author: Anthony Liguori <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M Makefile
    M Makefile.objs
    M block.c
    M block.h
    M block_int.h
    A blockdev-nbd.c
    M console.h
    M error.c
    M error.h
    M migration-exec.c
    M migration-fd.c
    M migration-tcp.c
    M migration-unix.c
    M migration.c
    M migration.h
    M nbd.c
    M qapi-schema.json
    M qemu-char.c
    M qemu-sockets.c
    M qemu-tool.c
    M qemu_socket.h
    M qerror.h
    M qga/channel-posix.c
    M qmp-commands.hx
    M qmp.c
    M tests/Makefile
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'bonzini/nbd-next' into staging

* bonzini/nbd-next: (30 commits)
  qmp: add NBD server commands
  block: add close notifiers
  block: prepare code for adding block notifiers
  qemu-sockets: add socket_listen, socket_connect, socket_parse
  tests: do not include tools-obj-y Signed-off-by: Paolo Bonzini 
<address@hidden>
  qemu-sockets: return InetSocketAddress from inet_parse
  qapi: add socket address types
  build: add QAPI files to the tools
  vnc: drop QERR_VNC_SERVER_FAILED
  qemu-sockets: add error propagation to Unix socket functions
  qemu-sockets: add error propagation to inet_parse
  qemu-sockets: add error propagation to inet_dgram_opts
  qemu-sockets: add error propagation to inet_connect_addr
  qemu-sockets: include strerror or gai_strerror output in error messages
  vnc: add error propagation to vnc_display_open
  vnc: reorganize code for reverse mode
  vnc: introduce a single label for error returns
  vnc: avoid Yoda conditionals
  qemu-ga: ask and print error information from qemu-sockets
  nbd: ask and print error information from qemu-sockets
  ...


  Commit: 8473f377393219390ea6f2d8d450a2b054bb823e
      
https://github.com/qemu/qemu/commit/8473f377393219390ea6f2d8d450a2b054bb823e
  Author: Luiz Capitulino <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M osdep.h

  Log Message:
  -----------
  win32: fix broken build due to missing QEMU_MADV_HUGEPAGE

Commit ad0b5321f1f797274603ebbe20108b0750baee94 forgot to add
QEMU_MADV_HUGEPAGE macros for when CONFIG_MADVISE is not defined.
This broke the build for Windows. Fix it.

Signed-off-by: Luiz Capitulino <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a8170e5e97ad...8473f3773932