[Qemu-commits] [qemu/qemu] 8fbf66: io: Fix double shift usages on QIOChannel features

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8fbf66121253969e59fe40de66e55bb2f27c5090
      
https://github.com/qemu/qemu/commit/8fbf66121253969e59fe40de66e55bb2f27c5090
  Author: Felipe Franciosi <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M include/io/channel.h
    M io/channel-socket.c

  Log Message:
  -----------
  io: Fix double shift usages on QIOChannel features

When QIOChannels were introduced in 666a3af9, the feature bits were
already defined shifted. However, when using them, the code was shifting
them again. The incorrect use was consistent until 74b6ce43, where
QIO_CHANNEL_FEATURE_LISTEN was defined shifted but tested unshifted.

This patch changes the definition to be unshifted and fixes the
incorrect usage introduced on 74b6ce43.

Signed-off-by: Felipe Franciosi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: e413ae0c0492c10d9277a1155ecc21fbbf0e2bc7
      
https://github.com/qemu/qemu/commit/e413ae0c0492c10d9277a1155ecc21fbbf0e2bc7
  Author: Felipe Franciosi <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M io/channel-socket.c
    M io/channel-tls.c
    M io/channel-websock.c
    M io/channel.c

  Log Message:
  -----------
  io: Use qio_channel_has_feature() where applicable

Parts of the code have been testing QIOChannel features directly with a
logical AND. This patch makes it all consistent by using the
qio_channel_has_feature() function to test if a feature is present.

Signed-off-by: Felipe Franciosi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: d8d3c7cc672d89b26180a404d6f0b03494160cf5
      
https://github.com/qemu/qemu/commit/d8d3c7cc672d89b26180a404d6f0b03494160cf5
  Author: Felipe Franciosi <address@hidden>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M include/io/channel.h
    M io/channel-socket.c
    M io/channel-tls.c
    M io/channel-websock.c
    M io/channel.c

  Log Message:
  -----------
  io: Introduce a qio_channel_set_feature() helper

Testing QIOChannel feature support can be done with a helper called
qio_channel_has_feature(). Setting feature support, however, was
done manually with a logical OR. This patch introduces a new helper
called qio_channel_set_feature() and makes use of it where applicable.

Signed-off-by: Felipe Franciosi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: bf5352082727df7207c54cf3fc5fb608dc2b1fda
      
https://github.com/qemu/qemu/commit/bf5352082727df7207c54cf3fc5fb608dc2b1fda
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M io/channel-socket.c

  Log Message:
  -----------
  io: set LISTEN flag explicitly for listen sockets

The SO_ACCEPTCONN ioctl is not portable across OS, with
some BSD versions and OS-X not supporting it. There is
no viable alternative to this, so instead just set the
feature explicitly when creating a listener socket.

The current users of qio_channel_socket_new_fd() won't
ever be given a listening socket, so there's no problem
with no auto-detecting it in this scenario

Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: af8096b2c3b16de3f6237f1ead6a657a7565272f
      
https://github.com/qemu/qemu/commit/af8096b2c3b16de3f6237f1ead6a657a7565272f
  Author: Felipe Franciosi <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M tests/test-io-channel-socket.c

  Log Message:
  -----------
  io: Add a QIOChannelSocket cleanup test

This patch adds a test to verify that the QIOChannel framework will not
unlink a filesystem unix socket unless the _FEATURE_LISTEN bit is set.

Due to a bug introduced in 74b6ce43, the framework would unlink the
entry if the _FEATURE_SHUTDOWN bit was set, regardless of the presence
of _FEATURE_LISTEN.

Signed-off-by: Felipe Franciosi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 20f4aa265ec8442be66f00ee3986a92018b44b7b
      
https://github.com/qemu/qemu/commit/20f4aa265ec8442be66f00ee3986a92018b44b7b
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M include/glib-compat.h
    M include/io/channel.h
    M io/channel.c

  Log Message:
  -----------
  io: add ability to set a name for IO channels

