Commit 17b74b98 authored by Markus Armbruster's avatar Markus Armbruster Committed by Amit Shah
Browse files

migration: Move qjson.[ch] to migration/ 



Type QJSON lets you build JSON text.  Its interface mirrors (a subset
of) abstract JSON syntax.

QAPI output visitors also produce JSON text.  They assert their
preconditions and invariants, and therefore abort on incorrect use.

Contrastingly, QJSON does *not* detect incorrect use.  It happily
produces invalid JSON then.  This is what migration wants.

QJSON was designed for migration, and migration is its only user.
Move it to migration/ for proper coverage by MAINTAINERS, and to deter
accidental use outside migration.

[Pointed out by Eric: QJSON was added in commits 0457d073..b1742570
 -- Amit]

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1462380558-2030-2-git-send-email-armbru@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent 65603e2f

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ common-obj-$(CONFIG_LINUX) += fsdev/ 
common-obj-y += migration/

common-obj-y += qemu-char.o #aio.o

common-obj-y += page_cache.o

common-obj-y += qjson.o



common-obj-$(CONFIG_SPICE) += spice-qemu-char.o

include/qjson.h→include/migration/qjson.h

+0 −0

File moved.

View file

include/migration/vmstate.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#ifndef CONFIG_USER_ONLY

#include <migration/qemu-file.h>

#endif

#include <qjson.h>

#include "migration/qjson.h"



typedef void SaveStateHandler(QEMUFile *f, void *opaque);

typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);

migration/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ common-obj-y += migration.o tcp.o 
common-obj-y += vmstate.o

common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o

common-obj-y += xbzrle.o postcopy-ram.o

common-obj-y += qjson.o



common-obj-$(CONFIG_RDMA) += rdma.o

common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o

qjson.c→migration/qjson.c

+17 −6
Original line number Diff line number Diff line 
/*

 * QEMU JSON writer

 * A simple JSON writer

 *

 * Copyright Alexander Graf

 *
@@ -11,12 +11,23 @@ 
 *

 */



/*

 * Type QJSON lets you build JSON text.  Its interface mirrors (a

 * subset of) abstract JSON syntax.

 *

 * It does *not* detect incorrect use.  It happily produces invalid

 * JSON then.  This is what migration wants.

 *

 * QAPI output visitors also produce JSON text.  However, they do

 * assert their preconditions and invariants, and therefore abort on

 * incorrect use.

 */



#include "qemu/osdep.h"

#include <qapi/qmp/qstring.h>

#include <glib.h>

#include <qjson.h>

#include <qemu/module.h>

#include <qom/object.h>

#include "qapi/qmp/qstring.h"

#include "migration/qjson.h"

#include "qemu/module.h"

#include "qom/object.h"



struct QJSON {

    Object obj;