audio: set default value for pcspk.iobase property

kraxel · kraxel · commit 2336172d9b39 · 2020-07-06T17:01:11.000+02:00
Allows dropping the explicit qdev_prop_set_uint32 call in pcspk_init.

Signed-off-by: Gerd Hoffmann &lt;kraxel@redhat.com&gt;
Message-id: 20200702132525.6849-21-kraxel@redhat.com
diff --git 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
@@ -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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,7 @@`
`33`	`33`
`34`	`34`	`static inline void pcspk_init(ISADevice isadev, ISABus bus, ISADevice *pit)`
`35`	`35`	`{`
`36`		`- DeviceState *dev;`
`37`		`-`
`38`		`- dev = DEVICE(isadev);`
`39`		`- qdev_prop_set_uint32(dev, "iobase", 0x61);`
`40`		`- object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL);`
	`36`	`+ object_property_set_link(OBJECT(isadev), OBJECT(pit), "pit", NULL);`
`41`	`37`	`isa_realize_and_unref(isadev, bus, &error_fatal);`
`42`	`38`	`}`
`43`	`39`