81a322d4a1
Sorry folks, but it has to be. One more of these invasive qdev patches. We have a serious design bug in the qdev interface: device init callbacks can't signal failure because the init() callback has no return value. This patch fixes it. We have already one case in-tree where this is needed: Try -device virtio-blk-pci (without drive= specified) and watch qemu segfault. This patch fixes it. With usb+scsi being converted to qdev we'll get more devices where the init callback can fail for various reasons. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
52 lines
1.4 KiB
C
52 lines
1.4 KiB
C
#ifndef HW_ISA_H
|
|
#define HW_ISA_H
|
|
|
|
/* ISA bus */
|
|
|
|
#include "ioport.h"
|
|
#include "qdev.h"
|
|
|
|
typedef struct ISABus ISABus;
|
|
typedef struct ISADevice ISADevice;
|
|
typedef struct ISADeviceInfo ISADeviceInfo;
|
|
|
|
struct ISADevice {
|
|
DeviceState qdev;
|
|
uint32_t iobase[2];
|
|
uint32_t isairq[2];
|
|
qemu_irq *irqs[2];
|
|
int nirqs;
|
|
};
|
|
|
|
typedef int (*isa_qdev_initfn)(ISADevice *dev);
|
|
struct ISADeviceInfo {
|
|
DeviceInfo qdev;
|
|
isa_qdev_initfn init;
|
|
};
|
|
|
|
ISABus *isa_bus_new(DeviceState *dev);
|
|
void isa_bus_irqs(qemu_irq *irqs);
|
|
void isa_connect_irq(ISADevice *dev, int devirq, int isairq);
|
|
qemu_irq isa_reserve_irq(int isairq);
|
|
void isa_init_irq(ISADevice *dev, qemu_irq *p);
|
|
void isa_qdev_register(ISADeviceInfo *info);
|
|
ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2,
|
|
uint32_t irq, uint32_t irq2);
|
|
|
|
extern target_phys_addr_t isa_mem_base;
|
|
|
|
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size);
|
|
|
|
/* dma.c */
|
|
int DMA_get_channel_mode (int nchan);
|
|
int DMA_read_memory (int nchan, void *buf, int pos, int size);
|
|
int DMA_write_memory (int nchan, void *buf, int pos, int size);
|
|
void DMA_hold_DREQ (int nchan);
|
|
void DMA_release_DREQ (int nchan);
|
|
void DMA_schedule(int nchan);
|
|
void DMA_init (int high_page_enable);
|
|
void DMA_register_channel (int nchan,
|
|
DMA_transfer_handler transfer_handler,
|
|
void *opaque);
|
|
#endif
|