[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 07/11] monitor: Move {hmp, qmp}.c to monitor/{hmp
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v2 07/11] monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c |
Date: |
Tue, 11 Jun 2019 15:40:39 +0200 |
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: Kevin Wolf <address@hidden>
---
docs/devel/writing-qmp-commands.txt | 9 +++++----
hmp.c => monitor/hmp-cmds.c | 2 +-
qmp.c => monitor/qmp-cmds.c | 2 +-
MAINTAINERS | 5 +++--
Makefile.objs | 2 +-
monitor/Makefile.objs | 1 +
6 files changed, 12 insertions(+), 9 deletions(-)
rename hmp.c => monitor/hmp-cmds.c (99%)
rename qmp.c => monitor/qmp-cmds.c (99%)
diff --git a/docs/devel/writing-qmp-commands.txt
b/docs/devel/writing-qmp-commands.txt
index cc6ecd6d5d..46a6c48683 100644
--- a/docs/devel/writing-qmp-commands.txt
+++ b/docs/devel/writing-qmp-commands.txt
@@ -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:
diff --git a/hmp.c b/monitor/hmp-cmds.c
similarity index 99%
rename from hmp.c
rename to monitor/hmp-cmds.c
index 99414cd39c..712737cd18 100644
--- a/hmp.c
+++ b/monitor/hmp-cmds.c
@@ -1,5 +1,5 @@
/*
- * Human Monitor Interface
+ * Human Monitor Interface commands
*
* Copyright IBM, Corp. 2011
*
diff --git a/qmp.c b/monitor/qmp-cmds.c
similarity index 99%
rename from qmp.c
rename to monitor/qmp-cmds.c
index fa1b3c1577..65520222ca 100644
--- a/qmp.c
+++ b/monitor/qmp-cmds.c
@@ -1,5 +1,5 @@
/*
- * QEMU Management Protocol
+ * QEMU Management Protocol commands
*
* Copyright IBM, Corp. 2011
*
diff --git a/MAINTAINERS b/MAINTAINERS
index 10c082314c..8789c82e5c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1925,7 +1925,8 @@ Human Monitor (HMP)
M: Dr. David Alan Gilbert <address@hidden>
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
@@ -2045,7 +2046,7 @@ F: tests/check-qom-proplist.c
QMP
M: Markus Armbruster <address@hidden>
S: Supported
-F: qmp.c
+F: monitor/qmp*
F: monitor/misc.c
F: docs/devel/*qmp-*
F: docs/interop/*qmp-*
diff --git a/Makefile.objs b/Makefile.objs
index dd39a70b48..9495fcbc7e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -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
#######################################################################
diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs
index e783b0616b..a7170af6e1 100644
--- a/monitor/Makefile.objs
+++ b/monitor/Makefile.objs
@@ -1 +1,2 @@
obj-y += misc.o
+common-obj-y += qmp-cmds.o hmp-cmds.o
--
2.20.1
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 03/11] monitor: Make MonitorQMP a child class of Monitor, (continued)
- [Qemu-block] [PATCH v2 05/11] monitor: Move cmd_table to MonitorHMP, Kevin Wolf, 2019/06/11
- [Qemu-block] [PATCH v2 06/11] Move monitor.c to monitor/misc.c, Kevin Wolf, 2019/06/11
- [Qemu-block] [PATCH v2 08/11] monitor: Create monitor_int.h with common definitions, Kevin Wolf, 2019/06/11
- [Qemu-block] [PATCH v2 07/11] monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c,
Kevin Wolf <=
- [Qemu-block] [PATCH v2 09/11] monitor: Split out monitor/qmp.c, Kevin Wolf, 2019/06/11
[Qemu-block] [PATCH v2 11/11] monitor: Split out monitor/monitor.c, Kevin Wolf, 2019/06/11