[PULL,v1,00/10] Merge qio 2016/10/20

Message ID	1476971286-10612-1-git-send-email-berrange@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: "Daniel P. Berrange" <berrange@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 20 Oct 2016 14:47:56 +0100 Message-Id: <1476971286-10612-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 00/10] Merge qio 2016/10/20 Precedence: list Cc: Peter Maydell <peter.maydell@linaro.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Daniel P. Berrangé Oct. 20, 2016, 1:47 p.m. UTC

The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e:

  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-10-18 09:29:44 +0100)

are available in the git repository at:

  git://github.com/berrange/qemu tags/pull-qio-2016-10-20-1

for you to fetch changes up to 8ef215b830231eb6bf2022d9ec261ca0de2b8014:

  main: set names for main loop sources created (2016-10-20 13:06:39 +0100)

----------------------------------------------------------------
Merge qio 2016/10/20 v1

----------------------------------------------------------------

Daniel P. Berrange (6):
  io: add ability to set a name for IO channels
  nbd: set name for all I/O channels created
  char: set name for all I/O channels created
  migration: set name for all I/O channels created
  vnc: set name for all I/O channels created
  main: set names for main loop sources created

Felipe Franciosi (4):
  io: Fix double shift usages on QIOChannel features
  io: Use qio_channel_has_feature() where applicable
  io: Introduce a qio_channel_set_feature() helper
  io: Add a QIOChannelSocket cleanup test

 block/nbd.c                    |  1 +
 blockdev-nbd.c                 |  3 ++
 include/glib-compat.h          | 11 ++++++
 include/io/channel.h           | 29 ++++++++++++++--
 io/channel-socket.c            | 12 ++++---
 io/channel-tls.c               |  4 +--
 io/channel-websock.c           |  4 +--
 io/channel.c                   | 35 +++++++++++++++----
 main-loop.c                    |  2 ++
 migration/exec.c               |  2 ++
 migration/fd.c                 |  2 ++
 migration/migration.c          |  1 +
 migration/savevm.c             |  3 ++
 migration/socket.c             |  5 +++
 migration/tls.c                |  2 ++
 nbd/client.c                   |  1 +
 nbd/server.c                   |  1 +
 qemu-char.c                    | 77 ++++++++++++++++++++++++++++++++++++++----
 tests/test-io-channel-socket.c | 33 ++++++++++++++++++
 ui/vnc-auth-vencrypt.c         |  1 +
 ui/vnc-ws.c                    |  3 ++
 ui/vnc.c                       |  7 ++++
 22 files changed, 213 insertions(+), 26 deletions(-)

Eric Blake Oct. 20, 2016, 2:55 p.m. UTC | #1

On 10/20/2016 08:47 AM, Daniel P. Berrange wrote:
> The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e:
> 
>   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-10-18 09:29:44 +0100)
> 
> are available in the git repository at:
> 
>   git://github.com/berrange/qemu tags/pull-qio-2016-10-20-1
> 
> for you to fetch changes up to 8ef215b830231eb6bf2022d9ec261ca0de2b8014:
> 
>   main: set names for main loop sources created (2016-10-20 13:06:39 +0100)
> 
> ----------------------------------------------------------------
> Merge qio 2016/10/20 v1

Isn't this v2 of the pull request?

Daniel P. Berrangé Oct. 20, 2016, 3:05 p.m. UTC | #2

On Thu, Oct 20, 2016 at 09:55:03AM -0500, Eric Blake wrote:
> On 10/20/2016 08:47 AM, Daniel P. Berrange wrote:
> > The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e:
> > 
> >   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-10-18 09:29:44 +0100)
> > 
> > are available in the git repository at:
> > 
> >   git://github.com/berrange/qemu tags/pull-qio-2016-10-20-1
> > 
> > for you to fetch changes up to 8ef215b830231eb6bf2022d9ec261ca0de2b8014:
> > 
> >   main: set names for main loop sources created (2016-10-20 13:06:39 +0100)
> > 
> > ----------------------------------------------------------------
> > Merge qio 2016/10/20 v1
> 
> Isn't this v2 of the pull request?

