[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/20] audio: set default value for pcspk.iobase property
From: |
Gerd Hoffmann |
Subject: |
[PATCH v4 20/20] audio: set default value for pcspk.iobase property |
Date: |
Wed, 24 Jun 2020 13:30:26 +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 4c7e339ac2b5..ea539e7605a8 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 v4 00/20] audio: deprecate -soundhw, Gerd Hoffmann, 2020/06/24
- [PATCH v4 03/20] audio: add deprecated_register_soundhw, Gerd Hoffmann, 2020/06/24
- [PATCH v4 10/20] audio: deprecate -soundhw hda, Gerd Hoffmann, 2020/06/24
- [PATCH v4 11/20] pc_basic_device_init: pass PCMachineState, Gerd Hoffmann, 2020/06/24
- [PATCH v4 15/20] audio: rework pcspk_init(), Gerd Hoffmann, 2020/06/24
- [PATCH v4 09/20] audio: deprecate -soundhw sb16, Gerd Hoffmann, 2020/06/24
- [PATCH v4 17/20] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/06/24
- [PATCH v4 16/20] audio: create pcspk device early, Gerd Hoffmann, 2020/06/24
- [PATCH v4 06/20] audio: deprecate -soundhw adlib, Gerd Hoffmann, 2020/06/24
- [PATCH v4 12/20] pc_basic_device_init: drop has_pit arg, Gerd Hoffmann, 2020/06/24
- [PATCH v4 20/20] audio: set default value for pcspk.iobase property,
Gerd Hoffmann <=
- [PATCH v4 04/20] audio: deprecate -soundhw ac97, Gerd Hoffmann, 2020/06/24
- [PATCH v4 01/20] stubs: add isa_create_simple, Gerd Hoffmann, 2020/06/24
- [PATCH v4 19/20] pcspk: update docs/system/target-i386-desc.rst.inc, Gerd Hoffmann, 2020/06/24
- [PATCH v4 13/20] pc_basic_device_init: drop no_vmport arg, Gerd Hoffmann, 2020/06/24
- [PATCH v4 18/20] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/06/24
- [PATCH v4 02/20] stubs: add pci_create_simple, Gerd Hoffmann, 2020/06/24
- [PATCH v4 08/20] audio: deprecate -soundhw gus, Gerd Hoffmann, 2020/06/24
- [PATCH v4 14/20] softmmu: initialize spice and audio earlier, Gerd Hoffmann, 2020/06/24