Commit 0bb8cacd authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'kraxel/tags/pull-audio-20170519-1' into staging 



audio: move & rename soundhw init code.

# gpg: Signature made Fri 19 May 2017 12:22:51 PM BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* kraxel/tags/pull-audio-20170519-1:
  audio: Rename hw/audio/audio.h to hw/audio/soundhw.h
  audio: Rename audio_init() to soundhw_init()
  audio: Move arch_init audio code to hw/audio/soundhw.c

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents a4657d4b 8a824e4d

arch_init.c

+1 −125
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "sysemu/sysemu.h"

#include "sysemu/arch_init.h"

#include "hw/pci/pci.h"

#include "hw/audio/audio.h"

#include "hw/audio/soundhw.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

#include "qmp-commands.h"
@@ -85,130 +85,6 @@ int graphic_depth = 32; 


const uint32_t arch_type = QEMU_ARCH;



struct soundhw {

    const char *name;

    const char *descr;

    int enabled;

    int isa;

    union {

        int (*init_isa) (ISABus *bus);

        int (*init_pci) (PCIBus *bus);

    } init;

};



static struct soundhw soundhw[9];

static int soundhw_count;



void isa_register_soundhw(const char *name, const char *descr,

                          int (*init_isa)(ISABus *bus))

{

    assert(soundhw_count < ARRAY_SIZE(soundhw) - 1);

    soundhw[soundhw_count].name = name;

    soundhw[soundhw_count].descr = descr;

    soundhw[soundhw_count].isa = 1;

    soundhw[soundhw_count].init.init_isa = init_isa;

    soundhw_count++;

}



void pci_register_soundhw(const char *name, const char *descr,

                          int (*init_pci)(PCIBus *bus))

{

    assert(soundhw_count < ARRAY_SIZE(soundhw) - 1);

    soundhw[soundhw_count].name = name;

    soundhw[soundhw_count].descr = descr;

    soundhw[soundhw_count].isa = 0;

    soundhw[soundhw_count].init.init_pci = init_pci;

    soundhw_count++;

}



void select_soundhw(const char *optarg)

{

    struct soundhw *c;



    if (is_help_option(optarg)) {

    show_valid_cards:



        if (soundhw_count) {

             printf("Valid sound card names (comma separated):\n");

             for (c = soundhw; c->name; ++c) {

                 printf ("%-11s %s\n", c->name, c->descr);

             }

             printf("\n-soundhw all will enable all of the above\n");

        } else {

             printf("Machine has no user-selectable audio hardware "

                    "(it may or may not have always-present audio hardware).\n");

        }

        exit(!is_help_option(optarg));

    }

    else {

        size_t l;

        const char *p;

        char *e;

        int bad_card = 0;



        if (!strcmp(optarg, "all")) {

            for (c = soundhw; c->name; ++c) {

                c->enabled = 1;

            }

            return;

        }



        p = optarg;

        while (*p) {

            e = strchr(p, ',');

            l = !e ? strlen(p) : (size_t) (e - p);



            for (c = soundhw; c->name; ++c) {

                if (!strncmp(c->name, p, l) && !c->name[l]) {

                    c->enabled = 1;

                    break;

                }

            }



            if (!c->name) {

                if (l > 80) {

                    error_report("Unknown sound card name (too big to show)");

                }

                else {

                    error_report("Unknown sound card name `%.*s'",

                                 (int) l, p);

                }

                bad_card = 1;

            }

            p += l + (e != NULL);

        }



        if (bad_card) {

            goto show_valid_cards;

        }

    }

}



void audio_init(void)

{

    struct soundhw *c;

    ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);

    PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);



    for (c = soundhw; c->name; ++c) {

        if (c->enabled) {

            if (c->isa) {

                if (!isa_bus) {

                    error_report("ISA bus not available for %s", c->name);

                    exit(1);

                }

                c->init.init_isa(isa_bus);

            } else {

                if (!pci_bus) {

                    error_report("PCI bus not available for %s", c->name);

                    exit(1);

                }

                c->init.init_pci(pci_bus);

            }

        }

    }

}



int kvm_available(void)

{

#ifdef CONFIG_KVM

hw/audio/Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -14,3 +14,5 @@ common-obj-$(CONFIG_PL041) += pl041.o lm4549.o 
common-obj-$(CONFIG_CS4231) += cs4231.o

common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o

common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o



common-obj-y += soundhw.o

hw/audio/ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/audio/audio.h"

#include "hw/audio/soundhw.h"

#include "audio/audio.h"

#include "hw/pci/pci.h"

#include "sysemu/dma.h"

hw/audio/adlib.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/audio/audio.h"

#include "hw/audio/soundhw.h"

#include "audio/audio.h"

#include "hw/isa/isa.h"

hw/audio/cs4231a.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */

#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/audio/audio.h"

#include "hw/audio/soundhw.h"

#include "audio/audio.h"

#include "hw/isa/isa.h"

#include "hw/qdev.h"