motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add common BusState

Browse source 
Implement and use a common device bus state.  The main side-effect is
that creating a bus and attaching it to a parent device are no longer
separate operations.  For legacy code we allow a NULL parent, but that
should go away eventually.

Also tweak creation code to veriry theat a device in on the right bus.

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2009-05-23 00:05:19 +01:00
parent 4856fcff8a
commit 02e2da45c4
30 changed files with 229 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

54
hw/qdev.h
View file

@ -2,20 +2,20 @@
#define QDEV_H
#include "hw.h"
#include "sys-queue.h"
typedef struct DeviceType DeviceType;
typedef struct DeviceProperty DeviceProperty;
typedef struct ChildBusList ChildBusList;
typedef struct BusState BusState;
/* This structure should not be accessed directly. We declare it here
so that it can be embedded in individual device state structures. */
struct DeviceState
{
struct DeviceState {
const char *name;
DeviceType *type;
void *bus;
BusState *parent_bus;
DeviceProperty *props;
int num_irq_sink;
qemu_irq *irq_sink;
@ -23,14 +23,32 @@ struct DeviceState
qemu_irq *gpio_out;
int num_gpio_in;
qemu_irq *gpio_in;
ChildBusList *child_bus;
LIST_HEAD(, BusState) child_bus;
NICInfo *nd;
LIST_ENTRY(DeviceState) sibling;
};
typedef enum {
BUS_TYPE_SYSTEM,
BUS_TYPE_PCI,
BUS_TYPE_SCSI,
BUS_TYPE_I2C,
BUS_TYPE_SSI
} BusType;
struct BusState {
DeviceState *parent;
const char *name;
BusType type;
LIST_HEAD(, DeviceState) children;
LIST_ENTRY(BusState) sibling;
};
/*** Board API. This should go away once we have a machine config file. ***/
DeviceState *qdev_create(void *bus, const char *name);
DeviceState *qdev_create(BusState *bus, const char *name);
void qdev_init(DeviceState *dev);
void qdev_free(DeviceState *dev);
/* Set properties between creation and init. */
void qdev_set_prop_int(DeviceState *dev, const char *name, uint64_t value);
@ -41,28 +59,33 @@ qemu_irq qdev_get_irq_sink(DeviceState *dev, int n);
qemu_irq qdev_get_gpio_in(DeviceState *dev, int n);
void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin);
void *qdev_get_child_bus(DeviceState *dev, const char *name);
BusState *qdev_get_child_bus(DeviceState *dev, const char *name);
/*** Device API. ***/
typedef void (*qdev_initfn)(DeviceState *dev, void *opaque);
typedef struct DeviceInfo DeviceInfo;
typedef void (*qdev_initfn)(DeviceState *dev, DeviceInfo *info);
typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv,
int unit);
DeviceType *qdev_register(const char *name, int size, qdev_initfn init,
void *opaque);
struct DeviceInfo {
qdev_initfn init;
BusType bus_type;
};
void qdev_register(const char *name, int size, DeviceInfo *info);
/* Register device properties. */
void qdev_init_irq_sink(DeviceState *dev, qemu_irq_handler handler, int nirq);
void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n);
void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n);
void qdev_attach_child_bus(DeviceState *dev, const char *name, void *bus);
void scsi_bus_new(DeviceState *host, SCSIAttachFn attach);
CharDriverState *qdev_init_chardev(DeviceState *dev);
void *qdev_get_bus(DeviceState *dev);
BusState *qdev_get_parent_bus(DeviceState *dev);
uint64_t qdev_get_prop_int(DeviceState *dev, const char *name, uint64_t def);
void *qdev_get_prop_ptr(DeviceState *dev, const char *name);
@ -76,4 +99,11 @@ void *qdev_get_prop_ptr(DeviceState *dev, const char *name);
#define DO_UPCAST(type, field, dev) container_of(dev, type, field)
#endif
/*** BUS API. ***/
BusState *qbus_create(BusType type, size_t size,
DeviceState *parent, const char *name);
#define FROM_QBUS(type, dev) DO_UPCAST(type, qbus, dev)
#endif