e90f2a8c3e
cannot_instantiate_with_device_add_yet was introduced by commit
efec3dd631 to replace no_user. It was
supposed to be a temporary measure.
When it was introduced, we had 54
cannot_instantiate_with_device_add_yet=true lines in the code.
Today (3 years later) this number has not shrunk: we now have
57 cannot_instantiate_with_device_add_yet=true lines. I think it
is safe to say it is not a temporary measure, and we won't see
the flag go away soon.
Instead of a long field name that misleads people to believe it
is temporary, replace it a shorter and less misleading field:
user_creatable.
Except for code comments, changes were generated using the
following Coccinelle patch:
@@
expression DC;
@@
(
-DC->cannot_instantiate_with_device_add_yet = false;
+DC->user_creatable = true;
|
-DC->cannot_instantiate_with_device_add_yet = true;
+DC->user_creatable = false;
)
@@
typedef ObjectClass;
expression dc;
identifier class, data;
@@
static void device_class_init(ObjectClass *class, void *data)
{
...
dc->hotpluggable = true;
+dc->user_creatable = true;
...
}
@@
@@
struct DeviceClass {
...
-bool cannot_instantiate_with_device_add_yet;
+bool user_creatable;
...
}
@@
expression DC;
@@
(
-!DC->cannot_instantiate_with_device_add_yet
+DC->user_creatable
|
-DC->cannot_instantiate_with_device_add_yet
+!DC->user_creatable
)
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Acked-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170503203604.31462-2-ehabkost@redhat.com>
[ehabkost: kept "TODO remove once we're there" comment]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
111 lines
3 KiB
C
111 lines
3 KiB
C
/*
|
|
* QEMU IRQ/GPIO common code.
|
|
*
|
|
* Copyright (c) 2016 Alistair Francis <alistair@alistair23.me>.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/or-irq.h"
|
|
|
|
static void or_irq_handler(void *opaque, int n, int level)
|
|
{
|
|
qemu_or_irq *s = OR_IRQ(opaque);
|
|
int or_level = 0;
|
|
int i;
|
|
|
|
s->levels[n] = level;
|
|
|
|
for (i = 0; i < s->num_lines; i++) {
|
|
or_level |= s->levels[i];
|
|
}
|
|
|
|
qemu_set_irq(s->out_irq, or_level);
|
|
}
|
|
|
|
static void or_irq_reset(DeviceState *dev)
|
|
{
|
|
qemu_or_irq *s = OR_IRQ(dev);
|
|
int i;
|
|
|
|
for (i = 0; i < MAX_OR_LINES; i++) {
|
|
s->levels[i] = false;
|
|
}
|
|
}
|
|
|
|
static void or_irq_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
qemu_or_irq *s = OR_IRQ(dev);
|
|
|
|
assert(s->num_lines < MAX_OR_LINES);
|
|
|
|
qdev_init_gpio_in(dev, or_irq_handler, s->num_lines);
|
|
}
|
|
|
|
static void or_irq_init(Object *obj)
|
|
{
|
|
qemu_or_irq *s = OR_IRQ(obj);
|
|
|
|
qdev_init_gpio_out(DEVICE(obj), &s->out_irq, 1);
|
|
}
|
|
|
|
static const VMStateDescription vmstate_or_irq = {
|
|
.name = TYPE_OR_IRQ,
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
.fields = (VMStateField[]) {
|
|
VMSTATE_BOOL_ARRAY(levels, qemu_or_irq, MAX_OR_LINES),
|
|
VMSTATE_END_OF_LIST(),
|
|
}
|
|
};
|
|
|
|
static Property or_irq_properties[] = {
|
|
DEFINE_PROP_UINT16("num-lines", qemu_or_irq, num_lines, 1),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void or_irq_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->reset = or_irq_reset;
|
|
dc->props = or_irq_properties;
|
|
dc->realize = or_irq_realize;
|
|
dc->vmsd = &vmstate_or_irq;
|
|
|
|
/* Reason: Needs to be wired up to work, e.g. see stm32f205_soc.c */
|
|
dc->user_creatable = false;
|
|
}
|
|
|
|
static const TypeInfo or_irq_type_info = {
|
|
.name = TYPE_OR_IRQ,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(qemu_or_irq),
|
|
.instance_init = or_irq_init,
|
|
.class_init = or_irq_class_init,
|
|
};
|
|
|
|
static void or_irq_register_types(void)
|
|
{
|
|
type_register_static(&or_irq_type_info);
|
|
}
|
|
|
|
type_init(or_irq_register_types)
|