From: Connor Kuehl <ckuehl@redhat.com>

The deprecation message in the expected output has technically been

wrong since the wrong version of a patch was applied to it. Because of

this, the test fails. Correct the expected output so that it passes.

Signed-off-by: Connor Kuehl <ckuehl@redhat.com>

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

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Message-Id: <20210421212343.85524-2-ckuehl@redhat.com>

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

---

tests/qemu-iotests/231.out | 4 +---

1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/231.out b/tests/qemu-iotests/231.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/231.out

+++ b/tests/qemu-iotests/231.out

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

QA output created by 231

-qemu-img: RBD options encoded in the filename as keyvalue pairs is deprecated. Future versions may cease to parse these options in the future.

+qemu-img: warning: RBD options encoded in the filename as keyvalue pairs is deprecated

unable to get monitor info from DNS SRV with service name: ceph-mon

-no monitors specified to connect to.

qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': error connecting: No such file or directory

unable to get monitor info from DNS SRV with service name: ceph-mon

-no monitors specified to connect to.

qemu-img: Could not open 'json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'BOGUS_CONF'}': error connecting: No such file or directory

*** done

--

2.31.1

From: Connor Kuehl <ckuehl@redhat.com>

Sometimes the parser needs to further split a token it has collected

from the token input stream. Right now, it does a cursory check to see

if the relevant characters appear in the token to determine if it should

break it down further.

However, qemu_rbd_next_tok() will escape characters as it removes tokens

from the token stream and plain strchr() won't. This can make the

initial strchr() check slightly misleading since it implies

qemu_rbd_next_tok() will find the token and split on it, except the

reality is that qemu_rbd_next_tok() will pass over it if it is escaped.

Use a custom strchr to avoid mixing escaped and unescaped string

operations. Furthermore, this code is identical to how

qemu_rbd_next_tok() seeks its next token, so incorporate this custom

strchr into the body of that function to reduce duplication.

Reported-by: Han Han <hhan@redhat.com>

Fixes: https://bugzilla.redhat.com/1873913

Signed-off-by: Connor Kuehl <ckuehl@redhat.com>

Message-Id: <20210421212343.85524-3-ckuehl@redhat.com>

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

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

---

block/rbd.c | 32 +++++++++++++++++++++-----------

tests/qemu-iotests/231 | 4 ++++

tests/qemu-iotests/231.out | 3 +++

3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c

index XXXXXXX..XXXXXXX 100644

--- a/block/rbd.c

+++ b/block/rbd.c

@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,

const char *keypairs, const char *secretid,

Error **errp);

+static char *qemu_rbd_strchr(char *src, char delim)

+{

+ char *p;

+

+ for (p = src; *p; ++p) {

+ if (*p == delim) {

+ return p;

+ }

+ if (*p == '\\' && p[1] != '\0') {

+ ++p;

+ }

+ }

+

+ return NULL;

+}

+

+

static char *qemu_rbd_next_tok(char *src, char delim, char **p)

