[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.2 1/2] rename parse_enum_option to qapi_en
From: |
Peter Lieven |
Subject: |
Re: [Qemu-devel] [PATCH for-2.2 1/2] rename parse_enum_option to qapi_enum_parse and make it public |
Date: |
Mon, 28 Jul 2014 22:06:50 +0200 |
Am 28.07.2014 um 21:58 schrieb Eric Blake <address@hidden>:
> On 07/28/2014 01:43 PM, Peter Lieven wrote:
>> Suggested-by: Markus Armbruster <address@hidden>
>> Signed-off-by: Hu Tao <address@hidden>
>> Signed-off-by: Peter Lieven <address@hidden>
>> ---
>> blockdev.c | 30 ++++++------------------------
>> include/qapi/util.h | 17 +++++++++++++++++
>> qapi/Makefile.objs | 2 +-
>> qapi/qapi-util.c | 34 ++++++++++++++++++++++++++++++++++
>> 4 files changed, 58 insertions(+), 25 deletions(-)
>> create mode 100644 include/qapi/util.h
>> create mode 100644 qapi/qapi-util.c
>
>> +++ b/blockdev.c
>> @@ -39,6 +39,7 @@
>> #include "qapi/qmp/types.h"
>> #include "qapi-visit.h"
>> #include "qapi/qmp-output-visitor.h"
>> +#include "qapi/util.h"
>> #include "sysemu/sysemu.h"
>> #include "block/block_int.h"
>> #include "qmp-commands.h"
>> @@ -274,25 +275,6 @@ static int parse_block_error_action(const char *buf,
>> bool is_read, Error **errp)
>> }
>> }
>>
>> -static inline int parse_enum_option(const char *lookup[], const char *buf,
>> - int max, int def, Error **errp)
>
> This file is GPLv2+,...
>
>> +++ b/qapi/qapi-util.c
>> @@ -0,0 +1,34 @@
>> +/*
>> + * QAPI util functions
>> + *
>> + * Authors:
>> + * Hu Tao <address@hidden>
>> + * Peter Lieven <address@hidden>
>> + *
>> + * This work is licensed under the terms of the GNU LGPL, version 2.1 or
>> later.
>> + * See the COPYING.LIB file in the top-level directory.
>
> ...but you have relaxed the license to LGPLv2+ in your code motion.
> Then again, Peter is the original author of this code in commit
> 82a402e9, so you have the legal right to relax things.
Actually, I was not aware. I just took Hu Taos original commit. As we want
to make a collection of utilities I would go as far as put a BSD license here.
I will send a v2 with your comments regarding Patch 2. And do that license
change as well.
Peter
>
> If this was intentional, then it probably should have been mentioned in
> the commit message. With that done:
> Reviewed-by: Eric Blake <address@hidden>
> If it was inadvertent, then post a v2 that makes the new file GPLv2+,
> for the avoidance of doubt.
>
> --
> Eric Blake eblake redhat com +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
>