Patchwork mips malta: Fix fdc regression

login
register
mail settings
Submitter Stefan Weil
Date Aug. 28, 2009, 11:48 a.m.
Message ID <1251460100-11333-1-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/32356/
State Superseded
Headers show

Comments

Stefan Weil - Aug. 28, 2009, 11:48 a.m.
8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
breaks MIPS Malta:

Tried to create isa device isa-fdc with no isa bus present

Fix this by creating an isa bus for piix4.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/piix_pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Stefan Weil - Aug. 28, 2009, 6:47 p.m.
Stefan Weil schrieb:
> 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc)
> breaks MIPS Malta:
>
> Tried to create isa device isa-fdc with no isa bus present
>
> Fix this by creating an isa bus for piix4.
>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/piix_pci.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index c9fef92..91fd038 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -365,6 +365,7 @@ static int piix4_initfn(PCIDevice *d)
>  {
>      uint8_t *pci_conf;
>  
> +    isa_bus_new(&d->qdev);
>      register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
>  
>      pci_conf = d->config;
>   

This patch no longer is sufficient with latest QEMU
because ISA irqs also have to be defined (otherwise
the MIPS Malta emulation gets a runtime crash).

Please don't use it.

Use the new patch (mips malta: Fix fdc regression and use qdev for i8042
setup).

Regards
Stefan

Patch

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index c9fef92..91fd038 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -365,6 +365,7 @@  static int piix4_initfn(PCIDevice *d)
 {
     uint8_t *pci_conf;
 
+    isa_bus_new(&d->qdev);
     register_savevm("PIIX4", 0, 2, piix_save, piix_load, d);
 
     pci_conf = d->config;