diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-02 15:25:21 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-07-06 17:01:11 +0200 |
| commit | 6b8d1416482feb84f5c1d33a4e2acf7367a8f11f (patch) | |
| tree | 87681a2aecf03db01dc4f5512e52ebc190a55d77 | |
| parent | 525d654d7a113e24e5c4efc21e6f2f8c952d21d9 (diff) | |
| download | focaccia-qemu-6b8d1416482feb84f5c1d33a4e2acf7367a8f11f.tar.gz focaccia-qemu-6b8d1416482feb84f5c1d33a4e2acf7367a8f11f.zip | |
audio: create pcspk device early
Create the pcspk device early, so it exists at machine type initialization time. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20200702132525.6849-17-kraxel@redhat.com
Diffstat (limited to '')
| -rw-r--r-- | hw/i386/pc.c | 3 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4fc1b7048b..88785f9dcc 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1219,7 +1219,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, /* connect PIT to output control line of the HPET */ qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0)); } - pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit); + pcspk_init(pcms->pcspk, isa_bus, pit); } i8257_dma_init(isa_bus, 0); @@ -1891,6 +1891,7 @@ static void pc_machine_initfn(Object *obj) pcms->pit_enabled = true; pc_system_flash_create(pcms); + pcms->pcspk = isa_new(TYPE_PC_SPEAKER); } static void pc_machine_reset(MachineState *machine) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d7690bf429..a802e69974 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -33,6 +33,7 @@ struct PCMachineState { PCIBus *bus; I2CBus *smbus; PFlashCFI01 *flash[2]; + ISADevice *pcspk; /* Configuration options: */ uint64_t max_ram_below_4g; |