[PULL 0/2] Block patches

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:

  Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:

  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)

----------------------------------------------------------------
Pull request

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

Stefano Garzarella (2):
  iothread: rename PollParamInfo to IOThreadParamInfo
  iothread: use IOThreadParamInfo in iothread_[set|get]_param()

 iothread.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

-- 
2.31.1

[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo

[Stefan Hajnoczi]

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
a new parameter (aio-max-batch) to IOThread and used PollParamInfo
structure to handle it.

Since it is not a parameter of the polling mechanism, we rename the
structure to a more generic IOThreadParamInfo.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/iothread.c b/iothread.c
index ddbbde61f7..a73e560ba0 100644
--- a/iothread.c
+++ b/iothread.c
@@ -215,18 +215,18 @@ static void iothread_complete(UserCreatable *obj, Error **errp)
 typedef struct {
     const char *name;
     ptrdiff_t offset; /* field's byte offset in IOThread struct */
-} PollParamInfo;
+} IOThreadParamInfo;
 
-static PollParamInfo poll_max_ns_info = {
+static IOThreadParamInfo poll_max_ns_info = {
     "poll-max-ns", offsetof(IOThread, poll_max_ns),
 };
-static PollParamInfo poll_grow_info = {
+static IOThreadParamInfo poll_grow_info = {
     "poll-grow", offsetof(IOThread, poll_grow),
 };
-static PollParamInfo poll_shrink_info = {
+static IOThreadParamInfo poll_shrink_info = {
     "poll-shrink", offsetof(IOThread, poll_shrink),
 };
-static PollParamInfo aio_max_batch_info = {
+static IOThreadParamInfo aio_max_batch_info = {
     "aio-max-batch", offsetof(IOThread, aio_max_batch),
 };
 
@@ -234,7 +234,7 @@ static void iothread_get_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
@@ -244,7 +244,7 @@ static bool iothread_set_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
-- 
2.31.1

[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()

[Stefan Hajnoczi]

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 0445409d74 ("iothread: generalize
iothread_set_param/iothread_get_param") moved common code to set and
get IOThread parameters in two new functions.

These functions are called inside callbacks, so we don't need to use an
opaque pointer. Let's replace `void *opaque` parameter with
`IOThreadParamInfo *info`.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/iothread.c b/iothread.c
index a73e560ba0..0f98af0f2a 100644
--- a/iothread.c
+++ b/iothread.c
@@ -231,20 +231,18 @@ static IOThreadParamInfo aio_max_batch_info = {
 };
 
 static void iothread_get_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
 }
 
 static bool iothread_set_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
@@ -266,16 +264,18 @@ static bool iothread_set_param(Object *obj, Visitor *v,
 static void iothread_get_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
@@ -291,16 +291,18 @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
 static void iothread_get_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
-- 
2.31.1

Re: [PULL 0/2] Block patches

[Richard Henderson]

On 10/11/21 5:40 AM, Stefan Hajnoczi wrote:
> The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
> 
>    Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/stefanha/qemu.git tags/block-pull-request
> 
> for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
> 
>    iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
> 
> ----------------------------------------------------------------
> Pull request
> 
> ----------------------------------------------------------------
> 
> Stefano Garzarella (2):
>    iothread: rename PollParamInfo to IOThreadParamInfo
>    iothread: use IOThreadParamInfo in iothread_[set|get]_param()
> 
>   iothread.c | 28 +++++++++++++++-------------
>   1 file changed, 15 insertions(+), 13 deletions(-)

Applied, thanks.

r~

Re: [PULL 0/2] Block patches

[Michael Tokarev]

22.01.2024 19:01, Stefan Hajnoczi :

> Akihiko Odaki (1):
>    coroutine-ucontext: Save fake stack for pooled coroutine
> 
> Fiona Ebner (1):
>    block/io: clear BDRV_BLOCK_RECURSE flag after recursing in
>      bdrv_co_block_status

These too also look like -stable matherial, both of the changes.
Please let me know if it's not.

Thanks,

/mjt

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Mon, 22 Jan 2024 at 16:01, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 09be34717190c1620f0c6e5c8765b8da354aeb4b:
>
>   Merge tag 'pull-request-2024-01-19' of https://gitlab.com/thuth/qemu into staging (2024-01-20 17:22:16 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 8a9be7992426c8920d4178e7dca59306a18c7a3a:
>
>   block/io: clear BDRV_BLOCK_RECURSE flag after recursing in bdrv_co_block_status (2024-01-22 11:00:12 -0500)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 09be34717190c1620f0c6e5c8765b8da354aeb4b:

  Merge tag 'pull-request-2024-01-19' of https://gitlab.com/thuth/qemu into staging (2024-01-20 17:22:16 +0000)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 8a9be7992426c8920d4178e7dca59306a18c7a3a:

  block/io: clear BDRV_BLOCK_RECURSE flag after recursing in bdrv_co_block_status (2024-01-22 11:00:12 -0500)

----------------------------------------------------------------
Pull request

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

Akihiko Odaki (1):
  coroutine-ucontext: Save fake stack for pooled coroutine

Fiona Ebner (1):
  block/io: clear BDRV_BLOCK_RECURSE flag after recursing in
    bdrv_co_block_status

 block/io.c                | 10 ++++++++++
 util/coroutine-ucontext.c | 35 ++++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 9 deletions(-)

-- 
2.43.0

Re: [PULL 0/2] Block patches

[Richard Henderson]

On 4/24/23 18:55, Stefan Hajnoczi wrote:
> The following changes since commit ac5f7bf8e208cd7893dbb1a9520559e569a4677c:
> 
>    Merge tag 'migration-20230424-pull-request' ofhttps://gitlab.com/juan.quintela/qemu  into staging (2023-04-24 15:00:39 +0100)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/stefanha/qemu.git  tags/block-pull-request
> 
> for you to fetch changes up to 9d672e290475001fcecdcc9dc79ad088ff89d17f:
> 
>    tracetool: use relative paths for '#line' preprocessor directives (2023-04-24 13:53:44 -0400)
> 
> ----------------------------------------------------------------
> Pull request (v2)
> 
> I dropped the zoned storage patches that had CI failures. This pull request
> only contains fixes now.

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.


r~

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit ac5f7bf8e208cd7893dbb1a9520559e569a4677c:

  Merge tag 'migration-20230424-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-04-24 15:00:39 +0100)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 9d672e290475001fcecdcc9dc79ad088ff89d17f:

  tracetool: use relative paths for '#line' preprocessor directives (2023-04-24 13:53:44 -0400)

----------------------------------------------------------------
Pull request (v2)

I dropped the zoned storage patches that had CI failures. This pull request
only contains fixes now.

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

Philippe Mathieu-Daudé (1):
  block/dmg: Declare a type definition for DMG uncompress function

Thomas De Schampheleire (1):
  tracetool: use relative paths for '#line' preprocessor directives

 block/dmg.h                         | 8 ++++----
 block/dmg.c                         | 7 ++-----
 scripts/tracetool/backend/ftrace.py | 4 +++-
 scripts/tracetool/backend/log.py    | 4 +++-
 scripts/tracetool/backend/syslog.py | 4 +++-
 5 files changed, 15 insertions(+), 12 deletions(-)

-- 
2.39.2

Re: [PULL 0/2] Block patches

[Richard Henderson]

On 7/7/22 13:42, Stefan Hajnoczi wrote:
> The following changes since commit 8e9398e3b1a860b8c29c670c1b6c36afe8d87849:
> 
>    Merge tag 'pull-ppc-20220706' of https://gitlab.com/danielhb/qemu into staging (2022-07-07 06:21:05 +0530)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/stefanha/qemu.git tags/block-pull-request
> 
> for you to fetch changes up to be6a166fde652589761cf70471bcde623e9bd72a:
> 
>    block/io_uring: clarify that short reads can happen (2022-07-07 09:04:15 +0100)
> 
> ----------------------------------------------------------------
> Pull request

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.


r~


> 
> ----------------------------------------------------------------
> 
> Dominique Martinet (1):
>    io_uring: fix short read slow path
> 
> Stefan Hajnoczi (1):
>    block/io_uring: clarify that short reads can happen
> 
>   block/io_uring.c | 12 ++++--------
>   1 file changed, 4 insertions(+), 8 deletions(-)
> 

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 8e9398e3b1a860b8c29c670c1b6c36afe8d87849:

  Merge tag 'pull-ppc-20220706' of https://gitlab.com/danielhb/qemu into staging (2022-07-07 06:21:05 +0530)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to be6a166fde652589761cf70471bcde623e9bd72a:

  block/io_uring: clarify that short reads can happen (2022-07-07 09:04:15 +0100)

----------------------------------------------------------------
Pull request

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

Dominique Martinet (1):
  io_uring: fix short read slow path

Stefan Hajnoczi (1):
  block/io_uring: clarify that short reads can happen

 block/io_uring.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

-- 
2.36.1

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 67c1115edd98f388ca89dd38322ea3fadf034523:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210323-pull-request' into staging (2021-03-23 23:47:30 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 3460fd7f3959d1fa7bcc255796844aa261c805a4:
>
>   migrate-bitmaps-postcopy-test: check that we can't remove in-flight bitmaps (2021-03-24 13:41:19 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> This dirty bitmap fix solves a crash that can be triggered in the destination
> QEMU process during live migration.
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM

Re: [PULL 0/2] Block patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 3043 bytes --]

On Thu, Mar 25, 2021 at 04:36:43PM +0000, Peter Maydell wrote:
> On Thu, 25 Mar 2021 at 16:28, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > On Thu, Mar 25, 2021 at 01:17:50PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> > > Thanks! My path modifies migration/block-dirty-bitmap.c. qsd-jobs runs block-commit and block-stream jobs and don't start any kind of migration or snapshot or savevm, so it seems impossible that qsd-jobs runs the code touched by my patch..
> >
> > Confirmed. The failure is not related to this pull request.
> >
> > I reproduced the same s390x host failure on commit
> > 9e2e9fe3df9f539f8b6941ceb96d25355fdae47e (HEAD -> master, tag:
> > v6.0.0-rc0, origin/master, origin/HEAD):
> >
> > qsd-jobs                        fail       [11:04:58] [11:04:58]   0.1s                 output mismatch (see qsd-jobs.out.bad)
> > --- /root/qemu/tests/qemu-iotests/tests/qsd-jobs.out
> > +++ qsd-jobs.out.bad
> > @@ -9,11 +9,11 @@
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
> >  {"return": {}}
> > +{"return": {}}
> > +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "job0"}}
> > +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
> > -{"return": {}}
> > -{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "standby", "id": "job0"}}
> > -{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
> >  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
> >
> > Peter: Please merge this pull request since the failure is pre-existing.
> 
> OK, I'll run the pullreq through merge testing again.
> 
> Could somebody on the block team look at this s390 host intermittent ?

I need to look into more s390x stuff on Monday so I'd be happy to dig
deeper then.

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Thu, 25 Mar 2021 at 16:28, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> On Thu, Mar 25, 2021 at 01:17:50PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> > Thanks! My path modifies migration/block-dirty-bitmap.c. qsd-jobs runs block-commit and block-stream jobs and don't start any kind of migration or snapshot or savevm, so it seems impossible that qsd-jobs runs the code touched by my patch..
>
> Confirmed. The failure is not related to this pull request.
>
> I reproduced the same s390x host failure on commit
> 9e2e9fe3df9f539f8b6941ceb96d25355fdae47e (HEAD -> master, tag:
> v6.0.0-rc0, origin/master, origin/HEAD):
>
> qsd-jobs                        fail       [11:04:58] [11:04:58]   0.1s                 output mismatch (see qsd-jobs.out.bad)
> --- /root/qemu/tests/qemu-iotests/tests/qsd-jobs.out
> +++ qsd-jobs.out.bad
> @@ -9,11 +9,11 @@
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
>  {"return": {}}
> +{"return": {}}
> +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "job0"}}
> +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
> -{"return": {}}
> -{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "standby", "id": "job0"}}
> -{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
>  {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
>
> Peter: Please merge this pull request since the failure is pre-existing.

OK, I'll run the pullreq through merge testing again.

Could somebody on the block team look at this s390 host intermittent ?

thanks
-- PMM

Re: [PULL 0/2] Block patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 3741 bytes --]

On Thu, Mar 25, 2021 at 01:17:50PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> 25.03.2021 12:56, Stefan Hajnoczi wrote:
> > On Wed, Mar 24, 2021 at 08:42:27PM +0000, Peter Maydell wrote:
> > > On Wed, 24 Mar 2021 at 20:18, Vladimir Sementsov-Ogievskiy
> > > <vsementsov@virtuozzo.com> wrote:
> > > > 
> > > > 24.03.2021 21:05, Peter Maydell wrote:
> > > > > On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > > > > > 
> > > > > > Vladimir Sementsov-Ogievskiy (2):
> > > > > >     migration/block-dirty-bitmap: make incoming disabled bitmaps busy
> > > > > >     migrate-bitmaps-postcopy-test: check that we can't remove in-flight
> > > > > >       bitmaps
> > > > > 
> > > > > This failed the 'qsd-jobs' iotest on s390x:
> > > 
> > > > I can't believe it related. My commit modifies bitmap status during bitmaps migration on target vm. There is no kind of migration in qsd-jobs test.
> > > 
> > > It's possible it's an intermittent, but it's not one I've seen
> > > before. We still have lots of time this release cycle to figure
> > > out the issue and get this fix in.
> > 
> > Vladimir: I'll get hold of an s390 machine and try to reproduce the
> > failure. I should have some news by Monday.
> 
> Thanks! My path modifies migration/block-dirty-bitmap.c. qsd-jobs runs block-commit and block-stream jobs and don't start any kind of migration or snapshot or savevm, so it seems impossible that qsd-jobs runs the code touched by my patch..

Confirmed. The failure is not related to this pull request.

I reproduced the same s390x host failure on commit
9e2e9fe3df9f539f8b6941ceb96d25355fdae47e (HEAD -> master, tag:
v6.0.0-rc0, origin/master, origin/HEAD):

qsd-jobs                        fail       [11:04:58] [11:04:58]   0.1s                 output mismatch (see qsd-jobs.out.bad)
--- /root/qemu/tests/qemu-iotests/tests/qsd-jobs.out
+++ qsd-jobs.out.bad
@@ -9,11 +9,11 @@
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
 {"return": {}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
-{"return": {}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "standby", "id": "job0"}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

Peter: Please merge this pull request since the failure is pre-existing.

Thanks,
Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/2] Block patches

[Vladimir Sementsov-Ogievskiy]

25.03.2021 12:56, Stefan Hajnoczi wrote:
> On Wed, Mar 24, 2021 at 08:42:27PM +0000, Peter Maydell wrote:
>> On Wed, 24 Mar 2021 at 20:18, Vladimir Sementsov-Ogievskiy
>> <vsementsov@virtuozzo.com> wrote:
>>>
>>> 24.03.2021 21:05, Peter Maydell wrote:
>>>> On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>>>>
>>>>> Vladimir Sementsov-Ogievskiy (2):
>>>>>     migration/block-dirty-bitmap: make incoming disabled bitmaps busy
>>>>>     migrate-bitmaps-postcopy-test: check that we can't remove in-flight
>>>>>       bitmaps
>>>>
>>>> This failed the 'qsd-jobs' iotest on s390x:
>>
>>> I can't believe it related. My commit modifies bitmap status during bitmaps migration on target vm. There is no kind of migration in qsd-jobs test.
>>
>> It's possible it's an intermittent, but it's not one I've seen
>> before. We still have lots of time this release cycle to figure
>> out the issue and get this fix in.
> 
> Vladimir: I'll get hold of an s390 machine and try to reproduce the
> failure. I should have some news by Monday.

Thanks! My path modifies migration/block-dirty-bitmap.c. qsd-jobs runs block-commit and block-stream jobs and don't start any kind of migration or snapshot or savevm, so it seems impossible that qsd-jobs runs the code touched by my patch..

> 
> Let's put the pull request on hold for now.
> 
> Stefan
> 


-- 
Best regards,
Vladimir

Re: [PULL 0/2] Block patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]

