On 02/02/2016 04:41 PM, Andreas Färber wrote: > Am 03.02.2016 um 00:38 schrieb Eric Blake: >> On 02/02/2016 05:57 AM, Daniel P. Berrange wrote: >>> The QMP monitor code has two helper methods object_add >>> and qmp_object_del that are called from several places >>> in the code (QMP, HMP and main emulator startup). >>> >>> The HMP and main emulator startup code also share >>> further logic that extracts the qom-type & id >>> values from a qdict. >>> >>> We soon need to use this logic from qemu-img, qemu-io >>> and qemu-nbd too, but don't want those to depend on >>> the monitor, nor do we want to duplicate the code. >> >> Yay - merge conflicts with my work pending on Markus' qapi-next branch: >> https://lists.gnu.org/archive/html/qemu-devel/2016-02/msg00254.html > > Did I review the wrong patch then? I assumed this was the one I was > asked to look at just before FOSDEM...
No, you got the right patch; it's just that I've been independently improving the code in hmp.c and vl.c that Dan is now refactoring, so at least one of us will have to rebase. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
