From 6bd5a7c200059a54c05cbf30fe03029167b2c1da Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Thu, 29 Jul 2010 16:03:48 +0200
Subject: [PATCH] Fix --with-xen-proxy related compile error

Move virDomainChrTargetTypeToString out of the #ifndef PROXY
block, because it's used outside of it.
---
 src/conf/domain_conf.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 82e5ce7457..883c682e66 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2441,26 +2441,6 @@ out:
     return ret;
 }
 
-static const char *
-virDomainChrTargetTypeToString(int deviceType,
-                               int targetType)
-{
-    const char *type = NULL;
-
-    switch (deviceType) {
-    case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
-        type = virDomainChrChannelTargetTypeToString(targetType);
-        break;
-    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
-        type = virDomainChrConsoleTargetTypeToString(targetType);
-        break;
-    default:
-        break;
-    }
-
-    return type;
-}
-
 static int
 virDomainChrDefParseTargetXML(virCapsPtr caps,
                               virDomainChrDefPtr def,
@@ -3952,6 +3932,26 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps,
 #endif /* !PROXY */
 
 
+static const char *
+virDomainChrTargetTypeToString(int deviceType,
+                               int targetType)
+{
+    const char *type = NULL;
+
+    switch (deviceType) {
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
+        type = virDomainChrChannelTargetTypeToString(targetType);
+        break;
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+        type = virDomainChrConsoleTargetTypeToString(targetType);
+        break;
+    default:
+        break;
+    }
+
+    return type;
+}
+
 static void
 virVirtualPortProfileFormat(virBufferPtr buf,
                             virVirtualPortProfileParamsPtr virtPort,