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>
		
	
		
			
				
	
	
		
			178 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			178 lines
		
	
	
		
			4.1 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 "sysemu/char.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "qapi/qmp/qerror.h"
 | 
						|
#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
 | 
						|
 | 
						|
#define TYPE_RNG_EGD "rng-egd"
 | 
						|
#define RNG_EGD(obj) OBJECT_CHECK(RngEgd, (obj), TYPE_RNG_EGD)
 | 
						|
 | 
						|
typedef struct RngEgd
 | 
						|
{
 | 
						|
    RngBackend parent;
 | 
						|
 | 
						|
    CharDriverState *chr;
 | 
						|
    char *chr_name;
 | 
						|
} RngEgd;
 | 
						|
 | 
						|
static void rng_egd_request_entropy(RngBackend *b, RngRequest *req)
 | 
						|
{
 | 
						|
    RngEgd *s = RNG_EGD(b);
 | 
						|
    size_t size = req->size;
 | 
						|
 | 
						|
    while (size > 0) {
 | 
						|
        uint8_t header[2];
 | 
						|
        uint8_t len = MIN(size, 255);
 | 
						|
 | 
						|
        /* synchronous entropy request */
 | 
						|
        header[0] = 0x02;
 | 
						|
        header[1] = len;
 | 
						|
 | 
						|
        qemu_chr_fe_write(s->chr, header, sizeof(header));
 | 
						|
 | 
						|
        size -= len;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static int rng_egd_chr_can_read(void *opaque)
 | 
						|
{
 | 
						|
    RngEgd *s = RNG_EGD(opaque);
 | 
						|
    RngRequest *req;
 | 
						|
    int size = 0;
 | 
						|
 | 
						|
    QSIMPLEQ_FOREACH(req, &s->parent.requests, next) {
 | 
						|
        size += req->size - req->offset;
 | 
						|
    }
 | 
						|
 | 
						|
    return size;
 | 
						|
}
 | 
						|
 | 
						|
static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size)
 | 
						|
{
 | 
						|
    RngEgd *s = RNG_EGD(opaque);
 | 
						|
    size_t buf_offset = 0;
 | 
						|
 | 
						|
    while (size > 0 && !QSIMPLEQ_EMPTY(&s->parent.requests)) {
 | 
						|
        RngRequest *req = QSIMPLEQ_FIRST(&s->parent.requests);
 | 
						|
        int len = MIN(size, req->size - req->offset);
 | 
						|
 | 
						|
        memcpy(req->data + req->offset, buf + buf_offset, len);
 | 
						|
        buf_offset += len;
 | 
						|
        req->offset += len;
 | 
						|
        size -= len;
 | 
						|
 | 
						|
        if (req->offset == req->size) {
 | 
						|
            req->receive_entropy(req->opaque, req->data, req->size);
 | 
						|
 | 
						|
            rng_backend_finalize_request(&s->parent, req);
 | 
						|
        }
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void rng_egd_opened(RngBackend *b, Error **errp)
 | 
						|
{
 | 
						|
    RngEgd *s = RNG_EGD(b);
 | 
						|
 | 
						|
    if (s->chr_name == NULL) {
 | 
						|
        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
 | 
						|
                   "chardev", "a valid character device");
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    s->chr = qemu_chr_find(s->chr_name);
 | 
						|
    if (s->chr == NULL) {
 | 
						|
        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
 | 
						|
                  "Device '%s' not found", s->chr_name);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    if (qemu_chr_fe_claim(s->chr) != 0) {
 | 
						|
        error_setg(errp, QERR_DEVICE_IN_USE, s->chr_name);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    /* FIXME we should resubmit pending requests when the CDS reconnects. */
 | 
						|
    qemu_chr_add_handlers(s->chr, rng_egd_chr_can_read, rng_egd_chr_read,
 | 
						|
                          NULL, s);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp)
 | 
						|
{
 | 
						|
    RngBackend *b = RNG_BACKEND(obj);
 | 
						|
    RngEgd *s = RNG_EGD(b);
 | 
						|
 | 
						|
    if (b->opened) {
 | 
						|
        error_setg(errp, QERR_PERMISSION_DENIED);
 | 
						|
    } else {
 | 
						|
        g_free(s->chr_name);
 | 
						|
        s->chr_name = g_strdup(value);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static char *rng_egd_get_chardev(Object *obj, Error **errp)
 | 
						|
{
 | 
						|
    RngEgd *s = RNG_EGD(obj);
 | 
						|
 | 
						|
    if (s->chr && s->chr->label) {
 | 
						|
        return g_strdup(s->chr->label);
 | 
						|
    }
 | 
						|
 | 
						|
    return NULL;
 | 
						|
}
 | 
						|
 | 
						|
static void rng_egd_init(Object *obj)
 | 
						|
{
 | 
						|
    object_property_add_str(obj, "chardev",
 | 
						|
                            rng_egd_get_chardev, rng_egd_set_chardev,
 | 
						|
                            NULL);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_egd_finalize(Object *obj)
 | 
						|
{
 | 
						|
    RngEgd *s = RNG_EGD(obj);
 | 
						|
 | 
						|
    if (s->chr) {
 | 
						|
        qemu_chr_add_handlers(s->chr, NULL, NULL, NULL, NULL);
 | 
						|
        qemu_chr_fe_release(s->chr);
 | 
						|
    }
 | 
						|
 | 
						|
    g_free(s->chr_name);
 | 
						|
}
 | 
						|
 | 
						|
static void rng_egd_class_init(ObjectClass *klass, void *data)
 | 
						|
{
 | 
						|
    RngBackendClass *rbc = RNG_BACKEND_CLASS(klass);
 | 
						|
 | 
						|
    rbc->request_entropy = rng_egd_request_entropy;
 | 
						|
    rbc->opened = rng_egd_opened;
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo rng_egd_info = {
 | 
						|
    .name = TYPE_RNG_EGD,
 | 
						|
    .parent = TYPE_RNG_BACKEND,
 | 
						|
    .instance_size = sizeof(RngEgd),
 | 
						|
    .class_init = rng_egd_class_init,
 | 
						|
    .instance_init = rng_egd_init,
 | 
						|
    .instance_finalize = rng_egd_finalize,
 | 
						|
};
 | 
						|
 | 
						|
static void register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&rng_egd_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(register_types);
 |