Re: [PATCH] esx: Simplify some esxVI_Boolean to bool

Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx> · Tue, 17 May 2011 13:27:14 +0200

2011/5/16 Eric Blake <eblake@xxxxxxxxxx>:
> 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@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list