qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] f7afa7: iotests/231: Update expected deprecat


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] f7afa7: iotests/231: Update expected deprecation message
Date: Mon, 17 May 2021 03:30:48 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: f7afa7daa08c09d7c8435a95a13f6bd9dd11255e
      
https://github.com/qemu/qemu/commit/f7afa7daa08c09d7c8435a95a13f6bd9dd11255e
  Author: Connor Kuehl <ckuehl@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/231.out

  Log Message:
  -----------
  iotests/231: Update expected deprecation message

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>


  Commit: 2b99cfce08da53a07e86271747fe465556ac7eb4
      
https://github.com/qemu/qemu/commit/2b99cfce08da53a07e86271747fe465556ac7eb4
  Author: Connor Kuehl <ckuehl@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/rbd.c
    M tests/qemu-iotests/231
    M tests/qemu-iotests/231.out

  Log Message:
  -----------
  block/rbd: Add an escape-aware strchr helper

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>


  Commit: 78632a3d1685454fec83f83586c675e7f2a1a84a
      
https://github.com/qemu/qemu/commit/78632a3d1685454fec83f83586c675e7f2a1a84a
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/monitor/block-hmp-cmds.c
    M qemu-io-cmds.c
    M qemu-io.c

  Log Message:
  -----------
  monitor: hmp_qemu_io: acquire aio contex, fix crash

Max reported the following bug:

$ ./qemu-img create -f raw src.img 1G
$ ./qemu-img create -f raw dst.img 1G

