diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-05-10 21:22:50 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-05-22 09:44:48 +0200 |
| commit | 963e94a97b3052529678253c6e6efcf102ca3635 (patch) | |
| tree | f55279af4a7fdfcdb71475c2601b8a54f69bacd7 | |
| parent | cf2528a53613b85c91678d14bd5551245089081a (diff) | |
| download | qemu-963e94a97b3052529678253c6e6efcf102ca3635.zip qemu-963e94a97b3052529678253c6e6efcf102ca3635.tar.gz qemu-963e94a97b3052529678253c6e6efcf102ca3635.tar.bz2 | |
hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file
We are going to require the macro from other files, too, so move
this #define to the header file.
Message-Id: <20230512124033.502654-9-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/char/parallel-isa.c | 2 | ||||
| -rw-r--r-- | hw/char/parallel.c | 1 | ||||
| -rw-r--r-- | hw/isa/isa-superio.c | 3 | ||||
| -rw-r--r-- | include/hw/char/parallel.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index 1ccbb96..547ae69 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -21,7 +21,7 @@ static void parallel_init(ISABus *bus, int index, Chardev *chr) DeviceState *dev; ISADevice *isadev; - isadev = isa_new("isa-parallel"); + isadev = isa_new(TYPE_ISA_PARALLEL); dev = DEVICE(isadev); qdev_prop_set_uint32(dev, "index", index); qdev_prop_set_chr(dev, "chardev", chr); diff --git a/hw/char/parallel.c b/hw/char/parallel.c index af551e7..3d32589 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -93,7 +93,6 @@ typedef struct ParallelState { PortioList portio_list; } ParallelState; -#define TYPE_ISA_PARALLEL "isa-parallel" OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) struct ISAParallelState { diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index c81bfe5..9292ec3 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "sysemu/blockdev.h" #include "chardev/char.h" +#include "hw/char/parallel.h" #include "hw/block/fdc.h" #include "hw/isa/superio.h" #include "hw/qdev-properties.h" @@ -51,7 +52,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) } else { name = g_strdup_printf("parallel%d", i); } - isa = isa_new("isa-parallel"); + isa = isa_new(TYPE_ISA_PARALLEL); d = DEVICE(isa); qdev_prop_set_uint32(d, "index", i); if (k->parallel.get_iobase) { diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 0a23c0f..29d2876 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -4,6 +4,8 @@ #include "hw/isa/isa.h" #include "chardev/char.h" +#define TYPE_ISA_PARALLEL "isa-parallel" + void parallel_hds_isa_init(ISABus *bus, int n); bool parallel_mm_init(MemoryRegion *address_space, |