qjson.[ch] is a JSON writer used by migration. Eric proposed to replace it by common code in his "Add qapi-to-JSON and clone visitors" series. David's review led to the conclusion that migration would prefer to keep its own JSON writer, to better serve its requirements. PATCH 1 move it to its proper place, and explains why it exists in a bit more detail. PATCH 2 simplifies it a bit.
Markus Armbruster (2): migration: Move qjson.[ch] to migration/ migration/qjson: Drop gratuitous use of QOM Makefile.objs | 1 - include/{ => migration}/qjson.h | 2 +- include/migration/vmstate.h | 2 +- migration/Makefile.objs | 1 + qjson.c => migration/qjson.c | 58 +++++++++++++++-------------------------- migration/savevm.c | 2 +- migration/vmstate.c | 1 - tests/Makefile | 2 +- 8 files changed, 26 insertions(+), 43 deletions(-) rename include/{ => migration}/qjson.h (95%) rename qjson.c => migration/qjson.c (70%) -- 2.5.5