audio: move audio.h under include/qemu/

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>

diff --git a/MAINTAINERS b/MAINTAINERS
index 64491c800c2cf94ae6f696a4979053b7090ac797..24323e8800f2aad834067df2fb5cd80b0f5d58d3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2977,6 +2977,7 @@ X: audio/paaudio.c
 X: audio/sdlaudio.c
 X: audio/sndioaudio.c
 X: audio/spiceaudio.c
+F: include/qemu/audio.h
 F: qapi/audio.json
 
 ALSA Audio backend

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 797cb478e6e418f58d968f56f23f38a148fc8ab9..d1e4817081e4b826aa6c7dc5cb50070be75373a1 100644 (file)
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -26,7 +26,7 @@
 #include <alsa/asoundlib.h>
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "trace.h"
 
 #pragma GCC diagnostic ignored "-Waddress"

diff --git a/audio/audio.c b/audio/audio.c
index 3229829befd6ff022e8bd87deadc6bf1863f7ab5..19499abe1642fb47b7c9b863e5f78c541379bfd4 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"

diff --git a/audio/audio_int.h b/audio/audio_int.h
index d66f7aac321b2f86eb4779b41b1faa5b372cea8f..8d4f4ca8fca296317b7a15b49de7a2c173ee48cf 100644 (file)
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -29,7 +29,7 @@
 #define FLOAT_MIXENG
 /* #define RECIPROCAL */
 #endif
-#include "audio.h"
+#include "qemu/audio.h"
 #include "mixeng.h"
 
 #ifdef CONFIG_GIO

diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index 316f118f50997bdf7ea4ce710c1d66568f4fa5a2..44a8ff24a6f5b22e2671bc4ff87515b38b34ab71 100644 (file)
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -7,7 +7,7 @@
 #include <mmreg.h>
 #include <mmsystem.h>
 
-#include "audio.h"
+#include "qemu/audio.h"
 #include "audio_int.h"
 #include "audio_win_int.h"
 

diff --git a/audio/coreaudio.m b/audio/coreaudio.m
index cadd729d50537850d81718b9284efed5877d9185..8b3cd6db1600c48bcdc41ac4838796a23182666b 100644 (file)
--- a/audio/coreaudio.m
+++ b/audio/coreaudio.m
@@ -28,7 +28,7 @@
 
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #define AUDIO_CAP "coreaudio"
 #include "audio_int.h"

diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index c97c34b4869b56a43ac5490a03b069e593ca3b3c..157d36428e9eee9082b7727f3f3100bd1e1b39de 100644 (file)
--- a/audio/dbusaudio.c
+++ b/audio/dbusaudio.c
@@ -35,7 +35,7 @@
 #include "ui/dbus-display1.h"
 
 #define AUDIO_CAP "dbus"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "audio_int.h"
 #include "trace.h"
 

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index bd00c50e80f2f8482abc6e56d1673f09a5ef5eb1..8b773ded217a4bf3266c03f034c355163f980e4c 100644 (file)
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #define AUDIO_CAP "dsound"
 #include "audio_int.h"

diff --git a/audio/jackaudio.c b/audio/jackaudio.c
index 974a3caad34767abce0bba68e412d28a8acfb023..28face99890b739b115c144f063b8f24d7a48ed0 100644 (file)
--- a/audio/jackaudio.c
+++ b/audio/jackaudio.c
@@ -26,7 +26,7 @@
 #include "qemu/module.h"
 #include "qemu/atomic.h"
 #include "qemu/main-loop.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #define AUDIO_CAP "jack"
 #include "audio_int.h"

diff --git a/audio/mixeng.c b/audio/mixeng.c
index af9ec3d4d21b875ed3c5a014ef60acbfd123dcc5..e63c76e021d2b1c73aa80980d13acc86ae207fb5 100644 (file)
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -24,7 +24,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #define AUDIO_CAP "mixeng"
 #include "audio_int.h"

diff --git a/audio/noaudio.c b/audio/noaudio.c
index 34ff1d2a27003fc8bcac67ea829b2588dbec087b..b136b74e26c403e54cf151a12e5874c70486e594 100644 (file)
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #define AUDIO_CAP "noaudio"
 #include "audio_int.h"

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 4a549b26a2c232e1abffe7f1744c0676fe90b8a3..5ba91f6793a1e653aca6b66ec06404f0b373b3f4 100644 (file)
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -29,7 +29,7 @@
 #include "qemu/module.h"
 #include "qemu/host-utils.h"
 #include "qapi/error.h"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "trace.h"
 
 #define AUDIO_CAP "oss"

