[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/35] monitor: Move monitor_putc() next to monitor_puts & externa
From: |
Markus Armbruster |
Subject: |
[PULL 30/35] monitor: Move monitor_putc() next to monitor_puts & external linkage |
Date: |
Fri, 3 Feb 2023 09:45:44 +0100 |
monitor_putc() will soon be used from more than one .c file.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-28-armbru@redhat.com>
---
include/monitor/monitor.h | 1 +
monitor/misc.c | 27 ---------------------------
monitor/monitor.c | 27 +++++++++++++++++++++++++++
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 1e6f4c9bd7..033390f699 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -35,6 +35,7 @@ int monitor_puts(Monitor *mon, const char *str);
int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
G_GNUC_PRINTF(2, 0);
int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
+void monitor_printc(Monitor *mon, int ch);
void monitor_flush(Monitor *mon);
int monitor_set_cpu(Monitor *mon, int cpu_index);
int monitor_get_cpu_index(Monitor *mon);
diff --git a/monitor/misc.c b/monitor/misc.c
index c531d95b5b..7a0ba35923 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -304,33 +304,6 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
}
}
-static void monitor_printc(Monitor *mon, int c)
-{
- monitor_printf(mon, "'");
- switch(c) {
- case '\'':
- monitor_printf(mon, "\\'");
- break;
- case '\\':
- monitor_printf(mon, "\\\\");
- break;
- case '\n':
- monitor_printf(mon, "\\n");
- break;
- case '\r':
- monitor_printf(mon, "\\r");
- break;
- default:
- if (c >= 32 && c <= 126) {
- monitor_printf(mon, "%c", c);
- } else {
- monitor_printf(mon, "\\x%02x", c);
- }
- break;
- }
- monitor_printf(mon, "'");
-}
-
static void memory_dump(Monitor *mon, int count, int format, int wsize,
hwaddr addr, int is_physical)
{
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 605fe41748..0a990633d8 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -259,6 +259,33 @@ int monitor_printf(Monitor *mon, const char *fmt, ...)
return ret;
}
+void monitor_printc(Monitor *mon, int c)
+{
+ monitor_printf(mon, "'");
+ switch(c) {
+ case '\'':
+ monitor_printf(mon, "\\'");
+ break;
+ case '\\':
+ monitor_printf(mon, "\\\\");
+ break;
+ case '\n':
+ monitor_printf(mon, "\\n");
+ break;
+ case '\r':
+ monitor_printf(mon, "\\r");
+ break;
+ default:
+ if (c >= 32 && c <= 126) {
+ monitor_printf(mon, "%c", c);
+ } else {
+ monitor_printf(mon, "\\x%02x", c);
+ }
+ break;
+ }
+ monitor_printf(mon, "'");
+}
+
/*
* Print to current monitor if we have one, else to stderr.
*/
--
2.39.0
- [PULL 00/35] Monitor patches for 2023-02-03, Markus Armbruster, 2023/02/03
- [PULL 04/35] monitor: Drop unnecessary includes, Markus Armbruster, 2023/02/03
- [PULL 14/35] qom: Move HMP commands from monitor/ to qom/, Markus Armbruster, 2023/02/03
- [PULL 21/35] migration: Move the QMP command from monitor/ to migration/, Markus Armbruster, 2023/02/03
- [PULL 02/35] MAINTAINERS: Cover include/sysemu/accel-blocker.h, Markus Armbruster, 2023/02/03
- [PULL 11/35] trace: Move HMP commands from monitor/ to trace/, Markus Armbruster, 2023/02/03
- [PULL 12/35] machine: Move QMP commands from monitor/ to hw/core/, Markus Armbruster, 2023/02/03
- [PULL 03/35] MAINTAINERS: Cover tpm.c again, Markus Armbruster, 2023/02/03
- [PULL 24/35] runstate: Move HMP commands from monitor/ to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 15/35] block: Factor out hmp_change_medium(), and move to block/monitor/, Markus Armbruster, 2023/02/03
- [PULL 30/35] monitor: Move monitor_putc() next to monitor_puts & external linkage,
Markus Armbruster <=
- [PULL 18/35] net: Move HMP commands from monitor to net/, Markus Armbruster, 2023/02/03
- [PULL 28/35] qdev: Move HMP command completion from monitor to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 35/35] monitor: Rename misc.c to hmp-target.c, Markus Armbruster, 2023/02/03
- [PULL 08/35] hmp: Drop redundant argument check from add_completion_option(), Markus Armbruster, 2023/02/03
- [PULL 31/35] monitor: Move target-dependent HMP commands to hmp-cmds-target.c, Markus Armbruster, 2023/02/03
- [PULL 01/35] MAINTAINERS: Cover userfaultfd, Markus Armbruster, 2023/02/03
- [PULL 33/35] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c, Markus Armbruster, 2023/02/03
- [PULL 25/35] stats: Move QMP commands from monitor/ to stats/, Markus Armbruster, 2023/02/03
- [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly, Markus Armbruster, 2023/02/03
- [PULL 20/35] migration: Move HMP commands from monitor/ to migration/, Markus Armbruster, 2023/02/03