The following changes since commit b4fbe1f65a4769c09e6bf2d79fc84360f840f40e:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190129' into staging (2019-01-29 12:00:19 +0000)

are available in the Git repository at:

https://git.xanclic.moe/XanClic/qemu.git tags/pull-block-2019-01-31

for you to fetch changes up to 908b30164bbffad7430d551b2a03a8fbcaa631ef:

iotests: Allow 147 to be run concurrently (2019-01-31 00:44:55 +0100)

Block patches:

- New debugging QMP command to explore block graphs

- Converted DPRINTF()s to trace events

- Fixed qemu-io's use of getopt() for systems with optreset

- Minor NVMe emulation fixes

- An iotest fix

Li Qiang (3):

nvme: use TYPE_NVME instead of constant string

nvme: ensure the num_queues is not zero

nvme: use pci_dev directly in nvme_realize

Max Reitz (3):

iotests.py: Add qemu_nbd_pipe()

iotests: Bind qemu-nbd to localhost in 147

iotests: Allow 147 to be run concurrently

Richard W.M. Jones (1):

qemu-io: Add generic function for reinitializing optind.

Vladimir Sementsov-Ogievskiy (2):

qapi: add x-debug-query-block-graph

scripts: add render_block_graph function for QEMUMachine

configure | 14 ++++

qapi/block-core.json | 108 ++++++++++++++++++++++++

include/block/block.h | 1 +

include/qemu/osdep.h | 16 ++++

include/sysemu/block-backend.h | 2 +

block.c | 148 +++++++++++++++++++++++++++++++++

block/block-backend.c | 5 ++

block/curl.c | 29 ++-----

block/file-posix.c | 25 ++----

block/sheepdog.c | 47 ++++-------

block/ssh.c | 46 ++++------

blockdev.c | 5 ++

hw/block/nvme.c | 15 ++--

qemu-img.c | 2 +-

qemu-io-cmds.c | 2 +-

block/trace-events | 47 +++++++++++

scripts/render_block_graph.py | 120 ++++++++++++++++++++++++++

tests/qemu-iotests/147 | 98 +++++++++++++++-------

tests/qemu-iotests/iotests.py | 14 ++++

19 files changed, 608 insertions(+), 136 deletions(-)

create mode 100755 scripts/render_block_graph.py

2.20.1

To do this, we need to allow creating the NBD server on various ports

instead of a single one (which may not even work if you run just one

instance, because something entirely else might be using that port).

So we just pick a random port in [32768, 32768 + 1024) and try to create

a server there. If that fails, we just retry until something sticks.

For the IPv6 test, we need a different range, though (just above that

one). This is because "localhost" resolves to both 127.0.0.1 and ::1.

This means that if you bind to it, it will bind to both, if possible, or

just one if the other is already in use. Therefore, if the IPv6 test

has already taken [::1]:some_port and we then try to take

localhost:some_port, that will work -- only the second server will be

bound to 127.0.0.1:some_port alone and not [::1]:some_port in addition.

So we have two different servers on the same port, one for IPv4 and one

for IPv6.

But when we then try to connect to the server through

localhost:some_port, we will always end up at the IPv6 one (as long as

it is up), and this may not be the one we want.

Thus, we must make sure not to create an IPv6-only NBD server on the

same port as a normal "dual-stack" NBD server -- which is done by using

distinct port ranges, as explained above.

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-id: 20181221234750.23577-4-mreitz@redhat.com

Reviewed-by: John Snow <jsnow@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

---

tests/qemu-iotests/147 | 98 +++++++++++++++++++++++++++++-------------

1 file changed, 68 insertions(+), 30 deletions(-)

diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/147

+++ b/tests/qemu-iotests/147

@@ -XXX,XX +XXX,XX @@

#

import os

+import random

import socket

import stat

import time

import iotests

-from iotests import cachemode, imgfmt, qemu_img, qemu_nbd

+from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_pipe

-NBD_PORT = 10811

+NBD_PORT_START = 32768

+NBD_PORT_END = NBD_PORT_START + 1024

+NBD_IPV6_PORT_START = NBD_PORT_END

+NBD_IPV6_PORT_END = NBD_IPV6_PORT_START + 1024

test_img = os.path.join(iotests.test_dir, 'test.img')

unix_socket = os.path.join(iotests.test_dir, 'nbd.socket')

@@ -XXX,XX +XXX,XX @@ class QemuNBD(NBDBlockdevAddBase):

except OSError:

pass

+ def _try_server_up(self, *args):

+ status, msg = qemu_nbd_pipe('-f', imgfmt, test_img, *args)

+ if status == 0:

+ return True

+ if 'Address already in use' in msg:

+ return False

+ self.fail(msg)

+

def _server_up(self, *args):

- self.assertEqual(qemu_nbd('-f', imgfmt, test_img, *args), 0)

+ self.assertTrue(self._try_server_up(*args))

def test_inet(self):

- self._server_up('-b', 'localhost', '-p', str(NBD_PORT))

+ while True:

+ nbd_port = random.randrange(NBD_PORT_START, NBD_PORT_END)

+ if self._try_server_up('-b', 'localhost', '-p', str(nbd_port)):

+ break

+

address = { 'type': 'inet',

'data': {

'host': 'localhost',

- 'port': str(NBD_PORT)

+ 'port': str(nbd_port)

} }

- self.client_test('nbd://localhost:%i' % NBD_PORT,

+ self.client_test('nbd://localhost:%i' % nbd_port,

flatten_sock_addr(address))

def test_unix(self):

@@ -XXX,XX +XXX,XX @@ class BuiltinNBD(NBDBlockdevAddBase):

except OSError:

pass