diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-18 16:35:27 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 15:16:19 +0100 |
| commit | 533fdaedeb7f7ae90866312f57249ebbb7e3c97f (patch) | |
| tree | ada9b99a39c08b7df0b9f5cd20b2df0f3f3fb4e6 /hw/core/nmi.c | |
| parent | 24da21f265b091dee756398a24d63dd8a2f3d5ab (diff) | |
| download | qemu-533fdaedeb7f7ae90866312f57249ebbb7e3c97f.tar.gz | |
error: Consistently name Error * objects err, and not errp
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>
Diffstat (limited to 'hw/core/nmi.c')
| -rw-r--r-- | hw/core/nmi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/core/nmi.c b/hw/core/nmi.c index de1d1f8cb1..4057cdd6a2 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -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); } |