I guess so. My pull request script just starts numbering from 1 on each
new day and the previous pull was sent yesterday.

Regards,
Daniel

Eric Blake Oct. 20, 2016, 3:16 p.m. UTC | #3

On 10/20/2016 10:05 AM, Daniel P. Berrange wrote:

>>> Merge qio 2016/10/20 v1
>>
>> Isn't this v2 of the pull request?
> 
> I guess so. My pull request script just starts numbering from 1 on each
> new day and the previous pull was sent yesterday.

Ah, I see; yesterday's was 'merge qio 2016/10/19', where the difference
in date is sufficient.  Not worth worrying about, then, so sorry for my
noise :)

Peter Maydell Oct. 20, 2016, 4:11 p.m. UTC | #4

On 20 October 2016 at 14:47, Daniel P. Berrange <berrange@redhat.com> wrote:
> The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-10-18 09:29:44 +0100)
>
> are available in the git repository at:
>
>   git://github.com/berrange/qemu tags/pull-qio-2016-10-20-1
>
> for you to fetch changes up to 8ef215b830231eb6bf2022d9ec261ca0de2b8014:
>
>   main: set names for main loop sources created (2016-10-20 13:06:39 +0100)
>
> ----------------------------------------------------------------
> Merge qio 2016/10/20 v1
>
> ----------------------------------------------------------------
>

Unfortunately the new test seems to fail on OSX:

  GTESTER tests/test-io-channel-socket
