qdev: allow embedded bus structs
cover qdev: allow embedded bus structs
Hi,
This patch series allows to have qdev bus structs embedded into another struct. Typically that would be the state struct of the parent device. The first patch provides the qdev infrastructure, the other ones which over some bus implementations.
cheers,
Gerd
PATCH 1/7 allow qdev busses allocations be inplace
--- hw/qdev.c | 15 ++++++++++++--- hw/qdev.h | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-)
hw/qdev.c +12 -3
@@ -502,13 +502,12 @@ static BusState *qbus_find(const char *path) } } -BusState *qbus_create (BusInfo *info,DeviceState *parent,const char *name) +void qbus_create_inplace (BusState *bus,BusInfo *info, +DeviceState *parent,const char *name) { -BusState *bus;char *buf;int i,len; - bus =qemu_mallocz (info->size); bus->info = info; bus->parent = parent;
@@ -537,6 +536,16 @@ BusState *qbus_create(BusInfo *info, DeviceState *parent, const char *name)QLIST_INSERT_HEAD (&parent->child_bus, bus, sibling); parent->num_child_bus++; } + +} + +BusState *qbus_create (BusInfo *info,DeviceState *parent,const char *name) +{ +BusState *bus; + + bus =qemu_mallocz (info->size); + bus->qdev_allocated =1 ; +qbus_create_inplace (bus, info, parent, name);return bus; }
hw/qdev.h +3 -0
@@ -47,6 +47,7 @@ struct BusState {DeviceState *parent;BusInfo *info;const char *name; +int qdev_allocated; QLIST_HEAD(, DeviceState) children;QLIST_ENTRY (BusState) sibling; };
@@ -144,6 +145,8 @@ BusState *qdev_get_parent_bus(DeviceState *dev);/*** BUS API. ***/ +void qbus_create_inplace (BusState *bus,BusInfo *info, +DeviceState *parent,const char *name);BusState *qbus_create (BusInfo *info,DeviceState *parent,const char *name);#define FROM_QBUS (type, dev) DO_UPCAST(type, qbus, dev)
Signature · 1 line
1.6.2.5
[Qemu-devel] Re: [PATCH 1/7] allow qdev busses allocations be inplace
Quoted 1 line · Gerd Hoffmann
+void qbus_create_inplace(BusState *bus, BusInfo *info,
qbus_init?
Paolo
[Qemu-devel] Re: [PATCH 1/7] allow qdev busses allocations be inplace
Quoted 4 lines · Paolo Bonzini
Quoted 1 line · Gerd Hoffmann
+void qbus_create_inplace(BusState *bus, BusInfo *info,
qbus_init?
I'd prefer to keep it named simliar to the allocating version to avoid confusion ...
cheers,
Gerd
[Qemu-devel] Re: [PATCH 1/7] allow qdev busses allocations be inplace
Quoted 8 lines · Gerd Hoffmann
Quoted 4 lines · Paolo Bonzini
Quoted 1 line · Gerd Hoffmann
+void qbus_create_inplace(BusState *bus, BusInfo *info,
qbus_init?I'd prefer to keep it named simliar to the allocating version to avoid confusion ...
Yeah, since you're going to destroy both of them with the same function it makes sense.
Paolo
[Qemu-devel] Re: [PATCH 1/7] allow qdev busses allocations be inplace
In reply to Gerd HoffmannQuoted 1 line · Gerd Hoffmann
+ int
qdev_allocated;
Also, this member seems write-only.
Paolo
[Qemu-devel] Re: [PATCH 1/7] allow qdev busses allocations be inplace
Quoted 4 lines · Paolo Bonzini
Quoted 1 line · Gerd Hoffmann
+ int
qdev_allocated;Also, this member seems write-only.
Yes, there is no qbus_destroy yet. So now this just serves as reminder that we'll need to keep track of it ;)
cheers,
Gerd
[Qemu-devel] Re: [PATCH 1/7] allow qdev busses allocations be inplace
Quoted 7 lines · Gerd Hoffmann
Quoted 4 lines · Paolo Bonzini
Quoted 1 line · Gerd Hoffmann
+ int
qdev_allocated;Also, this member seems write-only.
Yes, there is no
qbus_destroyyet.
Which is actually a bug. If you hot-unplug a virtual usb mass storage device the associated scsi bus should go away. It doesn't though. Will include a fix when respinning the series.
cheers,
Gerd
PATCH 2/7 switch scsi bus to inplace allocation.
In reply to Gerd Hoffmann--- hw/esp.c | 10 +++++----- hw/lsi53c895a.c | 12 ++++++------ hw/scsi-bus.c | 9 +++------ hw/scsi-disk.h | 4 ++-- hw/usb-msd.c | 6 +++--- 5 files changed, 19 insertions(+), 22 deletions(-)
hw/esp.c +5 -5
@@ -63,7 +63,7 @@ struct ESPState {uint8_t ti_buf[TI_BUFSZ ];uint32_t sense;uint32_t dma; -SCSIBus *bus; +SCSIBus bus;SCSIDevice *current_dev;uint8_t cmdbuf[TI_BUFSZ ];uint32_t cmdlen;
@@ -191,7 +191,7 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf) s->async_len =0 ; } -if (target >=ESP_MAX_DEVS || !s->bus->devs[target]) { +if (target >=ESP_MAX_DEVS || !s->bus.devs[target]) {// No such drive s->rregs[ESP_RSTAT ] =0 ; s->rregs[ESP_RINTR ] =INTR_DC ;
@@ -199,7 +199,7 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf)esp_raise_irq (s);return 0 ; } - s->current_dev = s->bus->devs[target]; + s->current_dev = s->bus.devs[target];return dmalen; }
@@ -692,8 +692,8 @@ static int esp_init1(SysBusDevice *dev)qdev_init_gpio_in (&dev->qdev, parent_esp_reset,1 ); - s->bus =scsi_bus_new (&dev->qdev,0 ,ESP_MAX_DEVS , esp_command_complete); -scsi_bus_legacy_handle_cmdline (s->bus); +scsi_bus_new (&s->bus, &dev->qdev,0 ,ESP_MAX_DEVS , esp_command_complete); +scsi_bus_legacy_handle_cmdline (&s->bus);return 0 ; }
hw/lsi53c895a.c +6 -6
@@ -193,7 +193,7 @@ typedef struct {* 2 if processing DMA from lsi_execute_script. * 3 if a DMA operation is in progress. */ int waiting; -SCSIBus *bus; +SCSIBus bus;SCSIDevice *current_dev;int current_lun;/* The tag is a combination of the device ID and the SCSI tag. */
@@ -585,7 +585,7 @@ static void lsi_reselect(LSIState *s, uint32_t tag) id = (tag >>8 ) &0xf ; s->ssid = id |0x80 ;DPRINTF ("Reselected target %d\n" , id); - s->current_dev = s->bus->devs[id]; + s->current_dev = s->bus.devs[id]; s->current_tag = tag; s->scntl1 |=LSI_SCNTL1_CON ;lsi_set_phase (s,PHASE_MI );
@@ -1041,7 +1041,7 @@ again: } s->sstat0 |=LSI_SSTAT0_WOA ; s->scntl1 &= ~LSI_SCNTL1_IARB ; -if (id >=LSI_MAX_DEVS || !s->bus->devs[id]) { +if (id >=LSI_MAX_DEVS || !s->bus.devs[id]) {DPRINTF ("Selected absent target %d\n" , id);lsi_script_scsi_interrupt (s,0 ,LSI_SIST1_STO );lsi_disconnect (s);
@@ -1052,7 +1052,7 @@ again:/* ??? Linux drivers compain when this is set. Maybe it only applies in low-level mode (unimplemented). lsi_script_scsi_interrupt(s, LSI_SIST0_CMP, 0); */ - s->current_dev = s->bus->devs[id]; + s->current_dev = s->bus.devs[id]; s->current_tag = id <<8 ; s->scntl1 |=LSI_SCNTL1_CON ;if (insn & (1 <<3 )) {
@@ -2178,8 +2178,8 @@ static int lsi_scsi_init(PCIDevice *dev)lsi_soft_reset (s); - s->bus =scsi_bus_new (&dev->qdev,1 ,LSI_MAX_DEVS , lsi_command_complete); -scsi_bus_legacy_handle_cmdline (s->bus); +scsi_bus_new (&s->bus, &dev->qdev,1 ,LSI_MAX_DEVS , lsi_command_complete); +scsi_bus_legacy_handle_cmdline (&s->bus);register_savevm ("lsiscsi" ,-1 ,0 , lsi_scsi_save, lsi_scsi_load, s);return 0 ; }
hw/scsi-bus.c +3 -6
@@ -15,17 +15,14 @@ static struct BusInfo scsi_bus_info = {static int next_scsi_bus;/* Create a scsi bus, and attach devices to it. */ -SCSIBus *scsi_bus_new (DeviceState *host,int tcq,int ndev, -scsi_completionfn complete) +void scsi_bus_new (SCSIBus *bus,DeviceState *host,int tcq,int ndev, +scsi_completionfn complete) { -SCSIBus *bus; - - bus =FROM_QBUS (SCSIBus,qbus_create (&scsi_bus_info, host,NULL )); +qbus_create_inplace (&bus->qbus, &scsi_bus_info, host,NULL ); bus->busnr = next_scsi_bus++; bus->tcq = tcq; bus->ndev = ndev; bus->complete = complete; -return bus; }static int scsi_qdev_init (DeviceState *qdev,DeviceInfo *base)
hw/scsi-disk.h +2 -2
@@ -52,8 +52,8 @@ struct SCSIBus {SCSIDevice *devs[8 ]; }; -SCSIBus *scsi_bus_new (DeviceState *host,int tcq,int ndev, -scsi_completionfn complete); +void scsi_bus_new (SCSIBus *bus,DeviceState *host,int tcq,int ndev, +scsi_completionfn complete);void scsi_qdev_register (SCSIDeviceInfo *info);static inline SCSIBus *scsi_bus_from_device (SCSIDevice *d)
hw/usb-msd.c +3 -3
@@ -45,7 +45,7 @@ typedef struct {uint32_t data_len;uint32_t residue;uint32_t tag; -SCSIBus *bus; +SCSIBus bus;DriveInfo *dinfo;SCSIDevice *scsi_dev;int result;
@@ -527,8 +527,8 @@ static int usb_msd_initfn(USBDevice *dev) } s->dev.speed =USB_SPEED_FULL ; - s->bus =scsi_bus_new (&s->dev.qdev,0 ,1 , usb_msd_command_complete); - s->scsi_dev =scsi_bus_legacy_add_drive (s->bus, s->dinfo,0 ); +scsi_bus_new (&s->bus, &s->dev.qdev,0 ,1 , usb_msd_command_complete); + s->scsi_dev =scsi_bus_legacy_add_drive (&s->bus, s->dinfo,0 );usb_msd_handle_reset (dev);return 0 ; }
Signature · 1 line
1.6.2.5
PATCH 3/7 switch usb bus to inplace allocation.
In reply to Gerd Hoffmann--- hw/usb-bus.c | 7 ++----- hw/usb-musb.c | 6 +++--- hw/usb-ohci.c | 6 +++--- hw/usb-uhci.c | 6 +++--- hw/usb.h | 2 +- 5 files changed, 12 insertions(+), 15 deletions(-)
hw/usb-bus.c +2 -5
@@ -14,16 +14,13 @@ static struct BusInfo usb_bus_info = {static int next_usb_bus =0 ; static QTAILQ_HEAD(, USBBus) busses = QTAILQ_HEAD_INITIALIZER(busses); -USBBus *usb_bus_new (DeviceState *host) +void usb_bus_new (USBBus *bus,DeviceState *host) { -USBBus *bus; - - bus =FROM_QBUS (USBBus,qbus_create (&usb_bus_info, host,NULL )); +qbus_create_inplace (&bus->qbus, &usb_bus_info, host,NULL ); bus->busnr = next_usb_bus++;QTAILQ_INIT (&bus->free);QTAILQ_INIT (&bus->used);QTAILQ_INSERT_TAIL (&busses, bus, next); -return bus; }USBBus *usb_bus_find (int busnr)
hw/usb-musb.c +3 -3
@@ -281,7 +281,7 @@ typedef struct {struct MUSBState {qemu_irq *irqs; -USBBus *bus; +USBBus bus;USBPort port;int idx;
@@ -331,8 +331,8 @@ struct MUSBState { s->ep[i].epnum = i; } - s->bus =usb_bus_new (NULL /* FIXME */ ); -usb_register_port (s->bus, &s->port, s,0 , musb_attach); +usb_bus_new (&s->bus,NULL /* FIXME */ ); +usb_register_port (&s->bus, &s->port, s,0 , musb_attach);return s; }
hw/usb-ohci.c +3 -3
@@ -65,7 +65,7 @@ enum ohci_type { }; typedef struct { - USBBus *bus; + USBBus bus; qemu_irq irq; enum ohci_type type; int mem;
@@ -1690,10 +1690,10 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, ohci->irq = irq; ohci->type = type; - ohci->bus =usb_bus_new (dev); +usb_bus_new (&ohci->bus, dev); ohci->num_ports = num_ports;for (i =0 ; i < num_ports; i++) { -usb_register_port (ohci->bus, &ohci->rhport[i].port, ohci, i, ohci_attach); +usb_register_port (&ohci->bus, &ohci->rhport[i].port, ohci, i, ohci_attach); } ohci->async_td =0 ;
hw/usb-uhci.c +3 -3
@@ -122,7 +122,7 @@ typedef struct UHCIPort { typedef struct UHCIState { PCIDevice dev; - USBBus *bus; + USBBus bus; uint16_t cmd; /* cmd register */ uint16_t status; uint16_t intr; /* interrupt enable register */
@@ -1083,9 +1083,9 @@ static int usb_uhci_common_initfn(UHCIState *s) pci_conf[0x3d ] =4 ;// interrupt pin 3 pci_conf[0x60 ] =0x10 ;// release number - s->bus =usb_bus_new (&s->dev.qdev); +usb_bus_new (&s->bus, &s->dev.qdev);for (i =0 ; i <NB_PORTS ; i++) { -usb_register_port (s->bus, &s->ports[i].port, s, i, uhci_attach); +usb_register_port (&s->bus, &s->ports[i].port, s, i, uhci_attach); } s->frame_timer =qemu_new_timer (vm_clock, uhci_frame_timer, s);
hw/usb.h +1 -1
@@ -303,7 +303,7 @@ struct USBBus {QTAILQ_ENTRY (USBBus) next; }; -USBBus *usb_bus_new (DeviceState *host); +void usb_bus_new (USBBus *bus,DeviceState *host);USBBus *usb_bus_find (int busnr);void usb_qdev_register (USBDeviceInfo *info);void usb_qdev_register_many (USBDeviceInfo *info);
Signature · 1 line
1.6.2.5
PATCH 4/7 switch ide bus to inplace allocation.
In reply to Gerd Hoffmann--- hw/ide/internal.h | 2 +- hw/ide/isa.c | 24 ++++++++++++------------ hw/ide/pci.c | 42 +++++++++++++++++++++--------------------- hw/ide/qdev.c | 7 ++----- 4 files changed, 36 insertions(+), 39 deletions(-)
hw/ide/internal.h +1 -1
@@ -551,7 +551,7 @@ void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,void ide_init_ioport (IDEBus *bus,int iobase,int iobase2);/* hw/ide/qdev.c */ -IDEBus *ide_bus_new (DeviceState *dev); +void ide_bus_new (IDEBus *idebus,DeviceState *dev);IDEDevice *ide_create_drive (IDEBus *bus,int unit,DriveInfo *drive);#endif /* HW_IDE_INTERNAL_H */
hw/ide/isa.c +12 -12
@@ -37,7 +37,7 @@ typedef struct ISAIDEState { ISADevice dev; - IDEBus *bus; + IDEBus bus; uint32_t iobase; uint32_t iobase2; uint32_t isairq;
@@ -48,18 +48,18 @@ static void isa_ide_save(QEMUFile* f, void *opaque) {ISAIDEState *s = opaque; -idebus_save (f, s->bus); -ide_save (f, &s->bus->ifs[0 ]); -ide_save (f, &s->bus->ifs[1 ]); +idebus_save (f, &s->bus); +ide_save (f, &s->bus.ifs[0 ]); +ide_save (f, &s->bus.ifs[1 ]); }static int isa_ide_load (QEMUFile * f,void *opaque,int version_id) {ISAIDEState *s = opaque; -idebus_load (f, s->bus, version_id); -ide_load (f, &s->bus->ifs[0 ], version_id); -ide_load (f, &s->bus->ifs[1 ], version_id); +idebus_load (f, &s->bus, version_id); +ide_load (f, &s->bus.ifs[0 ], version_id); +ide_load (f, &s->bus.ifs[1 ], version_id);return 0 ; }
@@ -67,10 +67,10 @@ static int isa_ide_initfn(ISADevice *dev) {ISAIDEState *s =DO_UPCAST (ISAIDEState, dev, dev); - s->bus =ide_bus_new (&s->dev.qdev); -ide_init_ioport (s->bus, s->iobase, s->iobase2); +ide_bus_new (&s->bus, &s->dev.qdev); +ide_init_ioport (&s->bus, s->iobase, s->iobase2);isa_init_irq (dev, &s->irq, s->isairq); -ide_init2 (s->bus,NULL ,NULL , s->irq); +ide_init2 (&s->bus,NULL ,NULL , s->irq);register_savevm ("isa-ide" ,0 ,3 , isa_ide_save, isa_ide_load, s);return 0 ; };
@@ -90,9 +90,9 @@ int isa_ide_init(int iobase, int iobase2, int isairq, s =DO_UPCAST (ISAIDEState, dev, dev);if (hd0) -ide_create_drive (s->bus,0 , hd0); +ide_create_drive (&s->bus,0 , hd0);if (hd1) -ide_create_drive (s->bus,1 , hd1); +ide_create_drive (&s->bus,1 , hd1);return 0 ; }
hw/ide/pci.c +21 -21
100 lines not on this page · raw message
hw/ide/qdev.c +2 -5
@@ -29,12 +29,9 @@ static struct BusInfo ide_bus_info = { .size = sizeof(IDEBus), }; -IDEBus *ide_bus_new (DeviceState *dev) +void ide_bus_new (IDEBus *idebus,DeviceState *dev) { -IDEBus *idebus; - - idebus =FROM_QBUS (IDEBus,qbus_create (&ide_bus_info, dev,NULL )); -return idebus; +qbus_create_inplace (&idebus->qbus, &ide_bus_info, dev,NULL ); }static int ide_qdev_init (DeviceState *qdev,DeviceInfo *base)
Signature · 1 line
1.6.2.5
PATCH 5/7 support inplace allocation for pci bus, split irq init.
In reply to Gerd Hoffmann--- hw/pci.c | 43 +++++++++++++++++++++++++++++++++---------- hw/pci.h | 5 +++++ 2 files changed, 38 insertions(+), 10 deletions(-)
hw/pci.c +33 -10
@@ -98,24 +98,47 @@ static void pci_bus_reset(void *opaque) } } -PCIBus *pci_register_bus (DeviceState *parent,const char *name, -pci_set_irq_fn set_irq,pci_map_irq_fn map_irq, -void *irq_opaque,int devfn_min,int nirq) +void pci_bus_new_inplace (PCIBus *bus,DeviceState *parent, +const char *name,int devfn_min) { -PCIBus *bus;static int nbus =0 ; - bus =FROM_QBUS (PCIBus,qbus_create (&pci_bus_info, parent, name)); - bus->set_irq = set_irq; - bus->map_irq = map_irq; - bus->irq_opaque = irq_opaque; +qbus_create_inplace (&bus->qbus, &pci_bus_info, parent, name); bus->devfn_min = devfn_min; - bus->nirq = nirq; - bus->irq_count =qemu_mallocz (nirq *sizeof (bus->irq_count[0 ])); bus->next = first_bus; first_bus = bus;vmstate_register (nbus++, &vmstate_pcibus, bus);qemu_register_reset (pci_bus_reset, bus); +} + +PCIBus *pci_bus_new (DeviceState *parent,const char *name,int devfn_min) +{ +PCIBus *bus; + + bus =qemu_mallocz (sizeof (*bus)); + bus->qbus.qdev_allocated =1 ; +pci_bus_new_inplace (bus, parent, name, devfn_min); +return bus; +} + +void pci_bus_irqs (PCIBus *bus,pci_set_irq_fn set_irq,pci_map_irq_fn map_irq, +void *irq_opaque,int nirq) +{ + bus->set_irq = set_irq; + bus->map_irq = map_irq; + bus->irq_opaque = irq_opaque; + bus->nirq = nirq; + bus->irq_count =qemu_mallocz (nirq *sizeof (bus->irq_count[0 ])); +} + +PCIBus *pci_register_bus (DeviceState *parent,const char *name, +pci_set_irq_fn set_irq,pci_map_irq_fn map_irq, +void *irq_opaque,int devfn_min,int nirq) +{ +PCIBus *bus; + + bus =pci_bus_new (parent, name, devfn_min); +pci_bus_irqs (bus, set_irq, map_irq, irq_opaque, nirq);return bus; }
hw/pci.h +5 -0
@@ -242,6 +242,11 @@ int pci_device_load(PCIDevice *s, QEMUFile *f);typedef void (*pci_set_irq_fn )(void *opaque,int irq_num,int level);typedef int (*pci_map_irq_fn )(PCIDevice *pci_dev,int irq_num); +void pci_bus_new_inplace (PCIBus *bus,DeviceState *parent, +const char *name,int devfn_min); +PCIBus *pci_bus_new (DeviceState *parent,const char *name,int devfn_min); +void pci_bus_irqs (PCIBus *bus,pci_set_irq_fn set_irq,pci_map_irq_fn map_irq, +void *irq_opaque,int nirq);PCIBus *pci_register_bus (DeviceState *parent,const char *name,pci_set_irq_fn set_irq,pci_map_irq_fn map_irq,void *irq_opaque,int devfn_min,int nirq);
Signature · 1 line
1.6.2.5
PATCH 6/7 convert pci bridge to qdev
In reply to Gerd Hoffmann--- hw/pci.c | 66 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 18 deletions(-)
hw/pci.c +48 -18
@@ -142,18 +142,16 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name,return bus; } -static PCIBus *pci_register_secondary_bus (PCIDevice *dev, -pci_map_irq_fn map_irq, -const char *name) +static void pci_register_secondary_bus (PCIBus *bus, +PCIDevice *dev, +pci_map_irq_fn map_irq, +const char *name) { -PCIBus *bus; - - bus =FROM_QBUS (PCIBus,qbus_create (&pci_bus_info, &dev->qdev, name)); +qbus_create_inplace (&bus->qbus, &pci_bus_info, &dev->qdev, name); bus->map_irq = map_irq; bus->parent_dev = dev; bus->next = dev->bus->next; dev->bus->next = bus; -return bus; }int pci_bus_num (PCIBus *s)
@@ -858,7 +856,9 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,typedef struct {PCIDevice dev; -PCIBus *bus; +PCIBus bus; +uint32_t vid; +uint32_t did; }PCIBridge ; static void pci_bridge_write_config(PCIDevice *d,
@@ -867,7 +867,7 @@ static void pci_bridge_write_config(PCIDevice *d,PCIBridge *s = (PCIBridge *)d;pci_default_write_config (d, address, val, len); - s->bus->bus_num = d->config[PCI_SECONDARY_BUS ]; + s->bus.bus_num = d->config[PCI_SECONDARY_BUS ]; }PCIBus *pci_find_bus (int bus_num)
@@ -890,15 +890,12 @@ PCIDevice *pci_find_device(int bus_num, int slot, int function)return bus->devices[PCI_DEVFN (slot, function)]; } -PCIBus *pci_bridge_init (PCIBus *bus,int devfn,uint16_t vid,uint16_t did, -pci_map_irq_fn map_irq,const char *name) +static int pci_bridge_initfn (PCIDevice *dev) { -PCIBridge *s; - s = (PCIBridge *)pci_register_device (bus, name,sizeof (PCIBridge), - devfn,NULL , pci_bridge_write_config); +PCIBridge *s =DO_UPCAST (PCIBridge, dev, dev); -pci_config_set_vendor_id (s->dev.config, vid); -pci_config_set_device_id (s->dev.config, did); +pci_config_set_vendor_id (s->dev.config, s->vid); +pci_config_set_device_id (s->dev.config, s->did); s->dev.config[0x04 ] =0x06 ;// command = bus master, pci mem s->dev.config[0x05 ] =0x00 ;
@@ -911,9 +908,23 @@ PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, s->dev.config[PCI_HEADER_TYPE ] =PCI_HEADER_TYPE_MULTI_FUNCTION |PCI_HEADER_TYPE_BRIDGE ;// header_type s->dev.config[0x1E ] =0xa0 ;// secondary status +return 0 ; +} - s->bus =pci_register_secondary_bus (&s->dev, map_irq, name); -return s->bus; +PCIBus *pci_bridge_init (PCIBus *bus,int devfn,uint16_t vid,uint16_t did, +pci_map_irq_fn map_irq,const char *name) +{ +PCIDevice *dev; +PCIBridge *s; + + dev =pci_create_noinit (bus, devfn,"pci-bridge" ); +qdev_prop_set_uint32 (&dev->qdev,"vendorid" , vid); +qdev_prop_set_uint32 (&dev->qdev,"deviceid" , did); +qdev_init (&dev->qdev); + + s =DO_UPCAST (PCIBridge, dev, dev); +pci_register_secondary_bus (&s->bus, &s->dev, map_irq, name); +return &s->bus; }static int pci_qdev_init (DeviceState *qdev,DeviceInfo *base)
@@ -1074,3 +1085,22 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) r->addr, r->addr + r->size - 1); } } + +static PCIDeviceInfo bridge_info = { + .qdev.name ="pci-bridge" , + .qdev.size =sizeof (PCIBridge), + .init = pci_bridge_initfn, + .config_write = pci_bridge_write_config, + .qdev.props = (Property []) { +DEFINE_PROP_HEX32 ("vendorid" , PCIBridge, vid,0 ), +DEFINE_PROP_HEX32 ("deviceid" , PCIBridge, did,0 ), +DEFINE_PROP_END_OF_LIST (), + } +}; + +static void pci_register_devices (void ) +{ +pci_qdev_register (&bridge_info); +} + +device_init (pci_register_devices)
Signature · 1 line
1.6.2.5
PATCH 7/7 piix_pci: kill PIIX3IrqState
In reply to Gerd Hoffmann--- hw/piix_pci.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-)
hw/piix_pci.c +17 -20
@@ -36,18 +36,14 @@ typedef PCIHostState I440FXState;typedef struct PIIX3State {PCIDevice dev;int pci_irq_levels[4 ]; -}PIIX3State ; - -typedef struct PIIX3IrqState { -PIIX3State *piix3;qemu_irq *pic; -}PIIX3IrqState ; +}PIIX3State ;struct PCII440FXState {PCIDevice dev;target_phys_addr_t isa_page_descs[384 /4 ];uint8_t smm_enabled; -PIIX3IrqState *irq_state; +PIIX3State *piix3; };static void i440fx_addr_writel (void * opaque,uint32_t addr,uint32_t val)
@@ -167,7 +163,7 @@ static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id)if (version_id ==2 )for (i =0 ; i <4 ; i++) - d->irq_state->piix3->pci_irq_levels[i] =qemu_get_be32 (f); + d->piix3->pci_irq_levels[i] =qemu_get_be32 (f);return 0 ; }
@@ -232,23 +228,24 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq *PCIBus *b;PCIDevice *d;I440FXState *s; -PIIX3IrqState *irq_state =qemu_malloc (sizeof (*irq_state)); +PIIX3State *piix3; - irq_state->pic = pic; dev =qdev_create (NULL ,"i440FX-pcihost" ); s =FROM_SYSBUS (I440FXState,sysbus_from_qdev (dev)); - b =pci_register_bus (&s->busdev.qdev,"pci.0" , - piix3_set_irq, pci_slot_get_pirq, irq_state,0 ,4 ); + b =pci_bus_new (&s->busdev.qdev,NULL ,0 ); s->bus = b;qdev_init (dev); d =pci_create_simple (b,0 ,"i440FX" ); *pi440fx_state =DO_UPCAST (PCII440FXState, dev, d); - (*pi440fx_state)->irq_state = irq_state; - irq_state->piix3 =DO_UPCAST (PIIX3State, dev, + piix3 =DO_UPCAST (PIIX3State, dev,pci_create_simple (b,-1 ,"PIIX3" )); - *piix3_devfn = irq_state->piix3->dev.devfn; + piix3->pic = pic; +pci_bus_irqs (b, piix3_set_irq, pci_slot_get_pirq, piix3,4 ); + (*pi440fx_state)->piix3 = piix3; + + *piix3_devfn = piix3->dev.devfn;return b; }
@@ -258,22 +255,22 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq *static void piix3_set_irq (void *opaque,int irq_num,int level) {int i, pic_irq, pic_level; -PIIX3IrqState *irq_state = opaque; +PIIX3State *piix3 = opaque; - irq_state->piix3->pci_irq_levels[irq_num] = level; + piix3->pci_irq_levels[irq_num] = level;/* now we change the pic irq level according to the piix irq mappings */ /* XXX: optimize */ - pic_irq = irq_state->piix3->dev.config[0x60 + irq_num]; + pic_irq = piix3->dev.config[0x60 + irq_num];if (pic_irq <16 ) {/* The pic level is the logical OR of all the PCI irqs mapped to it */ pic_level =0 ;for (i =0 ; i <4 ; i++) { -if (pic_irq == irq_state->piix3->dev.config[0x60 + i]) - pic_level |= irq_state->piix3->pci_irq_levels[i]; +if (pic_irq == piix3->dev.config[0x60 + i]) + pic_level |= piix3->pci_irq_levels[i]; } -qemu_set_irq (irq_state->pic[pic_irq], pic_level); +qemu_set_irq (piix3->pic[pic_irq], pic_level); } }
Signature · 1 line
1.6.2.5