[libvirt] [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 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 82e5ce7..883c682 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, -- 1.7.0.4
On 07/29/10 - 04:07:08PM, Matthias Bolte wrote:
Move virDomainChrTargetTypeToString out of the #ifndef PROXY block, because it's used outside of it. --- src/conf/domain_conf.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 82e5ce7..883c682 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,
Makes sense to me, ACK -- Chris Lalancette
On 07/29/2010 08:07 AM, Matthias Bolte wrote:
Move virDomainChrTargetTypeToString out of the #ifndef PROXY block, because it's used outside of it. --- src/conf/domain_conf.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
2010/7/29 Eric Blake <eblake@redhat.com>:
On 07/29/2010 08:07 AM, Matthias Bolte wrote:
Move virDomainChrTargetTypeToString out of the #ifndef PROXY block, because it's used outside of it. --- src/conf/domain_conf.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
ACK.
Thanks, pushed. Matthias
participants (3)
-
Chris Lalancette -
Eric Blake -
Matthias Bolte