diff --git a/audio/paaudio.c b/audio/paaudio.c
index 93030f3fc806cc82dfd73364d1bb1fae8b4aeafd..8eb80ede45bdecf4750551daffc083ea93297c7c 100644 (file)
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -2,7 +2,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "qapi/error.h"
 
 #include <pulse/pulseaudio.h>

diff --git a/audio/pwaudio.c b/audio/pwaudio.c
index 8e13b58286537c43a2672c2a3d7c36e7551346eb..8f6c0900c8f59aa0f0945a457f5ebd9dfccf94b8 100644 (file)
--- a/audio/pwaudio.c
+++ b/audio/pwaudio.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include <spa/param/audio/format-utils.h>

diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 641357e5ee38bbb7056fdde0155f50600cf67201..4ef73c8dfb81d3f773fa4735eac352300ababadf 100644 (file)
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -27,7 +27,7 @@
 #include <SDL_thread.h>
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #ifndef _WIN32
 #ifdef __sun__

diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c
index 8eb35e1e5386261f15c34a0ccdac33ff53ca1b3f..f4f53b1c6f8689587efe9ab84e9305aaa1866618 100644 (file)
--- a/audio/sndioaudio.c
+++ b/audio/sndioaudio.c
@@ -18,7 +18,7 @@
 #include <poll.h>
 #include <sndio.h>
 #include "qemu/main-loop.h"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "trace.h"
 
 #define AUDIO_CAP "sndio"

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 7e737bff9a382ea950c551c84073413802f5b0fc..77ba89ffaaf6a9fd7542d409ed58daa7d26c1542 100644 (file)
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -26,7 +26,7 @@
 #include "ui/qemu-spice.h"
 
 #define AUDIO_CAP "spice"
-#include "audio.h"
+#include "qemu/audio.h"
 #include "audio_int.h"
 
 #if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= 3

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index a098b20cad41b5cd8a760915cb06c54f00a0d7de..4d9c921305c55ed86d57f50a6963421f1c90d465 100644 (file)
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "qemu/audio.h"
 
 #define AUDIO_CAP "wav"
 #include "audio_int.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index b1d8fbd470a461182dc0d6095246716a31e075ce..81ed051b98b1061b53813542d656f0ee78a431f2 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -26,7 +26,7 @@
 #include "hw/irq.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "target/arm/cpu-qom.h"
 
 #define TYPE_INTEGRATOR_CM "integrator_core"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 329b162eb20a5a840f2f1dd775dab17db5ded027..6032301bb61ab2fd72af6d1139d64f55b20ecd29 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -36,7 +36,7 @@
 #include "qemu/cutils.h"
 #include "qom/object.h"
 #include "hw/net/mv88w8618_eth.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qemu/error-report.h"
 #include "target/arm/cpu-qom.h"
 

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 5c9050490b4d4c62cfaa95f28d702e75c2a6a6d8..892bdc8db261d97985e38ecd5b12a95aadc2e857 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -29,7 +29,7 @@
 #include "hw/irq.h"
 #include "hw/i2c/arm_sbcon_i2c.h"
 #include "hw/sd/sd.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "target/arm/cpu-qom.h"
 
 #define SMP_BOOT_ADDR 0xe0000000

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 5cf1a70d10dc15edf631f3ea32463461ec0792ac..cba77864e867533e02a627cddc4b59ea6fa89b5a 100644 (file)
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -25,7 +25,7 @@
 #include "hw/char/pl011.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "target/arm/cpu-qom.h"
 #include "qemu/log.h"
 

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 60cd375fe75d8f5cd1dfd3f111b9e3fb9d01c68b..d26a07f0f57b4d4045a3e1c743da06bccc97ebd3 100644 (file)
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -44,7 +44,7 @@
 #include "hw/sd/sd.h"
 #include "qobject/qlist.h"
 #include "qom/object.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "target/arm/cpu-qom.h"
 
 #define VEXPRESS_BOARD_ID 0x8e0

diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 14b6641a7136148ccd0497d4c364fcfcfba16deb..4ed346a88daf402c315c7961f2f4c3dc8f04e6ae 100644 (file)
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -25,7 +25,7 @@
 #include "system/device_tree.h"
 #include "qom/object.h"
 #include "net/can_emu.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 struct XlnxZCU102 {
     MachineState parent_obj;

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index a91bf52b9593a73baa5296d331b0bf6fc7a7dd97..be7a39377f9580b62662127aeef8e8b9cb160d43 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 4e6c80b8e00ab6a043990703637b934ae8cecf24..19d3a5f12805ce2ddbd0c19e2aa4e06c93f69fdc 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"

