soundhw: remove ability to create multiple soundcards
The usefulness of enabling a dozen soundcards is dubious. Simplify the code by allowing a single instance of -soundhw, with no support for parsing either comma-separated values or 'soundhw all'. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6e57793748
commit
9c50b8aae2
|
@ -25,6 +25,7 @@
|
||||||
#include "qemu/option.h"
|
#include "qemu/option.h"
|
||||||
#include "qemu/help_option.h"
|
#include "qemu/help_option.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
|
#include "qapi/error.h"
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
|
@ -34,7 +35,6 @@ struct soundhw {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *descr;
|
const char *descr;
|
||||||
const char *typename;
|
const char *typename;
|
||||||
int enabled;
|
|
||||||
int isa;
|
int isa;
|
||||||
int (*init_pci) (PCIBus *bus);
|
int (*init_pci) (PCIBus *bus);
|
||||||
};
|
};
|
||||||
|
@ -64,10 +64,16 @@ void deprecated_register_soundhw(const char *name, const char *descr,
|
||||||
soundhw_count++;
|
soundhw_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct soundhw *selected = NULL;
|
||||||
|
|
||||||
void select_soundhw(const char *optarg)
|
void select_soundhw(const char *optarg)
|
||||||
{
|
{
|
||||||
struct soundhw *c;
|
struct soundhw *c;
|
||||||
|
|
||||||
|
if (selected) {
|
||||||
|
error_setg(&error_fatal, "only one -soundhw option is allowed");
|
||||||
|
}
|
||||||
|
|
||||||
if (is_help_option(optarg)) {
|
if (is_help_option(optarg)) {
|
||||||
show_valid_cards:
|
show_valid_cards:
|
||||||
|
|
||||||
|
@ -84,44 +90,15 @@ void select_soundhw(const char *optarg)
|
||||||
exit(!is_help_option(optarg));
|
exit(!is_help_option(optarg));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
size_t l;
|
for (c = soundhw; c->name; ++c) {
|
||||||
const char *p;
|
if (g_str_equal(c->name, optarg)) {
|
||||||
char *e;
|
selected = c;
|
||||||
int bad_card = 0;
|
break;
|
||||||
|
|
||||||
if (!strcmp(optarg, "all")) {
|
|
||||||
for (c = soundhw; c->name; ++c) {
|
|
||||||
c->enabled = 1;
|
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
p = optarg;
|
if (!c->name) {
|
||||||
while (*p) {
|
error_report("Unknown sound card name `%s'", optarg);
|
||||||
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;
|
goto show_valid_cards;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -129,30 +106,29 @@ void select_soundhw(const char *optarg)
|
||||||
|
|
||||||
void soundhw_init(void)
|
void soundhw_init(void)
|
||||||
{
|
{
|
||||||
struct soundhw *c;
|
struct soundhw *c = selected;
|
||||||
ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);
|
ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);
|
||||||
PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
|
PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
|
||||||
|
|
||||||
for (c = soundhw; c->name; ++c) {
|
if (!c) {
|
||||||
if (c->enabled) {
|
return;
|
||||||
if (c->typename) {
|
}
|
||||||
warn_report("'-soundhw %s' is deprecated, "
|
if (c->typename) {
|
||||||
"please use '-device %s' instead",
|
warn_report("'-soundhw %s' is deprecated, "
|
||||||
c->name, c->typename);
|
"please use '-device %s' instead",
|
||||||
if (c->isa) {
|
c->name, c->typename);
|
||||||
isa_create_simple(isa_bus, c->typename);
|
if (c->isa) {
|
||||||
} else {
|
isa_create_simple(isa_bus, c->typename);
|
||||||
pci_create_simple(pci_bus, -1, c->typename);
|
} else {
|
||||||
}
|
pci_create_simple(pci_bus, -1, c->typename);
|
||||||
} else {
|
|
||||||
assert(!c->isa);
|
|
||||||
if (!pci_bus) {
|
|
||||||
error_report("PCI bus not available for %s", c->name);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
c->init_pci(pci_bus);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
assert(!c->isa);
|
||||||
|
if (!pci_bus) {
|
||||||
|
error_report("PCI bus not available for %s", c->name);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
c->init_pci(pci_bus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue