On 06/17/2014 04:57 AM, Paolo Bonzini wrote: > Il 15/06/2014 02:52, Wenchao Xia ha scritto: >>> Unfortunately, this already does not apply anymore. >>> >>> I've placed the rebase on branch qapi-event of my github repository. The >>> resolutions are trivial, so perhaps Luiz or Michael can pull from there? >>> >>> Paolo >>
I'm still reviewing your git tree; I raised a couple comments on 3/29 (see my replies there). Also: > +++ b/include/qapi/qmp-event.h > @@ -17,7 +17,7 @@ > #include "qapi/error.h" > #include "qapi/qmp/qdict.h" > > -typedef void (*QMPEventFuncEmit)(int event_kind, QDict *dict, Error **errp); > +typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp); It looks like you have some churn on this definition; patch 4/29 in your qapi-event branch did: -enum QAPIEvent; -typedef void (*QMPEventFuncEmit)(enum QAPIEvent event, QDict *dict, Error **errp); +typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp); Can you hoist the use of 'unsigned' directly into 2/29 to minimize the churn? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature