Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue

[Wenchao Xia <wenchaoqemu@gmail.com>]

于 2014/6/21 4:02, Eric Blake 写道:
> On 06/20/2014 01:49 PM, Paolo Bonzini wrote:
>
>>
>> As I explained on IRC, many patches when rebased would have conflicts
>> with Igor's new event.  I think this is much more complex than having
>> an "extraordinary" merge commit.
>>
>> I include the conflict resolution:
>>
>> - hw/acpi/memory-hotplug.c is only present in mst's branch, so I'm
>> including the diff from there (changing to the QAPI event style)
>>
>> - qapi-event.json is only present in luiz's branch, so I'm
>> including the diff from there (adding the ACPI_DEVICE_OST event)
>
> One other alternative would have been to pull out the new
> ACPI_DEVICE_OST patches out of mst's branch, and upgrade them to Igor's
> v3 which applies on top of Wenchao's work:
> https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg04927.html
>

   So which way to go now?

>>
>> -
>> Paolo
>>
>> a76d72f692ed5f4f30f116cc9c3ac5fefe221cb7
>> Merge: 0a99aae b98ff90
>> Author: Paolo Bonzini <pbonzini@redhat.com>
>> Date:   Fri Jun 20 21:18:08 2014 +0200
>>
>>      Merge commit b98ff90e9459e0113da8502c03670a9539f90aa1 of git://repo.or.cz/qemu/qmp-unstable into HEAD
>>
>>      Conflicts:
>>      	docs/qmp/qmp-events.txt [removed with QAPI event conversion]
>>      	hw/core/qdev.c [trivial header file conflict]
>>      	include/monitor/monitor.h [QMP event enum removed by QAPI conversion]
>>      	monitor.c [QMP event enum removed by QAPI conversion]
>>      	qapi-schema.json [trivial, code added by both sides in the same place]
>>      	qemu-char.c [trivial, code added by both sides in the same place]
>>      	vl.c [trivial header file conflict]
>>
>>      Other files changed:
>>              qapi-event.json [include ACPI_DEVICE_OST event]
>>              hw/acpi/memory-hotplug.c [use QAPI event]
>>
>>      Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
> If you are okay taking this complex merge patch, you can add:
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
>