[libvirt] [PATCH 6/8] qemu: monitor: Use qemuMonitorJSONBlockJobError in qemuMonitorJSONDrivePivot

Peter Krempa posted 8 patches 6 years, 9 months ago
[libvirt] [PATCH 6/8] qemu: monitor: Use qemuMonitorJSONBlockJobError in qemuMonitorJSONDrivePivot
Posted by Peter Krempa 6 years, 9 months ago
The API deals with a block job so use the common error reporting
function for it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/qemu/qemu_monitor_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index fed2f50e28..670089b87c 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4758,7 +4758,7 @@ qemuMonitorJSONDrivePivot(qemuMonitorPtr mon,
     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
         goto cleanup;

-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+    if (qemuMonitorJSONBlockJobError(cmd, reply, device) < 0)
         goto cleanup;

     ret = 0;
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 6/8] qemu: monitor: Use qemuMonitorJSONBlockJobError in qemuMonitorJSONDrivePivot
Posted by John Ferlan 6 years, 8 months ago

On 08/15/2018 07:52 AM, Peter Krempa wrote:
> The API deals with a block job so use the common error reporting
> function for it.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  src/qemu/qemu_monitor_json.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Very strange - this got applied to qemuMonitorJSONBlockStream in my "git
am" of the patches... Gets stranger on the next patch too, but at least
this explains what happened there...

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 6/8] qemu: monitor: Use qemuMonitorJSONBlockJobError in qemuMonitorJSONDrivePivot
Posted by Peter Krempa 6 years, 8 months ago
On Thu, Aug 23, 2018 at 17:38:39 -0400, John Ferlan wrote:
> 
> 
> On 08/15/2018 07:52 AM, Peter Krempa wrote:
> > The API deals with a block job so use the common error reporting
> > function for it.
> > 
> > Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> > ---
> >  src/qemu/qemu_monitor_json.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> 
> Very strange - this got applied to qemuMonitorJSONBlockStream in my "git
> am" of the patches... Gets stranger on the next patch too, but at least
> this explains what happened there...

Yeah. The blockdev series probably shifted some code arround (I was
adding the APIs for media manipulation) and the context was not big
enough to apply this correctly. I had the same problem now when I've
rebased it locally.

I've made sure now that it's applied at the correct point.

> 
> Reviewed-by: John Ferlan <jferlan@redhat.com>
> 
> John
> 
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list