[PATCH 2/2] update definition of libxl_bitmap_{or, and}

[PATCH 2/2] update definition of libxl_bitmap_{or, and}

[Linda Jacobson]

Fixed a comment that included a reference to a function that was
not included with these changes.

Signed-off-by: Linda Jacobson <lindaj@jma3.com>
---
 tools/libxl/libxl_utils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h
index 0b6480d..4852127 100644
--- a/tools/libxl/libxl_utils.h
+++ b/tools/libxl/libxl_utils.h
@@ -91,7 +91,7 @@ void libxl_bitmap_set(libxl_bitmap *bitmap, int bit);
 void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit);
 int libxl_bitmap_count_set(const libxl_bitmap *bitmap);
 char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *bitmap);
-/* or, and and xor functions for two bitmaps
+/* or and and functions for two bitmaps
  */
 int libxl_bitmap_or(libxl_ctx *ctx, libxl_bitmap *or_map,
                     libxl_bitmap *map1, libxl_bitmap *map2); 
-- 
1.9.1

Re: [PATCH 2/2] update definition of libxl_bitmap_{or, and}

[Julien Grall]

Hi Linda,

As said on the previous patch, it's not necessary to send another patch 
in order to fix the previous one. Can you merge them?

Regards,

On 11/04/2015 05:25, Linda Jacobson wrote:
> Fixed a comment that included a reference to a function that was
> not included with these changes.
>
> Signed-off-by: Linda Jacobson <lindaj@jma3.com>
> ---
>   tools/libxl/libxl_utils.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h
> index 0b6480d..4852127 100644
> --- a/tools/libxl/libxl_utils.h
> +++ b/tools/libxl/libxl_utils.h
> @@ -91,7 +91,7 @@ void libxl_bitmap_set(libxl_bitmap *bitmap, int bit);
>   void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit);
>   int libxl_bitmap_count_set(const libxl_bitmap *bitmap);
>   char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *bitmap);
> -/* or, and and xor functions for two bitmaps
> +/* or and and functions for two bitmaps
>    */
>   int libxl_bitmap_or(libxl_ctx *ctx, libxl_bitmap *or_map,
>                       libxl_bitmap *map1, libxl_bitmap *map2);
>

-- 
Julien Grall

Re: [PATCH 2/2] update definition of libxl_bitmap_{or, and}

[Linda]

Hi Julien,
     Thanks for your feed back.  Also, thanks for sending to all the 
maintainers.


On 4/11/2015 2:32 PM, Julien Grall wrote:
> Hi Linda,
>
> As said on the previous patch, it's not necessary to send another 
> patch in order to fix the previous one. Can you merge them?
Of course, I can.  I'll make all the changes you requested, and just 
send a new patch with all the updates.   I assume it's a git option, 
that I didn't use.  I'll look for it.  I wasn't planning on doing it 
this way, but just followed the steps I'd done before.  Git actually 
wanted to send two emails, so I chose the second.  I'll look for the 
correct way to do this.

Linda
>
> Regards,
>
> On 11/04/2015 05:25, Linda Jacobson wrote:
>> Fixed a comment that included a reference to a function that was
>> not included with these changes.
>>
>> Signed-off-by: Linda Jacobson <lindaj@jma3.com>
>> ---
>>   tools/libxl/libxl_utils.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h
>> index 0b6480d..4852127 100644
>> --- a/tools/libxl/libxl_utils.h
>> +++ b/tools/libxl/libxl_utils.h
>> @@ -91,7 +91,7 @@ void libxl_bitmap_set(libxl_bitmap *bitmap, int bit);
>>   void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit);
>>   int libxl_bitmap_count_set(const libxl_bitmap *bitmap);
>>   char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap 
>> *bitmap);
>> -/* or, and and xor functions for two bitmaps
>> +/* or and and functions for two bitmaps
>>    */
>>   int libxl_bitmap_or(libxl_ctx *ctx, libxl_bitmap *or_map,
>>                       libxl_bitmap *map1, libxl_bitmap *map2);
>>
>