Re: [Qemu-devel] [PATCH v4 7/7] qom: allow properties to be registered against classes

[Andreas Färber]

Am 06.11.2015 um 10:32 schrieb Daniel P. Berrange:
> On Thu, Nov 05, 2015 at 07:12:39PM +0100, Andreas Färber wrote:
>> Am 13.10.2015 um 15:18 schrieb Pavel Fedin:
>>>> diff --git a/include/qom/object.h b/include/qom/object.h
>>>> index 2a54515..38f41d3 100644
>>>> --- a/include/qom/object.h
>>>> +++ b/include/qom/object.h
>> [...]
>>>> @@ -964,8 +975,14 @@ typedef struct ObjectPropertyIterator 
>>>> ObjectPropertyIterator;
>>>>   * object_property_iter_init:
>>>>   * @obj: the object
>>>>   *
>>>> +<<<<<<< HEAD
>>>>   * Initializes an iterator for traversing all properties
>>>>   * registered against an object instance.
>>>> +=======
>>>> + * Iterates over all properties defined against the object
>>>> + * instance, its class and all parent classes, calling
>>>> + * @iter for each property.
>>>> +>>>>>>> 0ca9307... qom: allow properties to be registered against classes
>>>
>>>  Conflict markers slipped in the comment
>>
>> There is no v5 fixing this yet? If agreement has been reached, I would
>> at least start applying from the front, to avoid another lengthy review
>> cycle; I could try to resolve the conflict myself if it's the only nit.
> 
> Opps, I missed this comment. No, I've not sent a v5, but it looks like
> it is just this comment that's the problem which is why I didn't catch
> it during compilation.

Fixed up and queued on qom-next for next merge window:
https://github.com/afaerber/qemu-cpu/commits/qom-next

Thanks,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)