Commit 9157eee1 authored by Miroslav Rezanina's avatar Miroslav Rezanina Committed by Paolo Bonzini
Browse files

Move parallel_hds_isa_init to hw/isa/isa-bus.c 



Disabling CONFIG_PARALLEL cause removing parallel_hds_isa_init defined in
parallel.c. This function is called during initialization of some boards so
disabling CONFIG_PARALLEL cause build failure.

This patch moves parallel_hds_isa_init to hw/isa/isa-bus.c so it is included
in case of disabled CONFIG_PARALLEL. Build is successful but qemu will abort
with "Unknown device" error when function is called.

Signed-off-by: default avatarMiroslav Rezanina <mrezanin@redhat.com>
Message-Id: <1431509970-32154-1-git-send-email-mrezanin@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 00967f4e

hw/char/parallel.c

+0 −25
Original line number Diff line number Diff line
@@ -641,28 +641,3 @@ static void parallel_register_types(void) 
}



type_init(parallel_register_types)
 


static void parallel_init(ISABus *bus, int index, CharDriverState *chr)

{

    DeviceState *dev;

    ISADevice *isadev;



    isadev = isa_create(bus, "isa-parallel");

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "index", index);

    qdev_prop_set_chr(dev, "chardev", chr);

    qdev_init_nofail(dev);

}



void parallel_hds_isa_init(ISABus *bus, int n)

{

    int i;



    assert(n <= MAX_PARALLEL_PORTS);



    for (i = 0; i < n; i++) {

        if (parallel_hds[i]) {

            parallel_init(bus, i, parallel_hds[i]);

        }

    }

}

hw/isa/isa-bus.c

+26 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "hw/sysbus.h"

#include "sysemu/sysemu.h"

#include "hw/isa/isa.h"

#include "hw/i386/pc.h"



static ISABus *isabus;
@@ -267,3 +268,28 @@ MemoryRegion *isa_address_space_io(ISADevice *dev) 
}



type_init(isabus_register_types)



static void parallel_init(ISABus *bus, int index, CharDriverState *chr)

{

    DeviceState *dev;

    ISADevice *isadev;



    isadev = isa_create(bus, "isa-parallel");

    dev = DEVICE(isadev);

    qdev_prop_set_uint32(dev, "index", index);

    qdev_prop_set_chr(dev, "chardev", chr);

    qdev_init_nofail(dev);

}



void parallel_hds_isa_init(ISABus *bus, int n)

{

    int i;



    assert(n <= MAX_PARALLEL_PORTS);



    for (i = 0; i < n; i++) {

        if (parallel_hds[i]) {

            parallel_init(bus, i, parallel_hds[i]);

        }

    }

}