[2/3] hw/audio: Remove the "use_broken_id" hack from the AC97 device
diff mbox series

Message ID 20191205160652.23493-3-thuth@redhat.com
State New
Headers show
Series
  • Remove deprecated pc-0.x machine types and related hacks
Related show

Commit Message

Thomas Huth Dec. 5, 2019, 4:06 p.m. UTC
Now that the old pc-0.x machine types are gone, we do not need
the "use_broken_id" hack anymore.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/audio/ac97.c | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Philippe Mathieu-Daudé Dec. 6, 2019, 5:52 a.m. UTC | #1
On 12/5/19 5:06 PM, Thomas Huth wrote:
> Now that the old pc-0.x machine types are gone, we do not need
> the "use_broken_id" hack anymore.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   hw/audio/ac97.c | 9 ---------
>   1 file changed, 9 deletions(-)
> 
> diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
> index a136b97f68..78cda88333 100644
> --- a/hw/audio/ac97.c
> +++ b/hw/audio/ac97.c
> @@ -161,7 +161,6 @@ typedef struct AC97BusMasterRegs {
>   typedef struct AC97LinkState {
>       PCIDevice dev;
>       QEMUSoundCard card;
> -    uint32_t use_broken_id;
>       uint32_t glob_cnt;
>       uint32_t glob_sta;
>       uint32_t cas;
> @@ -1373,13 +1372,6 @@ static void ac97_realize(PCIDevice *dev, Error **errp)
>       c[PCI_BASE_ADDRESS_0 + 6] = 0x00;
>       c[PCI_BASE_ADDRESS_0 + 7] = 0x00;
>   
> -    if (s->use_broken_id) {
> -        c[PCI_SUBSYSTEM_VENDOR_ID] = 0x86;
> -        c[PCI_SUBSYSTEM_VENDOR_ID + 1] = 0x80;
> -        c[PCI_SUBSYSTEM_ID] = 0x00;
> -        c[PCI_SUBSYSTEM_ID + 1] = 0x00;
> -    }
> -
>       c[PCI_INTERRUPT_LINE] = 0x00;      /* intr_ln interrupt line rw */
>       c[PCI_INTERRUPT_PIN] = 0x01;      /* intr_pn interrupt pin ro */
>   
> @@ -1411,7 +1403,6 @@ static int ac97_init (PCIBus *bus)
>   
>   static Property ac97_properties[] = {
>       DEFINE_AUDIO_PROPERTIES(AC97LinkState, card),
> -    DEFINE_PROP_UINT32 ("use_broken_id", AC97LinkState, use_broken_id, 0),
>       DEFINE_PROP_END_OF_LIST (),
>   };
>   
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Patch
diff mbox series

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index a136b97f68..78cda88333 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -161,7 +161,6 @@  typedef struct AC97BusMasterRegs {
 typedef struct AC97LinkState {
     PCIDevice dev;
     QEMUSoundCard card;
-    uint32_t use_broken_id;
     uint32_t glob_cnt;
     uint32_t glob_sta;
     uint32_t cas;
@@ -1373,13 +1372,6 @@  static void ac97_realize(PCIDevice *dev, Error **errp)
     c[PCI_BASE_ADDRESS_0 + 6] = 0x00;
     c[PCI_BASE_ADDRESS_0 + 7] = 0x00;
 
-    if (s->use_broken_id) {
-        c[PCI_SUBSYSTEM_VENDOR_ID] = 0x86;
-        c[PCI_SUBSYSTEM_VENDOR_ID + 1] = 0x80;
-        c[PCI_SUBSYSTEM_ID] = 0x00;
-        c[PCI_SUBSYSTEM_ID + 1] = 0x00;
-    }
-
     c[PCI_INTERRUPT_LINE] = 0x00;      /* intr_ln interrupt line rw */
     c[PCI_INTERRUPT_PIN] = 0x01;      /* intr_pn interrupt pin ro */
 
@@ -1411,7 +1403,6 @@  static int ac97_init (PCIBus *bus)
 
 static Property ac97_properties[] = {
     DEFINE_AUDIO_PROPERTIES(AC97LinkState, card),
-    DEFINE_PROP_UINT32 ("use_broken_id", AC97LinkState, use_broken_id, 0),
     DEFINE_PROP_END_OF_LIST (),
 };