{

char *end;

*p = NULL;

- for (end = src; *end; ++end) {

- if (*end == delim) {

- break;

- }

- if (*end == '\\' && end[1] != '\0') {

- end++;

- }

- }

- if (*end == delim) {

+ end = qemu_rbd_strchr(src, delim);

+ if (end) {

*p = end + 1;

*end = '\0';

}

@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options,

qemu_rbd_unescape(found_str);

qdict_put_str(options, "pool", found_str);

- if (strchr(p, '@')) {

+ if (qemu_rbd_strchr(p, '@')) {

image_name = qemu_rbd_next_tok(p, '@', &p);

found_str = qemu_rbd_next_tok(p, ':', &p);

@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options,

image_name = qemu_rbd_next_tok(p, ':', &p);

}

/* Check for namespace in the image_name */

- if (strchr(image_name, '/')) {

+ if (qemu_rbd_strchr(image_name, '/')) {

found_str = qemu_rbd_next_tok(image_name, '/', &image_name);

qemu_rbd_unescape(found_str);

qdict_put_str(options, "namespace", found_str);

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/231

+++ b/tests/qemu-iotests/231

@@ -XXX,XX +XXX,XX @@ _filter_conf()

$QEMU_IMG info "json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=${BOGUS_CONF}'}" 2>&1 | _filter_conf

$QEMU_IMG info "json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'${BOGUS_CONF}'}" 2>&1 | _filter_conf

+# Regression test: the qemu-img invocation is expected to fail, but it should

+# not seg fault the parser.

+$QEMU_IMG create "rbd:rbd/aa\/bb:conf=${BOGUS_CONF}" 1M 2>&1 | _filter_conf

+

# success, all done

echo "*** done"

rm -f $seq.full

diff --git a/tests/qemu-iotests/231.out b/tests/qemu-iotests/231.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/231.out

+++ b/tests/qemu-iotests/231.out

@@ -XXX,XX +XXX,XX @@ unable to get monitor info from DNS SRV with service name: ceph-mon

qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': error connecting: No such file or directory

unable to get monitor info from DNS SRV with service name: ceph-mon

qemu-img: Could not open 'json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'BOGUS_CONF'}': error connecting: No such file or directory

+Formatting 'rbd:rbd/aa\/bb:conf=BOGUS_CONF', fmt=raw size=1048576

+unable to get monitor info from DNS SRV with service name: ceph-mon

+qemu-img: rbd:rbd/aa\/bb:conf=BOGUS_CONF: error connecting: No such file or directory

*** done

--

2.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

Instead of buffering the test output into a StringIO, patch it on

the fly by wrapping sys.stdout's write method. This can be

done unconditionally, even if using -d, which makes execute_unittest

a bit simpler.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Tested-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>

Message-Id: <20210323181928.311862-2-pbonzini@redhat.com>

Message-Id: <20210503110110.476887-2-pbonzini@redhat.com>

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

---

tests/qemu-iotests/240.out | 8 ++--

tests/qemu-iotests/245.out | 8 ++--

tests/qemu-iotests/295.out | 6 +--

tests/qemu-iotests/296.out | 8 ++--

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

5 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/tests/qemu-iotests/240.out b/tests/qemu-iotests/240.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/240.out

+++ b/tests/qemu-iotests/240.out

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

{"return": {}}

{"execute": "blockdev-del", "arguments": {"node-name": "hd0"}}

{"return": {}}

-==Attach two SCSI disks using the same block device and the same iothread==

+.==Attach two SCSI disks using the same block device and the same iothread==

{"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "hd0", "read-only": true, "read-zeroes": true}}

{"return": {}}

{"execute": "object-add", "arguments": {"id": "iothread0", "qom-type": "iothread"}}

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

{"return": {}}

{"execute": "blockdev-del", "arguments": {"node-name": "hd0"}}

{"return": {}}

-==Attach two SCSI disks using the same block device but different iothreads==

+.==Attach two SCSI disks using the same block device but different iothreads==

{"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "hd0", "read-only": true, "read-zeroes": true}}

{"return": {}}

{"execute": "object-add", "arguments": {"id": "iothread0", "qom-type": "iothread"}}

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

{"return": {}}

{"execute": "blockdev-del", "arguments": {"node-name": "hd0"}}

{"return": {}}

-==Attach a SCSI disks using the same block device as a NBD server==

+.==Attach a SCSI disks using the same block device as a NBD server==

{"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "hd0", "read-only": true, "read-zeroes": true}}

{"return": {}}

{"execute": "nbd-server-start", "arguments": {"addr": {"data": {"path": "SOCK_DIR/PID-nbd.sock"}, "type": "unix"}}}

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

{"return": {}}

{"execute": "device_add", "arguments": {"drive": "hd0", "driver": "scsi-hd", "id": "scsi-hd0"}}

{"return": {}}

-....

+.

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

Ran 4 tests

diff --git a/tests/qemu-iotests/245.out b/tests/qemu-iotests/245.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/245.out

+++ b/tests/qemu-iotests/245.out

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

-{"execute": "job-finalize", "arguments": {"id": "commit0"}}

+..{"execute": "job-finalize", "arguments": {"id": "commit0"}}

{"return": {}}

{"data": {"id": "commit0", "type": "commit"}, "event": "BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"device": "commit0", "len": 3145728, "offset": 3145728, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

-{"execute": "job-finalize", "arguments": {"id": "stream0"}}

+...{"execute": "job-finalize", "arguments": {"id": "stream0"}}

{"return": {}}

{"data": {"id": "stream0", "type": "stream"}, "event": "BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"device": "stream0", "len": 3145728, "offset": 3145728, "speed": 0, "type": "stream"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

-{"execute": "job-finalize", "arguments": {"id": "stream0"}}

+.{"execute": "job-finalize", "arguments": {"id": "stream0"}}

{"return": {}}

{"data": {"id": "stream0", "type": "stream"}, "event": "BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

{"data": {"device": "stream0", "len": 3145728, "offset": 3145728, "speed": 0, "type": "stream"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}

-.....................

+...............

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

Ran 21 tests

diff --git a/tests/qemu-iotests/295.out b/tests/qemu-iotests/295.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/295.out

+++ b/tests/qemu-iotests/295.out

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

{"return": {}}

{"execute": "job-dismiss", "arguments": {"id": "job_erase_key"}}

{"return": {}}

-{"execute": "job-dismiss", "arguments": {"id": "job_add_key"}}

+.{"execute": "job-dismiss", "arguments": {"id": "job_add_key"}}

{"return": {}}

{"execute": "job-dismiss", "arguments": {"id": "job_erase_key"}}

{"return": {}}

@@ -XXX,XX +XXX,XX @@ Job failed: Invalid password, cannot unlock any keyslot

{"return": {}}

{"execute": "job-dismiss", "arguments": {"id": "job_add_key"}}

{"return": {}}

-{"execute": "job-dismiss", "arguments": {"id": "job_add_key"}}

+.{"execute": "job-dismiss", "arguments": {"id": "job_add_key"}}

{"return": {}}

{"execute": "job-dismiss", "arguments": {"id": "job_add_key"}}

{"return": {}}

@@ -XXX,XX +XXX,XX @@ Job failed: All the active keyslots match the (old) password that was given and

{"return": {}}

{"execute": "job-dismiss", "arguments": {"id": "job_erase_key"}}

{"return": {}}

-...

+.

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

Ran 3 tests

diff --git a/tests/qemu-iotests/296.out b/tests/qemu-iotests/296.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/296.out

+++ b/tests/qemu-iotests/296.out

@@ -XXX,XX +XXX,XX @@ Job failed: Failed to get shared "consistent read" lock

qemu-img: Failed to get shared "consistent read" lock

Is another process using the image [TEST_DIR/test.img]?

-Formatting 'TEST_DIR/test.img', fmt=luks size=1048576 key-secret=keysec0 iter-time=10

+.Formatting 'TEST_DIR/test.img', fmt=luks size=1048576 key-secret=keysec0 iter-time=10

Job failed: Block node is read-only

{"execute": "job-dismiss", "arguments": {"id": "job0"}}

@@ -XXX,XX +XXX,XX @@ Job failed: Failed to get shared "consistent read" lock

{"return": {}}

{"execute": "job-dismiss", "arguments": {"id": "job0"}}