提交 3b8d0509 编写于 作者: F Filip Alac 提交者: Erik Skultety

qemu: capabilities: Add 'hda-output' sound codec to capabilities

Signed-off-by: NFilip Alac <filipalac@gmail.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 fcb53e8e
...@@ -487,6 +487,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, ...@@ -487,6 +487,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
/* 300 */ /* 300 */
"sdl-gl", "sdl-gl",
"screendump_device", "screendump_device",
"hda-output",
); );
...@@ -1117,6 +1118,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { ...@@ -1117,6 +1118,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER }, { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER },
{ "virtual-css-bridge", QEMU_CAPS_CCW }, { "virtual-css-bridge", QEMU_CAPS_CCW },
{ "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW }, { "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW },
{ "hda-output", QEMU_CAPS_HDA_OUTPUT },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
......
...@@ -471,6 +471,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ ...@@ -471,6 +471,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 300 */ /* 300 */
QEMU_CAPS_SDL_GL, /* -sdl gl */ QEMU_CAPS_SDL_GL, /* -sdl gl */
QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */ QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */
QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
......
...@@ -4137,6 +4137,8 @@ qemuSoundCodecTypeToCaps(int type) ...@@ -4137,6 +4137,8 @@ qemuSoundCodecTypeToCaps(int type)
return QEMU_CAPS_HDA_DUPLEX; return QEMU_CAPS_HDA_DUPLEX;
case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO: case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO:
return QEMU_CAPS_HDA_MICRO; return QEMU_CAPS_HDA_MICRO;
case VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT:
return QEMU_CAPS_HDA_OUTPUT;
default: default:
return -1; return -1;
} }
......
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/> <flag name='kernel-irqchip'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='hda-output'/>
<version>1005003</version> <version>1005003</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>46523</microcodeVersion> <microcodeVersion>46523</microcodeVersion>
......
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/> <flag name='kernel-irqchip'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='hda-output'/>
<version>1006000</version> <version>1006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>44752</microcodeVersion> <microcodeVersion>44752</microcodeVersion>
......
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/> <flag name='kernel-irqchip'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='hda-output'/>
<version>1007000</version> <version>1007000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>50196</microcodeVersion> <microcodeVersion>50196</microcodeVersion>
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<flag name='query-named-block-nodes'/> <flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/> <flag name='kernel-irqchip'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='hda-output'/>
<version>2001001</version> <version>2001001</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>58992</microcodeVersion> <microcodeVersion>58992</microcodeVersion>
......
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>303541</microcodeVersion> <microcodeVersion>303541</microcodeVersion>
......
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>382824</microcodeVersion> <microcodeVersion>382824</microcodeVersion>
......
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>344938</microcodeVersion> <microcodeVersion>344938</microcodeVersion>
......
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
<flag name='memory-backend-file.discard-data'/> <flag name='memory-backend-file.discard-data'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='screendump_device'/> <flag name='screendump_device'/>
<flag name='hda-output'/>
<version>2011090</version> <version>2011090</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>343099</microcodeVersion> <microcodeVersion>343099</microcodeVersion>
......
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
<flag name='memory-backend-file.discard-data'/> <flag name='memory-backend-file.discard-data'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='screendump_device'/> <flag name='screendump_device'/>
<flag name='hda-output'/>
<version>2011090</version> <version>2011090</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>419968</microcodeVersion> <microcodeVersion>419968</microcodeVersion>
......
...@@ -202,6 +202,7 @@ ...@@ -202,6 +202,7 @@
<flag name='memory-backend-file.discard-data'/> <flag name='memory-backend-file.discard-data'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='screendump_device'/> <flag name='screendump_device'/>
<flag name='hda-output'/>
<version>2011090</version> <version>2011090</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>390813</microcodeVersion> <microcodeVersion>390813</microcodeVersion>
......
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2004000</version> <version>2004000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>75406</microcodeVersion> <microcodeVersion>75406</microcodeVersion>
......
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2005000</version> <version>2005000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>216528</microcodeVersion> <microcodeVersion>216528</microcodeVersion>
......
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>228241</microcodeVersion> <microcodeVersion>228241</microcodeVersion>
......
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>263005</microcodeVersion> <microcodeVersion>263005</microcodeVersion>
......
...@@ -173,6 +173,7 @@ ...@@ -173,6 +173,7 @@
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>227332</microcodeVersion> <microcodeVersion>227332</microcodeVersion>
......
...@@ -178,6 +178,7 @@ ...@@ -178,6 +178,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2007000</version> <version>2007000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>239029</microcodeVersion> <microcodeVersion>239029</microcodeVersion>
......
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2008000</version> <version>2008000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>255684</microcodeVersion> <microcodeVersion>255684</microcodeVersion>
......
...@@ -147,6 +147,7 @@ ...@@ -147,6 +147,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2009000</version> <version>2009000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>346538</microcodeVersion> <microcodeVersion>346538</microcodeVersion>
......
...@@ -193,6 +193,7 @@ ...@@ -193,6 +193,7 @@
<flag name='disk-write-cache'/> <flag name='disk-write-cache'/>
<flag name='nbd-tls'/> <flag name='nbd-tls'/>
<flag name='sdl-gl'/> <flag name='sdl-gl'/>
<flag name='hda-output'/>
<version>2009000</version> <version>2009000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>320947</microcodeVersion> <microcodeVersion>320947</microcodeVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册