Merge "Merge cherrypicks of [2147191] into emu-31-release." into emu-31-releasesnap-temp-L89900000955527101snap-temp-L75000000955682630snap-temp-L21700000955705411snap-temp-L04100000955706866

3 files changed, 6 insertions, 3 deletions

diff --git a/cmake-main.darwin-aarch64.inc b/cmake-main.darwin-aarch64.inc
index fc497d4acc..99b691905e 100644
--- a/cmake-main.darwin-aarch64.inc
+++ b/cmake-main.darwin-aarch64.inc
@@ -152,6 +152,7 @@ hw/audio/lm4549.c
 hw/audio/marvell_88w8618.c
 hw/audio/pl041.c
 hw/audio/soundhw.c
+hw/audio/virtio-snd.c
 hw/audio/wm8750.c
 hw/block/block.c
 hw/block/cdrom.c
@@ -1450,7 +1451,7 @@ PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/adc")
 set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/arm/allwinner-a10.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/armv7m.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/aspeed.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/aspeed_soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/bcm2835_peripherals.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/bcm2836.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/boot.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/collie.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/cubieboard.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/digic.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/digic_boards.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/exynos4210.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/exynos4_boards.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx25.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx31.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx6.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx7.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/gumstix.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/highbank.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/imx25_pdk.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/integratorcp.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/iotkit.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/kzm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mainstone.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mcimx7d-sabre.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mps2-tz.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mps2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/msf2-soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/msf2-som.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/musicpal.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/netduino2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/nseries.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap1.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap_sx1.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/palm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx_gpio.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx_pic.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/ranchu.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/raspi.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/realview.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/sabrelite.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/spitz.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/stellaris.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/stm32f205_soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/strongarm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/sysbus-fdt.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/tosa.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/versatilepb.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/vexpress.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/virt-acpi-build.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/virt.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xilinx_zynq.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xlnx-zcu102.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xlnx-zynqmp.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/z2.c
 ${ANDROID_AUTOGEN}/hw/arm/trace.c PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/arm")
 
-set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/audio/ac97.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/es1370.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/goldfish_audio.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/hda-codec.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/intel-hda.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/lm4549.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/marvell_88w8618.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pl041.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/soundhw.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/wm8750.c
+set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/audio/ac97.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/es1370.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/goldfish_audio.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/hda-codec.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/intel-hda.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/lm4549.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/marvell_88w8618.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pl041.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/soundhw.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/virtio-snd.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/wm8750.c
 ${ANDROID_AUTOGEN}/hw/audio/trace.c PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/audio")
 
 set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/block/block.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/cdrom.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/ecc.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/hd-geometry.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/m25p80.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/nand.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/nvme.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/onenand.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/pflash_cfi01.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/pflash_cfi02.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/virtio-blk.c
diff --git a/cmake-main.darwin-x86_64.inc b/cmake-main.darwin-x86_64.inc
index 6a498ea242..95f2c479cf 100644
--- a/cmake-main.darwin-x86_64.inc
+++ b/cmake-main.darwin-x86_64.inc
@@ -143,6 +143,7 @@ hw/audio/goldfish_audio.c
 hw/audio/hda-codec.c
 hw/audio/intel-hda.c
 hw/audio/soundhw.c
+hw/audio/virtio-snd.c
 hw/block/block.c
 hw/block/cdrom.c
 hw/block/hd-geometry.c
@@ -1912,7 +1913,7 @@ PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/adc")
 set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/arm/allwinner-a10.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/armv7m.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/aspeed.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/aspeed_soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/bcm2835_peripherals.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/bcm2836.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/boot.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/collie.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/cubieboard.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/digic.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/digic_boards.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/exynos4210.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/exynos4_boards.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx25.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx31.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx6.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx7.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/gumstix.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/highbank.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/imx25_pdk.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/integratorcp.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/iotkit.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/kzm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mainstone.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mcimx7d-sabre.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mps2-tz.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mps2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/msf2-soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/msf2-som.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/musicpal.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/netduino2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/nseries.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap1.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap_sx1.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/palm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx_gpio.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx_pic.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/ranchu.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/raspi.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/realview.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/sabrelite.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/spitz.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/stellaris.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/stm32f205_soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/strongarm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/sysbus-fdt.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/tosa.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/versatilepb.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/vexpress.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/virt-acpi-build.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/virt.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xilinx_zynq.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xlnx-zcu102.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xlnx-zynqmp.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/z2.c
 ${ANDROID_AUTOGEN}/hw/arm/trace.c PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/arm")
 
