Commit 08f9541d authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Drop unused error argument for list and implicit struct 



No backend was setting an error when ending the visit of a list or
implicit struct, or when moving to the next list node.  Make the
callers a bit easier to follow by making this a part of the contract,
and removing the errp argument - callers can then unconditionally end
an object as part of cleanup without having to think about whether a
second error is dominated by a first, because there is no second
error.

A later patch will then tackle the larger task of splitting
visit_end_struct(), which can indeed set an error.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-24-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent bdd8e6b5

hw/ppc/spapr_drc.c

+1 −5
Original line number Diff line number Diff line
@@ -315,11 +315,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name, 
                    return;

                }

            }

            visit_end_list(v, &err);

            if (err) {

                error_propagate(errp, err);

                return;

            }

            visit_end_list(v);

            break;

        }

        default:

include/qapi/visitor-impl.h

+6 −3
Original line number Diff line number Diff line
@@ -24,11 +24,14 @@ struct Visitor 


    void (*start_implicit_struct)(Visitor *v, void **obj, size_t size,

                                  Error **errp);

    void (*end_implicit_struct)(Visitor *v, Error **errp);

    /* May be NULL */

    void (*end_implicit_struct)(Visitor *v);



    void (*start_list)(Visitor *v, const char *name, Error **errp);

    GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp);

    void (*end_list)(Visitor *v, Error **errp);

    /* Must be set */

    GenericList *(*next_list)(Visitor *v, GenericList **list);

    /* Must be set */

    void (*end_list)(Visitor *v);



    void (*type_enum)(Visitor *v, const char *name, int *obj,

                      const char *const strings[], Error **errp);

include/qapi/visitor.h

+5 −3
Original line number Diff line number Diff line 
/*

 * Core Definitions for QAPI Visitor Classes

 *

 * Copyright (C) 2012-2016 Red Hat, Inc.

 * Copyright IBM, Corp. 2011

 *

 * Authors:
@@ -32,10 +33,11 @@ void visit_start_struct(Visitor *v, const char *name, void **obj, 
void visit_end_struct(Visitor *v, Error **errp);

void visit_start_implicit_struct(Visitor *v, void **obj, size_t size,

                                 Error **errp);

void visit_end_implicit_struct(Visitor *v, Error **errp);

void visit_end_implicit_struct(Visitor *v);



void visit_start_list(Visitor *v, const char *name, Error **errp);

GenericList *visit_next_list(Visitor *v, GenericList **list, Error **errp);

void visit_end_list(Visitor *v, Error **errp);

GenericList *visit_next_list(Visitor *v, GenericList **list);

void visit_end_list(Visitor *v);



/**

 * Check if an optional member @name of an object needs visiting.

qapi/opts-visitor.c

+3 −3
Original line number Diff line number Diff line 
/*

 * Options Visitor

 *

 * Copyright Red Hat, Inc. 2012, 2013

 * Copyright Red Hat, Inc. 2012-2016

 *

 * Author: Laszlo Ersek <lersek@redhat.com>

 *
@@ -221,7 +221,7 @@ opts_start_list(Visitor *v, const char *name, Error **errp) 




static GenericList *

opts_next_list(Visitor *v, GenericList **list, Error **errp)

opts_next_list(Visitor *v, GenericList **list)

{

    OptsVisitor *ov = to_ov(v);

    GenericList **link;
@@ -270,7 +270,7 @@ opts_next_list(Visitor *v, GenericList **list, Error **errp) 




static void

opts_end_list(Visitor *v, Error **errp)

opts_end_list(Visitor *v)

{

    OptsVisitor *ov = to_ov(v);

qapi/qapi-dealloc-visitor.c

+4 −4
Original line number Diff line number Diff line 
/*

 * Dealloc Visitor

 *

 * Copyright (C) 2012-2016 Red Hat, Inc.

 * Copyright IBM, Corp. 2011

 *

 * Authors:
@@ -84,7 +85,7 @@ static void qapi_dealloc_start_implicit_struct(Visitor *v, 
    qapi_dealloc_push(qov, obj);

}



static void qapi_dealloc_end_implicit_struct(Visitor *v, Error **errp)

static void qapi_dealloc_end_implicit_struct(Visitor *v)

{

    QapiDeallocVisitor *qov = to_qov(v);

    void **obj = qapi_dealloc_pop(qov);
@@ -99,8 +100,7 @@ static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp) 
    qapi_dealloc_push(qov, NULL);

}



static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,

                                           Error **errp)

static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp)

{

    GenericList *list = *listp;

    QapiDeallocVisitor *qov = to_qov(v);
@@ -120,7 +120,7 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp, 
    return NULL;

}



static void qapi_dealloc_end_list(Visitor *v, Error **errp)

static void qapi_dealloc_end_list(Visitor *v)

{

    QapiDeallocVisitor *qov = to_qov(v);

    void *obj = qapi_dealloc_pop(qov);