Skip to contentSkip to conversation

fix qemu build with nas installed

PATCH In review Christoph Egger 2 participants 3 messages Sep 21, 2011 – Sep 27, 2011

lore
Share & tools
lore

Christoph Egger

author
#0 lore raw

PATCH 1/1 fix qemu build with nas installed

When NAS (http://nas.sf.net) is installed then there is an existing audio/audio.h. Then when compiling qemu, #include "audio/audio.h" takes the one from NAS and causes the build to fail.

So rename audio/audio.h to audio/qaudio.h and adjust all users.

Signed-off-by Christoph Egger <[email protected]>
arch_init.c +1 -1
index 9a5a0e3..516c4c0 100644
@@ -32,7 +32,7 @@
 #include "monitor.h"
 #include "sysemu.h"
 #include "arch_init.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "hw/pc.h"
 #include "hw/pci.h"
 #include "hw/audiodev.h"
audio/audio.c +1 -1
index 5649075..efbd6a0 100644
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "hw/hw.h"
-#include "audio.h"
+#include "qaudio.h"
 #include "monitor.h"
 #include "qemu-timer.h"
 #include "sysemu.h"
audio/audio.h deleted +0 -166

166 lines not on this page · raw message

audio/mixeng.c +1 -1
index 5446be6..7efe815 100644
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "audio.h"
+#include "qaudio.h"
 
 #define AUDIO_CAP "mixeng"
 #include "audio_int.h"
audio/noaudio.c +1 -1
index 54958f8..c6ad9fb 100644
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "audio.h"
+#include "qaudio.h"
 #include "qemu-timer.h"
 
 #define AUDIO_CAP "noaudio"
audio/ossaudio.c +1 -1
index df51b7c..6c5bec4 100644
@@ -33,7 +33,7 @@
 #include "qemu-common.h"
 #include "host-utils.h"
 #include "qemu-char.h"
-#include "audio.h"
+#include "qaudio.h"
 
 #define AUDIO_CAP "oss"
 #include "audio_int.h"
audio/qaudio.h new file +166 -0

166 lines not on this page · raw message

audio/wavaudio.c +1 -1
index aed1817..d8673cb 100644
@@ -23,7 +23,7 @@
  */
 #include "hw/hw.h"
 #include "qemu-timer.h"
-#include "audio.h"
+#include "qaudio.h"
 
 #define AUDIO_CAP "wav"
 #include "audio_int.h"
audio/wavcapture.c +1 -1
index c64f0ef..28434c3 100644
@@ -1,6 +1,6 @@
 #include "hw/hw.h"
 #include "monitor.h"
-#include "audio.h"
+#include "qaudio.h"
 
 typedef struct {
     QEMUFile *f;
hw/ac97.c +1 -1
index 541d9a4..f4adfcd 100644
@@ -16,7 +16,7 @@
 
 #include "hw.h"
 #include "audiodev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "pci.h"
 
 enum {
hw/es1370.c +1 -1
index a9387d1..553f921 100644
@@ -28,7 +28,7 @@
 
 #include "hw.h"
 #include "audiodev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "pci.h"
 
 /* Missing stuff:
hw/hda-audio.c +1 -2
index c699d6f..1bd849f 100644
@@ -21,7 +21,7 @@
 #include "pci.h"
 #include "intel-hda.h"
 #include "intel-hda-defs.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 /* 
-------------------------------------------------------------------------- */
hw/marvell_88w8618_audio.c +1 -1
index f8c5242..89db43c 100644
@@ -10,7 +10,7 @@
 #include "hw.h"
 #include "i2c.h"
 #include "sysbus.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 #define MP_AUDIO_SIZE           0x00001000
hw/milkymist-ac97.c +1 -1
index 6104732..bb041bd 100644
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "sysbus.h"
 #include "trace.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-error.h"
 
 enum {
hw/mips_fulong2e.c +1 -1
index abe3056..99c0f42 100644
@@ -29,7 +29,7 @@
 #include "usb-uhci.h"
 #include "qemu-char.h"
 #include "sysemu.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-log.h"
 #include "loader.h"
 #include "mips-bios.h"
hw/omap2.c +1 -1
index ca088d9..6d37da1 100644
@@ -28,7 +28,7 @@
 #include "flash.h"
 #include "soc_dma.h"
 #include "sysbus.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 /* Enhanced Audio Controller (CODEC only) */
 struct omap_eac_s {
hw/palm.c +1 -1
index 4c67e75..60bf998 100644
@@ -17,7 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "sysemu.h"
 #include "console.h"
 #include "omap.h"
hw/pcspk.c +1 -1
index 7fa2d36..343466e 100644
@@ -25,7 +25,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "isa.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-timer.h"
 
 #define PCSPK_BUF_LEN 1792
hw/sb16.c +1 -1
index a76df1b..e9694ab 100644
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "audiodev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "isa.h"
 #include "qdev.h"
 #include "qemu-timer.h"
hw/spitz.c +1 -1
index 0adae59..99126d6 100644
@@ -20,7 +20,7 @@
 #include "sharpsl.h"
 #include "console.h"
 #include "block.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "boards.h"
 #include "blockdev.h"
 #include "sysbus.h"
hw/tsc210x.c +1 -1
index 3c448a6..d1708c4 100644
@@ -20,7 +20,7 @@
  */
 
 #include "hw.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-timer.h"
 #include "console.h"
 #include "omap.h"      /* For I2SCodec and uWireSlave */
hw/wm8750.c +1 -1
index 39383f4..035ffde 100644
@@ -9,7 +9,7 @@
 
 #include "hw.h"
 #include "i2c.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 #define IN_PORT_N      3
 #define OUT_PORT_N     3
hw/z2.c +1 -1
index b6ae608..f08dbef 100644
@@ -19,7 +19,7 @@
 #include "flash.h"
 #include "blockdev.h"
 #include "console.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 #ifdef DEBUG_Z2
 #define DPRINTF(fmt, ...) \
monitor.c +1 -1
index 03ae997..d111685 100644
@@ -40,7 +40,7 @@
 #include "readline.h"
 #include "console.h"
 #include "blockdev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "disas.h"
 #include "balloon.h"
 #include "qemu-timer.h"
ui/vnc.h +1 -1
index 66689f1..a60196c 100644
@@ -34,7 +34,7 @@
 #endif
 #include "console.h"
 #include "monitor.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "bitmap.h"
 #include <zlib.h>
 #include <stdbool.h>
vl.c +1 -1
index b773d2f..9967ff9 100644
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 #include "blockdev.h"
 #include "block-migration.h"
 #include "dma.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "migration.h"
 #include "kvm.h"
 #include "qemu-option.h"
Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
arch_init.c +1 -1
index 9a5a0e3..516c4c0 100644
@@ -32,7 +32,7 @@
 #include "monitor.h"
 #include "sysemu.h"
 #include "arch_init.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "hw/pc.h"
 #include "hw/pci.h"
 #include "hw/audiodev.h"
audio/audio.c +1 -1
index 5649075..efbd6a0 100644
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "hw/hw.h"
-#include "audio.h"
+#include "qaudio.h"
 #include "monitor.h"
 #include "qemu-timer.h"
 #include "sysemu.h"
audio/audio.h deleted +0 -166

166 lines not on this page · raw message

audio/mixeng.c +1 -1
index 5446be6..7efe815 100644
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "audio.h"
+#include "qaudio.h"
 
 #define AUDIO_CAP "mixeng"
 #include "audio_int.h"
audio/noaudio.c +1 -1
index 54958f8..c6ad9fb 100644
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "audio.h"
+#include "qaudio.h"
 #include "qemu-timer.h"
 
 #define AUDIO_CAP "noaudio"
audio/ossaudio.c +1 -1
index df51b7c..6c5bec4 100644
@@ -33,7 +33,7 @@
 #include "qemu-common.h"
 #include "host-utils.h"
 #include "qemu-char.h"
-#include "audio.h"
+#include "qaudio.h"
 
 #define AUDIO_CAP "oss"
 #include "audio_int.h"
audio/qaudio.h new file +166 -0

166 lines not on this page · raw message

audio/wavaudio.c +1 -1
index aed1817..d8673cb 100644
@@ -23,7 +23,7 @@
  */
 #include "hw/hw.h"
 #include "qemu-timer.h"
-#include "audio.h"
+#include "qaudio.h"
 
 #define AUDIO_CAP "wav"
 #include "audio_int.h"
audio/wavcapture.c +1 -1
index c64f0ef..28434c3 100644
@@ -1,6 +1,6 @@
 #include "hw/hw.h"
 #include "monitor.h"
-#include "audio.h"
+#include "qaudio.h"
 
 typedef struct {
     QEMUFile *f;
hw/ac97.c +1 -1
index 541d9a4..f4adfcd 100644
@@ -16,7 +16,7 @@
 
 #include "hw.h"
 #include "audiodev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "pci.h"
 
 enum {
hw/es1370.c +1 -1
index a9387d1..553f921 100644
@@ -28,7 +28,7 @@
 
 #include "hw.h"
 #include "audiodev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "pci.h"
 
 /* Missing stuff:
hw/hda-audio.c +1 -1
index c699d6f..1bd849f 100644
@@ -21,7 +21,7 @@
 #include "pci.h"
 #include "intel-hda.h"
 #include "intel-hda-defs.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 /* -------------------------------------------------------------------------- */
hw/marvell_88w8618_audio.c +1 -1
index f8c5242..89db43c 100644
@@ -10,7 +10,7 @@
 #include "hw.h"
 #include "i2c.h"
 #include "sysbus.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 #define MP_AUDIO_SIZE           0x00001000
hw/milkymist-ac97.c +1 -1
index 6104732..bb041bd 100644
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "sysbus.h"
 #include "trace.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-error.h"
 
 enum {
hw/mips_fulong2e.c +1 -1
index abe3056..99c0f42 100644
@@ -29,7 +29,7 @@
 #include "usb-uhci.h"
 #include "qemu-char.h"
 #include "sysemu.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-log.h"
 #include "loader.h"
 #include "mips-bios.h"
hw/omap2.c +1 -1
index ca088d9..6d37da1 100644
@@ -28,7 +28,7 @@
 #include "flash.h"
 #include "soc_dma.h"
 #include "sysbus.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 /* Enhanced Audio Controller (CODEC only) */
 struct omap_eac_s {
hw/palm.c +1 -1
index 4c67e75..60bf998 100644
@@ -17,7 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "sysemu.h"
 #include "console.h"
 #include "omap.h"
hw/pcspk.c +1 -1
index 7fa2d36..343466e 100644
@@ -25,7 +25,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "isa.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-timer.h"
 
 #define PCSPK_BUF_LEN 1792
hw/sb16.c +1 -1
index a76df1b..e9694ab 100644
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "audiodev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "isa.h"
 #include "qdev.h"
 #include "qemu-timer.h"
hw/spitz.c +1 -1
index 0adae59..99126d6 100644
@@ -20,7 +20,7 @@
 #include "sharpsl.h"
 #include "console.h"
 #include "block.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "boards.h"
 #include "blockdev.h"
 #include "sysbus.h"
hw/tsc210x.c +1 -1
index 3c448a6..d1708c4 100644
@@ -20,7 +20,7 @@
  */
 
 #include "hw.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "qemu-timer.h"
 #include "console.h"
 #include "omap.h"	/* For I2SCodec and uWireSlave */
hw/wm8750.c +1 -1
index 39383f4..035ffde 100644
@@ -9,7 +9,7 @@
 
 #include "hw.h"
 #include "i2c.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 #define IN_PORT_N	3
 #define OUT_PORT_N	3
hw/z2.c +1 -1
index b6ae608..f08dbef 100644
@@ -19,7 +19,7 @@
 #include "flash.h"
 #include "blockdev.h"
 #include "console.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 
 #ifdef DEBUG_Z2
 #define DPRINTF(fmt, ...) \
monitor.c +1 -1
index 03ae997..d111685 100644
@@ -40,7 +40,7 @@
 #include "readline.h"
 #include "console.h"
 #include "blockdev.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "disas.h"
 #include "balloon.h"
 #include "qemu-timer.h"
ui/vnc.h +1 -1
index 66689f1..a60196c 100644
@@ -34,7 +34,7 @@
 #endif
 #include "console.h"
 #include "monitor.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "bitmap.h"
 #include <zlib.h>
 #include <stdbool.h>
vl.c +1 -1
index b773d2f..9967ff9 100644
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 #include "blockdev.h"
 #include "block-migration.h"
 #include "dma.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"
 #include "migration.h"
 #include "kvm.h"
 #include "qemu-option.h"
#1 lore raw
Quoted 16 lines · Christoph Egger

When NAS (http://nas.sf.net) is installed then there is an existing audio/audio.h. Then when compiling qemu, #include "audio/audio.h" takes the one from NAS and causes the build to fail.

So rename audio/audio.h to audio/qaudio.h and adjust all users.

Signed-off-by Christoph Egger <[email protected]>
arch_init.c +0 -0
index 9a5a0e3..516c4c0 100644

arch_init.c line 35

Quoted 5 lines
arch_init.c +1 -1
@@ -32,7 +32,7 @@
  #include "monitor.h"
  #include "sysemu.h"
  #include "arch_init.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"

It's not looking for system headers so why is /usr/include/audio/audio.h getting picked up instead of ./audio/audio.h?

If it was #include <audio/audio.h> I could understand but I suspect we have a mess of include paths that the compiler is searching and it would be nice to fix that instead.

Stefan

author
#2 lore raw
Quoted 28 lines · Stefan Hajnoczi
Quoted 16 lines · Christoph Egger

When NAS (http://nas.sf.net) is installed then there is an existing audio/audio.h. Then when compiling qemu, #include "audio/audio.h" takes the one from NAS and causes the build to fail.

So rename audio/audio.h to audio/qaudio.h and adjust all users.

Signed-off-by Christoph Egger<[email protected]>
arch_init.c +0 -0
index 9a5a0e3..516c4c0 100644

arch_init.c line 35

Quoted 5 lines
arch_init.c +1 -1
@@ -32,7 +32,7 @@
  #include "monitor.h"
  #include "sysemu.h"
  #include "arch_init.h"
-#include "audio/audio.h"
+#include "audio/qaudio.h"

It's not looking for system headers so why is /usr/include/audio/audio.h getting picked up instead of ./audio/audio.h?

Quoted 3 lines

If it was #include<audio/audio.h> I could understand but I suspect we have a mess of include paths that the compiler is searching and it would be nice to fix that instead.

The include pathes passed to the compiler are always pre-pended. So the compiler searches headers in third-party packages first. I haven't found the place in configure where this happens.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632