mirror of https://gitee.com/openkylin/libvirt.git
Xen: VIR_FROM_THIS cleanup
The virErrorDomain enum has VIR_FROM_XEN, VIR_FROM_XEND, VIR_FROM_XENSTORE, VIR_FROM_SEXPR, and VIR_FROM_XENXM. Use these elements in the corresponding .c files. While at it, remove the VIR_FROM_THIS define in src/xenconfig/xenxs_private.h.
This commit is contained in:
parent
56635345ad
commit
7d3698b47c
|
@ -52,7 +52,7 @@
|
||||||
#include "xen_hypervisor.h"
|
#include "xen_hypervisor.h"
|
||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_XEN
|
#define VIR_FROM_THIS VIR_FROM_XENSTORE
|
||||||
|
|
||||||
VIR_LOG_INIT("xen.xs_internal");
|
VIR_LOG_INIT("xen.xs_internal");
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
#include "xen_common.h"
|
#include "xen_common.h"
|
||||||
|
|
||||||
|
#define VIR_FROM_THIS VIR_FROM_XEN
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Convenience method to grab a long int from the config file object
|
* Convenience method to grab a long int from the config file object
|
||||||
|
|
|
@ -41,6 +41,8 @@
|
||||||
#include "virstoragefile.h"
|
#include "virstoragefile.h"
|
||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
|
|
||||||
|
#define VIR_FROM_THIS VIR_FROM_SEXPR
|
||||||
|
|
||||||
VIR_LOG_INIT("xenconfig.xen_sxpr");
|
VIR_LOG_INIT("xenconfig.xen_sxpr");
|
||||||
|
|
||||||
/* Get a domain id from a S-expression string */
|
/* Get a domain id from a S-expression string */
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
#include "xen_common.h"
|
#include "xen_common.h"
|
||||||
|
|
||||||
|
#define VIR_FROM_THIS VIR_FROM_XENXM
|
||||||
|
|
||||||
static int
|
static int
|
||||||
xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
|
xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
|
||||||
|
|
|
@ -46,6 +46,4 @@
|
||||||
# define DEFAULT_VIF_SCRIPT "vif-bridge"
|
# define DEFAULT_VIF_SCRIPT "vif-bridge"
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# define VIR_FROM_THIS VIR_FROM_NONE
|
|
||||||
|
|
||||||
#endif /* __VIR_XENXS_PRIVATE_H__ */
|
#endif /* __VIR_XENXS_PRIVATE_H__ */
|
||||||
|
|
Loading…
Reference in New Issue