On Wed, Mar 24, 2021 at 08:42:27PM +0000, Peter Maydell wrote:
> On Wed, 24 Mar 2021 at 20:18, Vladimir Sementsov-Ogievskiy
> <vsementsov@virtuozzo.com> wrote:
> >
> > 24.03.2021 21:05, Peter Maydell wrote:
> > > On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > >>
> > >> Vladimir Sementsov-Ogievskiy (2):
> > >>    migration/block-dirty-bitmap: make incoming disabled bitmaps busy
> > >>    migrate-bitmaps-postcopy-test: check that we can't remove in-flight
> > >>      bitmaps
> > >
> > > This failed the 'qsd-jobs' iotest on s390x:
> 
> > I can't believe it related. My commit modifies bitmap status during bitmaps migration on target vm. There is no kind of migration in qsd-jobs test.
> 
> It's possible it's an intermittent, but it's not one I've seen
> before. We still have lots of time this release cycle to figure
> out the issue and get this fix in.

Vladimir: I'll get hold of an s390 machine and try to reproduce the
failure. I should have some news by Monday.

Let's put the pull request on hold for now.

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Wed, 24 Mar 2021 at 20:18, Vladimir Sementsov-Ogievskiy
<vsementsov@virtuozzo.com> wrote:
>
> 24.03.2021 21:05, Peter Maydell wrote:
> > On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >>
> >> Vladimir Sementsov-Ogievskiy (2):
> >>    migration/block-dirty-bitmap: make incoming disabled bitmaps busy
> >>    migrate-bitmaps-postcopy-test: check that we can't remove in-flight
> >>      bitmaps
> >
> > This failed the 'qsd-jobs' iotest on s390x:

