External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 17:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

xend: Remove redundant validity checks, clean up function headers

Browse Source 
Arguments for driver entry points are checked in libvirt.c, so no need to
check again. Make function entry points consistent. Don't type caste the
privateData.
This commit is contained in:
John Ferlan 2013-01-29 09:53:13 -05:00
parent 273f34ba36
commit d951c1a0b9
1 changed files with 95 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

417
src/xen/xend_internal.c
View File

@ -1,7 +1,7 @@
/* /*
* xend_internal.c: access to Xen though the Xen Daemon interface * xend_internal.c: access to Xen though the Xen Daemon interface
* *
* Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010-2013 Red Hat, Inc.
* Copyright (C) 2005 Anthony Liguori <aliguori@us.ibm.com> * Copyright (C) 2005 Anthony Liguori <aliguori@us.ibm.com>
* *
* This file is subject to the terms and conditions of the GNU Lesser General * This file is subject to the terms and conditions of the GNU Lesser General
@ -60,11 +60,8 @@
#define XEND_RCV_BUF_MAX_LEN (256 * 1024) #define XEND_RCV_BUF_MAX_LEN (256 * 1024)
static int static int
virDomainXMLDevID(virDomainPtr domain, virDomainXMLDevID(virDomainPtr domain, virDomainDeviceDefPtr dev, char *class,
virDomainDeviceDefPtr dev, char *ref, int ref_len);
char *class,
char *ref,
int ref_len);
/** /**
* do_connect: * do_connect:
@ -79,7 +76,7 @@ do_connect(virConnectPtr xend)
{ {
int s; int s;
int no_slow_start = 1; int no_slow_start = 1;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) xend->privateData; xenUnifiedPrivatePtr priv = xend->privateData;
s = socket(priv->addrfamily, SOCK_STREAM, priv->addrprotocol); s = socket(priv->addrfamily, SOCK_STREAM, priv->addrprotocol);
if (s == -1) { if (s == -1) {
@ -331,8 +328,7 @@ xend_req(int fd, char **content)
* Returns the HTTP return code or -1 in case or error. * Returns the HTTP return code or -1 in case or error.
*/ */
static int ATTRIBUTE_NONNULL(3) static int ATTRIBUTE_NONNULL(3)
xend_get(virConnectPtr xend, const char *path, xend_get(virConnectPtr xend, const char *path, char **content)
char **content)
{ {
int ret; int ret;
int s = do_connect(xend); int s = do_connect(xend);
@ -611,12 +607,8 @@ int
xenDaemonOpen_unix(virConnectPtr conn, const char *path) xenDaemonOpen_unix(virConnectPtr conn, const char *path)
{ {
struct sockaddr_un *addr; struct sockaddr_un *addr;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
if ((conn == NULL) || (path == NULL))
return -1;
priv = (xenUnifiedPrivatePtr) conn->privateData;
memset(&priv->addr, 0, sizeof(priv->addr)); memset(&priv->addr, 0, sizeof(priv->addr));
priv->addrfamily = AF_UNIX; priv->addrfamily = AF_UNIX;
/* /*
@ -650,17 +642,12 @@ xenDaemonOpen_unix(virConnectPtr conn, const char *path)
static int static int
xenDaemonOpen_tcp(virConnectPtr conn, const char *host, const char *port) xenDaemonOpen_tcp(virConnectPtr conn, const char *host, const char *port)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
struct addrinfo *res, *r; struct addrinfo *res, *r;
struct addrinfo hints; struct addrinfo hints;
int saved_errno = EINVAL; int saved_errno = EINVAL;
int ret; int ret;
if ((conn == NULL) || (host == NULL) || (port == NULL))
return -1;
priv = (xenUnifiedPrivatePtr) conn->privateData;
priv->addrlen = 0; priv->addrlen = 0;
memset(&priv->addr, 0, sizeof(priv->addr)); memset(&priv->addr, 0, sizeof(priv->addr));
@ -830,7 +817,8 @@ xenDaemonDomainCreateXML(virConnectPtr xend, const char *sexpr)
* Returns the id on success; -1 (with errno) on error * Returns the id on success; -1 (with errno) on error
*/ */
int int
xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname, xenDaemonDomainLookupByName_ids(virConnectPtr xend,
const char *domname,
unsigned char *uuid) unsigned char *uuid)
{ {
struct sexpr *root; struct sexpr *root;
@ -925,17 +913,11 @@ error:
static int static int
xend_detect_config_version(virConnectPtr conn) { xend_detect_config_version(virConnectPtr conn)
{
struct sexpr *root; struct sexpr *root;
const char *value; const char *value;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
if (!VIR_IS_CONNECT(conn)) {
virReportError(VIR_ERR_INVALID_CONN, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) conn->privateData;
root = sexpr_get(conn, "/xend/node/"); root = sexpr_get(conn, "/xend/node/");
if (root == NULL) if (root == NULL)
@ -1008,14 +990,12 @@ sexpr_to_xend_domain_state(virDomainPtr domain, const struct sexpr *root)
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
static int static int
sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root, sexpr_to_xend_domain_info(virDomainPtr domain,
const struct sexpr *root,
virDomainInfoPtr info) virDomainInfoPtr info)
{ {
int vcpus; int vcpus;
if ((root == NULL) || (info == NULL))
return -1;
info->state = sexpr_to_xend_domain_state(domain, root); info->state = sexpr_to_xend_domain_state(domain, root);
info->memory = sexpr_u64(root, "domain/memory") << 10; info->memory = sexpr_u64(root, "domain/memory") << 10;
info->maxMem = sexpr_u64(root, "domain/maxmem") << 10; info->maxMem = sexpr_u64(root, "domain/maxmem") << 10;
@ -1044,10 +1024,6 @@ sexpr_to_xend_node_info(const struct sexpr *root, virNodeInfoPtr info)
{ {
const char *machine; const char *machine;
if ((root == NULL) || (info == NULL))
return -1;
machine = sexpr_node(root, "node/machine"); machine = sexpr_node(root, "node/machine");
if (machine == NULL) { if (machine == NULL) {
info->model[0] = 0; info->model[0] = 0;
@ -1107,8 +1083,7 @@ sexpr_to_xend_node_info(const struct sexpr *root, virNodeInfoPtr info)
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
static int static int
sexpr_to_xend_topology(const struct sexpr *root, sexpr_to_xend_topology(const struct sexpr *root, virCapsPtr caps)
virCapsPtr caps)
{ {
const char *nodeToCpu; const char *nodeToCpu;
const char *cur; const char *cur;
@ -1200,12 +1175,7 @@ sexpr_to_domain(virConnectPtr conn, const struct sexpr *root)
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
const char *name; const char *name;
const char *tmp; const char *tmp;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
if ((conn == NULL) || (root == NULL))
return NULL;
priv = (xenUnifiedPrivatePtr) conn->privateData;
if (sexpr_uuid(uuid, root, "domain/uuid") < 0) if (sexpr_uuid(uuid, root, "domain/uuid") < 0)
goto error; goto error;
@ -1350,11 +1320,6 @@ xenDaemonClose(virConnectPtr conn ATTRIBUTE_UNUSED)
int int
xenDaemonDomainSuspend(virDomainPtr domain) xenDaemonDomainSuspend(virDomainPtr domain)
{ {
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1376,11 +1341,6 @@ xenDaemonDomainSuspend(virDomainPtr domain)
int int
xenDaemonDomainResume(virDomainPtr domain) xenDaemonDomainResume(virDomainPtr domain)
{ {
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1403,11 +1363,6 @@ xenDaemonDomainResume(virDomainPtr domain)
int int
xenDaemonDomainShutdown(virDomainPtr domain) xenDaemonDomainShutdown(virDomainPtr domain)
{ {
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1433,11 +1388,6 @@ xenDaemonDomainReboot(virDomainPtr domain, unsigned int flags)
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1465,16 +1415,10 @@ xenDaemonDomainReboot(virDomainPtr domain, unsigned int flags)
* Returns 0 in case of success, -1 (with errno) in case of error. * Returns 0 in case of success, -1 (with errno) in case of error.
*/ */
int int
xenDaemonDomainDestroyFlags(virDomainPtr domain, xenDaemonDomainDestroyFlags(virDomainPtr domain, unsigned int flags)
unsigned int flags)
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1498,14 +1442,7 @@ xenDaemonDomainGetOSType(virDomainPtr domain)
{ {
char *type; char *type;
struct sexpr *root; struct sexpr *root;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return NULL;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return NULL; return NULL;
@ -1545,12 +1482,6 @@ xenDaemonDomainGetOSType(virDomainPtr domain)
int int
xenDaemonDomainSave(virDomainPtr domain, const char *filename) xenDaemonDomainSave(virDomainPtr domain, const char *filename)
{ {
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
(filename == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1578,17 +1509,12 @@ xenDaemonDomainSave(virDomainPtr domain, const char *filename)
* Returns 0 in case of success, -1 in case of error. * Returns 0 in case of success, -1 in case of error.
*/ */
int int
xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename, xenDaemonDomainCoreDump(virDomainPtr domain,
const char *filename,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1); virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
(filename == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Domain %s isn't running."), domain->name); _("Domain %s isn't running."), domain->name);
@ -1616,11 +1542,6 @@ xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
int int
xenDaemonDomainRestore(virConnectPtr conn, const char *filename) xenDaemonDomainRestore(virConnectPtr conn, const char *filename)
{ {
if ((conn == NULL) || (filename == NULL)) {
/* this should be caught at the interface but ... */
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
return xend_op(conn, "", "op", "restore", "file", filename, NULL); return xend_op(conn, "", "op", "restore", "file", filename, NULL);
} }
@ -1638,14 +1559,7 @@ xenDaemonDomainGetMaxMemory(virDomainPtr domain)
{ {
unsigned long long ret = 0; unsigned long long ret = 0;
struct sexpr *root; struct sexpr *root;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return 0;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return 0; return 0;
@ -1677,14 +1591,7 @@ int
xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
{ {
char buf[1024]; char buf[1024];
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -1714,14 +1621,7 @@ int
xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory) xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory)
{ {
char buf[1024]; char buf[1024];
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -1733,13 +1633,11 @@ xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory)
virDomainDefPtr virDomainDefPtr
xenDaemonDomainFetch(virConnectPtr conn, xenDaemonDomainFetch(virConnectPtr conn, int domid, const char *name,
int domid,
const char *name,
const char *cpus) const char *cpus)
{ {
struct sexpr *root; struct sexpr *root;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
virDomainDefPtr def; virDomainDefPtr def;
int id; int id;
char * tty; char * tty;
@ -1752,8 +1650,6 @@ xenDaemonDomainFetch(virConnectPtr conn,
if (root == NULL) if (root == NULL)
return NULL; return NULL;
priv = (xenUnifiedPrivatePtr) conn->privateData;
id = xenGetDomIdFromSxpr(root, priv->xendConfigVersion); id = xenGetDomIdFromSxpr(root, priv->xendConfigVersion);
xenUnifiedLock(priv); xenUnifiedLock(priv);
if (sexpr_lookup(root, "domain/image/hvm")) if (sexpr_lookup(root, "domain/image/hvm"))
@ -1788,21 +1684,16 @@ cleanup:
* the caller must free() the returned value. * the caller must free() the returned value.
*/ */
char * char *
xenDaemonDomainGetXMLDesc(virDomainPtr domain, unsigned int flags, xenDaemonDomainGetXMLDesc(virDomainPtr domain,
unsigned int flags,
const char *cpus) const char *cpus)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
virDomainDefPtr def; virDomainDefPtr def;
char *xml; char *xml;
/* Flags checked by virDomainDefFormat */ /* Flags checked by virDomainDefFormat */
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return NULL;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
/* fall-through to the next driver to handle */ /* fall-through to the next driver to handle */
return NULL; return NULL;
@ -1837,15 +1728,7 @@ xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
{ {
struct sexpr *root; struct sexpr *root;
int ret; int ret;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
(info == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -1915,11 +1798,6 @@ xenDaemonLookupByName(virConnectPtr conn, const char *domname)
struct sexpr *root; struct sexpr *root;
virDomainPtr ret = NULL; virDomainPtr ret = NULL;
if ((conn == NULL) || (domname == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return NULL;
}
root = sexpr_get(conn, "/xend/domain/%s?detail=1", domname); root = sexpr_get(conn, "/xend/domain/%s?detail=1", domname);
if (root == NULL) if (root == NULL)
goto error; goto error;
@ -1942,19 +1820,11 @@ error:
* Returns 0 in case of success and -1 in case of failure. * Returns 0 in case of success and -1 in case of failure.
*/ */
int int
xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) { xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
{
int ret = -1; int ret = -1;
struct sexpr *root; struct sexpr *root;
if (!VIR_IS_CONNECT(conn)) {
virReportError(VIR_ERR_INVALID_CONN, __FUNCTION__);
return -1;
}
if (info == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
root = sexpr_get(conn, "/xend/node/"); root = sexpr_get(conn, "/xend/node/");
if (root == NULL) if (root == NULL)
return -1; return -1;
@ -1974,21 +1844,11 @@ xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) {
* Returns -1 in case of error, 0 otherwise. * Returns -1 in case of error, 0 otherwise.
*/ */
int int
xenDaemonNodeGetTopology(virConnectPtr conn, xenDaemonNodeGetTopology(virConnectPtr conn, virCapsPtr caps)
virCapsPtr caps) { {
int ret = -1; int ret = -1;
struct sexpr *root; struct sexpr *root;
if (!VIR_IS_CONNECT(conn)) {
virReportError(VIR_ERR_INVALID_CONN, __FUNCTION__);
return -1;
}
if (caps == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
root = sexpr_get(conn, "/xend/node/"); root = sexpr_get(conn, "/xend/node/");
if (root == NULL) { if (root == NULL) {
return -1; return -1;
@ -2017,14 +1877,6 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
int major, minor; int major, minor;
unsigned long version; unsigned long version;
if (!VIR_IS_CONNECT(conn)) {
virReportError(VIR_ERR_INVALID_CONN, __FUNCTION__);
return -1;
}
if (hvVer == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
root = sexpr_get(conn, "/xend/node/"); root = sexpr_get(conn, "/xend/node/");
if (root == NULL) if (root == NULL)
return -1; return -1;
@ -2061,8 +1913,6 @@ xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids)
if (maxids == 0) if (maxids == 0)
return 0; return 0;
if ((ids == NULL) || (maxids < 0))
goto error;
root = sexpr_get(conn, "/xend/domain"); root = sexpr_get(conn, "/xend/domain");
if (root == NULL) if (root == NULL)
goto error; goto error;
@ -2131,7 +1981,8 @@ error:
* Returns a new domain object or NULL in case of failure * Returns a new domain object or NULL in case of failure
*/ */
virDomainPtr virDomainPtr
xenDaemonLookupByID(virConnectPtr conn, int id) { xenDaemonLookupByID(virConnectPtr conn, int id)
{
char *name = NULL; char *name = NULL;
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
virDomainPtr ret; virDomainPtr ret;
@ -2164,25 +2015,23 @@ xenDaemonLookupByID(virConnectPtr conn, int id) {
* the unified driver should keep trying. * the unified driver should keep trying.
*/ */
int int
xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, xenDaemonDomainSetVcpusFlags(virDomainPtr domain,
unsigned int vcpus,
unsigned int flags) unsigned int flags)
{ {
char buf[VIR_UUID_BUFLEN]; char buf[VIR_UUID_BUFLEN];
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
int max; int max;
virCheckFlags(VIR_DOMAIN_VCPU_LIVE | virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
VIR_DOMAIN_VCPU_CONFIG | VIR_DOMAIN_VCPU_CONFIG |
VIR_DOMAIN_VCPU_MAXIMUM, -1); VIR_DOMAIN_VCPU_MAXIMUM, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) if (vcpus < 1) {
|| (vcpus < 1)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1; return -1;
} }
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) || if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) ||
(flags & VIR_DOMAIN_VCPU_MAXIMUM)) (flags & VIR_DOMAIN_VCPU_MAXIMUM))
return -2; return -2;
@ -2249,21 +2098,21 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus,
* Returns 0 for success; -1 (with errno) on error * Returns 0 for success; -1 (with errno) on error
*/ */
int int
xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, xenDaemonDomainPinVcpu(virDomainPtr domain,
unsigned char *cpumap, int maplen) unsigned int vcpu,
unsigned char *cpumap,
int maplen)
{ {
char buf[VIR_UUID_BUFLEN], mapstr[sizeof(cpumap_t) * 64]; char buf[VIR_UUID_BUFLEN], mapstr[sizeof(cpumap_t) * 64];
int i, j, ret; int i, j, ret;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) if (maplen > (int)sizeof(cpumap_t)) {
|| (cpumap == NULL) || (maplen < 1) || (maplen > (int)sizeof(cpumap_t))) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1; return -1;
} }
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
mapstr[0] = '['; mapstr[0] = '[';
mapstr[1] = 0; mapstr[1] = 0;
@ -2335,19 +2184,12 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
{ {
struct sexpr *root; struct sexpr *root;
int ret; int ret;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
virCheckFlags(VIR_DOMAIN_VCPU_LIVE | virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
VIR_DOMAIN_VCPU_CONFIG | VIR_DOMAIN_VCPU_CONFIG |
VIR_DOMAIN_VCPU_MAXIMUM, -1); VIR_DOMAIN_VCPU_MAXIMUM, -1);
if (domain == NULL || domain->conn == NULL || domain->name == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
/* If xendConfigVersion is 2, then we can only report _LIVE (and /* If xendConfigVersion is 2, then we can only report _LIVE (and
* xm_internal reports _CONFIG). If it is 3, then _LIVE and * xm_internal reports _CONFIG). If it is 3, then _LIVE and
* _CONFIG are always in sync for a running system. */ * _CONFIG are always in sync for a running system. */
@ -2395,8 +2237,11 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
* Returns the number of info filled in case of success, -1 in case of failure. * Returns the number of info filled in case of success, -1 in case of failure.
*/ */
int int
xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, xenDaemonDomainGetVcpus(virDomainPtr domain,
unsigned char *cpumaps, int maplen) virVcpuInfoPtr info,
int maxinfo,
unsigned char *cpumaps,
int maplen)
{ {
struct sexpr *root, *s, *t; struct sexpr *root, *s, *t;
virVcpuInfoPtr ipt = info; virVcpuInfoPtr ipt = info;
@ -2404,16 +2249,6 @@ xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
unsigned char *cpumap; unsigned char *cpumap;
int vcpu, cpu; int vcpu, cpu;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|| (info == NULL) || (maxinfo < 1)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
if (cpumaps != NULL && maplen < 1) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
root = sexpr_get(domain->conn, "/xend/domain/%s?op=vcpuinfo", domain->name); root = sexpr_get(domain->conn, "/xend/domain/%s?op=vcpuinfo", domain->name);
if (root == NULL) if (root == NULL)
return -1; return -1;
@ -2482,7 +2317,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
virDomainPtr ret; virDomainPtr ret;
char *name = NULL; char *name = NULL;
int id = -1; int id = -1;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
/* Old approach for xen <= 3.0.3 */ /* Old approach for xen <= 3.0.3 */
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
@ -2562,19 +2397,16 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
* Returns a new domain object or NULL in case of failure * Returns a new domain object or NULL in case of failure
*/ */
virDomainPtr virDomainPtr
xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags)
unsigned int flags)
{ {
int ret; int ret;
char *sexpr; char *sexpr;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
virDomainDefPtr def; virDomainDefPtr def;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
priv = (xenUnifiedPrivatePtr) conn->privateData;
if (!(def = virDomainDefParseString(priv->caps, xmlDesc, if (!(def = virDomainDefParseString(priv->caps, xmlDesc,
1 << VIR_DOMAIN_VIRT_XEN, 1 << VIR_DOMAIN_VIRT_XEN,
VIR_DOMAIN_XML_INACTIVE))) VIR_DOMAIN_XML_INACTIVE)))
@ -2627,10 +2459,11 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
static int static int
xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, xenDaemonAttachDeviceFlags(virDomainPtr domain,
const char *xml,
unsigned int flags) unsigned int flags)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *sexpr = NULL; char *sexpr = NULL;
int ret = -1; int ret = -1;
virDomainDeviceDefPtr dev = NULL; virDomainDeviceDefPtr dev = NULL;
@ -2641,13 +2474,6 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml,
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0) { if (domain->id < 0) {
/* Cannot modify live config if domain is inactive */ /* Cannot modify live config if domain is inactive */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
@ -2793,10 +2619,11 @@ cleanup:
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int int
xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, xenDaemonUpdateDeviceFlags(virDomainPtr domain,
const char *xml,
unsigned int flags) unsigned int flags)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *sexpr = NULL; char *sexpr = NULL;
int ret = -1; int ret = -1;
virDomainDeviceDefPtr dev = NULL; virDomainDeviceDefPtr dev = NULL;
@ -2807,13 +2634,6 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE |
VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1); VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0) { if (domain->id < 0) {
/* Cannot modify live config if domain is inactive */ /* Cannot modify live config if domain is inactive */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
@ -2907,10 +2727,11 @@ cleanup:
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
static int static int
xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, xenDaemonDetachDeviceFlags(virDomainPtr domain,
const char *xml,
unsigned int flags) unsigned int flags)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
char class[8], ref[80]; char class[8], ref[80];
virDomainDeviceDefPtr dev = NULL; virDomainDeviceDefPtr dev = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
@ -2920,13 +2741,6 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml,
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0) { if (domain->id < 0) {
/* Cannot modify live config if domain is inactive */ /* Cannot modify live config if domain is inactive */
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
@ -3006,22 +2820,15 @@ cleanup:
} }
int int
xenDaemonDomainGetAutostart(virDomainPtr domain, xenDaemonDomainGetAutostart(virDomainPtr domain, int *autostart)
int *autostart)
{ {
struct sexpr *root; struct sexpr *root;
const char *tmp; const char *tmp;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
/* xm_internal.c (the support for defined domains from /etc/xen /* xm_internal.c (the support for defined domains from /etc/xen
* config files used by old Xen) will handle this. * config files used by old Xen) will handle this.
*/ */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -3044,24 +2851,17 @@ xenDaemonDomainGetAutostart(virDomainPtr domain,
} }
int int
xenDaemonDomainSetAutostart(virDomainPtr domain, xenDaemonDomainSetAutostart(virDomainPtr domain, int autostart)
int autostart)
{ {
struct sexpr *root, *autonode; struct sexpr *root, *autonode;
virBuffer buffer = VIR_BUFFER_INITIALIZER; virBuffer buffer = VIR_BUFFER_INITIALIZER;
char *content = NULL; char *content = NULL;
int ret = -1; int ret = -1;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INTERNAL_ERROR, __FUNCTION__);
return -1;
}
/* xm_internal.c (the support for defined domains from /etc/xen /* xm_internal.c (the support for defined domains from /etc/xen
* config files used by old Xen) will handle this. * config files used by old Xen) will handle this.
*/ */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -3313,15 +3113,15 @@ xenDaemonDomainMigratePerform(virDomainPtr domain,
return ret; return ret;
} }
virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { virDomainPtr
xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc)
{
int ret; int ret;
char *sexpr; char *sexpr;
virDomainPtr dom; virDomainPtr dom;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = conn->privateData;
virDomainDefPtr def; virDomainDefPtr def;
priv = (xenUnifiedPrivatePtr) conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return NULL; return NULL;
@ -3358,19 +3158,13 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) {
virDomainDefFree(def); virDomainDefFree(def);
return NULL; return NULL;
} }
int xenDaemonDomainCreate(virDomainPtr domain) int
xenDaemonDomainCreate(virDomainPtr domain)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
int ret; int ret;
virDomainPtr tmp; virDomainPtr tmp;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -3387,16 +3181,10 @@ int xenDaemonDomainCreate(virDomainPtr domain)
return ret; return ret;
} }
int xenDaemonDomainUndefine(virDomainPtr domain) int
xenDaemonDomainUndefine(virDomainPtr domain)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
@ -3418,7 +3206,7 @@ xenDaemonNumOfDefinedDomains(virConnectPtr conn)
struct sexpr *root = NULL; struct sexpr *root = NULL;
int ret = -1; int ret = -1;
struct sexpr *_for_i, *node; struct sexpr *_for_i, *node;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
/* xm_internal.c (the support for defined domains from /etc/xen /* xm_internal.c (the support for defined domains from /etc/xen
* config files used by old Xen) will handle this. * config files used by old Xen) will handle this.
@ -3446,17 +3234,18 @@ error:
} }
static int static int
xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { xenDaemonListDefinedDomains(virConnectPtr conn,
char **const names,
int maxnames)
{
struct sexpr *root = NULL; struct sexpr *root = NULL;
int i, ret = -1; int i, ret = -1;
struct sexpr *_for_i, *node; struct sexpr *_for_i, *node;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -1; return -1;
if ((names == NULL) || (maxnames < 0))
goto error;
if (maxnames == 0) if (maxnames == 0)
return 0; return 0;
@ -3507,18 +3296,12 @@ error:
static char * static char *
xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
struct sexpr *root; struct sexpr *root;
const char *ret = NULL; const char *ret = NULL;
char *schedulertype = NULL; char *schedulertype = NULL;
if (domain->conn == NULL || domain->name == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return NULL;
}
/* Support only xendConfigVersion >=4 */ /* Support only xendConfigVersion >=4 */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("unsupported in xendConfigVersion < 4")); "%s", _("unsupported in xendConfigVersion < 4"));
@ -3577,21 +3360,16 @@ error:
*/ */
static int static int
xenDaemonGetSchedulerParameters(virDomainPtr domain, xenDaemonGetSchedulerParameters(virDomainPtr domain,
virTypedParameterPtr params, int *nparams) virTypedParameterPtr params,
int *nparams)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
struct sexpr *root; struct sexpr *root;
char *sched_type = NULL; char *sched_type = NULL;
int sched_nparam = 0; int sched_nparam = 0;
int ret = -1; int ret = -1;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
/* Support only xendConfigVersion >=4 */ /* Support only xendConfigVersion >=4 */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("unsupported in xendConfigVersion < 4")); "%s", _("unsupported in xendConfigVersion < 4"));
@ -3684,22 +3462,17 @@ error:
*/ */
static int static int
xenDaemonSetSchedulerParameters(virDomainPtr domain, xenDaemonSetSchedulerParameters(virDomainPtr domain,
virTypedParameterPtr params, int nparams) virTypedParameterPtr params,
int nparams)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
struct sexpr *root; struct sexpr *root;
char *sched_type = NULL; char *sched_type = NULL;
int i; int i;
int sched_nparam = 0; int sched_nparam = 0;
int ret = -1; int ret = -1;
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
return -1;
}
/* Support only xendConfigVersion >=4 and active domains */ /* Support only xendConfigVersion >=4 and active domains */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("unsupported in xendConfigVersion < 4")); "%s", _("unsupported in xendConfigVersion < 4"));
@ -3793,11 +3566,13 @@ error:
* Returns 0 if successful, -1 if error, -2 if declined. * Returns 0 if successful, -1 if error, -2 if declined.
*/ */
int int
xenDaemonDomainBlockPeek(virDomainPtr domain, const char *path, xenDaemonDomainBlockPeek(virDomainPtr domain,
unsigned long long offset, size_t size, const char *path,
unsigned long long offset,
size_t size,
void *buffer) void *buffer)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv = domain->conn->privateData;
struct sexpr *root = NULL; struct sexpr *root = NULL;
int fd = -1, ret = -1; int fd = -1, ret = -1;
virDomainDefPtr def; virDomainDefPtr def;
@ -3806,8 +3581,6 @@ xenDaemonDomainBlockPeek(virDomainPtr domain, const char *path,
int vncport; int vncport;
const char *actual; const char *actual;
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4)
return -2; /* Decline, allow XM to handle it. */ return -2; /* Decline, allow XM to handle it. */