Peter points out double underscore prefix names tend to be reserved
for the system. Clean these up.
Suggested-by: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Nicholas Piggin <npig...@gmail.com>
---
chardev/char.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/chardev/char.c b/chardev/char.c
index 47a744ebeb..46d4798e4e 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -628,8 +628,8 @@ static void qemu_chardev_set_replay(Chardev *chr, Error
**errp)
}
}
-static Chardev *__qemu_chr_new_from_opts(QemuOpts *opts, GMainContext *context,
- bool replay, Error **errp)
+static Chardev *do_qemu_chr_new_from_opts(QemuOpts *opts, GMainContext
*context,
+ bool replay, Error **errp)
{
const ChardevClass *cc;
Chardev *base = NULL, *chr = NULL;
@@ -707,12 +707,12 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
GMainContext *context,
Error **errp)
{
/* XXX: should this really not record/replay? */
- return __qemu_chr_new_from_opts(opts, context, false, errp);
+ return do_qemu_chr_new_from_opts(opts, context, false, errp);
}
-static Chardev *__qemu_chr_new(const char *label, const char *filename,
- bool permit_mux_mon, GMainContext *context,
- bool replay)
+static Chardev *qemu_chr_new_from_name(const char *label, const char *filename,
+ bool permit_mux_mon,
+ GMainContext *context, bool replay)
{
const char *p;
Chardev *chr;
@@ -735,7 +735,7 @@ static Chardev *__qemu_chr_new(const char *label, const
char *filename,
if (!opts)
return NULL;
- chr = __qemu_chr_new_from_opts(opts, context, replay, &err);
+ chr = do_qemu_chr_new_from_opts(opts, context, replay, &err);
if (!chr) {
error_report_err(err);
goto out;
@@ -760,7 +760,8 @@ out:
Chardev *qemu_chr_new_noreplay(const char *label, const char *filename,
bool permit_mux_mon, GMainContext *context)
{
- return __qemu_chr_new(label, filename, permit_mux_mon, context, false);
+ return qemu_chr_new_from_name(label, filename, permit_mux_mon, context,
+ false);
}
static Chardev *qemu_chr_new_permit_mux_mon(const char *label,
@@ -768,7 +769,8 @@ static Chardev *qemu_chr_new_permit_mux_mon(const char
*label,
bool permit_mux_mon,
GMainContext *context)
{
- return __qemu_chr_new(label, filename, permit_mux_mon, context, true);
+ return qemu_chr_new_from_name(label, filename, permit_mux_mon, context,
+ true);
}
Chardev *qemu_chr_new(const char *label, const char *filename,
--
2.45.2
