diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-28 15:28:20 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-09-04 09:37:24 -0500 |
| commit | 85a750ca90ec78b4288b84b716dda2d90643ae7f (patch) | |
| tree | 383712427affa2a2c95124ae26b7bc5f3bbd9599 /hw/pc.h | |
| parent | bd7dce87eacd90ef99b0e625cc4d5f2ab4573a70 (diff) | |
| download | focaccia-qemu-85a750ca90ec78b4288b84b716dda2d90643ae7f.tar.gz focaccia-qemu-85a750ca90ec78b4288b84b716dda2d90643ae7f.zip | |
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>
Diffstat (limited to 'hw/pc.h')
| -rw-r--r-- | hw/pc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/pc.h b/hw/pc.h index 3572165f29..ec5735b893 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -120,9 +120,8 @@ int pcspk_audio_init(qemu_irq *pic); struct 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); -int piix3_init(PCIBus *bus, int devfn); void i440fx_init_memory_mappings(PCII440FXState *d); /* piix4.c */ |