* [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions
@ 2014-06-27 13:47 Markus Armbruster
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression Markus Armbruster
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Markus Armbruster @ 2014-06-27 13:47 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, wenchaoqemu, lcapitulino, stefanha, pbonzini
This series plus Paolo's "[PATCH for 2.1] qdev: correctly send
DEVICE_DELETED for recursively-deleted devices" makes qemu-iotests
check -qcow2 again pass for me.
Luiz offered to take it through his tree.
Markus Armbruster (2):
blockjob: Fix recent BLOCK_JOB_READY regression
blockjob: Fix recent BLOCK_JOB_ERROR regression
blockjob.c | 8 ++++++--
qapi/block-core.json | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
--
1.9.3
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression
2014-06-27 13:47 [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Markus Armbruster
@ 2014-06-27 13:47 ` Markus Armbruster
2014-06-27 16:28 ` Kevin Wolf
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR regression Markus Armbruster
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Markus Armbruster @ 2014-06-27 13:47 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, wenchaoqemu, lcapitulino, stefanha, pbonzini
Commit bcada37 dropped the (undocumented) members type, len, offset,
speed, breaking tests/qemu-iotests/040 and 041.
Restore them. This fixes 040, and partially fixes 041.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
blockjob.c | 6 +++++-
qapi/block-core.json | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 4da86cd..37a8f1f 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -256,7 +256,11 @@ void block_job_event_completed(BlockJob *job, const char *msg)
void block_job_event_ready(BlockJob *job)
{
- qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs), &error_abort);
+ qapi_event_send_block_job_ready(job->driver->job_type,
+ bdrv_get_device_name(job->bs),
+ job->len,
+ job->offset,
+ job->speed, &error_abort);
}
BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
diff --git a/qapi/block-core.json b/qapi/block-core.json
index af6b436..8f42f24 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1559,4 +1559,8 @@
# Since: 1.3
##
{ 'event': 'BLOCK_JOB_READY',
- 'data': { 'device': 'str' } }
+ 'data': { 'type' : 'BlockJobType',
+ 'device': 'str',
+ 'len' : 'int',
+ 'offset': 'int',
+ 'speed' : 'int' } }
--
1.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR regression
2014-06-27 13:47 [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Markus Armbruster
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression Markus Armbruster
@ 2014-06-27 13:47 ` Markus Armbruster
2014-06-27 16:31 ` Kevin Wolf
2014-06-27 16:20 ` [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Benoît Canet
2014-06-27 16:55 ` Luiz Capitulino
3 siblings, 1 reply; 9+ messages in thread
From: Markus Armbruster @ 2014-06-27 13:47 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, wenchaoqemu, lcapitulino, stefanha, pbonzini
Commit 5a2d2cb screwed up the the value of members device and action,
breaking tests/qemu-iotests/041.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
blockjob.c | 2 +-
qapi/block-core.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 37a8f1f..4d8ff45 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -286,7 +286,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
default:
abort();
}
- qapi_event_send_block_job_error(bdrv_get_device_name(bs),
+ qapi_event_send_block_job_error(bdrv_get_device_name(job->bs),
is_read ? IO_OPERATION_TYPE_READ :
IO_OPERATION_TYPE_WRITE,
action, &error_abort);
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 8f42f24..c339d05 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1544,7 +1544,7 @@
{ 'event': 'BLOCK_JOB_ERROR',
'data': { 'device' : 'str',
'operation': 'IoOperationType',
- 'action' : 'BlockdevOnError' } }
+ 'action' : 'BlockErrorAction' } }
##
# @BLOCK_JOB_READY
--
1.9.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions
2014-06-27 13:47 [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Markus Armbruster
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression Markus Armbruster
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR regression Markus Armbruster
@ 2014-06-27 16:20 ` Benoît Canet
2014-06-27 16:55 ` Luiz Capitulino
3 siblings, 0 replies; 9+ messages in thread
From: Benoît Canet @ 2014-06-27 16:20 UTC (permalink / raw)
To: Markus Armbruster
Cc: kwolf, wenchaoqemu, qemu-devel, lcapitulino, stefanha, pbonzini
The Friday 27 Jun 2014 à 15:47:20 (+0200), Markus Armbruster wrote :
> This series plus Paolo's "[PATCH for 2.1] qdev: correctly send
> DEVICE_DELETED for recursively-deleted devices" makes qemu-iotests
> check -qcow2 again pass for me.
>
> Luiz offered to take it through his tree.
>
> Markus Armbruster (2):
> blockjob: Fix recent BLOCK_JOB_READY regression
> blockjob: Fix recent BLOCK_JOB_ERROR regression
>
> blockjob.c | 8 ++++++--
> qapi/block-core.json | 8 ++++++--
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
> --
> 1.9.3
>
>
For what it worth.
Tested-By: Benoit Canet <benoit@irqsave.net>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression Markus Armbruster
@ 2014-06-27 16:28 ` Kevin Wolf
2014-06-27 16:42 ` Luiz Capitulino
2014-06-27 16:55 ` Markus Armbruster
0 siblings, 2 replies; 9+ messages in thread
From: Kevin Wolf @ 2014-06-27 16:28 UTC (permalink / raw)
To: Markus Armbruster
Cc: wenchaoqemu, qemu-devel, lcapitulino, stefanha, pbonzini
Am 27.06.2014 um 15:47 hat Markus Armbruster geschrieben:
> Commit bcada37 dropped the (undocumented) members type, len, offset,
> speed, breaking tests/qemu-iotests/040 and 041.
>
> Restore them. This fixes 040, and partially fixes 041.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> blockjob.c | 6 +++++-
> qapi/block-core.json | 6 +++++-
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/blockjob.c b/blockjob.c
> index 4da86cd..37a8f1f 100644
> --- a/blockjob.c
> +++ b/blockjob.c
> @@ -256,7 +256,11 @@ void block_job_event_completed(BlockJob *job, const char *msg)
>
> void block_job_event_ready(BlockJob *job)
> {
> - qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs), &error_abort);
> + qapi_event_send_block_job_ready(job->driver->job_type,
> + bdrv_get_device_name(job->bs),
> + job->len,
> + job->offset,
> + job->speed, &error_abort);
> }
>
> BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index af6b436..8f42f24 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -1559,4 +1559,8 @@
> # Since: 1.3
> ##
> { 'event': 'BLOCK_JOB_READY',
> - 'data': { 'device': 'str' } }
> + 'data': { 'type' : 'BlockJobType',
> + 'device': 'str',
> + 'len' : 'int',
> + 'offset': 'int',
> + 'speed' : 'int' } }
Please document the added fields in the comment above the definition.
Looks good otherwise.
Kevin
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR regression
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR regression Markus Armbruster
@ 2014-06-27 16:31 ` Kevin Wolf
0 siblings, 0 replies; 9+ messages in thread
From: Kevin Wolf @ 2014-06-27 16:31 UTC (permalink / raw)
To: Markus Armbruster
Cc: wenchaoqemu, qemu-devel, lcapitulino, stefanha, pbonzini
Am 27.06.2014 um 15:47 hat Markus Armbruster geschrieben:
> Commit 5a2d2cb screwed up the the value of members device and action,
> breaking tests/qemu-iotests/041.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression
2014-06-27 16:28 ` Kevin Wolf
@ 2014-06-27 16:42 ` Luiz Capitulino
2014-06-27 16:55 ` Markus Armbruster
1 sibling, 0 replies; 9+ messages in thread
From: Luiz Capitulino @ 2014-06-27 16:42 UTC (permalink / raw)
To: Kevin Wolf; +Cc: wenchaoqemu, Markus Armbruster, qemu-devel, stefanha, pbonzini
On Fri, 27 Jun 2014 18:28:47 +0200
Kevin Wolf <kwolf@redhat.com> wrote:
> Am 27.06.2014 um 15:47 hat Markus Armbruster geschrieben:
> > Commit bcada37 dropped the (undocumented) members type, len, offset,
> > speed, breaking tests/qemu-iotests/040 and 041.
> >
> > Restore them. This fixes 040, and partially fixes 041.
> >
> > Signed-off-by: Markus Armbruster <armbru@redhat.com>
> > ---
> > blockjob.c | 6 +++++-
> > qapi/block-core.json | 6 +++++-
> > 2 files changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/blockjob.c b/blockjob.c
> > index 4da86cd..37a8f1f 100644
> > --- a/blockjob.c
> > +++ b/blockjob.c
> > @@ -256,7 +256,11 @@ void block_job_event_completed(BlockJob *job, const char *msg)
> >
> > void block_job_event_ready(BlockJob *job)
> > {
> > - qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs), &error_abort);
> > + qapi_event_send_block_job_ready(job->driver->job_type,
> > + bdrv_get_device_name(job->bs),
> > + job->len,
> > + job->offset,
> > + job->speed, &error_abort);
> > }
> >
> > BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
> > diff --git a/qapi/block-core.json b/qapi/block-core.json
> > index af6b436..8f42f24 100644
> > --- a/qapi/block-core.json
> > +++ b/qapi/block-core.json
> > @@ -1559,4 +1559,8 @@
> > # Since: 1.3
> > ##
> > { 'event': 'BLOCK_JOB_READY',
> > - 'data': { 'device': 'str' } }
> > + 'data': { 'type' : 'BlockJobType',
> > + 'device': 'str',
> > + 'len' : 'int',
> > + 'offset': 'int',
> > + 'speed' : 'int' } }
>
> Please document the added fields in the comment above the definition.
We have to add them to docs/qmp/qmp-events.txt too.
Markus, you can add a diff in this thread and I'll squash it with the patch.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression
2014-06-27 16:28 ` Kevin Wolf
2014-06-27 16:42 ` Luiz Capitulino
@ 2014-06-27 16:55 ` Markus Armbruster
1 sibling, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2014-06-27 16:55 UTC (permalink / raw)
To: Kevin Wolf; +Cc: pbonzini, lcapitulino, wenchaoqemu, stefanha, qemu-devel
Kevin Wolf <kwolf@redhat.com> writes:
> Am 27.06.2014 um 15:47 hat Markus Armbruster geschrieben:
>> Commit bcada37 dropped the (undocumented) members type, len, offset,
>> speed, breaking tests/qemu-iotests/040 and 041.
>>
>> Restore them. This fixes 040, and partially fixes 041.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>> blockjob.c | 6 +++++-
>> qapi/block-core.json | 6 +++++-
>> 2 files changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/blockjob.c b/blockjob.c
>> index 4da86cd..37a8f1f 100644
>> --- a/blockjob.c
>> +++ b/blockjob.c
>> @@ -256,7 +256,11 @@ void block_job_event_completed(BlockJob *job,
>> const char *msg)
>>
>> void block_job_event_ready(BlockJob *job)
>> {
>> - qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs),
>> &error_abort);
>> + qapi_event_send_block_job_ready(job->driver->job_type,
>> + bdrv_get_device_name(job->bs),
>> + job->len,
>> + job->offset,
>> + job->speed, &error_abort);
>> }
>>
>> BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
>> diff --git a/qapi/block-core.json b/qapi/block-core.json
>> index af6b436..8f42f24 100644
>> --- a/qapi/block-core.json
>> +++ b/qapi/block-core.json
>> @@ -1559,4 +1559,8 @@
>> # Since: 1.3
>> ##
>> { 'event': 'BLOCK_JOB_READY',
>> - 'data': { 'device': 'str' } }
>> + 'data': { 'type' : 'BlockJobType',
>> + 'device': 'str',
>> + 'len' : 'int',
>> + 'offset': 'int',
>> + 'speed' : 'int' } }
>
> Please document the added fields in the comment above the definition.
I hesistated, because it's not obvious to me whether we want all these
members from a design point of view, and then I forgot in my haste to
get the fix out.
Unwanted fields (if any) should be marked deprecated.
Anyway, I'll post a quick fix adding docs, for immediate commit. We can
then discuss further doc changes. Plenty of time for those.
> Looks good otherwise.
Thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions
2014-06-27 13:47 [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Markus Armbruster
` (2 preceding siblings ...)
2014-06-27 16:20 ` [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Benoît Canet
@ 2014-06-27 16:55 ` Luiz Capitulino
3 siblings, 0 replies; 9+ messages in thread
From: Luiz Capitulino @ 2014-06-27 16:55 UTC (permalink / raw)
To: Markus Armbruster; +Cc: kwolf, wenchaoqemu, qemu-devel, stefanha, pbonzini
On Fri, 27 Jun 2014 15:47:20 +0200
Markus Armbruster <armbru@redhat.com> wrote:
> This series plus Paolo's "[PATCH for 2.1] qdev: correctly send
> DEVICE_DELETED for recursively-deleted devices" makes qemu-iotests
> check -qcow2 again pass for me.
>
> Luiz offered to take it through his tree.
Kevin is going to take them via block tree:
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
>
> Markus Armbruster (2):
> blockjob: Fix recent BLOCK_JOB_READY regression
> blockjob: Fix recent BLOCK_JOB_ERROR regression
>
> blockjob.c | 8 ++++++--
> qapi/block-core.json | 8 ++++++--
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-06-27 18:15 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-27 13:47 [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Markus Armbruster
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 1/2] blockjob: Fix recent BLOCK_JOB_READY regression Markus Armbruster
2014-06-27 16:28 ` Kevin Wolf
2014-06-27 16:42 ` Luiz Capitulino
2014-06-27 16:55 ` Markus Armbruster
2014-06-27 13:47 ` [Qemu-devel] [PATCH 2.1 2/2] blockjob: Fix recent BLOCK_JOB_ERROR regression Markus Armbruster
2014-06-27 16:31 ` Kevin Wolf
2014-06-27 16:20 ` [Qemu-devel] [PATCH 2.1 0/2] Fix two recent event regressions Benoît Canet
2014-06-27 16:55 ` Luiz Capitulino
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.