提交 45ef4d5e 编写于 作者: M Matthias Bolte

Implement virVMOperationType{To|From}String independent from WITH_MACVTAP

As this symbols are exported independent from WITH_MACVTAP.
上级 c6506ff8
...@@ -27,12 +27,13 @@ ...@@ -27,12 +27,13 @@
#include <config.h> #include <config.h>
#include <stdint.h>
#if WITH_MACVTAP || WITH_VIRTUALPORT #if WITH_MACVTAP || WITH_VIRTUALPORT
# include <stdio.h> # include <stdio.h>
# include <errno.h> # include <errno.h>
# include <fcntl.h> # include <fcntl.h>
# include <stdint.h>
# include <c-ctype.h> # include <c-ctype.h>
# include <sys/socket.h> # include <sys/socket.h>
# include <sys/ioctl.h> # include <sys/ioctl.h>
...@@ -44,10 +45,15 @@ ...@@ -44,10 +45,15 @@
# include <netlink/msg.h> # 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 "memory.h"
# include "logging.h" # include "logging.h"
# include "macvtap.h"
# include "interface.h" # include "interface.h"
# include "conf/domain_conf.h" # include "conf/domain_conf.h"
# include "virterror_internal.h" # include "virterror_internal.h"
...@@ -77,17 +83,6 @@ ...@@ -77,17 +83,6 @@
# define LLDPAD_PID_FILE "/var/run/lldpad.pid" # 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 { enum virVirtualPortOp {
ASSOCIATE = 0x1, ASSOCIATE = 0x1,
DISASSOCIATE = 0x2, DISASSOCIATE = 0x2,
...@@ -1609,3 +1604,13 @@ vpDisassociatePortProfileId(const char *macvtap_ifname, ...@@ -1609,3 +1604,13 @@ vpDisassociatePortProfileId(const char *macvtap_ifname,
} }
#endif /* WITH_MACVTAP || WITH_VIRTUALPORT */ #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")
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册