mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Monitor: remove unneeded checks

Browse Source 
It's not needed to check the return of qobject_from_jsonf()
anymore, as an assert() has been added there.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2010-02-08 17:01:28 -02:00 committed by Anthony Liguori
parent 668e3cac4f
commit ba14414174
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block.c
View File

@ -1301,7 +1301,6 @@ void bdrv_info(Monitor *mon, QObject **ret_data)
"'removable': %i, 'locked': %i }",
bs->device_name, type, bs->removable,
bs->locked);
assert(bs_obj != NULL);
if (bs->drv) {
QObject *obj;
@ -1312,7 +1311,6 @@ void bdrv_info(Monitor *mon, QObject **ret_data)
bs->filename, bs->read_only,
bs->drv->format_name,
bdrv_is_encrypted(bs));
assert(obj != NULL);
if (bs->backing_file[0] != '\0') {
QDict *qdict = qobject_to_qdict(obj);
qdict_put(qdict, "backing_file",
@ -1398,7 +1396,6 @@ void bdrv_info_stats(Monitor *mon, QObject **ret_data)
bs->device_name,
bs->rd_bytes, bs->wr_bytes,
bs->rd_ops, bs->wr_ops);
assert(obj != NULL);
qlist_append_obj(devices, obj);
}

1
hw/pci-hotplug.c
View File

@ -285,7 +285,6 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict, QObject **ret_data)
qobject_from_jsonf("{ 'domain': 0, 'bus': %d, 'slot': %d, "
"'function': %d }", pci_bus_num(dev->bus),
PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
assert(*ret_data != NULL);
} else
monitor_printf(mon, "failed to add %s\n", opts);
}

3
migration.c
View File

@ -183,8 +183,6 @@ static void migrate_put_status(QDict *qdict, const char *name,
obj = qobject_from_jsonf("{ 'transferred': %" PRId64 ", "
"'remaining': %" PRId64 ", "
"'total': %" PRId64 " }", trans, rem, total);
assert(obj != NULL);
qdict_put_obj(qdict, name, obj);
}
@ -258,7 +256,6 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
*ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
break;
}
assert(*ret_data != NULL);
}
}

5
monitor.c
View File

@ -351,8 +351,6 @@ static void timestamp_put(QDict *qdict)
obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", "
"'microseconds': %" PRId64 " }",
(int64_t) tv.tv_sec, (int64_t) tv.tv_usec);
assert(obj != NULL);
qdict_put_obj(qdict, "timestamp", obj);
}
@ -900,7 +898,6 @@ static void do_info_cpus(Monitor *mon, QObject **ret_data)
obj = qobject_from_jsonf("{ 'CPU': %d, 'current': %i, 'halted': %i }",
env->cpu_index, env == mon->mon_cpu,
env->halted);
assert(obj != NULL);
cpu = qobject_to_qdict(obj);
@ -4415,8 +4412,6 @@ static void monitor_control_event(void *opaque, int event)
json_message_parser_init(&mon->mc->parser, handle_qmp_command);
data = get_qmp_greeting();
assert(data != NULL);
monitor_json_emitter(mon, data);
qobject_decref(data);
}