> I can't believe it related. My commit modifies bitmap status during bitmaps migration on target vm. There is no kind of migration in qsd-jobs test.

It's possible it's an intermittent, but it's not one I've seen
before. We still have lots of time this release cycle to figure
out the issue and get this fix in.

-- PMM

Re: [PULL 0/2] Block patches

[Vladimir Sementsov-Ogievskiy]

24.03.2021 21:05, Peter Maydell wrote:
> On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>>
>> The following changes since commit 67c1115edd98f388ca89dd38322ea3fadf034523:
>>
>>    Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210323-pull-request' into staging (2021-03-23 23:47:30 +0000)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/stefanha/qemu.git tags/block-pull-request
>>
>> for you to fetch changes up to 3460fd7f3959d1fa7bcc255796844aa261c805a4:
>>
>>    migrate-bitmaps-postcopy-test: check that we can't remove in-flight bitmaps (2021-03-24 13:41:19 +0000)
>>
>> ----------------------------------------------------------------
>> Pull request
>>
>> This dirty bitmap fix solves a crash that can be triggered in the destination
>> QEMU process during live migration.
>>
>> ----------------------------------------------------------------
>>
>> Vladimir Sementsov-Ogievskiy (2):
>>    migration/block-dirty-bitmap: make incoming disabled bitmaps busy
>>    migrate-bitmaps-postcopy-test: check that we can't remove in-flight
>>      bitmaps
> 
> This failed the 'qsd-jobs' iotest on s390x:
> 
> 
>    TEST   iotest-qcow2: 309
>    TEST   iotest-qcow2: 313
>    TEST   iotest-qcow2: qsd-jobs [fail]
> QEMU          --
> "/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-system-s390x"
> -nodefaults -display none -accel qtest
> QEMU_IMG      -- "/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-img"
> QEMU_IO       --
> "/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-io" --cache
> writeback --aio threads -f qcow2
> QEMU_NBD      -- "/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-nbd"
> IMGFMT        -- qcow2
> IMGPROTO      -- file
> PLATFORM      -- Linux/s390x qemu01 4.15.0-132-generic
> TEST_DIR      -- /home/ubuntu/qemu/build/all/tests/qemu-iotests/scratch
> SOCK_DIR      -- /tmp/tmp807j_qyh
> SOCKET_SCM_HELPER --
> /home/ubuntu/qemu/build/all/tests/qemu-iotests/socket_scm_helper
> --- /home/ubuntu/qemu/tests/qemu-iotests/tests/qsd-jobs.out
> +++ qsd-jobs.out.bad
> @@ -9,11 +9,11 @@
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id":
> "job0"}}
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id":
> "job0"}}
>   {"return": {}}
> +{"return": {}}
> +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id":
> "job0"}}
> +{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id":
> "job0"}}
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id":
> "job0"}}
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0,
> "offset": 0, "speed": 0, "type": "commit"}}
> -{"return": {}}
> -{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "standby", "id":
> "job0"}}
> -{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id":
> "job0"}}
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id":
> "job0"}}
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id":
> "job0"}}
>   {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
> "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0,
> "offset": 0, "speed": 0, "type": "commit"}}
> Not run: 172 186 192 220 287
> Failures: qsd-jobs
> Failed 1 of 118 iotests
> 
> thanks
> -- PMM
> 

