提交 bd7c36c5 编写于 作者: D Daniel P. Berrange

Replace use of xenapiError with virReportError

Update the XenAPI driver to use virReportError instead of
the xenapiError custom macro
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 3b7399b5
...@@ -43,10 +43,6 @@ ...@@ -43,10 +43,6 @@
#define VIR_FROM_THIS VIR_FROM_XENAPI #define VIR_FROM_THIS VIR_FROM_XENAPI
#define xenapiError(code, ...) \
virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__)
static int xenapiDefaultConsoleType(const char *ostype) static int xenapiDefaultConsoleType(const char *ostype)
{ {
...@@ -1123,7 +1119,7 @@ xenapiDomainSetVcpusFlags (virDomainPtr dom, unsigned int nvcpus, ...@@ -1123,7 +1119,7 @@ xenapiDomainSetVcpusFlags (virDomainPtr dom, unsigned int nvcpus,
xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
if (flags != VIR_DOMAIN_VCPU_LIVE) { if (flags != VIR_DOMAIN_VCPU_LIVE) {
xenapiError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
flags); flags);
return -1; return -1;
} }
...@@ -1293,7 +1289,7 @@ xenapiDomainGetVcpusFlags (virDomainPtr dom, unsigned int flags) ...@@ -1293,7 +1289,7 @@ xenapiDomainGetVcpusFlags (virDomainPtr dom, unsigned int flags)
xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
xenapiError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
flags); flags);
return -1; return -1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册