* [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c
@ 2017-01-17 18:46 Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 1/3] audio: Move arch_init audio " Eduardo Habkost
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Eduardo Habkost @ 2017-01-17 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
This moves the arch_init.c soundhw code to its own file, renames
audio_init() to soundhw_init(), and renames hw/audio/audio.h to
hw/audio/soundhw.h.
Eduardo Habkost (3):
audio: Move arch_init audio code to hw/audio/soundhw.c
audio: Rename audio_init() to soundhw_init()
audio: Rename hw/audio/audio.h to hw/audio/soundhw.h
include/hw/audio/{audio.h => soundhw.h} | 3 +
include/sysemu/arch_init.h | 2 -
arch_init.c | 126 +-------------------------
hw/audio/ac97.c | 2 +-
hw/audio/adlib.c | 2 +-
hw/audio/cs4231a.c | 2 +-
hw/audio/es1370.c | 2 +-
hw/audio/gus.c | 2 +-
hw/audio/intel-hda.c | 2 +-
hw/audio/pcspk.c | 2 +-
hw/audio/sb16.c | 2 +-
hw/audio/soundhw.c | 156 ++++++++++++++++++++++++++++++++
vl.c | 3 +-
hw/audio/Makefile.objs | 2 +
14 files changed, 172 insertions(+), 136 deletions(-)
rename include/hw/audio/{audio.h => soundhw.h} (81%)
create mode 100644 hw/audio/soundhw.c
--
2.11.0.259.g40922b1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 1/3] audio: Move arch_init audio code to hw/audio/soundhw.c
2017-01-17 18:46 [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
@ 2017-01-17 18:46 ` Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 2/3] audio: Rename audio_init() to soundhw_init() Eduardo Habkost
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2017-01-17 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
There's no reason to keep the soundhw table in arch_init.c. Move
that code to a new hw/audio/soundhw.c file.
While moving the code, trivial coding style issues were fixed.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/audio/audio.h | 3 +
include/sysemu/arch_init.h | 2 -
arch_init.c | 124 -----------------------------------
hw/audio/soundhw.c | 156 +++++++++++++++++++++++++++++++++++++++++++++
vl.c | 1 +
hw/audio/Makefile.objs | 2 +
6 files changed, 162 insertions(+), 126 deletions(-)
create mode 100644 hw/audio/soundhw.c
diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h
index 55d40f71bf..259bb2cf96 100644
--- a/include/hw/audio/audio.h
+++ b/include/hw/audio/audio.h
@@ -7,4 +7,7 @@ void isa_register_soundhw(const char *name, const char *descr,
void pci_register_soundhw(const char *name, const char *descr,
int (*init_pci)(PCIBus *bus));
+void audio_init(void);
+void select_soundhw(const char *optarg);
+
#endif
diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 1c9dad1b72..608c49fcdf 100644
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -27,10 +27,8 @@ enum {
extern const uint32_t arch_type;
-void select_soundhw(const char *optarg);
void do_acpitable_option(const QemuOpts *opts);
void do_smbios_option(QemuOpts *opts);
-void audio_init(void);
int kvm_available(void);
int xen_available(void);
diff --git a/arch_init.c b/arch_init.c
index 5cc58b2c35..16465c3f54 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -111,130 +111,6 @@ int qemu_read_default_config_files(bool userconfig)
return 0;
}
-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);
- }
- }
- }
-}
-
void do_acpitable_option(const QemuOpts *opts)
{
#ifdef TARGET_I386
diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
new file mode 100644
index 0000000000..3411fe1f90
--- /dev/null
+++ b/hw/audio/soundhw.c
@@ -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/audio.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 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);
+ }
+ }
+ }
+}
+
diff --git a/vl.c b/vl.c
index c643d3ff3a..cb610873bc 100644
--- a/vl.c
+++ b/vl.c
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
#include "migration/block.h"
#include "sysemu/tpm.h"
#include "sysemu/dma.h"
+#include "hw/audio/audio.h"
#include "audio/audio.h"
#include "migration/migration.h"
#include "sysemu/cpus.h"
diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs
index 7ce85a2e88..1ee912a688 100644
--- a/hw/audio/Makefile.objs
+++ b/hw/audio/Makefile.objs
@@ -15,4 +15,6 @@ 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
+
$(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
--
2.11.0.259.g40922b1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 2/3] audio: Rename audio_init() to soundhw_init()
2017-01-17 18:46 [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 1/3] audio: Move arch_init audio " Eduardo Habkost
@ 2017-01-17 18:46 ` Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 3/3] audio: Rename hw/audio/audio.h to hw/audio/soundhw.h Eduardo Habkost
2017-01-20 21:11 ` [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
3 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2017-01-17 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
To make it consistent with the remaining soundhw.c functions and
avoid confusion with the audio_init() function in audio/audio.c,
rename audio_init() to soundhw_init().
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/audio/audio.h | 2 +-
hw/audio/soundhw.c | 2 +-
vl.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h
index 259bb2cf96..119f7d78d5 100644
--- a/include/hw/audio/audio.h
+++ b/include/hw/audio/audio.h
@@ -7,7 +7,7 @@ void isa_register_soundhw(const char *name, const char *descr,
void pci_register_soundhw(const char *name, const char *descr,
int (*init_pci)(PCIBus *bus));
-void audio_init(void);
+void soundhw_init(void);
void select_soundhw(const char *optarg);
#endif
diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 3411fe1f90..2178a5c8ef 100644
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -127,7 +127,7 @@ void select_soundhw(const char *optarg)
}
}
-void audio_init(void)
+void soundhw_init(void)
{
struct soundhw *c;
ISABus *isa_bus =
diff --git a/vl.c b/vl.c
index cb610873bc..a5bf85ebec 100644
--- a/vl.c
+++ b/vl.c
@@ -4546,7 +4546,7 @@ int main(int argc, char **argv, char **envp)
realtime_init();
- audio_init();
+ soundhw_init();
cpu_synchronize_all_post_init();
--
2.11.0.259.g40922b1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 3/3] audio: Rename hw/audio/audio.h to hw/audio/soundhw.h
2017-01-17 18:46 [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 1/3] audio: Move arch_init audio " Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 2/3] audio: Rename audio_init() to soundhw_init() Eduardo Habkost
@ 2017-01-17 18:46 ` Eduardo Habkost
2017-01-20 21:11 ` [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
3 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2017-01-17 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
All the functions in hw/audio/audio.h are called "soundhw_*()"
and live in hw/audio/audiohw.c. Rename the header file for
consistency.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/audio/{audio.h => soundhw.h} | 0
arch_init.c | 2 +-
hw/audio/ac97.c | 2 +-
hw/audio/adlib.c | 2 +-
hw/audio/cs4231a.c | 2 +-
hw/audio/es1370.c | 2 +-
hw/audio/gus.c | 2 +-
hw/audio/intel-hda.c | 2 +-
hw/audio/pcspk.c | 2 +-
hw/audio/sb16.c | 2 +-
hw/audio/soundhw.c | 2 +-
vl.c | 2 +-
12 files changed, 11 insertions(+), 11 deletions(-)
rename include/hw/audio/{audio.h => soundhw.h} (100%)
diff --git a/include/hw/audio/audio.h b/include/hw/audio/soundhw.h
similarity index 100%
rename from include/hw/audio/audio.h
rename to include/hw/audio/soundhw.h
diff --git a/arch_init.c b/arch_init.c
index 16465c3f54..da26b40056 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -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 "hw/smbios/smbios.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index c30657501c..959c786261 100644
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -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"
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 7836446fc8..a9356e83b5 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -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"
diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index 3ecd0582bf..096e8e98d7 100644
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -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"
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index fe64c1ac37..dd7c23d185 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -28,7 +28,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"
diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index 3d08a6576a..21861be869 100644
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -24,7 +24,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"
#include "gusemu.h"
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 537face94d..8e36147f64 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -22,7 +22,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
#include "qemu/timer.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
#include "intel-hda.h"
#include "intel-hda-defs.h"
#include "sysemu/dma.h"
diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 798002277b..c815a2b9ca 100644
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "qemu/timer.h"
#include "hw/timer/i8254.h"
diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 6b4427f242..6ab2f6f89a 100644
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -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"
diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 2178a5c8ef..710912e715 100644
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -28,7 +28,7 @@
#include "qom/object.h"
#include "hw/isa/isa.h"
#include "hw/pci/pci.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
struct soundhw {
const char *name;
diff --git a/vl.c b/vl.c
index a5bf85ebec..27213fd6af 100644
--- a/vl.c
+++ b/vl.c
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
#include "migration/block.h"
#include "sysemu/tpm.h"
#include "sysemu/dma.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
#include "audio/audio.h"
#include "migration/migration.h"
#include "sysemu/cpus.h"
--
2.11.0.259.g40922b1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c
2017-01-17 18:46 [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
` (2 preceding siblings ...)
2017-01-17 18:46 ` [Qemu-devel] [PATCH 3/3] audio: Rename hw/audio/audio.h to hw/audio/soundhw.h Eduardo Habkost
@ 2017-01-20 21:11 ` Eduardo Habkost
2017-02-16 15:17 ` Gerd Hoffmann
3 siblings, 1 reply; 6+ messages in thread
From: Eduardo Habkost @ 2017-01-20 21:11 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Ping? Any feedback?
On Tue, Jan 17, 2017 at 04:46:35PM -0200, Eduardo Habkost wrote:
> This moves the arch_init.c soundhw code to its own file, renames
> audio_init() to soundhw_init(), and renames hw/audio/audio.h to
> hw/audio/soundhw.h.
>
> Eduardo Habkost (3):
> audio: Move arch_init audio code to hw/audio/soundhw.c
> audio: Rename audio_init() to soundhw_init()
> audio: Rename hw/audio/audio.h to hw/audio/soundhw.h
>
> include/hw/audio/{audio.h => soundhw.h} | 3 +
> include/sysemu/arch_init.h | 2 -
> arch_init.c | 126 +-------------------------
> hw/audio/ac97.c | 2 +-
> hw/audio/adlib.c | 2 +-
> hw/audio/cs4231a.c | 2 +-
> hw/audio/es1370.c | 2 +-
> hw/audio/gus.c | 2 +-
> hw/audio/intel-hda.c | 2 +-
> hw/audio/pcspk.c | 2 +-
> hw/audio/sb16.c | 2 +-
> hw/audio/soundhw.c | 156 ++++++++++++++++++++++++++++++++
> vl.c | 3 +-
> hw/audio/Makefile.objs | 2 +
> 14 files changed, 172 insertions(+), 136 deletions(-)
> rename include/hw/audio/{audio.h => soundhw.h} (81%)
> create mode 100644 hw/audio/soundhw.c
>
> --
> 2.11.0.259.g40922b1
>
>
--
Eduardo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c
2017-01-20 21:11 ` [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
@ 2017-02-16 15:17 ` Gerd Hoffmann
0 siblings, 0 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2017-02-16 15:17 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel
On Fr, 2017-01-20 at 19:11 -0200, Eduardo Habkost wrote:
> Ping? Any feedback?
>
> On Tue, Jan 17, 2017 at 04:46:35PM -0200, Eduardo Habkost wrote:
> > This moves the arch_init.c soundhw code to its own file, renames
> > audio_init() to soundhw_init(), and renames hw/audio/audio.h to
> > hw/audio/soundhw.h.
Looks good to me. Seems to need a rebase though, tried to add to the
audio queue but it doesn't apply. Can you send a rebase?
thanks,
Gerd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-16 15:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-17 18:46 [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 1/3] audio: Move arch_init audio " Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 2/3] audio: Rename audio_init() to soundhw_init() Eduardo Habkost
2017-01-17 18:46 ` [Qemu-devel] [PATCH 3/3] audio: Rename hw/audio/audio.h to hw/audio/soundhw.h Eduardo Habkost
2017-01-20 21:11 ` [Qemu-devel] [PATCH 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
2017-02-16 15:17 ` Gerd Hoffmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).