Commit f1b3ccfa authored by Kevin Wolf's avatar Kevin Wolf Committed by Markus Armbruster
Browse files

monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c



Now that we have a monitor/ subdirectory, let's move hmp.c and qmp.c
from the root directory there. As they contain implementations of
monitor commands, rename them to {hmp,qmp}-cmds.c, so that {hmp,qmp}.c
are free for the HMP and QMP infrastructure.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190613153405.24769-9-kwolf@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent e84328fa
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -1919,7 +1919,8 @@ Human Monitor (HMP)
M: Dr. David Alan Gilbert <dgilbert@redhat.com>
S: Maintained
F: monitor/misc.c
F: hmp.[ch]
F: monitor/hmp*
F: hmp.h
F: hmp-commands*.hx
F: include/monitor/hmp-target.h
F: tests/test-hmp.c
@@ -2039,7 +2040,7 @@ F: tests/check-qom-proplist.c
QMP
M: Markus Armbruster <armbru@redhat.com>
S: Supported
F: qmp.c
F: monitor/qmp*
F: monitor/misc.c
F: docs/devel/*qmp-*
F: docs/interop/*qmp-*
+1 −1
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ common-obj-$(CONFIG_FDT) += device_tree.o
######################################################################
# qapi

common-obj-y += qmp.o hmp.o
common-obj-y += qapi/
common-obj-y += monitor/
endif

#######################################################################
+5 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ new QMP command.

2. Write the QMP command itself, which is a regular C function. Preferably,
   the command should be exported by some QEMU subsystem. But it can also be
   added to the qmp.c file
   added to the monitor/qmp-cmds.c file

3. At this point the command can be tested under the QMP protocol

@@ -101,7 +101,8 @@ protocol data.

The next step is to write the "hello-world" implementation. As explained
earlier, it's preferable for commands to live in QEMU subsystems. But
"hello-world" doesn't pertain to any, so we put its implementation in qmp.c:
"hello-world" doesn't pertain to any, so we put its implementation in
monitor/qmp-cmds.c:

void qmp_hello_world(Error **errp)
{
@@ -146,7 +147,7 @@ for mandatory arguments). Finally, 'str' is the argument's type, which
stands for "string". The QAPI also supports integers, booleans, enumerations
and user defined types.

Now, let's update our C implementation in qmp.c:
Now, let's update our C implementation in monitor/qmp-cmds.c:

void qmp_hello_world(bool has_message, const char *message, Error **errp)
{
@@ -267,7 +268,7 @@ monitor (HMP).

With the introduction of the QAPI, HMP commands make QMP calls. Most of the
time HMP commands are simple wrappers. All HMP commands implementation exist in
the hmp.c file.
the monitor/hmp-cmds.c file.

Here's the implementation of the "hello-world" HMP command:

+1 −0
Original line number Diff line number Diff line
obj-y += misc.o
common-obj-y += qmp-cmds.o hmp-cmds.o
+1 −1
Original line number Diff line number Diff line
/*
 * Human Monitor Interface
 * Human Monitor Interface commands
 *
 * Copyright IBM, Corp. 2011
 *
Loading