conf: add 'ich7' sound model

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 <bogorodskiy@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 0d0dcbc5ceea087ec0bc9b7ed124043dddd69fad..fb9638f3f6ce8025df993a79458bb45e31c667e8 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4360,6 +4360,7 @@
           <value>pcspk</value>
           <value>ac97</value>
           <value>ich6</value>
+          <value>ich7</value>
           <value>ich9</value>
           <value>usb</value>
         </choice>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6064d31b9989d5ede1a1704f9776bdee4711d89f..cfdea84c88fc7b7ee8695ff8a4c0d121e59d8174 100644 (file)
--- 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 68be32614c2aef629cf593bb44593227943f25c8..7b60c28c6df2e786c3dbc1c5565210e1788cb741 100644 (file)
--- 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 01812cd39b01b4861a8256365bc7f3b2b3661c2c..ec3d4c8d998507b4be9f9a2f515464e84fff0e00 100644 (file)
--- 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 058cbda2a26885f329ad4aa4a6df06e3635f3c2f..d25fb653d32d4f7805170e5c44a9c15c5cb66aeb 100644 (file)
--- 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 cac60e3394eb7c659ae8799f81772d2fb0a5a154..9b5df859ff565bc156fed581d6d342ad9fde4f2e 100644 (file)
--- 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"),