**
ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
test_io_channel_unix(_Bool): assertion failed:
(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
GTester: last random seed: R02S300c198252e54fe12ff5d64603150e68
**
ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
test_io_channel_unix(_Bool): assertion failed:
(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
GTester: last random seed: R02S7ade3405366ffc33ad5cf50619671f53

thanks
-- PMM

Daniel P. Berrangé Oct. 21, 2016, 10:28 a.m. UTC | #5

On Thu, Oct 20, 2016 at 05:11:56PM +0100, Peter Maydell wrote:
> On 20 October 2016 at 14:47, Daniel P. Berrange <berrange@redhat.com> wrote:
> > The following changes since commit e8ddc2eae5ccc41f0815e5c43e70cb04a7e67e2e:
> >
> >   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-10-18 09:29:44 +0100)
> >
> > are available in the git repository at:
> >
> >   git://github.com/berrange/qemu tags/pull-qio-2016-10-20-1
> >
> > for you to fetch changes up to 8ef215b830231eb6bf2022d9ec261ca0de2b8014:
> >
> >   main: set names for main loop sources created (2016-10-20 13:06:39 +0100)
> >
> > ----------------------------------------------------------------
> > Merge qio 2016/10/20 v1
> >
> > ----------------------------------------------------------------
> >
> 
> Unfortunately the new test seems to fail on OSX:
> 
>   GTESTER tests/test-io-channel-socket
> **
> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
> test_io_channel_unix(_Bool): assertion failed:
> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
> GTester: last random seed: R02S300c198252e54fe12ff5d64603150e68
> **
> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
> test_io_channel_unix(_Bool): assertion failed:
> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
> GTester: last random seed: R02S7ade3405366ffc33ad5cf50619671f53

Oh interesting - I've just seen my Travis CI build check also failed
over night on OS-X.

I wonder if OS-X automatically deletes UNIX non-abstract sockets paths
on the filesystem when the socket FD is closed ?!?!

Regards,
Daniel

Peter Maydell Oct. 21, 2016, 10:35 a.m. UTC | #6

On 21 October 2016 at 11:28, Daniel P. Berrange <berrange@redhat.com> wrote:
> On Thu, Oct 20, 2016 at 05:11:56PM +0100, Peter Maydell wrote:
>> Unfortunately the new test seems to fail on OSX:
>>
>>   GTESTER tests/test-io-channel-socket
>> **
>> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
>> test_io_channel_unix(_Bool): assertion failed:
>> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
>> GTester: last random seed: R02S300c198252e54fe12ff5d64603150e68
>> **
>> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
>> test_io_channel_unix(_Bool): assertion failed:
>> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
>> GTester: last random seed: R02S7ade3405366ffc33ad5cf50619671f53
>
> Oh interesting - I've just seen my Travis CI build check also failed
> over night on OS-X.
>
> I wonder if OS-X automatically deletes UNIX non-abstract sockets paths
> on the filesystem when the socket FD is closed ?!?!

The assertion is the other way round, isn't it? It's trying to
assert that the path doesn't exist, but in fact it does
(and it's still lying around in my working tree after the
test failure).

thanks
-- PMM

Daniel P. Berrangé Oct. 21, 2016, 10:41 a.m. UTC | #7

On Fri, Oct 21, 2016 at 11:35:38AM +0100, Peter Maydell wrote:
> On 21 October 2016 at 11:28, Daniel P. Berrange <berrange@redhat.com> wrote:
> > On Thu, Oct 20, 2016 at 05:11:56PM +0100, Peter Maydell wrote:
> >> Unfortunately the new test seems to fail on OSX:
> >>
> >>   GTESTER tests/test-io-channel-socket
> >> **
> >> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
> >> test_io_channel_unix(_Bool): assertion failed:
> >> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
> >> GTester: last random seed: R02S300c198252e54fe12ff5d64603150e68
> >> **
> >> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
> >> test_io_channel_unix(_Bool): assertion failed:
> >> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
> >> GTester: last random seed: R02S7ade3405366ffc33ad5cf50619671f53
> >
> > Oh interesting - I've just seen my Travis CI build check also failed
> > over night on OS-X.
> >
> > I wonder if OS-X automatically deletes UNIX non-abstract sockets paths
> > on the filesystem when the socket FD is closed ?!?!
> 
> The assertion is the other way round, isn't it? It's trying to
> assert that the path doesn't exist, but in fact it does
> (and it's still lying around in my working tree after the
> test failure).

Oooooh, I'm looking at the wrong test case. I was assuming it was the
newly added test case that failed, whereas it is the original test
case we've regressd on.

Regards,
Daniel

Daniel P. Berrangé Oct. 21, 2016, 10:52 a.m. UTC | #8

On Fri, Oct 21, 2016 at 11:41:01AM +0100, Daniel P. Berrange wrote:
> On Fri, Oct 21, 2016 at 11:35:38AM +0100, Peter Maydell wrote:
> > On 21 October 2016 at 11:28, Daniel P. Berrange <berrange@redhat.com> wrote:
> > > On Thu, Oct 20, 2016 at 05:11:56PM +0100, Peter Maydell wrote:
> > >> Unfortunately the new test seems to fail on OSX:
> > >>
> > >>   GTESTER tests/test-io-channel-socket
> > >> **
> > >> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
> > >> test_io_channel_unix(_Bool): assertion failed:
> > >> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
> > >> GTester: last random seed: R02S300c198252e54fe12ff5d64603150e68
> > >> **
> > >> ERROR:/Users/pm215/src/qemu-for-merges/tests/test-io-channel-socket.c:386:void
> > >> test_io_channel_unix(_Bool): assertion failed:
> > >> (g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS) == FALSE)
> > >> GTester: last random seed: R02S7ade3405366ffc33ad5cf50619671f53
> > >
> > > Oh interesting - I've just seen my Travis CI build check also failed
> > > over night on OS-X.
> > >
> > > I wonder if OS-X automatically deletes UNIX non-abstract sockets paths
> > > on the filesystem when the socket FD is closed ?!?!
> > 
> > The assertion is the other way round, isn't it? It's trying to
> > assert that the path doesn't exist, but in fact it does
> > (and it's still lying around in my working tree after the
> > test failure).
> 
> Oooooh, I'm looking at the wrong test case. I was assuming it was the
> newly added test case that failed, whereas it is the original test
> case we've regressd on.

Ok, the problem is that  SO_ACCEPTCONN is not working on OS-X. Googling
it seems this is likely broken on some versions of BSD too, so I'll
rework the patch to avoid that function.

Regards,
Daniel

[PULL,v1,00/10] Merge qio 2016/10/20

Pull-request

Message

Comments