I can't believe it related. My commit modifies bitmap status during bitmaps migration on target vm. There is no kind of migration in qsd-jobs test.

-- 
Best regards,
Vladimir

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Wed, 24 Mar 2021 at 14:52, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 67c1115edd98f388ca89dd38322ea3fadf034523:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210323-pull-request' into staging (2021-03-23 23:47:30 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 3460fd7f3959d1fa7bcc255796844aa261c805a4:
>
>   migrate-bitmaps-postcopy-test: check that we can't remove in-flight bitmaps (2021-03-24 13:41:19 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> This dirty bitmap fix solves a crash that can be triggered in the destination
> QEMU process during live migration.
>
> ----------------------------------------------------------------
>
> Vladimir Sementsov-Ogievskiy (2):
>   migration/block-dirty-bitmap: make incoming disabled bitmaps busy
>   migrate-bitmaps-postcopy-test: check that we can't remove in-flight
>     bitmaps

This failed the 'qsd-jobs' iotest on s390x:


  TEST   iotest-qcow2: 309
  TEST   iotest-qcow2: 313
  TEST   iotest-qcow2: qsd-jobs [fail]
QEMU          --
"/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-system-s390x"
-nodefaults -display none -accel qtest
QEMU_IMG      -- "/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-img"
QEMU_IO       --
"/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-io" --cache
writeback --aio threads -f qcow2
QEMU_NBD      -- "/home/ubuntu/qemu/build/all/tests/qemu-iotests/../../qemu-nbd"
IMGFMT        -- qcow2
IMGPROTO      -- file
PLATFORM      -- Linux/s390x qemu01 4.15.0-132-generic
TEST_DIR      -- /home/ubuntu/qemu/build/all/tests/qemu-iotests/scratch
SOCK_DIR      -- /tmp/tmp807j_qyh
SOCKET_SCM_HELPER --
/home/ubuntu/qemu/build/all/tests/qemu-iotests/socket_scm_helper
--- /home/ubuntu/qemu/tests/qemu-iotests/tests/qsd-jobs.out
+++ qsd-jobs.out.bad
@@ -9,11 +9,11 @@
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id":
"job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id":
"job0"}}
 {"return": {}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id":
"job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id":
"job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id":
"job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0,
"offset": 0, "speed": 0, "type": "commit"}}
-{"return": {}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "standby", "id":
"job0"}}
-{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id":
"job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id":
"job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id":
"job0"}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP},
"event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0,
"offset": 0, "speed": 0, "type": "commit"}}
Not run: 172 186 192 220 287
Failures: qsd-jobs
Failed 1 of 118 iotests

