[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/19] audio: set default value for pcspk.iobase property
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 19/19] audio: set default value for pcspk.iobase property |
Date: |
Mon, 22 Jun 2020 13:29:14 +0200 |
Allows to drop the explicit qdev_prop_set_uint32 call in pcspk_init.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/audio/pcspk.h | 6 +-----
hw/audio/pcspk.c | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
index 8b485602675f..06cba00b8376 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);
}
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index ab290e686783..c537ea62d394 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(),
};
--
2.18.4
[PATCH v3 12/19] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/06/22
[PATCH v3 19/19] audio: set default value for pcspk.iobase property,
Gerd Hoffmann <=
[PATCH v3 06/19] audio: deprecate -soundhw adlib, Gerd Hoffmann, 2020/06/22
[PATCH v3 08/19] audio: deprecate -soundhw gus, Gerd Hoffmann, 2020/06/22
[PATCH v3 05/19] audio: deprecate -soundhw es1370, Gerd Hoffmann, 2020/06/22
[PATCH v3 07/19] audio: deprecate -soundhw cs4231a, Gerd Hoffmann, 2020/06/22
[PATCH v3 09/19] audio: deprecate -soundhw sb16, Gerd Hoffmann, 2020/06/22