[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/11] vl: Clean up after previous commit
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 04/11] vl: Clean up after previous commit |
Date: |
Thu, 25 Apr 2019 14:56:52 -0300 |
From: Markus Armbruster <address@hidden>
Since the previous commit, find_machine() and find_default_machine()
don't have to deallocate on return. This permits further
simplifications.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
vl.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/vl.c b/vl.c
index fb8c8eda2a..69c530a920 100644
--- a/vl.c
+++ b/vl.c
@@ -1468,40 +1468,31 @@ MachineState *current_machine;
static MachineClass *find_machine(const char *name, GSList *machines)
{
GSList *el;
- MachineClass *mc = NULL;
for (el = machines; el; el = el->next) {
- MachineClass *temp = el->data;
+ MachineClass *mc = el->data;
- if (!strcmp(temp->name, name)) {
- mc = temp;
- break;
- }
- if (temp->alias &&
- !strcmp(temp->alias, name)) {
- mc = temp;
- break;
+ if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) {
+ return mc;
}
}
- return mc;
+ return NULL;
}
static MachineClass *find_default_machine(GSList *machines)
{
GSList *el;
- MachineClass *mc = NULL;
for (el = machines; el; el = el->next) {
- MachineClass *temp = el->data;
+ MachineClass *mc = el->data;
- if (temp->is_default) {
- mc = temp;
- break;
+ if (mc->is_default) {
+ return mc;
}
}
- return mc;
+ return NULL;
}
MachineInfoList *qmp_query_machines(Error **errp)
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/11] Machine queue, 2019-04-25, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 01/11] hw: add compat machines for 4.1, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 02/11] vl.c: make find_default_machine() local, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 03/11] vl.c: allocate TYPE_MACHINE list once during bootup, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 04/11] vl: Clean up after previous commit,
Eduardo Habkost <=
- [Qemu-devel] [PULL 05/11] vl: Simplify machine_parse(), Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 06/11] cpu: Rename parse_cpu_model() to parse_cpu_option(), Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 07/11] cpu: Fix crash with empty -cpu option, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 08/11] util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 09/11] scripts/update-linux-headers: add linux/mman.h, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 10/11] linux-headers: add linux/mman.h., Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 11/11] util/mmap-alloc: support MAP_SYNC in qemu_ram_mmap(), Eduardo Habkost, 2019/04/25
- Re: [Qemu-devel] [PULL 00/11] Machine queue, 2019-04-25, Peter Maydell, 2019/04/26