From c9876ccf5646ce46bd25d107c95ebd26ce4bf29c Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Tue, 27 Apr 2021 17:04:32 +0200 Subject: [PATCH] virDomainAudioIOCommon: Change type of format to virDomainAudioFormat MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Tim Wiederhake Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- src/conf/domain_conf.c | 13 ++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7670e47359..3c0bb04cab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13120,11 +13120,14 @@ virDomainAudioCommonParse(virDomainAudioIOCommon *def, return -1; } - if (format && - (def->format = virDomainAudioFormatTypeFromString(format)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("cannot parse 'format' value '%s'"), format); - return -1; + if (format) { + int value; + if ((value = virDomainAudioFormatTypeFromString(format)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse 'format' value '%s'"), format); + return -1; + } + def->format = value; } } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 95d0516279..be8f43a35c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1502,7 +1502,7 @@ struct _virDomainAudioIOCommon { unsigned int frequency; unsigned int channels; unsigned int voices; - int format; /* virDomainAudioFormat */ + virDomainAudioFormat format; unsigned int bufferLength; /* milliseconds */ }; -- 2.47.2