Commit 7edd63f1 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qapi: make struct Visitor opaque 



Move its definition from qapi-visit-core.h to qapi-visit-impl.h.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4167c42c

qapi/qapi-visit-core.h

+0 −40
Original line number Diff line number Diff line
@@ -24,46 +24,6 @@ typedef struct GenericList 


typedef struct Visitor Visitor;



struct Visitor

{

    /* Must be set */

    void (*start_struct)(Visitor *v, void **obj, const char *kind,

                         const char *name, size_t size, Error **errp);

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



    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);



    void (*type_enum)(Visitor *v, int *obj, const char *strings[],

                      const char *kind, const char *name, Error **errp);



    void (*type_int)(Visitor *v, int64_t *obj, const char *name, Error **errp);

    void (*type_bool)(Visitor *v, bool *obj, const char *name, Error **errp);

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

    void (*type_number)(Visitor *v, double *obj, const char *name,

                        Error **errp);



    /* May be NULL */

    void (*start_optional)(Visitor *v, bool *present, const char *name,

                           Error **errp);

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



    void (*start_handle)(Visitor *v, void **obj, const char *kind,

                         const char *name, Error **errp);

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

    void (*type_uint8)(Visitor *v, uint8_t *obj, const char *name, Error **errp);

    void (*type_uint16)(Visitor *v, uint16_t *obj, const char *name, Error **errp);

    void (*type_uint32)(Visitor *v, uint32_t *obj, const char *name, Error **errp);

    void (*type_uint64)(Visitor *v, uint64_t *obj, const char *name, Error **errp);

    void (*type_int8)(Visitor *v, int8_t *obj, const char *name, Error **errp);

    void (*type_int16)(Visitor *v, int16_t *obj, const char *name, Error **errp);

    void (*type_int32)(Visitor *v, int32_t *obj, const char *name, Error **errp);

    void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Error **errp);

    /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */

    void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp);

};



void visit_start_handle(Visitor *v, void **obj, const char *kind,

                        const char *name, Error **errp);

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

qapi/qapi-visit-impl.h

+40 −0
Original line number Diff line number Diff line
@@ -15,6 +15,46 @@ 
#include "error.h"

#include "qapi/qapi-visit-core.h"



struct Visitor

{

    /* Must be set */

    void (*start_struct)(Visitor *v, void **obj, const char *kind,

                         const char *name, size_t size, Error **errp);

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



    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);



    void (*type_enum)(Visitor *v, int *obj, const char *strings[],

                      const char *kind, const char *name, Error **errp);



    void (*type_int)(Visitor *v, int64_t *obj, const char *name, Error **errp);

    void (*type_bool)(Visitor *v, bool *obj, const char *name, Error **errp);

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

    void (*type_number)(Visitor *v, double *obj, const char *name,

                        Error **errp);



    /* May be NULL */

    void (*start_optional)(Visitor *v, bool *present, const char *name,

                           Error **errp);

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



    void (*start_handle)(Visitor *v, void **obj, const char *kind,

                         const char *name, Error **errp);

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

    void (*type_uint8)(Visitor *v, uint8_t *obj, const char *name, Error **errp);

    void (*type_uint16)(Visitor *v, uint16_t *obj, const char *name, Error **errp);

    void (*type_uint32)(Visitor *v, uint32_t *obj, const char *name, Error **errp);

    void (*type_uint64)(Visitor *v, uint64_t *obj, const char *name, Error **errp);

    void (*type_int8)(Visitor *v, int8_t *obj, const char *name, Error **errp);

    void (*type_int16)(Visitor *v, int16_t *obj, const char *name, Error **errp);

    void (*type_int32)(Visitor *v, int32_t *obj, const char *name, Error **errp);

    void (*type_int64)(Visitor *v, int64_t *obj, const char *name, Error **errp);

    /* visit_type_size() falls back to (*type_uint64)() if type_size is unset */

    void (*type_size)(Visitor *v, uint64_t *obj, const char *name, Error **errp);

};



void input_type_enum(Visitor *v, int *obj, const char *strings[],

                     const char *kind, const char *name, Error **errp);

void output_type_enum(Visitor *v, int *obj, const char *strings[],