Re: [PATCH v3 1/6] conf: add 'ich7' sound model

[Daniel P . Berrangé]

On Fri, Aug 07, 2020 at 07:09:30PM +0400, Roman Bogorodskiy wrote:
> Add 'ich7' sound model. This is a preparation for sound support in
> bhyve, as 'ich7' is the only model it supports.
> 
> Signed-off-by: Roman Bogorodskiy 
> ---
>  docs/schemas/domaincommon.rng  | 1 +
>  src/conf/domain_conf.c | 1 +
>  src/conf/domain_conf.h | 1 +
>  src/qemu/qemu_command.c| 1 +
>  src/qemu/qemu_domain_address.c | 1 +
>  src/qemu/qemu_validate.c   | 1 +
>  6 files changed, 6 insertions(+)

Reviewed-by: Daniel P. Berrangé 


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

[PATCH v3 1/6] conf: add 'ich7' sound model

[Roman Bogorodskiy]

Add 'ich7' sound model. This is a preparation for sound support in
bhyve, as 'ich7' is the only model it supports.

Signed-off-by: Roman Bogorodskiy 
---
 docs/schemas/domaincommon.rng  | 1 +
 src/conf/domain_conf.c | 1 +
 src/conf/domain_conf.h | 1 +
 src/qemu/qemu_command.c| 1 +
 src/qemu/qemu_domain_address.c | 1 +
 src/qemu/qemu_validate.c   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 0d0dcbc5ce..fb9638f3f6 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4360,6 +4360,7 @@
   pcspk
   ac97
   ich6
+  ich7
   ich9
   usb
 
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ef67efa1da..f9cdc4efa9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -726,6 +726,7 @@ VIR_ENUM_IMPL(virDomainSoundModel,
   "ich6",
   "ich9",
   "usb",
+  "ich7",
 );
 
 VIR_ENUM_IMPL(virDomainKeyWrapCipherName,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 011bf66cb4..411b9b99e4 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1401,6 +1401,7 @@ typedef enum {
 VIR_DOMAIN_SOUND_MODEL_ICH6,
 VIR_DOMAIN_SOUND_MODEL_ICH9,
 VIR_DOMAIN_SOUND_MODEL_USB,
+VIR_DOMAIN_SOUND_MODEL_ICH7,
 
 VIR_DOMAIN_SOUND_MODEL_LAST
 } virDomainSoundModel;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 01812cd39b..ec3d4c8d99 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4026,6 +4026,7 @@ qemuBuildSoundDevStr(const virDomainDef *def,
 model = "sb16";
 break;
 case VIR_DOMAIN_SOUND_MODEL_PCSPK: /* pc-speaker is handled separately */
+case VIR_DOMAIN_SOUND_MODEL_ICH7:
 case VIR_DOMAIN_SOUND_MODEL_LAST:
 return NULL;
 }
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 058cbda2a2..d25fb653d3 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -759,6 +759,7 @@ 
qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
 case VIR_DOMAIN_SOUND_MODEL_SB16:
 case VIR_DOMAIN_SOUND_MODEL_PCSPK:
 case VIR_DOMAIN_SOUND_MODEL_USB:
+case VIR_DOMAIN_SOUND_MODEL_ICH7:
 case VIR_DOMAIN_SOUND_MODEL_LAST:
 return 0;
 }
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 488f258d00..4cd377c8bc 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -3588,6 +3588,7 @@ qemuValidateDomainDeviceDefSound(virDomainSoundDefPtr 
sound,
 case VIR_DOMAIN_SOUND_MODEL_SB16:
 case VIR_DOMAIN_SOUND_MODEL_PCSPK:
 break;
+case VIR_DOMAIN_SOUND_MODEL_ICH7:
 case VIR_DOMAIN_SOUND_MODEL_LAST:
 virReportError(VIR_ERR_INTERNAL_ERROR,
_("sound card model '%s' is not supported by qemu"),
-- 
2.27.0