-set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/audio/ac97.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/adlib.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/cs4231a.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/es1370.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/fmopl.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/goldfish_audio.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gus.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_hal.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_mixer.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/hda-codec.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/intel-hda.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/lm4549.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/marvell_88w8618.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pcspk.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pl041.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/sb16.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/soundhw.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/wm8750.c
+set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/audio/ac97.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/adlib.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/cs4231a.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/es1370.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/fmopl.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/goldfish_audio.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gus.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_hal.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_mixer.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/hda-codec.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/intel-hda.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/lm4549.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/marvell_88w8618.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pcspk.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pl041.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/sb16.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/soundhw.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/virtio-snd.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/wm8750.c
 ${ANDROID_AUTOGEN}/hw/audio/trace.c PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/audio")
 
 set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/block/block.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/cdrom.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/ecc.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/fdc.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/hd-geometry.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/m25p80.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/nand.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/nvme.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/onenand.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/pflash_cfi01.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/pflash_cfi02.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/virtio-blk.c
diff --git a/cmake-main.windows_msvc-x86_64.inc b/cmake-main.windows_msvc-x86_64.inc
index 8f235f6915..2ba5c67e4d 100644
--- a/cmake-main.windows_msvc-x86_64.inc
+++ b/cmake-main.windows_msvc-x86_64.inc
@@ -145,6 +145,7 @@ hw/audio/goldfish_audio.c
 hw/audio/hda-codec.c
 hw/audio/intel-hda.c
 hw/audio/soundhw.c
+hw/audio/virtio-snd.c
 hw/block/block.c
 hw/block/cdrom.c
 hw/block/hd-geometry.c
@@ -1902,7 +1903,7 @@ PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/adc")
 set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/arm/allwinner-a10.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/armv7m.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/aspeed.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/aspeed_soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/bcm2835_peripherals.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/bcm2836.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/boot.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/collie.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/cubieboard.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/digic.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/digic_boards.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/exynos4210.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/exynos4_boards.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx25.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx31.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx6.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/fsl-imx7.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/gumstix.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/highbank.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/imx25_pdk.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/integratorcp.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/iotkit.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/kzm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mainstone.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mcimx7d-sabre.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mps2-tz.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/mps2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/msf2-soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/msf2-som.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/musicpal.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/netduino2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/nseries.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap1.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap2.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/omap_sx1.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/palm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx_gpio.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/pxa2xx_pic.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/ranchu.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/raspi.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/realview.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/sabrelite.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/spitz.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/stellaris.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/stm32f205_soc.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/strongarm.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/sysbus-fdt.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/tosa.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/versatilepb.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/vexpress.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/virt-acpi-build.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/virt.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xilinx_zynq.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xlnx-zcu102.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/xlnx-zynqmp.c ${ANDROID_QEMU2_TOP_DIR}/hw/arm/z2.c
 ${ANDROID_AUTOGEN}/hw/arm/trace.c PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/arm")
 
-set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/audio/ac97.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/adlib.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/cs4231a.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/es1370.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/fmopl.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/goldfish_audio.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gus.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_hal.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_mixer.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/hda-codec.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/intel-hda.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/lm4549.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/marvell_88w8618.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pcspk.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pl041.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/sb16.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/soundhw.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/wm8750.c
+set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/audio/ac97.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/adlib.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/cs4231a.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/es1370.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/fmopl.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/goldfish_audio.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gus.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_hal.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/gusemu_mixer.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/hda-codec.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/intel-hda.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/lm4549.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/marvell_88w8618.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pcspk.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/pl041.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/sb16.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/soundhw.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/virtio-snd.c ${ANDROID_QEMU2_TOP_DIR}/hw/audio/wm8750.c
 ${ANDROID_AUTOGEN}/hw/audio/trace.c PROPERTIES COMPILE_FLAGS " -I ${ANDROID_AUTOGEN}/hw/audio")
 
 set_source_files_properties(${ANDROID_QEMU2_TOP_DIR}/hw/block/block.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/cdrom.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/ecc.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/fdc.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/hd-geometry.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/m25p80.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/nand.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/nvme.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/onenand.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/pflash_cfi01.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/pflash_cfi02.c ${ANDROID_QEMU2_TOP_DIR}/hw/block/virtio-blk.c