motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

error: Consistently name Error * objects err, and not errp

Browse source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1450452927-8346-25-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:27 +01:00
parent 24da21f265
commit 533fdaedeb
5 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hw/core/nmi.c
View file

@ -25,7 +25,7 @@
struct do_nmi_s {
int cpu_index;
Error *errp;
Error *err;
bool handled;
};
@ -40,8 +40,8 @@ static int do_nmi(Object *o, void *opaque)
NMIClass *nc = NMI_GET_CLASS(n);
ns->handled = true;
nc->nmi_monitor_handler(n, ns->cpu_index, &ns->errp);
if (ns->errp) {
nc->nmi_monitor_handler(n, ns->cpu_index, &ns->err);
if (ns->err) {
return -1;
}
}
@ -59,13 +59,13 @@ void nmi_monitor_handle(int cpu_index, Error **errp)
{
struct do_nmi_s ns = {
.cpu_index = cpu_index,
.errp = NULL,
.err = NULL,
.handled = false
};
nmi_children(object_get_root(), &ns);
if (ns.handled) {
error_propagate(errp, ns.errp);
error_propagate(errp, ns.err);
} else {
error_setg(errp, QERR_UNSUPPORTED);
}