diff --git a/hw/audio/asc.c b/hw/audio/asc.c
index 5c3f6c8f86e6d3105b56a384b1e64141f64e6777..0abb106979bbf08c22b3984999b45b29364a3874 100644 (file)
--- a/hw/audio/asc.c
+++ b/hw/audio/asc.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/irq.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/audio/asc.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index ec9643b8178aad97605201c48003bc5025e558f1..98fdbc5b7250d060d8709c9960400a8166c2df07 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 0628f033104d6fc8f88cd10b4e272d4ae2d6742c..9873ffadabb722cc653e3ff961b0ba2d1d7d1183 100644 (file)
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/pci/pci_device.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index d2533290219454616154d757e8c941332c0ee382..68f89e994c2a8a2afefef91c2508d958fc8ccadf 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index f7ae2aa1fd44fcb1621506927bc8122f068b6383..e90c9de046e90be753421bf19e78df6e4a13ffd0 100644 (file)
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -25,7 +25,7 @@
 #include "qemu/host-utils.h"
 #include "qemu/module.h"
 #include "intel-hda-defs.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "trace.h"
 #include "qom/object.h"
 

diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c
index c51ec0e66f721afc852950a0260925df500196bd..745441bd79019947ab80d56c1d1870e9fe712d9e 100644 (file)
--- a/hw/audio/lm4549.c
+++ b/hw/audio/lm4549.c
@@ -15,7 +15,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "lm4549.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h
index 1d858e2a04731e6cdf772a8c92199b497717397f..bbd73057bf13a3f48886bb010040a8908b8ceb2c 100644 (file)
--- a/hw/audio/lm4549.h
+++ b/hw/audio/lm4549.h
@@ -12,7 +12,7 @@
 #ifndef HW_LM4549_H
 #define HW_LM4549_H
 
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "exec/hwaddr.h"
 
 typedef void (*lm4549_callback)(void *opaque);

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index c5c79d083a43bfe8d356243a7b76f206557397e5..a483f4e70d198d452cd9c52dcb56e2821977abb6 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -16,7 +16,7 @@
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/audio/wm8750.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index a41f5b11f0cc763468620b0260a5e1bf56a179b3..916c56fa4c0a9e296b8c42701520a28d578a3797 100644 (file)
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 8109d124d13e1e1c4dd8a4c10c739f3352235a72..1e3c4caf5efc86ae74ddcf930f2a2d17fe0d16d5 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index d399c335c339689c8df9094bafbf51a1582f3872..336fb6d20bd7790da43df52da1715945e101bd72 100644 (file)
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -12,7 +12,7 @@
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/audio/wm8750.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qom/object.h"
 
 #define IN_PORT_N      3

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 28d2833c5dfb911b8397dfe53ff7fd8e3db93b14..0580550e127585b1b938d7e5ec30424a96602946 100644 (file)
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -36,7 +36,7 @@
 #include "hw/virtio/virtio-net.h"
 #include "hw/virtio/virtio-iommu.h"
 #include "hw/acpi/generic_event_device.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 GlobalProperty hw_compat_10_1[] = {
     { TYPE_ACPI_GED, "x-has-hest-addr", "false" },

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 24c835c5f4e77857797439e1be3a0293558c4ac4..7aa5cbb5103d885bd4aa69b3c243c938e0823b4d 100644 (file)
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "qdev-prop-internal.h"
 
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "chardev/char-fe.h"
 #include "system/block-backend.h"
 #include "system/blockdev.h"

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index c2fe16e985a8f067e9caeaee3771743715ab7120..5654a60c59588cb87c44af03c965aa1fb0d50c30 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -46,7 +46,7 @@
 #include "trace.h"
 #include "elf.h"
 #include "qemu/units.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 /* SMP is not enabled, for now */
 #define MAX_CPUS 1

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index c8e032ab64858edf9ed765e2956d3aada11bf83f..8dd9d2659967017b5c3a933342bfe8d4aaf05f5f 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -35,7 +35,7 @@
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qom/object.h"
 
 static void usb_audio_reinit(USBDevice *dev, unsigned channels);

diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h
index a60c2f597c80cc8fe3a7a16c76f8476722f47b89..bb51e9a3d1917f9ada6ecd98bbe55c80062e960a 100644 (file)
--- a/include/hw/audio/asc.h
+++ b/include/hw/audio/asc.h
@@ -14,7 +14,7 @@
 #define HW_AUDIO_ASC_H
 
 #include "hw/sysbus.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 #define ASC_FREQ 22257
 

diff --git a/include/hw/audio/virtio-snd.h b/include/hw/audio/virtio-snd.h
index 0ad80bc9beb24fc7d8e49874e6c8750fc8dc29fd..c176066584b45438f2475e34a463f87716beda0e 100644 (file)
--- a/include/hw/audio/virtio-snd.h
+++ b/include/hw/audio/virtio-snd.h
@@ -17,7 +17,7 @@
 #define QEMU_VIRTIO_SOUND_H
 
 #include "hw/virtio/virtio.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "standard-headers/linux/virtio_snd.h"
 

diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h
index 802a1427c9fdd6a08782aa33e479cbfeb204bcd1..af859e477dac2afa57235863643bb276f0064054 100644 (file)
--- a/include/hw/display/xlnx_dp.h
+++ b/include/hw/display/xlnx_dp.h
@@ -33,7 +33,7 @@
 #include "qemu/fifo8.h"
 #include "qemu/units.h"
 #include "hw/dma/xlnx_dpdma.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qom/object.h"
 #include "hw/ptimer.h"
 

diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h
index 48c412ce818e1157a1d285427a14c99115c5445a..ace9e6650e7603417594e625289ff0bff530a1a7 100644 (file)
--- a/include/hw/isa/vt82c686.h
+++ b/include/hw/isa/vt82c686.h
@@ -2,7 +2,7 @@
 #define HW_VT82C686_H
 
 #include "hw/pci/pci_device.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 #define TYPE_VT82C686B_ISA "vt82c686b-isa"
 #define TYPE_VT82C686B_USB_UHCI "vt82c686b-usb-uhci"

diff --git a/audio/audio.h b/include/qemu/audio.h
similarity index 100%
rename from audio/audio.h
rename to include/qemu/audio.h

diff --git a/include/system/replay.h b/include/system/replay.h
index 1e63c0784c397de2863ff7cc0ecced988462e364..68f91bdfbf2fba649d94af0968ebbe83d5423e5d 100644 (file)
--- a/include/system/replay.h
+++ b/include/system/replay.h
@@ -16,7 +16,7 @@
 #include "qapi/qapi-types-run-state.h"
 #include "qapi/qapi-types-ui.h"
 #include "block/aio.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 /* replay clock kinds */
 enum ReplayClockKind {

diff --git a/replay/replay-audio.c b/replay/replay-audio.c
index 3413801062872cca39dc978d856b9dab339f8619..1b614f41379fc642f4dae3888ab04703778d7287 100644 (file)
--- a/replay/replay-audio.c
+++ b/replay/replay-audio.c
@@ -13,7 +13,7 @@
 #include "qemu/error-report.h"
 #include "system/replay.h"
 #include "replay-internal.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 
 void replay_audio_out(size_t *played)
 {

diff --git a/scripts/codeconverter/codeconverter/test_regexps.py b/scripts/codeconverter/codeconverter/test_regexps.py
index fe7354b473a47dc5ac795f6309a46d49a4f70ede..b00e9ef15b24a57fb084737afaf66286ea9be51d 100644 (file)
--- a/scripts/codeconverter/codeconverter/test_regexps.py
+++ b/scripts/codeconverter/codeconverter/test_regexps.py
@@ -265,7 +265,7 @@ def test_initial_includes():
 
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/system/runstate.c b/system/runstate.c
index 32467aa8825437fecc96cfff5da6c78d166b54e9..e3ec16ab74d3dc022161339956faae9fc47c41a0 100644 (file)
--- a/system/runstate.c
+++ b/system/runstate.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "block/block.h"
 #include "block/export.h"
 #include "chardev/char.h"

diff --git a/system/vl.c b/system/vl.c
index dc2ea4c298b6203ca0d7c34d329af993206f00a6..29f5389151f46dd5c5c8a50d982607582d079de0 100644 (file)
--- a/system/vl.c
+++ b/system/vl.c
@@ -87,7 +87,7 @@
 #include "system/tpm.h"
 #include "system/dma.h"
 #include "hw/audio/model.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "system/cpus.h"
 #include "system/cpu-timers.h"
 #include "exec/icount.h"

diff --git a/ui/dbus.c b/ui/dbus.c
index fbe108af1e4aab42b8395b0efeca34cf866e296c..d2dff332585e3955cd2d3352d11a4f3f8874596e 100644 (file)
--- a/ui/dbus.c
+++ b/ui/dbus.c
@@ -34,8 +34,7 @@
 #include "ui/egl-helpers.h"
 #include "ui/egl-context.h"
 #endif
-#include "audio/audio.h"
-#include "audio/audio_int.h"
+#include "qemu/audio.h"
 #include "qapi/error.h"
 #include "trace.h"
 

diff --git a/ui/vnc.h b/ui/vnc.h
index e2137c5ed1141b4af6188926388a1a7c551417e5..4d8363ebf314bd3b209fdf2fa3f4cc61c3369234 100644 (file)
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -31,7 +31,7 @@
 #include "qemu/thread.h"
 #include "ui/clipboard.h"
 #include "ui/console.h"
-#include "audio/audio.h"
+#include "qemu/audio.h"
 #include "qemu/bitmap.h"
 #include "crypto/tlssession.h"
 #include "qemu/buffer.h"