2011/5/16 Eric Blake <ebl...@redhat.com>: > On 05/01/2011 01:57 PM, Matthias Bolte wrote: >> --- >> src/esx/esx_driver.c | 6 ++---- >> src/esx/esx_vi.c | 34 +++++++++++++++------------------- >> src/esx/esx_vi.h | 12 +++++------- >> 3 files changed, 22 insertions(+), 30 deletions(-) > > I got a trivial rebase error when testing this out: > >> @@ -3735,13 +3732,12 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, >> } >> >> if (taskInfo->cancelable == esxVI_Boolean_True) { >> - if (esxVI_CancelTask(ctx, task) < 0 && >> - blocked == esxVI_Boolean_True) { >> + if (esxVI_CancelTask(ctx, task) < 0 && blocked) { >> VIR_ERROR0(_("Cancelable task is blocked by an " > > now that the context has VIR_ERROR instead of VIR_ERROR0. But I'm > assuming you've already picked up on that. > > ACK. >
Thanks, pushed. Matthias -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list