readline: Extract readline_add_completion_of() from monitor
monitor/misc.h has static add_completion_option(). It's useful
elsewhere in the monitor. Since it's not monitor-specific, move it to
util/readline.c renamed to readline_add_completion_of(), and put it to
use.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-7-armbru@redhat.com>
diff --git a/include/qemu/readline.h b/include/qemu/readline.h
index 622aa45..b05e478 100644
--- a/include/qemu/readline.h
+++ b/include/qemu/readline.h
@@ -44,6 +44,8 @@
} ReadLineState;
void readline_add_completion(ReadLineState *rs, const char *str);
+void readline_add_completion_of(ReadLineState *rs,
+ const char *pfx, const char *str);
void readline_set_completion_index(ReadLineState *rs, int completion_index);
const char *readline_get_history(ReadLineState *rs, unsigned int index);
diff --git a/monitor/hmp.c b/monitor/hmp.c
index e5d914b..1b04f01 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -1189,8 +1189,8 @@
}
memcpy(cmd, pstart, len);
cmd[len] = '\0';
- if (name[0] == '\0' || !strncmp(name, cmd, strlen(name))) {
- readline_add_completion(mon->rs, cmd);
+ if (name[0] == '\0') {
+ readline_add_completion_of(mon->rs, name, cmd);
}
if (*p == '\0') {
break;
@@ -1270,7 +1270,7 @@
{
const char *cmdname;
int i;
- const char *ptype, *old_ptype, *str, *name;
+ const char *ptype, *old_ptype, *str;
const HMPCommand *cmd;
BlockBackend *blk = NULL;
@@ -1335,10 +1335,8 @@
/* block device name completion */
readline_set_completion_index(mon->rs, strlen(str));
while ((blk = blk_next(blk)) != NULL) {
- name = blk_name(blk);
- if (str[0] == '\0' ||
- !strncmp(name, str, strlen(str))) {
- readline_add_completion(mon->rs, name);
+ if (str[0] == '\0') {
+ readline_add_completion_of(mon->rs, str, blk_name(blk));
}
}
break;
diff --git a/monitor/misc.c b/monitor/misc.c
index d58a81c..9da5293 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1350,14 +1350,6 @@
return ret;
}
-static void add_completion_option(ReadLineState *rs, const char *str,
- const char *option)
-{
- if (!strncmp(option, str, strlen(str))) {
- readline_add_completion(rs, option);
- }
-}
-
void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
size_t len;
@@ -1369,7 +1361,7 @@
len = strlen(str);
readline_set_completion_index(rs, len);
for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) {
- add_completion_option(rs, str, NetClientDriver_str(i));
+ readline_add_completion_of(rs, str, NetClientDriver_str(i));
}
}
@@ -1386,14 +1378,12 @@
readline_set_completion_index(rs, len);
list = elt = object_class_get_list(TYPE_DEVICE, false);
while (elt) {
- const char *name;
DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
TYPE_DEVICE);
- name = object_class_get_name(OBJECT_CLASS(dc));
- if (dc->user_creatable
- && !strncmp(name, str, len)) {
- readline_add_completion(rs, name);
+ if (dc->user_creatable) {
+ readline_add_completion_of(rs, str,
+ object_class_get_name(OBJECT_CLASS(dc)));
}
elt = elt->next;
}
@@ -1416,8 +1406,8 @@
const char *name;
name = object_class_get_name(OBJECT_CLASS(elt->data));
- if (!strncmp(name, str, len) && strcmp(name, TYPE_USER_CREATABLE)) {
- readline_add_completion(rs, name);
+ if (strcmp(name, TYPE_USER_CREATABLE)) {
+ readline_add_completion_of(rs, str, name);
}
elt = elt->next;
}
@@ -1450,7 +1440,7 @@
}
static void peripheral_device_del_completion(ReadLineState *rs,
- const char *str, size_t len)
+ const char *str)
{
Object *peripheral = container_get(qdev_get_machine(), "/peripheral");
GSList *list, *item;
@@ -1463,8 +1453,8 @@
for (item = list; item; item = g_slist_next(item)) {
DeviceState *dev = item->data;
- if (dev->id && !strncmp(str, dev->id, len)) {
- readline_add_completion(rs, dev->id);
+ if (dev->id) {
+ readline_add_completion_of(rs, str, dev->id);
}
}
@@ -1473,15 +1463,12 @@
void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
{
- size_t len;
-
if (nb_args != 2) {
return;
}
- len = strlen(str);
- readline_set_completion_index(rs, len);
- peripheral_device_del_completion(rs, str, len);
+ readline_set_completion_index(rs, strlen(str));
+ peripheral_device_del_completion(rs, str);
}
void object_del_completion(ReadLineState *rs, int nb_args, const char *str)
@@ -1499,9 +1486,8 @@
while (list) {
ObjectPropertyInfo *info = list->value;
- if (!strncmp(info->type, "child<", 5)
- && !strncmp(info->name, str, len)) {
- readline_add_completion(rs, info->name);
+ if (!strncmp(info->type, "child<", 5)) {
+ readline_add_completion_of(rs, str, info->name);
}
list = list->next;
}
@@ -1521,14 +1507,11 @@
NET_CLIENT_DRIVER_NONE,
MAX_QUEUE_NUM);
for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- const char *name = ncs[i]->name;
- if (!strncmp(str, name, len)) {
- readline_add_completion(rs, name);
- }
+ readline_add_completion_of(rs, str, ncs[i]->name);
}
} else if (nb_args == 3) {
- add_completion_option(rs, str, "on");
- add_completion_option(rs, str, "off");
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
}
}
@@ -1546,12 +1529,8 @@
count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_DRIVER_NIC,
MAX_QUEUE_NUM);
for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- const char *name = ncs[i]->name;
- if (strncmp(str, name, len)) {
- continue;
- }
if (ncs[i]->is_netdev) {
- readline_add_completion(rs, name);
+ readline_add_completion_of(rs, str, ncs[i]->name);
}
}
}
@@ -1590,8 +1569,8 @@
}
g_free(pattern);
} else if (nb_args == 3) {
- add_completion_option(rs, str, "on");
- add_completion_option(rs, str, "off");
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
}
}
@@ -1604,7 +1583,7 @@
}
readline_set_completion_index(rs, strlen(str));
for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {
- add_completion_option(rs, str, WatchdogAction_str(i));
+ readline_add_completion_of(rs, str, WatchdogAction_str(i));
}
}
@@ -1618,14 +1597,11 @@
if (nb_args == 2) {
int i;
for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
- const char *name = MigrationCapability_str(i);
- if (!strncmp(str, name, len)) {
- readline_add_completion(rs, name);
- }
+ readline_add_completion_of(rs, str, MigrationCapability_str(i));
}
} else if (nb_args == 3) {
- add_completion_option(rs, str, "on");
- add_completion_option(rs, str, "off");
+ readline_add_completion_of(rs, str, "on");
+ readline_add_completion_of(rs, str, "off");
}
}
@@ -1639,10 +1615,7 @@
if (nb_args == 2) {
int i;
for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {
- const char *name = MigrationParameter_str(i);
- if (!strncmp(str, name, len)) {
- readline_add_completion(rs, name);
- }
+ readline_add_completion_of(rs, str, MigrationParameter_str(i));
}
}
}
@@ -1672,14 +1645,8 @@
snapshot = snapshots;
while (snapshot) {
- char *completion = snapshot->value->name;
- if (!strncmp(str, completion, len)) {
- readline_add_completion(rs, completion);
- }
- completion = snapshot->value->id;
- if (!strncmp(str, completion, len)) {
- readline_add_completion(rs, completion);
- }
+ readline_add_completion_of(rs, str, snapshot->value->name);
+ readline_add_completion_of(rs, str, snapshot->value->id);
snapshot = snapshot->next;
}
qapi_free_SnapshotInfoList(snapshots);
diff --git a/util/readline.c b/util/readline.c
index f1ac6e4..494a3d9 100644
--- a/util/readline.c
+++ b/util/readline.c
@@ -286,6 +286,14 @@
}
}
+void readline_add_completion_of(ReadLineState *rs,
+ const char *pfx, const char *str)
+{
+ if (!strncmp(str, pfx, strlen(pfx))) {
+ readline_add_completion(rs, str);
+ }
+}
+
void readline_set_completion_index(ReadLineState *rs, int index)
{
rs->completion_index = index;