The GSource object has ability to have a name, which is useful
when debugging performance problems with the mainloop event
callbacks that take too long. By associating a name with a
QIOChannel object, we can then set the name on any GSource
associated with the channel.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 0d73f7253e4837603dbcbb7af0706d4d57124b5e
      
https://github.com/qemu/qemu/commit/0d73f7253e4837603dbcbb7af0706d4d57124b5e
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M block/nbd.c
    M blockdev-nbd.c
    M nbd/client.c
    M nbd/server.c

  Log Message:
  -----------
  nbd: set name for all I/O channels created

Ensure that all I/O channels created for NBD are given names
to distinguish their respective roles.

Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: e93a68e102ffc8f8316ce24a57f094734dc4d8f7
      
https://github.com/qemu/qemu/commit/e93a68e102ffc8f8316ce24a57f094734dc4d8f7
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M include/glib-compat.h
    M qemu-char.c

  Log Message:
  -----------
  char: set name for all I/O channels created

Ensure that all I/O channels created for character devices
are given names to distinguish their respective roles.

Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 6f01f136af7516b180bc14408c56f96826a316b3
      
https://github.com/qemu/qemu/commit/6f01f136af7516b180bc14408c56f96826a316b3
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    M migration/savevm.c
    M migration/socket.c
    M migration/tls.c

  Log Message:
  -----------
  migration: set name for all I/O channels created

Ensure that all I/O channels created for migration are given names
to distinguish their respective roles.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 10bcfe5897b5101b2831b4e2cdbb439ba459d599
      
https://github.com/qemu/qemu/commit/10bcfe5897b5101b2831b4e2cdbb439ba459d599
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M ui/vnc-auth-vencrypt.c
    M ui/vnc-ws.c
    M ui/vnc.c

  Log Message:
  -----------
  vnc: set name for all I/O channels created

Ensure that all I/O channels created for VNC are given names
to distinguish their respective roles.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: c3ff757d25115d6a530e8859d7287a862b1dc02d
      
https://github.com/qemu/qemu/commit/c3ff757d25115d6a530e8859d7287a862b1dc02d
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M main-loop.c

  Log Message:
  -----------
  main: set names for main loop sources created

The main loop creates two generic sources for the AIO
and IO handler systems.

Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 01b601f06154c0d35f945b1321ddb3f39530cc43
      
https://github.com/qemu/qemu/commit/01b601f06154c0d35f945b1321ddb3f39530cc43
  Author: Peter Maydell <address@hidden>
  Date:   2016-10-28 (Fri, 28 Oct 2016)

  Changed paths:
    M block/nbd.c
    M blockdev-nbd.c
    M include/glib-compat.h
    M include/io/channel.h
    M io/channel-socket.c
    M io/channel-tls.c
    M io/channel-websock.c
    M io/channel.c
    M main-loop.c
    M migration/exec.c
    M migration/fd.c
    M migration/migration.c
    M migration/savevm.c
    M migration/socket.c
    M migration/tls.c
    M nbd/client.c
    M nbd/server.c
    M qemu-char.c
    M tests/test-io-channel-socket.c
    M ui/vnc-auth-vencrypt.c
    M ui/vnc-ws.c
    M ui/vnc.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' 
into staging

Merge qio 2016/10/27 v1

# gpg: Signature made Thu 27 Oct 2016 13:54:03 BST
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <address@hidden>"
# gpg:                 aka "Daniel P. Berrange <address@hidden>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qio-2016-10-27-1:
  main: set names for main loop sources created
  vnc: set name for all I/O channels created
  migration: set name for all I/O channels created
  char: set name for all I/O channels created
  nbd: set name for all I/O channels created
  io: add ability to set a name for IO channels
  io: Add a QIOChannelSocket cleanup test
  io: set LISTEN flag explicitly for listen sockets
  io: Introduce a qio_channel_set_feature() helper
  io: Use qio_channel_has_feature() where applicable
  io: Fix double shift usages on QIOChannel features

Conflicts:
        qemu-char.c

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/fd209e4a773d...01b601f06154