From 45ef4d5e8a1813e09a0608a382a86ce711bca253 Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 3 Dec 2010 18:02:59 +0100
Subject: [PATCH] Implement virVMOperationType{To|From}String independent from
 WITH_MACVTAP

As this symbols are exported independent from WITH_MACVTAP.
---
 src/util/macvtap.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/util/macvtap.c b/src/util/macvtap.c
index 2aa319c7e2..4345d978e6 100644
--- a/src/util/macvtap.c
+++ b/src/util/macvtap.c
@@ -27,12 +27,13 @@
 
 #include <config.h>
 
+#include <stdint.h>
+
 #if WITH_MACVTAP || WITH_VIRTUALPORT
 
 # include <stdio.h>
 # include <errno.h>
 # include <fcntl.h>
-# include <stdint.h>
 # include <c-ctype.h>
 # include <sys/socket.h>
 # include <sys/ioctl.h>
@@ -44,10 +45,15 @@
 
 # include <netlink/msg.h>
 
-# include "util.h"
+#endif /* WITH_MACVTAP || WITH_VIRTUALPORT */
+
+#include "util.h"
+#include "macvtap.h"
+
+#if WITH_MACVTAP || WITH_VIRTUALPORT
+
 # include "memory.h"
 # include "logging.h"
-# include "macvtap.h"
 # include "interface.h"
 # include "conf/domain_conf.h"
 # include "virterror_internal.h"
@@ -77,17 +83,6 @@
 # define LLDPAD_PID_FILE  "/var/run/lldpad.pid"
 
 
-VIR_ENUM_IMPL(virVMOperation, VIR_VM_OP_LAST,
-    "create",
-    "save",
-    "restore",
-    "destroy",
-    "migrate out",
-    "migrate in start",
-    "migrate in finish",
-    "no-op")
-
-
 enum virVirtualPortOp {
     ASSOCIATE = 0x1,
     DISASSOCIATE = 0x2,
@@ -1609,3 +1604,13 @@ vpDisassociatePortProfileId(const char *macvtap_ifname,
 }
 
 #endif /* WITH_MACVTAP || WITH_VIRTUALPORT */
+
+VIR_ENUM_IMPL(virVMOperation, VIR_VM_OP_LAST,
+    "create",
+    "save",
+    "restore",
+    "destroy",
+    "migrate out",
+    "migrate in start",
+    "migrate in finish",
+    "no-op")