Commit c2d0d012 authored by Richard Henderson's avatar Richard Henderson Committed by Avi Kivity
Browse files

isa: Pass i/o address space to isa_bus_new 



Not used yet, but at least we're provided with the correct region.

Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e11d6439

hw/isa-bus.c

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


struct ISABus {

    BusState qbus;

    MemoryRegion *address_space_io;

    qemu_irq *irqs;

};

static ISABus *isabus;
@@ -39,7 +40,7 @@ static struct BusInfo isa_bus_info = { 
    .get_fw_dev_path = isabus_get_fw_dev_path,

};



ISABus *isa_bus_new(DeviceState *dev)

ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io)

{

    if (isabus) {

        fprintf(stderr, "Can't create a second ISA bus\n");
@@ -51,6 +52,7 @@ ISABus *isa_bus_new(DeviceState *dev) 
    }



    isabus = FROM_QBUS(ISABus, qbus_create(&isa_bus_info, dev, NULL));

    isabus->address_space_io = address_space_io;

    return isabus;

}

hw/isa.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct ISADeviceInfo { 
    isa_qdev_initfn init;

};



ISABus *isa_bus_new(DeviceState *dev);

ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io);

void isa_bus_irqs(qemu_irq *irqs);

qemu_irq isa_get_irq(int isairq);

void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);

hw/mips_jazz.c

+10 −7
Original line number Diff line number Diff line
@@ -102,8 +102,9 @@ static void cpu_request_exit(void *opaque, int irq, int level) 
    }

}



static

void mips_jazz_init (MemoryRegion *address_space, ram_addr_t ram_size,

static void mips_jazz_init(MemoryRegion *address_space,

                           MemoryRegion *address_space_io,

                           ram_addr_t ram_size,

                           const char *cpu_model,

                           enum jazz_model_e jazz_model)

{
@@ -181,7 +182,7 @@ void mips_jazz_init (MemoryRegion *address_space, ram_addr_t ram_size, 


    /* ISA devices */

    i8259 = i8259_init(env->irq[4]);

    isa_bus_new(NULL);

    isa_bus_new(NULL, address_space_io);

    isa_bus_irqs(i8259);

    cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);

    DMA_init(0, cpu_exit_irq);
@@ -299,7 +300,8 @@ void mips_magnum_init (ram_addr_t ram_size, 
                       const char *kernel_filename, const char *kernel_cmdline,

                       const char *initrd_filename, const char *cpu_model)

{

    mips_jazz_init(get_system_memory(), ram_size, cpu_model, JAZZ_MAGNUM);

        mips_jazz_init(get_system_memory(), get_system_io(),

                       ram_size, cpu_model, JAZZ_MAGNUM);

}



static
@@ -308,7 +310,8 @@ void mips_pica61_init (ram_addr_t ram_size, 
                       const char *kernel_filename, const char *kernel_cmdline,

                       const char *initrd_filename, const char *cpu_model)

{

    mips_jazz_init(get_system_memory(), ram_size, cpu_model, JAZZ_PICA61);

    mips_jazz_init(get_system_memory(), get_system_io(),

                   ram_size, cpu_model, JAZZ_PICA61);

}



static QEMUMachine mips_magnum_machine = {

hw/mips_r4k.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ void mips_r4k_init (ram_addr_t ram_size, 


    /* The PIC is attached to the MIPS CPU INT0 pin */

    i8259 = i8259_init(env->irq[2]);

    isa_bus_new(NULL);

    isa_bus_new(NULL, get_system_io());

    isa_bus_irqs(i8259);



    rtc_init(2000, NULL);

hw/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void pc_init1(MemoryRegion *system_memory, 
    } else {

        pci_bus = NULL;

        i440fx_state = NULL;

        isa_bus_new(NULL);

        isa_bus_new(NULL, system_io);

        no_hpet = 1;

    }

    isa_bus_irqs(isa_irq);