Commit 2e4450ff authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Andreas Färber
Browse files

qom: Make enum string tables const-correct 



The enum string table parameters in various QOM/QAPI methods
are declared 'const char *strings[]'. This results in const
warnings if passed a variable that was declared as

   static const char * const strings[] = { .... };

Add the extra const annotation to the parameters, since
neither the string elements, nor the array itself should
ever be modified.

Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent a31bdae5

include/hw/qdev-core.h

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ struct Property { 
struct PropertyInfo {

    const char *name;

    const char *description;

    const char **enum_table;

    const char * const *enum_table;

    int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);

    ObjectPropertyAccessor *get;

    ObjectPropertyAccessor *set;

include/qapi/util.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef QAPI_UTIL_H

#define QAPI_UTIL_H



int qapi_enum_parse(const char *lookup[], const char *buf,

int qapi_enum_parse(const char * const lookup[], const char *buf,

                    int max, int def, Error **errp);



#endif

include/qapi/visitor-impl.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct Visitor 
    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[],

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

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

    void (*get_next_type)(Visitor *v, int *kind, const int *qobjects,

                          const char *name, Error **errp);
@@ -59,9 +59,9 @@ struct Visitor 
    void (*end_union)(Visitor *v, bool data_present, Error **errp);

};



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

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

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

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

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

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



#endif

include/qapi/visitor.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void visit_optional(Visitor *v, bool *present, const char *name, 
                    Error **errp);

void visit_get_next_type(Visitor *v, int *obj, const int *qtypes,

                         const char *name, Error **errp);

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

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

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

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

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

include/qom/object.h

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ int64_t object_property_get_int(Object *obj, const char *name, 
 * an enum).

 */

int object_property_get_enum(Object *obj, const char *name,

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

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



/**

 * object_property_get_uint16List: