mirror of https://github.com/xqemu/xqemu.git
Fold piix3_init() intto i440fx_init
i440fx_init will now work properly if we don't setup piix3 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
bd7dce87ea
commit
85a750ca90
3
hw/pc.c
3
hw/pc.c
|
@ -1279,8 +1279,7 @@ static void pc_init1(ram_addr_t ram_size,
|
||||||
isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24);
|
isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24);
|
||||||
|
|
||||||
if (pci_enabled) {
|
if (pci_enabled) {
|
||||||
pci_bus = i440fx_init(&i440fx_state, isa_irq);
|
pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq);
|
||||||
piix3_devfn = piix3_init(pci_bus, -1);
|
|
||||||
} else {
|
} else {
|
||||||
pci_bus = NULL;
|
pci_bus = NULL;
|
||||||
isa_bus_new(NULL);
|
isa_bus_new(NULL);
|
||||||
|
|
3
hw/pc.h
3
hw/pc.h
|
@ -120,9 +120,8 @@ int pcspk_audio_init(qemu_irq *pic);
|
||||||
struct PCII440FXState;
|
struct PCII440FXState;
|
||||||
typedef struct PCII440FXState PCII440FXState;
|
typedef struct PCII440FXState PCII440FXState;
|
||||||
|
|
||||||
PCIBus *i440fx_init(PCII440FXState **pi440fx_state, qemu_irq *pic);
|
PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, qemu_irq *pic);
|
||||||
void i440fx_set_smm(PCII440FXState *d, int val);
|
void i440fx_set_smm(PCII440FXState *d, int val);
|
||||||
int piix3_init(PCIBus *bus, int devfn);
|
|
||||||
void i440fx_init_memory_mappings(PCII440FXState *d);
|
void i440fx_init_memory_mappings(PCII440FXState *d);
|
||||||
|
|
||||||
/* piix4.c */
|
/* piix4.c */
|
||||||
|
|
|
@ -217,7 +217,9 @@ static int i440fx_initfn(PCIDevice *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
PCIBus *i440fx_init(PCII440FXState **pi440fx_state, qemu_irq *pic)
|
static PIIX3State *piix3_dev;
|
||||||
|
|
||||||
|
PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq *pic)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
PCIBus *b;
|
PCIBus *b;
|
||||||
|
@ -236,13 +238,14 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, qemu_irq *pic)
|
||||||
d = pci_create_simple(b, 0, "i440FX");
|
d = pci_create_simple(b, 0, "i440FX");
|
||||||
*pi440fx_state = DO_UPCAST(PCII440FXState, dev, d);
|
*pi440fx_state = DO_UPCAST(PCII440FXState, dev, d);
|
||||||
|
|
||||||
|
piix3_dev = DO_UPCAST(PIIX3State, dev, pci_create_simple(b, -1, "PIIX3"));
|
||||||
|
*piix3_devfn = piix3_dev->dev.devfn;
|
||||||
|
|
||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* PIIX3 PCI to ISA bridge */
|
/* PIIX3 PCI to ISA bridge */
|
||||||
|
|
||||||
static PIIX3State *piix3_dev;
|
|
||||||
|
|
||||||
static void piix3_set_irq(void *opaque, int irq_num, int level)
|
static void piix3_set_irq(void *opaque, int irq_num, int level)
|
||||||
{
|
{
|
||||||
int i, pic_irq, pic_level;
|
int i, pic_irq, pic_level;
|
||||||
|
@ -334,20 +337,11 @@ static int piix3_initfn(PCIDevice *dev)
|
||||||
pci_conf[PCI_HEADER_TYPE] =
|
pci_conf[PCI_HEADER_TYPE] =
|
||||||
PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; // header_type = PCI_multifunction, generic
|
PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; // header_type = PCI_multifunction, generic
|
||||||
|
|
||||||
piix3_dev = d;
|
|
||||||
piix3_reset(d);
|
piix3_reset(d);
|
||||||
qemu_register_reset(piix3_reset, d);
|
qemu_register_reset(piix3_reset, d);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int piix3_init(PCIBus *bus, int devfn)
|
|
||||||
{
|
|
||||||
PCIDevice *d;
|
|
||||||
|
|
||||||
d = pci_create_simple(bus, devfn, "PIIX3");
|
|
||||||
return d->devfn;
|
|
||||||
}
|
|
||||||
|
|
||||||
static PCIDeviceInfo i440fx_info[] = {
|
static PCIDeviceInfo i440fx_info[] = {
|
||||||
{
|
{
|
||||||
.qdev.name = "i440FX",
|
.qdev.name = "i440FX",
|
||||||
|
|
Loading…
Reference in New Issue