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>
163 lines
5.0 KiB
C
163 lines
5.0 KiB
C
/*
|
|
* QEMU DEC 21154 PCI bridge
|
|
*
|
|
* Copyright (c) 2006-2007 Fabrice Bellard
|
|
* Copyright (c) 2007 Jocelyn Mayer
|
|
*
|
|
* 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 "dec.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "hw/pci/pci_host.h"
|
|
#include "hw/pci/pci_bridge.h"
|
|
#include "hw/pci/pci_bus.h"
|
|
|
|
/* debug DEC */
|
|
//#define DEBUG_DEC
|
|
|
|
#ifdef DEBUG_DEC
|
|
#define DEC_DPRINTF(fmt, ...) \
|
|
do { printf("DEC: " fmt , ## __VA_ARGS__); } while (0)
|
|
#else
|
|
#define DEC_DPRINTF(fmt, ...)
|
|
#endif
|
|
|
|
#define DEC_21154(obj) OBJECT_CHECK(DECState, (obj), TYPE_DEC_21154)
|
|
|
|
typedef struct DECState {
|
|
PCIHostState parent_obj;
|
|
} DECState;
|
|
|
|
static int dec_map_irq(PCIDevice *pci_dev, int irq_num)
|
|
{
|
|
return irq_num;
|
|
}
|
|
|
|
static void dec_pci_bridge_realize(PCIDevice *pci_dev, Error **errp)
|
|
{
|
|
pci_bridge_initfn(pci_dev, TYPE_PCI_BUS);
|
|
}
|
|
|
|
static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
|
|
k->realize = dec_pci_bridge_realize;
|
|
k->exit = pci_bridge_exitfn;
|
|
k->vendor_id = PCI_VENDOR_ID_DEC;
|
|
k->device_id = PCI_DEVICE_ID_DEC_21154;
|
|
k->config_write = pci_bridge_write_config;
|
|
k->is_bridge = 1;
|
|
dc->desc = "DEC 21154 PCI-PCI bridge";
|
|
dc->reset = pci_bridge_reset;
|
|
dc->vmsd = &vmstate_pci_device;
|
|
}
|
|
|
|
static const TypeInfo dec_21154_pci_bridge_info = {
|
|
.name = "dec-21154-p2p-bridge",
|
|
.parent = TYPE_PCI_BRIDGE,
|
|
.instance_size = sizeof(PCIBridge),
|
|
.class_init = dec_21154_pci_bridge_class_init,
|
|
};
|
|
|
|
PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn)
|
|
{
|
|
PCIDevice *dev;
|
|
PCIBridge *br;
|
|
|
|
dev = pci_create_multifunction(parent_bus, devfn, false,
|
|
"dec-21154-p2p-bridge");
|
|
br = PCI_BRIDGE(dev);
|
|
pci_bridge_map_irq(br, "DEC 21154 PCI-PCI bridge", dec_map_irq);
|
|
qdev_init_nofail(&dev->qdev);
|
|
return pci_bridge_get_sec_bus(br);
|
|
}
|
|
|
|
static int pci_dec_21154_device_init(SysBusDevice *dev)
|
|
{
|
|
PCIHostState *phb;
|
|
|
|
phb = PCI_HOST_BRIDGE(dev);
|
|
|
|
memory_region_init_io(&phb->conf_mem, OBJECT(dev), &pci_host_conf_le_ops,
|
|
dev, "pci-conf-idx", 0x1000);
|
|
memory_region_init_io(&phb->data_mem, OBJECT(dev), &pci_host_data_le_ops,
|
|
dev, "pci-data-idx", 0x1000);
|
|
sysbus_init_mmio(dev, &phb->conf_mem);
|
|
sysbus_init_mmio(dev, &phb->data_mem);
|
|
return 0;
|
|
}
|
|
|
|
static void dec_21154_pci_host_realize(PCIDevice *d, Error **errp)
|
|
{
|
|
/* PCI2PCI bridge same values as PearPC - check this */
|
|
}
|
|
|
|
static void dec_21154_pci_host_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
k->realize = dec_21154_pci_host_realize;
|
|
k->vendor_id = PCI_VENDOR_ID_DEC;
|
|
k->device_id = PCI_DEVICE_ID_DEC_21154;
|
|
k->revision = 0x02;
|
|
k->class_id = PCI_CLASS_BRIDGE_PCI;
|
|
k->is_bridge = 1;
|
|
/*
|
|
* PCI-facing part of the host bridge, not usable without the
|
|
* host-facing part, which can't be device_add'ed, yet.
|
|
*/
|
|
dc->user_creatable = false;
|
|
}
|
|
|
|
static const TypeInfo dec_21154_pci_host_info = {
|
|
.name = "dec-21154",
|
|
.parent = TYPE_PCI_DEVICE,
|
|
.instance_size = sizeof(PCIDevice),
|
|
.class_init = dec_21154_pci_host_class_init,
|
|
};
|
|
|
|
static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
|
|
|
|
sdc->init = pci_dec_21154_device_init;
|
|
}
|
|
|
|
static const TypeInfo pci_dec_21154_device_info = {
|
|
.name = TYPE_DEC_21154,
|
|
.parent = TYPE_PCI_HOST_BRIDGE,
|
|
.instance_size = sizeof(DECState),
|
|
.class_init = pci_dec_21154_device_class_init,
|
|
};
|
|
|
|
static void dec_register_types(void)
|
|
{
|
|
type_register_static(&pci_dec_21154_device_info);
|
|
type_register_static(&dec_21154_pci_host_info);
|
|
type_register_static(&dec_21154_pci_bridge_info);
|
|
}
|
|
|
|
type_init(dec_register_types)
|