thanks
-- PMM

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 67c1115edd98f388ca89dd38322ea3fadf034523:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210323-pull-request' into staging (2021-03-23 23:47:30 +0000)

are available in the Git repository at:

  https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 3460fd7f3959d1fa7bcc255796844aa261c805a4:

  migrate-bitmaps-postcopy-test: check that we can't remove in-flight bitmaps (2021-03-24 13:41:19 +0000)

----------------------------------------------------------------
Pull request

This dirty bitmap fix solves a crash that can be triggered in the destination
QEMU process during live migration.

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

Vladimir Sementsov-Ogievskiy (2):
  migration/block-dirty-bitmap: make incoming disabled bitmaps busy
  migrate-bitmaps-postcopy-test: check that we can't remove in-flight
    bitmaps

 migration/block-dirty-bitmap.c                         |  6 ++++++
 tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test | 10 ++++++++++
 2 files changed, 16 insertions(+)

-- 
2.30.2

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Mon, 10 Feb 2020 at 09:23, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 346ed3151f1c43e72c40cb55b392a1d4cface62c:
>
>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20200206.0' into staging (2020-02-07 11:52:15 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 11a18c84db4a71497d3d40769688a01b6f64b2ad:
>
>   hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host (2020-02-07 16:49:39 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------
>
> Philippe Mathieu-Daudé (1):
>   hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host
>
> Vladimir Sementsov-Ogievskiy (1):
>   block: fix crash on zero-length unaligned write and read


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 346ed3151f1c43e72c40cb55b392a1d4cface62c:

  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20200206.0' into staging (2020-02-07 11:52:15 +0000)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 11a18c84db4a71497d3d40769688a01b6f64b2ad:

  hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host (2020-02-07 16:49:39 +0000)

----------------------------------------------------------------
Pull request

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

Philippe Mathieu-Daudé (1):
  hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host

Vladimir Sementsov-Ogievskiy (1):
  block: fix crash on zero-length unaligned write and read

 block/io.c        | 28 +++++++++++++++++++++++++++-
 hw/core/machine.c |  3 ++-
 2 files changed, 29 insertions(+), 2 deletions(-)

-- 
2.24.1

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Fri, 13 Dec 2019 at 14:33, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit b0ca999a43a22b38158a222233d3f5881648bb4f:
>
>   Update version for v4.2.0 release (2019-12-12 16:45:57 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 86d2a49b41832355ab50cf60cec0cd50680fc0e5:
>
>   iothread: document -object iothread on man page (2019-12-13 11:24:07 +0000)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------
>

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit b0ca999a43a22b38158a222233d3f5881648bb4f:

  Update version for v4.2.0 release (2019-12-12 16:45:57 +0000)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 86d2a49b41832355ab50cf60cec0cd50680fc0e5:

  iothread: document -object iothread on man page (2019-12-13 11:24:07 +0000)

----------------------------------------------------------------
Pull request

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

Evgeny Yakovlev (1):
  virtio-blk: advertise F_WCE (F_FLUSH) if F_CONFIG_WCE is advertised

Stefan Hajnoczi (1):
  iothread: document -object iothread on man page

 hw/arm/virt.c                  |  1 +
 hw/block/virtio-blk.c          |  6 +++++-
 hw/core/machine.c              |  5 +++++
 hw/i386/pc_piix.c              |  1 +
 hw/i386/pc_q35.c               |  1 +
 hw/ppc/spapr.c                 |  2 +-
 hw/s390x/s390-virtio-ccw.c     |  1 +
 include/hw/boards.h            |  3 +++
 include/hw/virtio/virtio-blk.h |  1 +
 qemu-options.hx                | 38 ++++++++++++++++++++++++++++++++++
 10 files changed, 57 insertions(+), 2 deletions(-)

-- 
2.23.0

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Fri, 25 Oct 2019 at 20:18, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to d154ef37ff885918fa3e512fd7a8e42870291667:
>
>   yield_until_fd_readable: make it work with any AioContect (2019-10-25 14:38:29 +0200)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------
>
> Dietmar Maurer (1):
>   yield_until_fd_readable: make it work with any AioContect
>
> Julia Suvorova (1):
>   virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.

-- PMM

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to d154ef37ff885918fa3e512fd7a8e42870291667:

  yield_until_fd_readable: make it work with any AioContect (2019-10-25 14:38:29 +0200)

----------------------------------------------------------------
Pull request

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

Dietmar Maurer (1):
  yield_until_fd_readable: make it work with any AioContect

Julia Suvorova (1):
  virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()

 hw/block/virtio-blk.c    | 1 +
 util/qemu-coroutine-io.c | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

-- 
2.21.0

Re: [PULL 0/2] Block patches

[Peter Maydell]

On Wed, 25 Sep 2019 at 18:44, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> The following changes since commit 240ab11fb72049d6373cbbec8d788f8e411a00bc:
>
>   Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190924' into staging (2019-09-24 15:36:31 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to f9a7e3698a737ee75a7b0af34203303df982550f:
>
>   virtio-blk: schedule virtio_notify_config to run on main context (2019-09-25 18:06:36 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> ----------------------------------------------------------------

Hi; I'm dropping this pullreq as it makes one of the patchew build
configs fail to compile.

thanks
-- PMM

Re: [PULL 0/2] Block patches

[Vladimir Sementsov-Ogievskiy]

26.09.2019 9:16, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20190925174400.8578-1-stefanha@redhat.com/
> 
> 
> 
> Hi,
> 
> This series failed the docker-mingw@fedora build test. Please find the testing commands and
> their output below. If you have Docker installed, you can probably reproduce it
> locally.
> 
> === TEST SCRIPT BEGIN ===
> #! /bin/bash
> export ARCH=x86_64
> make docker-image-fedora V=1 NETWORK=1
> time make docker-test-mingw@fedora J=14 NETWORK=1
> === TEST SCRIPT END ===
> 
>    CC      authz/list.o
>    CC      authz/listfile.o
> /tmp/qemu-test/src/util/iov.c: In function 'qemu_iovec_init_extended':
> /tmp/qemu-test/src/util/iov.c:451:9: error: 'mid_iov' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>           memcpy(p, mid_iov, mid_niov * sizeof(*p));
>           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> 
> The full log is available at
> http://patchew.org/logs/20190925174400.8578-1-stefanha@redhat.com/testing.docker-mingw@fedora/?type=message.
> ---
> Email generated automatically by Patchew [https://patchew.org/].
> Please send your feedback to patchew-devel@redhat.com
> 

Actually it's obvious that it is initialized here:

We go here only if mid_niov, which may be set only in "if (mid_len)", and mid_iov is set in same "if (mid_len)".

My clang don't warn.

Still, we may just initialize mid_iov to NULL and don't care.

-- 
Best regards,
Vladimir

Re: [PULL 0/2] Block patches

[no-reply]

Patchew URL: https://patchew.org/QEMU/20190925174400.8578-1-stefanha@redhat.com/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===

  CC      authz/list.o
  CC      authz/listfile.o
/tmp/qemu-test/src/util/iov.c: In function 'qemu_iovec_init_extended':
/tmp/qemu-test/src/util/iov.c:451:9: error: 'mid_iov' may be used uninitialized in this function [-Werror=maybe-uninitialized]
         memcpy(p, mid_iov, mid_niov * sizeof(*p));
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors


The full log is available at
http://patchew.org/logs/20190925174400.8578-1-stefanha@redhat.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

[PULL 0/2] Block patches

[Stefan Hajnoczi]

The following changes since commit 240ab11fb72049d6373cbbec8d788f8e411a00bc:

  Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190924' into staging (2019-09-24 15:36:31 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to f9a7e3698a737ee75a7b0af34203303df982550f:

  virtio-blk: schedule virtio_notify_config to run on main context (2019-09-25 18:06:36 +0100)

----------------------------------------------------------------
Pull request

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

Sergio Lopez (1):
  virtio-blk: schedule virtio_notify_config to run on main context

Vladimir Sementsov-Ogievskiy (1):
  util/ioc.c: try to reassure Coverity about qemu_iovec_init_extended

 hw/block/virtio-blk.c | 16 +++++++++++++++-
 util/iov.c            |  3 ++-
 2 files changed, 17 insertions(+), 2 deletions(-)

-- 
2.21.0