[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 4/6] soundhw: unify initialization for ISA and PCI soundhw
From: |
Paolo Bonzini |
Subject: |
[RFC PATCH 4/6] soundhw: unify initialization for ISA and PCI soundhw |
Date: |
Wed, 27 Apr 2022 13:32:23 +0200 |
Use qdev_new instead of distinguishing isa_create_simple/pci_create_simple.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/audio/soundhw.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 0fb64bdc8f..a9d8807b18 100644
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -114,25 +114,27 @@ void soundhw_init(void)
struct soundhw *c = selected;
ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS,
NULL);
PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS,
NULL);
+ BusState *bus;
- if (!c) {
- return;
- }
- if (c->typename) {
- warn_report("'-soundhw %s' is deprecated, "
- "please use '-device %s' instead",
- c->name, c->typename);
- if (c->isa) {
- isa_create_simple(isa_bus, c->typename);
- } else {
- pci_create_simple(pci_bus, -1, c->typename);
+ if (c->isa) {
+ if (!isa_bus) {
+ error_report("ISA bus not available for %s", c->name);
+ exit(1);
}
+ bus = BUS(isa_bus);
} else {
- assert(!c->isa);
if (!pci_bus) {
error_report("PCI bus not available for %s", c->name);
exit(1);
}
+ bus = BUS(pci_bus);
+ }
+
+ if (c->typename) {
+ DeviceState *dev = qdev_new(c->typename);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
+ } else {
+ assert(!c->isa);
c->init_pci(pci_bus);
}
}
--
2.35.1
- [RFC PATCH 0/6] replace -soundhw with -audio, Paolo Bonzini, 2022/04/27
- [RFC PATCH 1/6] pc: remove -soundhw pcspk, Paolo Bonzini, 2022/04/27
- [RFC PATCH 3/6] soundhw: extract soundhw help to a separate function, Paolo Bonzini, 2022/04/27
- [RFC PATCH 4/6] soundhw: unify initialization for ISA and PCI soundhw,
Paolo Bonzini <=
- [RFC PATCH 6/6] vl: introduce -audio as a replacement for -soundhw, Paolo Bonzini, 2022/04/27
- [RFC PATCH 2/6] soundhw: remove ability to create multiple soundcards, Paolo Bonzini, 2022/04/27
- [RFC PATCH 5/6] soundhw: move help handling to vl.c, Paolo Bonzini, 2022/04/27