diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-02 15:25:25 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-06 17:01:11 +0200 |
| commit | 2336172d9b396b4fa4483712f5560a563c25352f (patch) | |
| tree | 6cf6abe7fc96439090163e5b22b4dd245fef7543 | |
| parent | 59e75839057ec6e13538ef8b89aadfd9f237dc12 (diff) | |
| download | qemu-2336172d9b396b4fa4483712f5560a563c25352f.zip qemu-2336172d9b396b4fa4483712f5560a563c25352f.tar.gz qemu-2336172d9b396b4fa4483712f5560a563c25352f.tar.bz2 | |
audio: set default value for pcspk.iobase property
Allows dropping the explicit qdev_prop_set_uint32 call in pcspk_init.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200702132525.6849-21-kraxel@redhat.com
| -rw-r--r-- | hw/audio/pcspk.c | 2 | ||||
| -rw-r--r-- | include/hw/audio/pcspk.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 4c7e339..ea539e7 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -219,7 +219,7 @@ static const VMStateDescription vmstate_spk = { static Property pcspk_properties[] = { DEFINE_AUDIO_PROPERTIES(PCSpkState, card), - DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, -1), + DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, 0x61), DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 8b48560..06cba00 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -33,11 +33,7 @@ static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *pit) { - DeviceState *dev; - - dev = DEVICE(isadev); - qdev_prop_set_uint32(dev, "iobase", 0x61); - object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL); + object_property_set_link(OBJECT(isadev), OBJECT(pit), "pit", NULL); isa_realize_and_unref(isadev, bus, &error_fatal); } |