From 2dedb34a91467c49973d96bb764d964a60b56ae6 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 16 Mar 2009 10:47:12 +0000
Subject: [PATCH] Added ac97 soundcard to RNG schema & tests (Pritesh Kothari)

---
 AUTHORS                                        | 3 ++-
 ChangeLog                                      | 8 ++++++++
 docs/schemas/domain.rng                        | 1 +
 tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +-
 tests/qemuxml2argvdata/qemuxml2argv-sound.xml  | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c6bbc74c73..906fff61d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,7 +63,8 @@ Patches have also been contributed by:
   James Morris         <jmorris@namei.org>
   Daniel J Walsh       <dwalsh@redhat.com>
   Maximilian Wilhelm   <max@rfc2324.org>
-  Ryota Ozaki           <ozaki.ryota@gmail.com>
+  Ryota Ozaki          <ozaki.ryota@gmail.com>
+  Pritesh Kothari      <Pritesh.Kothari@Sun.COM>
 
   [....send patches to get your name here....]
 
diff --git a/ChangeLog b/ChangeLog
index 19ba4fbcd8..551dabb3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 16 10:45:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	Add ac97 to test case & RNG schema (Pritesh Kothari)
+	* docs/schemas/domain.rng: Add ac97 as valid soundcard
+	* tests/qemuxml2argvdata/qemuxml2argv-sound.args,
+	tests/qemuxml2argvdata/qemuxml2argv-sound.xml: Extend test to
+	cover ac97 soundcard.
+
 Mon Mar 16 11:40:00 CET 2009 Daniel Veillard <veillard@redhat.com>
 
 	* qemud/qemud.c src/cgroup.c src/uml_driver.c src/util.c: close
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 2e2e4089a3..107215c257 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -874,6 +874,7 @@
           <value>sb16</value>
           <value>es1370</value>
           <value>pcspk</value>
+          <value>ac97</value>
         </choice>
       </attribute>
     </element>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
index 084f0139f8..dddc587b2f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
@@ -1 +1 @@
-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -soundhw pcspk,es1370,sb16
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -soundhw pcspk,es1370,sb16,ac97
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
index cc85c53200..8c33e6c90a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml
@@ -21,5 +21,6 @@
     <sound model='pcspk'/>
     <sound model='es1370'/>
     <sound model='sb16'/>
+    <sound model='ac97'/>
   </devices>
 </domain>