diff options
| author | test <test@test.(none)> | 2013-07-02 17:51:55 +0900 |
|---|---|---|
| committer | test <test@test.(none)> | 2013-07-02 17:51:55 +0900 |
| commit | 6d7ee3e0d990b38cfe087fe1a179fda8d4b5e289 (patch) | |
| tree | c7f1213af278e23ed05d50d65103c687ad7d43e5 /audio/audio.c | |
| parent | c9d7a82ff83a1a21c843c072c3e13aa365ff6c51 (diff) | |
| parent | 295d81c62414a63c625fa2e78175573d4b3f5ba4 (diff) | |
| download | qemu-6d7ee3e0d990b38cfe087fe1a179fda8d4b5e289.tar.gz qemu-6d7ee3e0d990b38cfe087fe1a179fda8d4b5e289.tar.bz2 qemu-6d7ee3e0d990b38cfe087fe1a179fda8d4b5e289.zip | |
Merge 'qemu 1.5.1' into tizen_qemu_1.5.1
Conflicts:
Makefile
arch_init.h
block/raw-win32.c
blockdev.c
configure
console.h
cpu-defs.h
cpu-exec.c
cpus.c
default-configs/arm-softmmu.mak
exec-all.h
exec.c
fpu/softfloat.h
hw/9pfs/virtio-9p-device.c
hw/Makefile.objs
hw/acpi_piix4.c
hw/apic_common.c
hw/arm/Makefile.objs
hw/exynos4210.c
hw/exynos4210.h
hw/exynos4210_fimd.c
hw/exynos4210_gic.c
hw/exynos4210_uart.c
hw/pc.c
hw/pc_sysfw.c
hw/pci-hotplug.c
hw/pci.c
hw/pci.h
hw/pl050.c
hw/ps2.c
hw/qdev-properties.c
hw/qdev.c
hw/qdev.h
hw/vga-pci.c
hw/vga-pci.h
hw/vga_int.h
hw/virtio-balloon.c
hw/virtio-balloon.h
hw/virtio-blk.c
hw/virtio-blk.h
hw/virtio-net.c
hw/virtio-net.h
hw/virtio-pci.c
hw/virtio-pci.h
hw/virtio-serial-bus.c
hw/virtio-serial.h
hw/virtio.c
hw/virtio.h
input.c
kvm.h
main-loop.c
main-loop.h
os-win32.c
oslib-posix.c
oslib-win32.c
qemu-char.c
qemu-options.hx
qemu-sockets.c
softmmu_defs.h
softmmu_template.h
sysemu.h
tcg/i386/tcg-target.c
tcg/tcg.c
tcg/tcg.h
vl.c
Diffstat (limited to 'audio/audio.c')
| -rw-r--r-- | audio/audio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/audio/audio.c b/audio/audio.c index d7b7ec1cab..dc24d78c86 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -23,9 +23,9 @@ */ #include "hw/hw.h" #include "audio.h" -#include "monitor.h" -#include "qemu-timer.h" -#include "sysemu.h" +#include "monitor/monitor.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" #define AUDIO_CAP "audio" #include "audio_int.h" @@ -837,8 +837,9 @@ static int audio_attach_capture (HWVoiceOut *hw) QLIST_INSERT_HEAD (&hw_cap->sw_head, sw, entries); QLIST_INSERT_HEAD (&hw->cap_head, sc, entries); #ifdef DEBUG_CAPTURE - asprintf (&sw->name, "for %p %d,%d,%d", - hw, sw->info.freq, sw->info.bits, sw->info.nchannels); + sw->name = g_strdup_printf ("for %p %d,%d,%d", + hw, sw->info.freq, sw->info.bits, + sw->info.nchannels); dolog ("Added %s active = %d\n", sw->name, sw->active); #endif if (sw->active) { |