Re: [Qemu-devel] [PATCH v3 6/8] qom: object_class_property_iter_init() function

[Eduardo Habkost]

On Thu, Oct 27, 2016 at 05:34:45PM +0200, Igor Mammedov wrote:
> On Wed, 26 Oct 2016 14:30:24 -0200
> Eduardo Habkost <address@hidden> wrote:
> 
> > The new function will allow us to iterate over class properties
> > using the same logic we use for object properties. Unit test
> > included.
> with current master this patch doesn't apply:
> 
> Applying: qom: object_class_property_iter_init() function
> Context reduced to (2/2) to apply fragment at 1010
> Context reduced to (2/2) to apply fragment at 1019
> error: patch failed: qom/object.c:1017
> error: qom/object.c: patch does not apply
> error: patch failed: tests/check-qom-proplist.c:524
> error: tests/check-qom-proplist.c: patch does not apply
> Patch failed at 0001 qom: object_class_property_iter_init() function

It works here:

  $ git rev-parse HEAD
  5929d7e8a0e1f43333bc3528b50397ae8dd0fd6b
  $ grep -i 'message-id:' /tmp/apv3 
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  Message-Id: <address@hidden>
  $ git am /tmp/apv3
  Applying: tests: check-qom-proplist: Remove duplicate "bv" property
  Applying: tests: check-qom-proplist: Use &error_abort to catch errors
  Applying: qdev: device_class_set_props() function
  Applying: qdev: Extract property-default code to 
qdev_property_set_to_default()
  Applying: qdev: Register static properties as class properties
  Applying: qom: object_class_property_iter_init() function
  Applying: qmp: Support abstract classes on device-list-properties
  Applying: qdev: Warning about using object_class_property_add() in new code
  $ 

-- 
Eduardo