From 31b17e6d44d806476900ed5ff89414b3c5fd230e Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 7 May 2008 18:50:23 +0000
Subject: [PATCH] Disable sound functions when in proxy

---
 ChangeLog           | 5 +++++
 src/xend_internal.c | 2 +-
 src/xml.c           | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9ac8040426..b1c45ec4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  7 14:49:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c, src/xml.c: Disable certain sound functions
+	when built into proxy
+
 Wed May  7 18:12:11 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	*  src/qemu_conf.c src/qemu_conf.h src/qemu_driver.c: another patch
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 0817b7dee9..f9db57130c 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -851,6 +851,7 @@ urlencode(const char *string)
 
     return buffer;
 }
+#endif /* ! PROXY */
 
 /* Applicable sound models */
 const char *sound_models[] = { "sb16", "es1370" };
@@ -952,7 +953,6 @@ char *sound_string_to_xml(const char *sound) {
     return NULL;
 }
 
-#endif /* ! PROXY */
 
 /* PUBLIC FUNCTIONS */
 
diff --git a/src/xml.c b/src/xml.c
index e9e2e64820..94d0fd74a5 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -290,6 +290,7 @@ virConvertCpuSet(virConnectPtr conn, const char *str, int maxcpu) {
     return (res);
 }
 
+#ifndef PROXY
 /**
  * virBuildSoundStringFromXML
  * @sound buffer to populate
@@ -361,6 +362,7 @@ char * virBuildSoundStringFromXML(virConnectPtr conn,
     free(nodes);
     return NULL;
 }
+#endif /* !PROXY */
 #endif /* WITH_XEN */
 #ifndef PROXY