Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the Error typedef. Since then, we've moved to include qemu/osdep.h everywhere. Its file comment explains: "To avoid getting into possible circular include dependencies, this file should not include any other QEMU headers, with the exceptions of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which are doing a similar job to this file and are under similar constraints." qapi/error.h doesn't do a similar job, and it doesn't adhere to similar constraints: it includes qapi-types.h. That's in excess of 100KiB of crap most .c files don't actually need. Add the typedef to qemu/typedefs.h, and include that instead of qapi/error.h. Include qapi/error.h in .c files that need it and don't get it now. Include qapi-types.h in qom/object.h for uint16List. Update scripts/clean-includes accordingly. Update it further to match reality: replace config.h by config-target.h, add sysemu/os-posix.h, sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h comment quoted above similarly. This reduces the number of objects depending on qapi/error.h from "all of them" to less than a third. Unfortunately, the number depending on qapi-types.h shrinks only a little. More work is needed for that one. Signed-off-by: Markus Armbruster <armbru@redhat.com> [Fix compilation without the spice devel packages. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
		
			
				
	
	
		
			149 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			149 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * QEMU Random Number Generator Backend
 | 
						|
 *
 | 
						|
 * Copyright IBM, Corp. 2012
 | 
						|
 *
 | 
						|
 * Authors:
 | 
						|
 *  Anthony Liguori   <aliguori@us.ibm.com>
 | 
						|
 *
 | 
						|
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | 
						|
 * See the COPYING file in the top-level directory.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "sysemu/rng.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "qapi/qmp/qerror.h"
 | 
						|
#include "qom/object_interfaces.h"
 | 
						|
 | 
						|
void rng_backend_request_entropy(RngBackend *s, size_t size,
 | 
						|
                                 EntropyReceiveFunc *receive_entropy,
 | 
						|
                                 void *opaque)
 | 
						|
{
 | 
						|
    RngBackendClass *k = RNG_BACKEND_GET_CLASS(s);
 | 
						|
    RngRequest *req;
 | 
						|
 | 
						|
    if (k->request_entropy) {
 | 
						|
        req = g_malloc(sizeof(*req));
 | 
						|
 | 
						|
        req->offset = 0;
 | 
						|
        req->size = size;
 | 
						|
        req->receive_entropy = receive_entropy;
 | 
						|
        req->opaque = opaque;
 | 
						|
        req->data = g_malloc(req->size);
 | 
						|
 | 
						|
        k->request_entropy(s, req);
 | 
						|
 | 
						|
        QSIMPLEQ_INSERT_TAIL(&s->requests, req, next);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static bool rng_backend_prop_get_opened(Object *obj, Error **errp)
 | 
						|
{
 | 
						|
    RngBackend *s = RNG_BACKEND(obj);
 | 
						|
 | 
						|
    return s->opened;
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_complete(UserCreatable *uc, Error **errp)
 | 
						|
{
 | 
						|
    object_property_set_bool(OBJECT(uc), true, "opened", errp);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp)
 | 
						|
{
 | 
						|
    RngBackend *s = RNG_BACKEND(obj);
 | 
						|
    RngBackendClass *k = RNG_BACKEND_GET_CLASS(s);
 | 
						|
    Error *local_err = NULL;
 | 
						|
 | 
						|
    if (value == s->opened) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    if (!value && s->opened) {
 | 
						|
        error_setg(errp, QERR_PERMISSION_DENIED);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    if (k->opened) {
 | 
						|
        k->opened(s, &local_err);
 | 
						|
        if (local_err) {
 | 
						|
            error_propagate(errp, local_err);
 | 
						|
            return;
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    s->opened = true;
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_free_request(RngRequest *req)
 | 
						|
{
 | 
						|
    g_free(req->data);
 | 
						|
    g_free(req);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_free_requests(RngBackend *s)
 | 
						|
{
 | 
						|
    RngRequest *req, *next;
 | 
						|
 | 
						|
    QSIMPLEQ_FOREACH_SAFE(req, &s->requests, next, next) {
 | 
						|
        rng_backend_free_request(req);
 | 
						|
    }
 | 
						|
 | 
						|
    QSIMPLEQ_INIT(&s->requests);
 | 
						|
}
 | 
						|
 | 
						|
void rng_backend_finalize_request(RngBackend *s, RngRequest *req)
 | 
						|
{
 | 
						|
    QSIMPLEQ_REMOVE(&s->requests, req, RngRequest, next);
 | 
						|
    rng_backend_free_request(req);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_init(Object *obj)
 | 
						|
{
 | 
						|
    RngBackend *s = RNG_BACKEND(obj);
 | 
						|
 | 
						|
    QSIMPLEQ_INIT(&s->requests);
 | 
						|
 | 
						|
    object_property_add_bool(obj, "opened",
 | 
						|
                             rng_backend_prop_get_opened,
 | 
						|
                             rng_backend_prop_set_opened,
 | 
						|
                             NULL);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_finalize(Object *obj)
 | 
						|
{
 | 
						|
    RngBackend *s = RNG_BACKEND(obj);
 | 
						|
 | 
						|
    rng_backend_free_requests(s);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_backend_class_init(ObjectClass *oc, void *data)
 | 
						|
{
 | 
						|
    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
 | 
						|
 | 
						|
    ucc->complete = rng_backend_complete;
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo rng_backend_info = {
 | 
						|
    .name = TYPE_RNG_BACKEND,
 | 
						|
    .parent = TYPE_OBJECT,
 | 
						|
    .instance_size = sizeof(RngBackend),
 | 
						|
    .instance_init = rng_backend_init,
 | 
						|
    .instance_finalize = rng_backend_finalize,
 | 
						|
    .class_size = sizeof(RngBackendClass),
 | 
						|
    .class_init = rng_backend_class_init,
 | 
						|
    .abstract = true,
 | 
						|
    .interfaces = (InterfaceInfo[]) {
 | 
						|
        { TYPE_USER_CREATABLE },
 | 
						|
        { }
 | 
						|
    }
 | 
						|
};
 | 
						|
 | 
						|
static void register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&rng_backend_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(register_types);
 |