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: Eric Blake <eblake@redhat.com> Message-Id: <1454075341-13658-24-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
		
			
				
	
	
		
			86 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			86 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Core Definitions for QAPI Visitor Classes
 | 
						|
 *
 | 
						|
 * Copyright (C) 2012-2016 Red Hat, Inc.
 | 
						|
 * Copyright IBM, Corp. 2011
 | 
						|
 *
 | 
						|
 * Authors:
 | 
						|
 *  Anthony Liguori   <aliguori@us.ibm.com>
 | 
						|
 *
 | 
						|
 * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
 | 
						|
 * See the COPYING.LIB file in the top-level directory.
 | 
						|
 *
 | 
						|
 */
 | 
						|
#ifndef QAPI_VISITOR_CORE_H
 | 
						|
#define QAPI_VISITOR_CORE_H
 | 
						|
 | 
						|
#include "qemu/typedefs.h"
 | 
						|
#include "qapi/qmp/qobject.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include <stdlib.h>
 | 
						|
 | 
						|
typedef struct GenericList
 | 
						|
{
 | 
						|
    union {
 | 
						|
        void *value;
 | 
						|
        uint64_t padding;
 | 
						|
    };
 | 
						|
    struct GenericList *next;
 | 
						|
} GenericList;
 | 
						|
 | 
						|
void visit_start_struct(Visitor *v, const char *name, void **obj,
 | 
						|
                        size_t size, Error **errp);
 | 
						|
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);
 | 
						|
 | 
						|
void visit_start_list(Visitor *v, const char *name, 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.
 | 
						|
 * For input visitors, set *@present according to whether the
 | 
						|
 * corresponding visit_type_*() needs calling; for other visitors,
 | 
						|
 * leave *@present unchanged.  Return *@present for convenience.
 | 
						|
 */
 | 
						|
bool visit_optional(Visitor *v, const char *name, bool *present);
 | 
						|
 | 
						|
/**
 | 
						|
 * Determine the qtype of the item @name in the current object visit.
 | 
						|
 * For input visitors, set *@type to the correct qtype of a qapi
 | 
						|
 * alternate type; for other visitors, leave *@type unchanged.
 | 
						|
 * If @promote_int, treat integers as QTYPE_FLOAT.
 | 
						|
 */
 | 
						|
void visit_get_next_type(Visitor *v, const char *name, QType *type,
 | 
						|
                         bool promote_int, Error **errp);
 | 
						|
void visit_type_enum(Visitor *v, const char *name, int *obj,
 | 
						|
                     const char *const strings[], Error **errp);
 | 
						|
void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp);
 | 
						|
void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj,
 | 
						|
                      Error **errp);
 | 
						|
void visit_type_uint16(Visitor *v, const char *name, uint16_t *obj,
 | 
						|
                       Error **errp);
 | 
						|
void visit_type_uint32(Visitor *v, const char *name, uint32_t *obj,
 | 
						|
                       Error **errp);
 | 
						|
void visit_type_uint64(Visitor *v, const char *name, uint64_t *obj,
 | 
						|
                       Error **errp);
 | 
						|
void visit_type_int8(Visitor *v, const char *name, int8_t *obj, Error **errp);
 | 
						|
void visit_type_int16(Visitor *v, const char *name, int16_t *obj,
 | 
						|
                      Error **errp);
 | 
						|
void visit_type_int32(Visitor *v, const char *name, int32_t *obj,
 | 
						|
                      Error **errp);
 | 
						|
void visit_type_int64(Visitor *v, const char *name, int64_t *obj,
 | 
						|
                      Error **errp);
 | 
						|
void visit_type_size(Visitor *v, const char *name, uint64_t *obj,
 | 
						|
                     Error **errp);
 | 
						|
void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp);
 | 
						|
void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp);
 | 
						|
void visit_type_number(Visitor *v, const char *name, double *obj,
 | 
						|
                       Error **errp);
 | 
						|
void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp);
 | 
						|
bool visit_start_union(Visitor *v, bool data_present, Error **errp);
 | 
						|
 | 
						|
#endif
 |