External/libvirt
1
0
Fork 0
Code

virDomainAudioDef: Change type of "type" to virDomainAudioType

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-05-19 16:10:04 +02:00 committed by Michal Privoznik
parent 15670ebb17
commit 8f1b810333
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_command.c
View File

@ -524,7 +524,7 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UNUSED,
virCommandAddArg(cmd, "-s"); virCommandAddArg(cmd, "-s");
if (audio) { if (audio) {
switch ((virDomainAudioType) audio->type) { switch (audio->type) {
case VIR_DOMAIN_AUDIO_TYPE_OSS: case VIR_DOMAIN_AUDIO_TYPE_OSS:
if (virDomainAudioIOCommonIsSet(&audio->input) || if (virDomainAudioIOCommonIsSet(&audio->input) ||
virDomainAudioIOCommonIsSet(&audio->output)) { virDomainAudioIOCommonIsSet(&audio->output)) {

18
src/conf/domain_conf.c
View File

@ -2922,7 +2922,7 @@ virDomainAudioDefFree(virDomainAudioDef *def)
if (!def) if (!def)
return; return;
switch ((virDomainAudioType) def->type) { switch (def->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break; break;
@ -13123,24 +13123,26 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlopt G_GNUC_UNUSED,
virDomainAudioDef *def; virDomainAudioDef *def;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
g_autofree char *type = NULL; g_autofree char *typestr = NULL;
int type;
xmlNodePtr inputNode, outputNode; xmlNodePtr inputNode, outputNode;
def = g_new0(virDomainAudioDef, 1); def = g_new0(virDomainAudioDef, 1);
ctxt->node = node; ctxt->node = node;
type = virXMLPropString(node, "type"); typestr = virXMLPropString(node, "type");
if (!type) { if (!typestr) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing audio 'type' attribute")); _("missing audio 'type' attribute"));
goto error; goto error;
} }
if ((def->type = virDomainAudioTypeTypeFromString(type)) < 0) { if ((type = virDomainAudioTypeTypeFromString(typestr)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown audio type '%s'"), type); _("unknown audio type '%s'"), typestr);
goto error; goto error;
} }
def->type = type;
tmp = virXMLPropString(node, "id"); tmp = virXMLPropString(node, "id");
if (!tmp) { if (!tmp) {
@ -13163,7 +13165,7 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlopt G_GNUC_UNUSED,
if (outputNode && virDomainAudioCommonParse(&def->output, outputNode, ctxt) < 0) if (outputNode && virDomainAudioCommonParse(&def->output, outputNode, ctxt) < 0)
goto error; goto error;
switch ((virDomainAudioType) def->type) { switch (def->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break; break;
@ -25465,7 +25467,7 @@ virDomainAudioDefFormat(virBuffer *buf,
virBufferAsprintf(buf, "<audio id='%d' type='%s'", def->id, type); virBufferAsprintf(buf, "<audio id='%d' type='%s'", def->id, type);
switch ((virDomainAudioType)def->type) { switch (def->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break; break;

2
src/conf/domain_conf.h
View File

@ -1543,7 +1543,7 @@ struct _virDomainAudioIOSDL {
}; };
struct _virDomainAudioDef { struct _virDomainAudioDef {
int type; virDomainAudioType type;
unsigned int id; unsigned int id;

4
src/qemu/qemu_command.c
View File

@ -7670,7 +7670,7 @@ qemuBuildAudioCommandLineArg(virCommand *cmd,
qemuBuildAudioCommonArg(&buf, "in", &def->input); qemuBuildAudioCommonArg(&buf, "in", &def->input);
qemuBuildAudioCommonArg(&buf, "out", &def->output); qemuBuildAudioCommonArg(&buf, "out", &def->output);
switch ((virDomainAudioType)def->type) { switch (def->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break; break;
@ -7859,7 +7859,7 @@ qemuBuildAudioCommandLineEnv(virCommand *cmd,
qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_ADC_", &audio->input); qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_ADC_", &audio->input);
qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_DAC_", &audio->output); qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_DAC_", &audio->output);
switch ((virDomainAudioType)audio->type) { switch (audio->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break; break;

2
src/qemu/qemu_validate.c
View File

@ -4223,7 +4223,7 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
} }
} }
switch ((virDomainAudioType)audio->type) { switch (audio->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break; break;