$ (echo '
   {"execute":"qmp_capabilities"}
   {"execute":"blockdev-mirror",
    "arguments":{"job-id":"mirror",
                 "device":"source",
                 "target":"target",
                 "sync":"full",
                 "filter-node-name":"mirror-top"}}
'; sleep 3; echo '
   {"execute":"human-monitor-command",
    "arguments":{"command-line":
                 "qemu-io mirror-top \"write 0 1G\""}}') \
| x86_64-softmmu/qemu-system-x86_64 \
   -qmp stdio \
   -blockdev file,node-name=source,filename=src.img \
   -blockdev file,node-name=target,filename=dst.img \
   -object iothread,id=iothr0 \
   -device virtio-blk,drive=source,iothread=iothr0

crashes:

0  raise () at /usr/lib/libc.so.6
1  abort () at /usr/lib/libc.so.6
2  error_exit
   (err=<optimized out>,
   msg=msg@entry=0x55fbb1634790 <__func__.27> "qemu_mutex_unlock_impl")
   at ../util/qemu-thread-posix.c:37
3  qemu_mutex_unlock_impl
   (mutex=mutex@entry=0x55fbb25ab6e0,
   file=file@entry=0x55fbb1636957 "../util/async.c",
   line=line@entry=650)
   at ../util/qemu-thread-posix.c:109
4  aio_context_release (ctx=ctx@entry=0x55fbb25ab680) at ../util/async.c:650
5  bdrv_do_drained_begin
   (bs=bs@entry=0x55fbb3a87000, recursive=recursive@entry=false,
   parent=parent@entry=0x0,
   ignore_bds_parents=ignore_bds_parents@entry=false,
   poll=poll@entry=true) at ../block/io.c:441
6  bdrv_do_drained_begin
   (poll=true, ignore_bds_parents=false, parent=0x0, recursive=false,
   bs=0x55fbb3a87000) at ../block/io.c:448
7  blk_drain (blk=0x55fbb26c5a00) at ../block/block-backend.c:1718
8  blk_unref (blk=0x55fbb26c5a00) at ../block/block-backend.c:498
9  blk_unref (blk=0x55fbb26c5a00) at ../block/block-backend.c:491
10 hmp_qemu_io (mon=0x7fffaf3fc7d0, qdict=<optimized out>)
   at ../block/monitor/block-hmp-cmds.c:628

man pthread_mutex_unlock
...
    EPERM  The  mutex type is PTHREAD_MUTEX_ERRORCHECK or
    PTHREAD_MUTEX_RECURSIVE, or the mutex is a robust mutex, and the
    current thread does not own the mutex.

So, thread doesn't own the mutex. And we have iothread here.

Next, note that AIO_WAIT_WHILE() documents that ctx must be acquired
exactly once by caller. But where is it acquired in the call stack?
Seems nowhere.

qemuio_command do acquire aio context.. But we need context acquired
around blk_unref() as well and actually around blk_insert_bs() too.

Let's refactor qemuio_command so that it doesn't acquire aio context
but callers do that instead. This way we can cleanly acquire aio
context in hmp_qemu_io() around all three calls.

Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210423134233.51495-1-vsementsov@virtuozzo.com>
[mreitz: Fixed comment]
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 9c785cd714b3c368503ba3aed4266a77056cae29
      
https://github.com/qemu/qemu/commit/9c785cd714b3c368503ba3aed4266a77056cae29
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/backup.c
    M block/mirror.c
    M include/block/block_int.h
    M include/qemu/job.h
    M job.c
    M tests/qemu-iotests/264

  Log Message:
  -----------
  mirror: stop cancelling in-flight requests on non-force cancel in READY

If mirror is READY than cancel operation is not discarding the whole
result of the operation, but instead it's a documented way get a
point-in-time snapshot of source disk.

So, we should not cancel any requests if mirror is READ and
force=false. Let's fix that case.

Note, that bug that we have before this commit is not critical, as the
only .bdrv_cancel_in_flight implementation is nbd_cancel_in_flight()
and it cancels only requests waiting for reconnection, so it should be
rare case.

Fixes: 521ff8b779b11c394dbdc43f02e158dd99df308a
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210421075858.40197-1-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: f29f4c25eb9f11d78d62185b69456681f9c703b2
      
https://github.com/qemu/qemu/commit/f29f4c25eb9f11d78d62185b69456681f9c703b2
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/240.out
    M tests/qemu-iotests/245.out
    M tests/qemu-iotests/295.out
    M tests/qemu-iotests/296.out
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: do not buffer the test output

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>


  Commit: 00dbc85e0efd863498d52408b248039816c10532
      
https://github.com/qemu/qemu/commit/00dbc85e0efd863498d52408b248039816c10532
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: allow passing unittest.main arguments to the test scripts

Python test scripts that use unittest consist of multiple tests.
unittest.main allows selecting which tests to run, but currently this
is not possible because the iotests wrapper ignores sys.argv.

unittest.main command line options also allow the user to pick the
desired options for verbosity, failfast mode, etc.  While "-d" is
currently translated to "-v", it also enables extra debug output,
and other options are not available at all.

These command line options only work if the unittest.main testRunner
argument is a type, rather than a TestRunner instance.  Therefore, pass
the class name and "verbosity" argument to unittest.main, and adjust for
the different default warnings between TextTestRunner and unittest.main.

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-3-pbonzini@redhat.com>
Message-Id: <20210503110110.476887-3-pbonzini@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: c64430d2386d9968342a8e1ae00ed34ff0b98bbb
      
https://github.com/qemu/qemu/commit/c64430d2386d9968342a8e1ae00ed34ff0b98bbb
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/testenv.py
    M tests/qemu-iotests/testrunner.py

  Log Message:
  -----------
  qemu-iotests: move command line and environment handling from TestRunner to 
TestEnv

In the next patch, "check" will learn how to execute a test script without
going through TestRunner.  To enable this, keep only the text output
and subprocess handling in the TestRunner; move into TestEnv the logic
to prepare for running a subprocess.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210323181928.311862-4-pbonzini@redhat.com>
Message-Id: <20210503110110.476887-4-pbonzini@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 480b75ee1423ee6d8aba59cb8090d60eb97676ff
      
https://github.com/qemu/qemu/commit/480b75ee1423ee6d8aba59cb8090d60eb97676ff
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/check
    M tests/qemu-iotests/testenv.py
    M tests/qemu-iotests/testrunner.py

  Log Message:
  -----------
  qemu-iotests: let "check" spawn an arbitrary test command

Right now there is no easy way for "check" to print a reproducer command.
Because such a reproducer command line would be huge, we can instead teach
check to start a command of our choice.  This can be for example a Python
unit test with arguments to only run a specific subtest.

Move the trailing empty line to print_env(), since it always looks better
and one caller was not adding it.

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-5-pbonzini@redhat.com>
Message-Id: <20210503110110.476887-5-pbonzini@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: c3d479aab9d72fa0d6a3aafdaf0729140e6eae51
      
https://github.com/qemu/qemu/commit/c3d479aab9d72fa0d6a3aafdaf0729140e6eae51
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/testenv.py

  Log Message:
  -----------
  qemu-iotests: fix case of SOCK_DIR already in the environment

Due to a typo, in this case the SOCK_DIR was not being created.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210323181928.311862-6-pbonzini@redhat.com>
Message-Id: <20210503110110.476887-6-pbonzini@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: d65173f924ef0a170693fc59692a542d38f31879
      
https://github.com/qemu/qemu/commit/d65173f924ef0a170693fc59692a542d38f31879
  Author: Connor Kuehl <ckuehl@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M docs/tools/qemu-img.rst

  Log Message:
  -----------
  Document qemu-img options data_file and data_file_raw

The contents of this patch were initially developed and posted by Han
Han[1], however, it appears the original patch was not applied. Since
then, the relevant documentation has been moved and adapted to a new
format.

I've taken most of the original wording and tweaked it according to
some of the feedback from the original patch submission. I've also
adapted it to restructured text, which is the format the documentation
currently uses.

[1] https://lists.nongnu.org/archive/html/qemu-block/2019-10/msg01253.html

Fixes: https://bugzilla.redhat.com/1763105
Signed-off-by: Han Han <hhan@redhat.com>
Suggested-by: Max Reitz <mreitz@redhat.com>
[ Max: provided description of data_file_raw behavior ]
Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
Message-Id: <20210505195512.391128-1-ckuehl@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: bcc8584c832f7a52fd8c64483dd452c1baf01db7
      
https://github.com/qemu/qemu/commit/bcc8584c832f7a52fd8c64483dd452c1baf01db7
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/copy-on-read.c

  Log Message:
  -----------
  block/copy-on-read: use bdrv_drop_filter() and drop s->active

Now, after huge update of block graph permission update algorithm, we
don't need this workaround with active state of the filter. Drop it and
use new smart bdrv_drop_filter() function.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210506194143.394141-1-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: ac4e14f5dc93d6b4bc5d4849bb61810023330380
      
https://github.com/qemu/qemu/commit/ac4e14f5dc93d6b4bc5d4849bb61810023330380
  Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/qemu-iotests/iotests.py
    M tests/qemu-iotests/pylintrc
    M tests/qemu-iotests/testrunner.py

  Log Message:
  -----------
  qemu-iotests: fix pylint 2.8 consider-using-with error

pylint 2.8 introduces consider-using-with error, suggesting
to use the 'with' block statement when possible.

Modify all subprocess.Popen call to use the 'with' statement,
except the one in __init__ of QemuIoInteractive class, since
it is assigned to a class field and used in other methods.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210510190449.65948-1-eesposit@redhat.com>
[mreitz: Disable bad-option-value warning in the iotests' pylintrc, so
         that disabling consider-using-with in QemuIoInteractive will
         not produce a warning in pre-2.8 pylint versions]
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 94783301b8cb3f2b4fd871badd923fb3b9d2e7bf
      
https://github.com/qemu/qemu/commit/94783301b8cb3f2b4fd871badd923fb3b9d2e7bf
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/io.c
    M block/write-threshold.c
    M include/block/block_int.h
    M include/block/write-threshold.h

  Log Message:
  -----------
  block/write-threshold: don't use write notifiers

write-notifiers are used only for write-threshold. New code for such
purpose should create filters.

Let's better special-case write-threshold and drop write notifiers at
all. (Actually, write-threshold is special-cased anyway, as the only
user of write-notifiers)

So, create a new direct interface for bdrv_co_write_req_prepare() and
drop all write-notifier related logic from write-threshold.c.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-2-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[mreitz: Adjusted comment as per Eric's suggestion]
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: ad578c56d596a3250a62ae8687005ca6909d2688
      
https://github.com/qemu/qemu/commit/ad578c56d596a3250a62ae8687005ca6909d2688
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block.c
    M block/io.c
    M include/block/block_int.h

  Log Message:
  -----------
  block: drop write notifiers

They are unused now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-3-vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: e46354a8aeefe4637c689de27532bc00712f9c60
      
https://github.com/qemu/qemu/commit/e46354a8aeefe4637c689de27532bc00712f9c60
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/unit/test-write-threshold.c

  Log Message:
  -----------
  test-write-threshold: rewrite test_threshold_(not_)trigger tests

These tests use bdrv_write_threshold_exceeded() API, which is used only
for test (since pre-previous commit). Better is testing real API, which
is used in block.c as well.

So, let's call bdrv_write_threshold_check_write(), and check is
bs->write_threshold_offset cleared or not (it's cleared iff threshold
triggered).

Also we get rid of BdrvTrackedRequest use here. Note, that paranoiac
bdrv_check_request() calls were added in 8b1170012b1 to protect
BdrvTrackedRequest. Drop them now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-4-vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 2e0e9cbd897078fea2ad3772106e0cbd1f0c239a
      
https://github.com/qemu/qemu/commit/2e0e9cbd897078fea2ad3772106e0cbd1f0c239a
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/write-threshold.c
    M include/block/write-threshold.h
    M tests/unit/test-write-threshold.c

  Log Message:
  -----------
  block/write-threshold: drop extra APIs

bdrv_write_threshold_exceeded() is unused.

bdrv_write_threshold_is_set() is used only to double check the value of
bs->write_threshold_offset in tests. No real sense in it (both tests do
check real value with help of bdrv_write_threshold_get())

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-5-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[mreitz: Adjusted commit message as per Eric's suggestion]
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 935129223ce2a2eb61c59b585869724570d3a349
      
https://github.com/qemu/qemu/commit/935129223ce2a2eb61c59b585869724570d3a349
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/unit/test-write-threshold.c

  Log Message:
  -----------
  test-write-threshold: drop extra tests

Testing set/get of one 64bit variable doesn't seem necessary. We have a
lot of such variables. Also remaining tests do test set/get anyway.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-7-vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 23357b93c7bbeec65aef75f798cacbcda0ca5f4d
      
https://github.com/qemu/qemu/commit/23357b93c7bbeec65aef75f798cacbcda0ca5f4d
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M tests/unit/test-write-threshold.c

  Log Message:
  -----------
  test-write-threshold: drop extra TestStruct structure

We don't need this extra logic: it doesn't make code simpler.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-8-vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: c61ebf362d0abf288ce266845519d5a550a1d89f
      
https://github.com/qemu/qemu/commit/c61ebf362d0abf288ce266845519d5a550a1d89f
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-05-14 (Fri, 14 May 2021)

  Changed paths:
    M block/write-threshold.c
    M include/block/write-threshold.h
    M tests/unit/test-write-threshold.c

  Log Message:
  -----------
  write-threshold: deal with includes

"qemu/typedefs.h" is enough for include/block/write-threshold.h header
with forward declaration of BlockDriverState. Also drop extra includes
from block/write-threshold.c and tests/unit/test-write-threshold.c

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210506090621.11848-9-vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 32de74a1ac188cef3b996a65954d5b87128a4368
      
https://github.com/qemu/qemu/commit/32de74a1ac188cef3b996a65954d5b87128a4368
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M block.c
    M block/backup.c
    M block/copy-on-read.c
    M block/io.c
    M block/mirror.c
    M block/monitor/block-hmp-cmds.c
    M block/rbd.c
    M block/write-threshold.c
    M docs/tools/qemu-img.rst
    M include/block/block_int.h
    M include/block/write-threshold.h
    M include/qemu/job.h
    M job.c
    M qemu-io-cmds.c
    M qemu-io.c
    M tests/qemu-iotests/231
    M tests/qemu-iotests/231.out
    M tests/qemu-iotests/240.out
    M tests/qemu-iotests/245.out
    M tests/qemu-iotests/264
    M tests/qemu-iotests/295.out
    M tests/qemu-iotests/296.out
    M tests/qemu-iotests/check
    M tests/qemu-iotests/iotests.py
    M tests/qemu-iotests/pylintrc
    M tests/qemu-iotests/testenv.py
    M tests/qemu-iotests/testrunner.py
    M tests/unit/test-write-threshold.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2021-05-14' 
into staging

Block patches:
- drop block/io write notifiers
- qemu-iotests enhancements to make debugging easier
- rbd parsing fix
- HMP qemu-io fix (for iothreads)
- mirror job cancel relaxation (do not cancel in-flight requests when a
  READY mirror job is canceled with force=false)
- document qcow2's data_file and data_file_raw features
- fix iotest 297 for pylint 2.8
- block/copy-on-read refactoring

# gpg: Signature made Fri 14 May 2021 17:43:40 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2021-05-14:
  write-threshold: deal with includes
  test-write-threshold: drop extra TestStruct structure
  test-write-threshold: drop extra tests
  block/write-threshold: drop extra APIs
  test-write-threshold: rewrite test_threshold_(not_)trigger tests
  block: drop write notifiers
  block/write-threshold: don't use write notifiers
  qemu-iotests: fix pylint 2.8 consider-using-with error
  block/copy-on-read: use bdrv_drop_filter() and drop s->active
  Document qemu-img options data_file and data_file_raw
  qemu-iotests: fix case of SOCK_DIR already in the environment
  qemu-iotests: let "check" spawn an arbitrary test command
  qemu-iotests: move command line and environment handling from TestRunner to 
TestEnv
  qemu-iotests: allow passing unittest.main arguments to the test scripts
  qemu-iotests: do not buffer the test output
  mirror: stop cancelling in-flight requests on non-force cancel in READY
  monitor: hmp_qemu_io: acquire aio contex, fix crash
  block/rbd: Add an escape-aware strchr helper
  iotests/231: Update expected deprecation message

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/d9cbd7f7422d...32de74a1ac18



reply via email to

[Prev in Thread] Current Thread [Next in Thread]