Commit 8796c64e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/audio-20200706-pull-request' into staging 



audio: deprecate -soundhw

# gpg: Signature made Mon 06 Jul 2020 20:29:07 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20200706-pull-request:
  audio: set default value for pcspk.iobase property
  pcspk: update docs/system/target-i386-desc.rst.inc
  audio: add soundhw deprecation notice
  audio: deprecate -soundhw pcspk
  audio: create pcspk device early
  audio: rework pcspk_init()
  softmmu: initialize spice and audio earlier
  pc_basic_device_init: drop no_vmport arg
  pc_basic_device_init: drop has_pit arg
  pc_basic_device_init: pass PCMachineState
  audio: deprecate -soundhw hda
  audio: deprecate -soundhw sb16
  audio: deprecate -soundhw gus
  audio: deprecate -soundhw cs4231a
  audio: deprecate -soundhw adlib
  audio: deprecate -soundhw es1370
  audio: deprecate -soundhw ac97
  audio: add deprecated_register_soundhw
  stubs: add pci_create_simple
  stubs: add isa_create_simple

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cd955761 2336172d

docs/system/deprecated.rst

+9 −0
Original line number Diff line number Diff line
@@ -82,6 +82,15 @@ should specify an ``audiodev=`` property. Additionally, when using 
vnc, you should specify an ``audiodev=`` propery if you plan to

transmit audio through the VNC protocol.



Creating sound card devices using ``-soundhw`` (since 5.1)

''''''''''''''''''''''''''''''''''''''''''''''''''''''''''



Sound card devices should be created using ``-device`` instead.  The

names are the same for most devices.  The exceptions are ``hda`` which

needs two devices (``-device intel-hda -device hda-duplex``) and

``pcspk`` which can be activated using ``-machine

pcspk-audiodev=<name>``.



``-mon ...,control=readline,pretty=on|off`` (since 4.1)

'''''''''''''''''''''''''''''''''''''''''''''''''''''''

docs/system/target-i386-desc.rst.inc

+12 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ The QEMU PC System emulator simulates the following peripherals: 


-  CS4231A compatible sound card



-  PC speaker



-  PCI UHCI, OHCI, EHCI or XHCI USB controller and a virtual USB-1.1

   hub.
@@ -49,7 +51,7 @@ must be told to not have parallel ports to have working GUS. 


.. parsed-literal::



   |qemu_system_x86| dos.img -soundhw gus -parallel none

   |qemu_system_x86| dos.img -device gus -parallel none



Alternatively:
@@ -60,3 +62,12 @@ Alternatively: 
Or some other unclaimed IRQ.



CS4231A is the chip used in Windows Sound System and GUSMAX products



The PC speaker audio device can be configured using the pcspk-audiodev

machine property, i.e.



.. parsed-literal::



   |qemu_system_x86| some.img \

   -audiodev <backend>,id=<name> \

   -machine pcspk-audiodev=<name>

hw/audio/ac97.c

+2 −7
Original line number Diff line number Diff line
@@ -1393,12 +1393,6 @@ static void ac97_exit(PCIDevice *dev) 
    AUD_remove_card(&s->card);

}



static int ac97_init (PCIBus *bus)

{

    pci_create_simple(bus, -1, TYPE_AC97);

    return 0;

}



static Property ac97_properties[] = {

    DEFINE_AUDIO_PROPERTIES(AC97LinkState, card),

    DEFINE_PROP_END_OF_LIST (),
@@ -1436,7 +1430,8 @@ static const TypeInfo ac97_info = { 
static void ac97_register_types (void)

{

    type_register_static (&ac97_info);

    pci_register_soundhw("ac97", "Intel 82801AA AC97 Audio", ac97_init);

    deprecated_register_soundhw("ac97", "Intel 82801AA AC97 Audio",

                                0, TYPE_AC97);

}



type_init (ac97_register_types)

hw/audio/adlib.c

+1 −7
Original line number Diff line number Diff line
@@ -319,16 +319,10 @@ static const TypeInfo adlib_info = { 
    .class_init    = adlib_class_initfn,

};



static int Adlib_init (ISABus *bus)

{

    isa_create_simple (bus, TYPE_ADLIB);

    return 0;

}



static void adlib_register_types (void)

{

    type_register_static (&adlib_info);

    isa_register_soundhw("adlib", ADLIB_DESC, Adlib_init);

    deprecated_register_soundhw("adlib", ADLIB_DESC, 1, TYPE_ADLIB);

}



type_init (adlib_register_types)

hw/audio/cs4231a.c

+1 −7
Original line number Diff line number Diff line
@@ -683,12 +683,6 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp) 
    AUD_register_card ("cs4231a", &s->card);

}



static int cs4231a_init (ISABus *bus)

{

    isa_create_simple (bus, TYPE_CS4231A);

    return 0;

}



static Property cs4231a_properties[] = {

    DEFINE_AUDIO_PROPERTIES(CSState, card),

    DEFINE_PROP_UINT32 ("iobase",  CSState, port, 0x534),
@@ -720,7 +714,7 @@ static const TypeInfo cs4231a_info = { 
static void cs4231a_register_types (void)

{

    type_register_static (&cs4231a_info);

    isa_register_soundhw("cs4231a", "CS4231A", cs4231a_init);

    deprecated_register_soundhw("cs4231a", "CS4231A", 1, TYPE_CS4231A);

}



type_init (cs4231a_register_types)