mirror of https://github.com/proxmox/mirror_qemu
audio: move & rename soundhw init code.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJZHtWLAAoJEEy22O7T6HE4d9oP/1nPyreWKSOpsxe+eiwx+17S WKQOvQT9j9LzH5sTTZZS8eoKJh9wAkelvDhOnSBXyXJYBx6QLw4GB8mFZtqLpKEv ugFa0pHQWKmSJAWWGRJ39zU6hR/55tt5Z7OOr1G+9qyIcODCVBZR5fgjgTjIdtv+ f+aFYqaAZk8YYtOGe7j7FGaHXIbnF17gC8rMOsfiZmeNQh0lAvoDDVhv3TuKuG75 OlrmDfzDI0jpFrjsPBc8cj51GetgmEYS50TZ+3opWgQ0ymvZsmDQJ0+T1bEgZjkF t28Lkvx4PAjO/xS78mc9Pwj6nufO/PrLNtnzNnyYUjGHqtRY7ziO1vCu4EQt9REY SsyIkN27TsmvMUqqE7iHe/mxiFd12Jd+fkXDYOVWHi87q/rekufl7QTtLyaNLyog xribCfEwnUAkEj4SCSNfjX63Yc/rd6L+p26SZQCy1ccjapgdShrb5ZApVmikJn3X rIj2TKEcng1k04GKoXuTQDyClNh7LqhW3ixEDAZKfc+N8cSAVUki0WC+11Hv6yC5 yQF9T47gMjbcB5NJhYA7zwsP+XIQUWVEkYJQrna8jeLldwwfp8tiCD7YsNNj2hf9 OUfYTO97J+cM9aIEoC3NP6c4948sSqwBD9GS0I4iKA009OgIza6RRWzeCu+J4I3c +tVfP71pTF4kyLZjFKmL =xtPt -----END PGP SIGNATURE----- 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: Stefan Hajnoczi <stefanha@redhat.com>master
commit
0bb8cacd95
126
arch_init.c
126
arch_init.c
|
@ -27,7 +27,7 @@
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "sysemu/arch_init.h"
|
#include "sysemu/arch_init.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "qemu/config-file.h"
|
#include "qemu/config-file.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "qmp-commands.h"
|
#include "qmp-commands.h"
|
||||||
|
@ -85,130 +85,6 @@ int graphic_depth = 32;
|
||||||
|
|
||||||
const uint32_t arch_type = QEMU_ARCH;
|
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)
|
int kvm_available(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_KVM
|
#ifdef CONFIG_KVM
|
||||||
|
|
|
@ -14,3 +14,5 @@ common-obj-$(CONFIG_PL041) += pl041.o lm4549.o
|
||||||
common-obj-$(CONFIG_CS4231) += cs4231.o
|
common-obj-$(CONFIG_CS4231) += cs4231.o
|
||||||
common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o
|
common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o
|
||||||
common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o
|
common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o
|
||||||
|
|
||||||
|
common-obj-y += soundhw.o
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "sysemu/dma.h"
|
#include "sysemu/dma.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "hw/qdev.h"
|
#include "hw/qdev.h"
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "sysemu/dma.h"
|
#include "sysemu/dma.h"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "gusemu.h"
|
#include "gusemu.h"
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "hw/pci/msi.h"
|
#include "hw/pci/msi.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "intel-hda.h"
|
#include "intel-hda.h"
|
||||||
#include "intel-hda-defs.h"
|
#include "intel-hda-defs.h"
|
||||||
#include "sysemu/dma.h"
|
#include "sysemu/dma.h"
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/i386/pc.h"
|
#include "hw/i386/pc.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "hw/timer/i8254.h"
|
#include "hw/timer/i8254.h"
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/audio/audio.h"
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "hw/qdev.h"
|
#include "hw/qdev.h"
|
||||||
|
|
|
@ -0,0 +1,156 @@
|
||||||
|
/*
|
||||||
|
* QEMU System Emulator
|
||||||
|
*
|
||||||
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
#include "qemu-common.h"
|
||||||
|
#include "qemu/help_option.h"
|
||||||
|
#include "qemu/error-report.h"
|
||||||
|
#include "qom/object.h"
|
||||||
|
#include "hw/isa/isa.h"
|
||||||
|
#include "hw/pci/pci.h"
|
||||||
|
#include "hw/audio/soundhw.h"
|
||||||
|
|
||||||
|
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 soundhw_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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include "hw/pci/pci_host.h"
|
#include "hw/pci/pci_host.h"
|
||||||
#include "hw/ppc/ppc.h"
|
#include "hw/ppc/ppc.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
|
#include "hw/audio/soundhw.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "hw/ide.h"
|
#include "hw/ide.h"
|
||||||
|
@ -782,7 +783,7 @@ static void ibm_40p_init(MachineState *machine)
|
||||||
&cmos_checksum);
|
&cmos_checksum);
|
||||||
|
|
||||||
/* initialize audio subsystem */
|
/* initialize audio subsystem */
|
||||||
audio_init();
|
soundhw_init();
|
||||||
|
|
||||||
/* add some more devices */
|
/* add some more devices */
|
||||||
if (defaults_enabled()) {
|
if (defaults_enabled()) {
|
||||||
|
|
|
@ -7,4 +7,7 @@ void isa_register_soundhw(const char *name, const char *descr,
|
||||||
void pci_register_soundhw(const char *name, const char *descr,
|
void pci_register_soundhw(const char *name, const char *descr,
|
||||||
int (*init_pci)(PCIBus *bus));
|
int (*init_pci)(PCIBus *bus));
|
||||||
|
|
||||||
|
void soundhw_init(void);
|
||||||
|
void select_soundhw(const char *optarg);
|
||||||
|
|
||||||
#endif
|
#endif
|
|
@ -28,8 +28,6 @@ enum {
|
||||||
|
|
||||||
extern const uint32_t arch_type;
|
extern const uint32_t arch_type;
|
||||||
|
|
||||||
void select_soundhw(const char *optarg);
|
|
||||||
void audio_init(void);
|
|
||||||
int kvm_available(void);
|
int kvm_available(void);
|
||||||
int xen_available(void);
|
int xen_available(void);
|
||||||
|
|
||||||
|
|
3
vl.c
3
vl.c
|
@ -89,6 +89,7 @@ int main(int argc, char **argv)
|
||||||
#include "migration/block.h"
|
#include "migration/block.h"
|
||||||
#include "sysemu/tpm.h"
|
#include "sysemu/tpm.h"
|
||||||
#include "sysemu/dma.h"
|
#include "sysemu/dma.h"
|
||||||
|
#include "hw/audio/soundhw.h"
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "migration/migration.h"
|
#include "migration/migration.h"
|
||||||
#include "sysemu/cpus.h"
|
#include "sysemu/cpus.h"
|
||||||
|
@ -4574,7 +4575,7 @@ int main(int argc, char **argv, char **envp)
|
||||||
|
|
||||||
realtime_init();
|
realtime_init();
|
||||||
|
|
||||||
audio_init();
|
soundhw_init();
|
||||||
|
|
||||||
if (hax_enabled()) {
|
if (hax_enabled()) {
|
||||||
hax_sync_vcpus();
|
hax_sync_vcpus();
|
||||||
|
|
Loading…
Reference in New Issue