From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 10 Dec 2009 19:06:54 +0000 (+0000)
Subject: Remove restriction on duplicated sound devices in parser
X-Git-Tag: v0.7.6~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4359900ed1f3d0cd56b969da948ee4c48f611ff6;p=thirdparty%2Flibvirt.git

Remove restriction on duplicated sound devices in parser

It is perfectly acceptable to have multiple sound devices of
same type in guest configuration. If the underlying hypervisor
does not like this, it is its job to complain, not the XML
parser's

* src/conf/domain_conf.c: Remove hack which deleted duplicated
  sound device models.
* tests/xml2sexprdata/xml2sexpr-fv-sound.xml: Remove duplicate
  models
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5c427fbcbb..d2da072fc7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3764,23 +3764,12 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn,
     if (n && VIR_ALLOC_N(def->sounds, n) < 0)
         goto no_memory;
     for (i = 0 ; i < n ; i++) {
-        int collision = 0, j;
         virDomainSoundDefPtr sound = virDomainSoundDefParseXML(conn,
                                                                nodes[i],
                                                                flags);
         if (!sound)
             goto error;
 
-        /* Verify there's no duplicated sound card */
-        for (j = 0 ; j < def->nsounds ; j++) {
-            if (def->sounds[j]->model == sound->model)
-                collision = 1;
-        }
-        if (collision) {
-            virDomainSoundDefFree(sound);
-            continue;
-        }
-
         def->sounds[def->nsounds++] = sound;
     }
     VIR_FREE(nodes);
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
index 0fe92fe389..75c295cc24 100644
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
@@ -32,9 +32,6 @@
     </disk>
     <graphics type='vnc' port='5917' keymap='ja'/>
     <sound model='sb16'/>
-    <sound model='sb16'/>
-    <sound model='es1370'/>
-    <sound model='sb16'/>
     <sound model='es1370'/>
   </devices>
 </domain>