aboutsummaryrefslogtreecommitdiff
path: root/hw/char/parallel.c
diff options
context:
space:
mode:
authorMiroslav Rezanina <mrezanin@redhat.com>2015-05-13 11:39:30 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-06-05 17:09:58 +0200
commit9157eee1b1c076ff3316361b760e891dda13e9bf (patch)
tree22a583afad37a02691fcbd8db9c04aee0fffa1c8 /hw/char/parallel.c
parent00967f4e0bab246679d0ddc32fd31a7179345baf (diff)
downloadqemu-9157eee1b1c076ff3316361b760e891dda13e9bf.zip
qemu-9157eee1b1c076ff3316361b760e891dda13e9bf.tar.gz
qemu-9157eee1b1c076ff3316361b760e891dda13e9bf.tar.bz2
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: Miroslav Rezanina <mrezanin@redhat.com> Message-Id: <1431509970-32154-1-git-send-email-mrezanin@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char/parallel.c')
-rw-r--r--hw/char/parallel.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 4079554..c2b553f 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -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]);
- }
- }
-}