2006-11-16 19:06:13 +00:00
|
|
|
/*
|
|
|
|
* xm_internal.h: helper routines for dealing with inactive domains
|
|
|
|
*
|
2007-01-19 20:23:37 +00:00
|
|
|
* Copyright (C) 2006-2007 Red Hat
|
|
|
|
* Copyright (C) 2006 Daniel P. Berrange
|
2006-11-16 19:06:13 +00:00
|
|
|
*
|
2007-01-19 20:23:37 +00:00
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
2006-11-16 19:06:13 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2008-01-29 18:15:54 +00:00
|
|
|
#include <config.h>
|
2007-12-07 10:08:06 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
#include <dirent.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <sys/stat.h>
|
2007-06-15 15:24:20 +00:00
|
|
|
#include <limits.h>
|
2007-07-04 13:16:57 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <xen/dom0_ops.h>
|
|
|
|
|
2008-11-04 22:30:33 +00:00
|
|
|
#include "virterror_internal.h"
|
2008-11-04 23:22:06 +00:00
|
|
|
#include "datatypes.h"
|
2006-11-16 19:06:13 +00:00
|
|
|
#include "xm_internal.h"
|
2008-07-25 14:10:49 +00:00
|
|
|
#include "xen_unified.h"
|
2006-11-16 19:06:13 +00:00
|
|
|
#include "xend_internal.h"
|
|
|
|
#include "hash.h"
|
2007-06-26 22:33:22 +00:00
|
|
|
#include "buf.h"
|
2007-08-09 20:19:12 +00:00
|
|
|
#include "uuid.h"
|
2008-02-27 16:14:44 +00:00
|
|
|
#include "util.h"
|
2008-05-29 19:20:22 +00:00
|
|
|
#include "memory.h"
|
2008-11-25 10:44:52 +00:00
|
|
|
#include "logging.h"
|
|
|
|
|
2009-01-20 17:13:33 +00:00
|
|
|
#define VIR_FROM_THIS VIR_FROM_XENXM
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-19 18:12:00 +00:00
|
|
|
#ifdef WITH_RHEL5_API
|
|
|
|
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
|
2009-01-19 19:49:30 +00:00
|
|
|
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
|
2009-01-19 18:12:00 +00:00
|
|
|
#else
|
|
|
|
#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
|
2009-01-19 19:49:30 +00:00
|
|
|
#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
|
2009-01-19 18:12:00 +00:00
|
|
|
#endif
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
/* The true Xen limit varies but so far is always way
|
|
|
|
less than 1024, which is the Linux kernel limit according
|
|
|
|
to sched.h, so we'll match that for now */
|
|
|
|
#define XEN_MAX_PHYSICAL_CPU 1024
|
|
|
|
|
2007-11-28 10:11:18 +00:00
|
|
|
static int xenXMConfigSetString(virConfPtr conf, const char *setting,
|
|
|
|
const char *str);
|
2008-02-06 17:57:10 +00:00
|
|
|
char * xenXMAutoAssignMac(void);
|
2008-02-07 10:14:43 +00:00
|
|
|
static int xenXMDomainAttachDevice(virDomainPtr domain, const char *xml);
|
|
|
|
static int xenXMDomainDetachDevice(virDomainPtr domain, const char *xml);
|
2008-02-06 17:57:10 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
#define XM_REFRESH_INTERVAL 10
|
|
|
|
|
|
|
|
#define XM_CONFIG_DIR "/etc/xen"
|
|
|
|
#define XM_EXAMPLE_PREFIX "xmexample"
|
|
|
|
#define XEND_CONFIG_FILE "xend-config.sxp"
|
|
|
|
#define XEND_PCI_CONFIG_PREFIX "xend-pci-"
|
|
|
|
#define QEMU_IF_SCRIPT "qemu-ifup"
|
2008-02-06 17:57:10 +00:00
|
|
|
#define XM_XML_ERROR "Invalid xml"
|
2006-11-16 19:06:13 +00:00
|
|
|
|
Fri Jul 6 16:08:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c, src/proxy_internal.h,
src.xen_internal.c, src/xen_internal.h,
src/xen_unified.c, src/xen_unified.h,
src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: The interface
between xen_unified.c and its underlying driver now uses
a custom structure (struct xenUnifiedDriver) instead
of reusing virDriver.
* src/xen_unified.c: virDomainLookup* functions in Xen
now throw VIR_ERR_NO_DOMAIN if the domain does not exist.
* src/xs_internal.c: Fix indentation.
2007-07-06 15:11:22 +00:00
|
|
|
struct xenUnifiedDriver xenXMDriver = {
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMOpen, /* open */
|
|
|
|
xenXMClose, /* close */
|
|
|
|
NULL, /* version */
|
2007-06-26 11:42:46 +00:00
|
|
|
NULL, /* hostname */
|
2006-11-16 19:06:13 +00:00
|
|
|
NULL, /* nodeGetInfo */
|
2007-03-15 17:24:56 +00:00
|
|
|
NULL, /* getCapabilities */
|
2006-11-16 19:06:13 +00:00
|
|
|
NULL, /* listDomains */
|
|
|
|
NULL, /* numOfDomains */
|
2008-10-10 09:32:27 +00:00
|
|
|
NULL, /* domainCreateXML */
|
2006-11-16 19:06:13 +00:00
|
|
|
NULL, /* domainSuspend */
|
|
|
|
NULL, /* domainResume */
|
|
|
|
NULL, /* domainShutdown */
|
|
|
|
NULL, /* domainReboot */
|
|
|
|
NULL, /* domainDestroy */
|
|
|
|
NULL, /* domainGetOSType */
|
|
|
|
xenXMDomainGetMaxMemory, /* domainGetMaxMemory */
|
|
|
|
xenXMDomainSetMaxMemory, /* domainSetMaxMemory */
|
|
|
|
xenXMDomainSetMemory, /* domainMaxMemory */
|
|
|
|
xenXMDomainGetInfo, /* domainGetInfo */
|
|
|
|
NULL, /* domainSave */
|
|
|
|
NULL, /* domainRestore */
|
2006-11-22 17:48:29 +00:00
|
|
|
NULL, /* domainCoreDump */
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMDomainSetVcpus, /* domainSetVcpus */
|
2007-11-28 10:11:18 +00:00
|
|
|
xenXMDomainPinVcpu, /* domainPinVcpu */
|
2006-11-16 19:06:13 +00:00
|
|
|
NULL, /* domainGetVcpus */
|
2007-03-08 08:31:07 +00:00
|
|
|
NULL, /* domainGetMaxVcpus */
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMListDefinedDomains, /* listDefinedDomains */
|
|
|
|
xenXMNumOfDefinedDomains, /* numOfDefinedDomains */
|
|
|
|
xenXMDomainCreate, /* domainCreate */
|
|
|
|
xenXMDomainDefineXML, /* domainDefineXML */
|
|
|
|
xenXMDomainUndefine, /* domainUndefine */
|
2008-02-06 17:57:10 +00:00
|
|
|
xenXMDomainAttachDevice, /* domainAttachDevice */
|
|
|
|
xenXMDomainDetachDevice, /* domainDetachDevice */
|
2007-02-23 08:51:30 +00:00
|
|
|
NULL, /* domainGetAutostart */
|
|
|
|
NULL, /* domainSetAutostart */
|
2007-06-05 12:06:08 +00:00
|
|
|
NULL, /* domainGetSchedulerType */
|
|
|
|
NULL, /* domainGetSchedulerParameters */
|
|
|
|
NULL, /* domainSetSchedulerParameters */
|
2006-11-16 19:06:13 +00:00
|
|
|
};
|
|
|
|
|
2008-10-09 15:38:31 +00:00
|
|
|
#define xenXMError(conn, code, fmt...) \
|
2008-11-04 22:30:33 +00:00
|
|
|
virReportErrorHelper(conn, VIR_FROM_XENXM, code, __FILE__, \
|
2008-10-09 15:38:31 +00:00
|
|
|
__FUNCTION__, __LINE__, fmt)
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
static int xenInotifyActive(virConnectPtr conn)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
#ifndef WITH_XEN_INOTIFY
|
|
|
|
ret = 0;
|
|
|
|
#else
|
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
ret = (priv->inotifyWatch > 0);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
/* Convenience method to grab a int from the config file object */
|
2008-07-25 13:50:08 +00:00
|
|
|
static int xenXMConfigGetBool(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
const char *name,
|
|
|
|
int *value,
|
|
|
|
int def) {
|
2006-11-16 19:06:13 +00:00
|
|
|
virConfValuePtr val;
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
*value = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
if (!(val = virConfGetValue(conf, name))) {
|
2008-07-25 13:50:08 +00:00
|
|
|
*value = def;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val->type == VIR_CONF_LONG) {
|
|
|
|
*value = val->l ? 1 : 0;
|
|
|
|
} else if (val->type == VIR_CONF_STRING) {
|
|
|
|
if (!val->str) {
|
|
|
|
*value = def;
|
|
|
|
}
|
|
|
|
*value = STREQ(val->str, "1") ? 1 : 0;
|
|
|
|
} else {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was malformed"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convenience method to grab a int from the config file object */
|
|
|
|
static int xenXMConfigGetULong(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
const char *name,
|
|
|
|
unsigned long *value,
|
|
|
|
int def) {
|
|
|
|
virConfValuePtr val;
|
|
|
|
|
|
|
|
*value = 0;
|
|
|
|
if (!(val = virConfGetValue(conf, name))) {
|
|
|
|
*value = def;
|
|
|
|
return 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (val->type == VIR_CONF_LONG) {
|
|
|
|
*value = val->l;
|
|
|
|
} else if (val->type == VIR_CONF_STRING) {
|
|
|
|
char *ret;
|
2008-07-25 13:50:08 +00:00
|
|
|
if (!val->str) {
|
|
|
|
*value = def;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
*value = strtol(val->str, &ret, 10);
|
2008-07-25 13:50:08 +00:00
|
|
|
if (ret == val->str) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was malformed"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
} else {
|
2008-07-25 13:50:08 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was malformed"), name);
|
|
|
|
return -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
2008-07-25 13:50:08 +00:00
|
|
|
return 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convenience method to grab a string from the config file object */
|
2008-07-25 13:50:08 +00:00
|
|
|
static int xenXMConfigGetString(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
const char *name,
|
|
|
|
const char **value,
|
|
|
|
const char *def) {
|
2006-11-16 19:06:13 +00:00
|
|
|
virConfValuePtr val;
|
2008-07-25 13:50:08 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
*value = NULL;
|
|
|
|
if (!(val = virConfGetValue(conf, name))) {
|
2008-07-25 13:50:08 +00:00
|
|
|
*value = def;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val->type != VIR_CONF_STRING) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was malformed"), name);
|
|
|
|
return -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
if (!val->str)
|
2008-07-25 13:50:08 +00:00
|
|
|
*value = def;
|
|
|
|
else
|
|
|
|
*value = val->str;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int xenXMConfigCopyStringInternal(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
const char *name,
|
|
|
|
char **value,
|
|
|
|
int allowMissing) {
|
|
|
|
virConfValuePtr val;
|
|
|
|
|
|
|
|
*value = NULL;
|
|
|
|
if (!(val = virConfGetValue(conf, name))) {
|
|
|
|
if (allowMissing)
|
|
|
|
return 0;
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was missing"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val->type != VIR_CONF_STRING) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was not a string"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!val->str) {
|
|
|
|
if (allowMissing)
|
|
|
|
return 0;
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("config value %s was missing"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(*value = strdup(val->str))) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-07-25 13:50:08 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
|
|
|
|
static int xenXMConfigCopyString(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
const char *name,
|
|
|
|
char **value) {
|
|
|
|
return xenXMConfigCopyStringInternal(conn, conf, name, value, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int xenXMConfigCopyStringOpt(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
const char *name,
|
|
|
|
char **value) {
|
|
|
|
return xenXMConfigCopyStringInternal(conn, conf, name, value, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
/* Convenience method to grab a string UUID from the config file object */
|
|
|
|
static int xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) {
|
|
|
|
virConfValuePtr val;
|
|
|
|
if (!uuid || !name || !conf)
|
|
|
|
return (-1);
|
|
|
|
if (!(val = virConfGetValue(conf, name))) {
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val->type != VIR_CONF_STRING)
|
|
|
|
return (-1);
|
|
|
|
if (!val->str)
|
|
|
|
return (-1);
|
|
|
|
|
2007-08-09 20:19:12 +00:00
|
|
|
if (virUUIDParse(val->str, uuid) < 0)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Release memory associated with a cached config object */
|
|
|
|
static void xenXMConfigFree(void *payload, const char *key ATTRIBUTE_UNUSED) {
|
|
|
|
xenXMConfCachePtr entry = (xenXMConfCachePtr)payload;
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDefFree(entry->def);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(entry);
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
struct xenXMConfigReaperData {
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
time_t now;
|
|
|
|
};
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2006-12-19 21:54:20 +00:00
|
|
|
/* Remove any configs which were not refreshed recently */
|
|
|
|
static int xenXMConfigReaper(const void *payload, const char *key ATTRIBUTE_UNUSED, const void *data) {
|
2009-01-20 17:34:56 +00:00
|
|
|
const struct xenXMConfigReaperData *args = data;
|
2006-12-19 21:54:20 +00:00
|
|
|
xenXMConfCachePtr entry = (xenXMConfCachePtr)payload;
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
/* We're going to purge this config file, so check if it
|
|
|
|
is currently mapped as owner of a named domain. */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (entry->refreshedAt != args->now) {
|
2008-07-25 13:39:02 +00:00
|
|
|
const char *olddomname = entry->def->name;
|
2009-01-20 17:34:56 +00:00
|
|
|
char *nameowner = (char *)virHashLookup(args->priv->nameConfigMap, olddomname);
|
2008-07-25 13:39:02 +00:00
|
|
|
if (nameowner && STREQ(nameowner, key)) {
|
2009-01-20 17:34:56 +00:00
|
|
|
virHashRemoveEntry(args->priv->nameConfigMap, olddomname, NULL);
|
2006-12-19 21:54:20 +00:00
|
|
|
}
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
|
|
|
|
static virDomainDefPtr
|
|
|
|
xenXMConfigReadFile(virConnectPtr conn, const char *filename) {
|
|
|
|
virConfPtr conf;
|
|
|
|
virDomainDefPtr def;
|
|
|
|
|
2009-06-19 12:34:30 +00:00
|
|
|
if (!(conf = virConfReadFile(filename, 0)))
|
2008-07-25 13:39:02 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
def = xenXMDomainConfigParse(conn, conf);
|
|
|
|
virConfFree(conf);
|
|
|
|
|
|
|
|
return def;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
xenXMConfigSaveFile(virConnectPtr conn, const char *filename, virDomainDefPtr def) {
|
|
|
|
virConfPtr conf;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!(conf = xenXMDomainConfigFormat(conn, def)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
ret = virConfWriteFile(filename, conf);
|
|
|
|
virConfFree(conf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Caller must hold the lock on 'conn->privateData' before
|
|
|
|
* calling this funtion
|
|
|
|
*/
|
2008-11-25 10:44:52 +00:00
|
|
|
int
|
2009-01-20 17:34:56 +00:00
|
|
|
xenXMConfigCacheRemoveFile(virConnectPtr conn,
|
2008-11-25 10:44:52 +00:00
|
|
|
const char *filename)
|
|
|
|
{
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv = conn->privateData;
|
2008-11-25 10:44:52 +00:00
|
|
|
xenXMConfCachePtr entry;
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
entry = virHashLookup(priv->configCache, filename);
|
2008-11-25 10:44:52 +00:00
|
|
|
if (!entry) {
|
|
|
|
DEBUG("No config entry for %s", filename);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
virHashRemoveEntry(priv->nameConfigMap, entry->def->name, NULL);
|
|
|
|
virHashRemoveEntry(priv->configCache, filename, xenXMConfigFree);
|
2008-11-25 10:44:52 +00:00
|
|
|
DEBUG("Removed %s %s", entry->def->name, filename);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
/*
|
|
|
|
* Caller must hold the lock on 'conn->privateData' before
|
|
|
|
* calling this funtion
|
|
|
|
*/
|
2008-11-25 10:44:52 +00:00
|
|
|
int
|
|
|
|
xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename)
|
|
|
|
{
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv = conn->privateData;
|
2008-11-25 10:44:52 +00:00
|
|
|
xenXMConfCachePtr entry;
|
|
|
|
struct stat st;
|
|
|
|
int newborn = 0;
|
|
|
|
time_t now = time(NULL);
|
|
|
|
|
|
|
|
DEBUG("Adding file %s", filename);
|
|
|
|
|
|
|
|
/* Get modified time */
|
|
|
|
if ((stat(filename, &st) < 0)) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportSystemError(conn, errno,
|
|
|
|
_("cannot stat: %s"),
|
|
|
|
filename);
|
2008-11-25 10:44:52 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore zero length files, because inotify fires before
|
|
|
|
any content has actually been created */
|
|
|
|
if (st.st_size == 0) {
|
|
|
|
DEBUG("Ignoring zero length file %s", filename);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we already have a matching entry and it is not
|
|
|
|
modified, then carry on to next one*/
|
2009-01-20 17:34:56 +00:00
|
|
|
if ((entry = virHashLookup(priv->configCache, filename))) {
|
2008-11-25 10:44:52 +00:00
|
|
|
char *nameowner;
|
|
|
|
|
|
|
|
if (entry->refreshedAt >= st.st_mtime) {
|
|
|
|
entry->refreshedAt = now;
|
|
|
|
/* return success if up-to-date */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we currently own the name, then release it and
|
|
|
|
re-acquire it later - just in case it was renamed */
|
2009-01-20 17:34:56 +00:00
|
|
|
nameowner = (char *)virHashLookup(priv->nameConfigMap, entry->def->name);
|
2008-11-25 10:44:52 +00:00
|
|
|
if (nameowner && STREQ(nameowner, filename)) {
|
2009-01-20 17:34:56 +00:00
|
|
|
virHashRemoveEntry(priv->nameConfigMap, entry->def->name, NULL);
|
2008-11-25 10:44:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear existing config entry which needs refresh */
|
|
|
|
virDomainDefFree(entry->def);
|
|
|
|
entry->def = NULL;
|
|
|
|
} else { /* Completely new entry */
|
|
|
|
newborn = 1;
|
|
|
|
if (VIR_ALLOC(entry) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-11-25 10:44:52 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
memcpy(entry->filename, filename, PATH_MAX);
|
|
|
|
}
|
|
|
|
entry->refreshedAt = now;
|
|
|
|
|
|
|
|
if (!(entry->def = xenXMConfigReadFile(conn, entry->filename))) {
|
|
|
|
DEBUG("Failed to read %s", entry->filename);
|
|
|
|
if (!newborn)
|
2009-01-20 17:34:56 +00:00
|
|
|
virHashRemoveEntry(priv->configCache, filename, NULL);
|
2008-11-25 10:44:52 +00:00
|
|
|
VIR_FREE(entry);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If its a completely new entry, it must be stuck into
|
|
|
|
the cache (refresh'd entries are already registered) */
|
|
|
|
if (newborn) {
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashAddEntry(priv->configCache, entry->filename, entry) < 0) {
|
2008-11-25 10:44:52 +00:00
|
|
|
virDomainDefFree(entry->def);
|
|
|
|
VIR_FREE(entry);
|
|
|
|
xenXMError (conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("xenXMConfigCacheRefresh: virHashAddEntry"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* See if we need to map this config file in as the primary owner
|
|
|
|
* of the domain in question
|
|
|
|
*/
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!virHashLookup(priv->nameConfigMap, entry->def->name)) {
|
|
|
|
if (virHashAddEntry(priv->nameConfigMap, entry->def->name, entry->filename) < 0) {
|
|
|
|
virHashRemoveEntry(priv->configCache, filename, NULL);
|
2008-11-25 10:44:52 +00:00
|
|
|
virDomainDefFree(entry->def);
|
|
|
|
VIR_FREE(entry);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DEBUG("Added config %s %s", entry->def->name, filename);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2008-07-25 13:39:02 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
/* This method is called by various methods to scan /etc/xen
|
2009-01-21 18:11:14 +00:00
|
|
|
* (or whatever directory was set by LIBVIRT_XM_CONFIG_DIR
|
|
|
|
* environment variable) and process any domain configs. It
|
|
|
|
* has rate-limited so never rescans more frequently than
|
|
|
|
* once every X seconds
|
|
|
|
*
|
|
|
|
* Caller must hold the lock on 'conn->privateData' before
|
|
|
|
* calling this funtion
|
|
|
|
*/
|
2008-11-25 10:44:52 +00:00
|
|
|
int xenXMConfigCacheRefresh (virConnectPtr conn) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv = conn->privateData;
|
2006-11-16 19:06:13 +00:00
|
|
|
DIR *dh;
|
|
|
|
struct dirent *ent;
|
|
|
|
time_t now = time(NULL);
|
|
|
|
int ret = -1;
|
2009-01-20 17:34:56 +00:00
|
|
|
struct xenXMConfigReaperData args;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if (now == ((time_t)-1)) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportSystemError(conn, errno,
|
|
|
|
"%s", _("cannot get time of day"));
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Rate limit re-scans */
|
2009-01-20 17:34:56 +00:00
|
|
|
if ((now - priv->lastRefresh) < XM_REFRESH_INTERVAL)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (0);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv->lastRefresh = now;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
/* Process the files in the config dir */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(dh = opendir(priv->configDir))) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportSystemError(conn, errno,
|
|
|
|
_("cannot read directory %s"),
|
2009-01-20 17:34:56 +00:00
|
|
|
priv->configDir);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((ent = readdir(dh))) {
|
|
|
|
struct stat st;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Skip a bunch of crufty files that clearly aren't config files
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Like 'dot' files... */
|
2008-05-15 14:21:34 +00:00
|
|
|
if (STRPREFIX(ent->d_name, "."))
|
2006-11-16 19:06:13 +00:00
|
|
|
continue;
|
|
|
|
/* ...and the XenD server config file */
|
2008-05-15 14:21:34 +00:00
|
|
|
if (STRPREFIX(ent->d_name, XEND_CONFIG_FILE))
|
2006-11-16 19:06:13 +00:00
|
|
|
continue;
|
|
|
|
/* ...and random PCI config cruft */
|
2008-05-15 14:21:34 +00:00
|
|
|
if (STRPREFIX(ent->d_name, XEND_PCI_CONFIG_PREFIX))
|
2006-11-16 19:06:13 +00:00
|
|
|
continue;
|
|
|
|
/* ...and the example domain configs */
|
2008-05-15 14:21:34 +00:00
|
|
|
if (STRPREFIX(ent->d_name, XM_EXAMPLE_PREFIX))
|
2006-11-16 19:06:13 +00:00
|
|
|
continue;
|
|
|
|
/* ...and the QEMU networking script */
|
2008-05-15 14:21:34 +00:00
|
|
|
if (STRPREFIX(ent->d_name, QEMU_IF_SCRIPT))
|
2006-11-16 19:06:13 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* ...and editor backups */
|
|
|
|
if (ent->d_name[0] == '#')
|
|
|
|
continue;
|
|
|
|
if (ent->d_name[strlen(ent->d_name)-1] == '~')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Build the full file path */
|
2009-01-20 17:34:56 +00:00
|
|
|
if ((strlen(priv->configDir) + 1 + strlen(ent->d_name) + 1) > PATH_MAX)
|
2006-11-16 19:06:13 +00:00
|
|
|
continue;
|
2009-01-20 17:34:56 +00:00
|
|
|
strcpy(path, priv->configDir);
|
2006-11-16 19:06:13 +00:00
|
|
|
strcat(path, "/");
|
|
|
|
strcat(path, ent->d_name);
|
|
|
|
|
|
|
|
/* Skip anything which isn't a file (takes care of scripts/ subdir */
|
|
|
|
if ((stat(path, &st) < 0) ||
|
|
|
|
(!S_ISREG(st.st_mode))) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we already have a matching entry and it is not
|
|
|
|
modified, then carry on to next one*/
|
2008-11-25 10:44:52 +00:00
|
|
|
if (xenXMConfigCacheAddFile(conn, path) < 0) {
|
|
|
|
/* Ignoring errors, since alot of stuff goes wrong in /etc/xen */
|
2006-12-19 21:54:20 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Reap all entries which were not changed, by comparing
|
|
|
|
their refresh timestamp - the timestamp should match
|
|
|
|
'now' if they were refreshed. If timestamp doesn't match
|
|
|
|
then the config is no longer on disk */
|
2009-01-20 17:34:56 +00:00
|
|
|
args.now = now;
|
|
|
|
args.priv = priv;
|
|
|
|
virHashRemoveSet(priv->configCache, xenXMConfigReaper, xenXMConfigFree, &args);
|
2006-11-16 19:06:13 +00:00
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
if (dh)
|
|
|
|
closedir(dh);
|
|
|
|
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2009-01-20 18:20:09 +00:00
|
|
|
* The XM driver keeps a cache of config files as virDomainDefPtr
|
|
|
|
* objects in the xenUnifiedPrivatePtr. Optionally inotify lets
|
|
|
|
* us watch for changes (see separate driver), otherwise we poll
|
|
|
|
* every few seconds
|
2006-11-16 19:06:13 +00:00
|
|
|
*/
|
2008-12-17 21:26:16 +00:00
|
|
|
virDrvOpenStatus
|
2009-01-20 17:34:56 +00:00
|
|
|
xenXMOpen (virConnectPtr conn,
|
2007-12-05 18:28:05 +00:00
|
|
|
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
|
|
|
|
int flags ATTRIBUTE_UNUSED)
|
2007-04-04 14:19:49 +00:00
|
|
|
{
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv = conn->privateData;
|
|
|
|
|
|
|
|
priv->configDir = XM_CONFIG_DIR;
|
|
|
|
|
|
|
|
priv->configCache = virHashCreate(50);
|
|
|
|
if (!priv->configCache)
|
|
|
|
return (-1);
|
|
|
|
priv->nameConfigMap = virHashCreate(50);
|
|
|
|
if (!priv->nameConfigMap) {
|
|
|
|
virHashFree(priv->configCache, NULL);
|
|
|
|
priv->configCache = NULL;
|
|
|
|
return (-1);
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
2009-01-20 17:34:56 +00:00
|
|
|
/* Force the cache to be reloaded next time that
|
|
|
|
* xenXMConfigCacheRefresh is called.
|
|
|
|
*/
|
|
|
|
priv->lastRefresh = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2009-01-20 18:20:09 +00:00
|
|
|
* Free the cached config files associated with this
|
|
|
|
* connection
|
2006-11-16 19:06:13 +00:00
|
|
|
*/
|
2009-01-20 17:34:56 +00:00
|
|
|
int xenXMClose(virConnectPtr conn) {
|
|
|
|
xenUnifiedPrivatePtr priv = conn->privateData;
|
|
|
|
|
|
|
|
virHashFree(priv->nameConfigMap, NULL);
|
|
|
|
virHashFree(priv->configCache, xenXMConfigFree);
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Since these are all offline domains, we only return info about
|
2007-01-19 20:23:37 +00:00
|
|
|
* VCPUs and memory.
|
2006-11-16 19:06:13 +00:00
|
|
|
*/
|
|
|
|
int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
memset(info, 0, sizeof(virDomainInfo));
|
2008-07-25 13:39:02 +00:00
|
|
|
info->maxMem = entry->def->maxmem;
|
|
|
|
info->memory = entry->def->memory;
|
|
|
|
info->nrVirtCpu = entry->def->vcpus;
|
2006-11-16 19:06:13 +00:00
|
|
|
info->state = VIR_DOMAIN_SHUTOFF;
|
|
|
|
info->cpuTime = 0;
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (0);
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
error:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
#define MAX_VFB 1024
|
2006-11-16 19:06:13 +00:00
|
|
|
/*
|
|
|
|
* Turn a config record into a lump of XML describing the
|
2008-10-10 09:32:27 +00:00
|
|
|
* domain, suitable for later feeding for virDomainCreateXML
|
2006-11-16 19:06:13 +00:00
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDefPtr
|
|
|
|
xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
|
2006-11-16 19:06:13 +00:00
|
|
|
const char *str;
|
|
|
|
int hvm = 0;
|
2008-07-25 13:50:08 +00:00
|
|
|
int val;
|
2006-11-16 19:06:13 +00:00
|
|
|
virConfValuePtr list;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDefPtr def = NULL;
|
2008-07-25 13:50:08 +00:00
|
|
|
virDomainDiskDefPtr disk = NULL;
|
|
|
|
virDomainNetDefPtr net = NULL;
|
|
|
|
virDomainGraphicsDefPtr graphics = NULL;
|
2009-04-03 12:38:52 +00:00
|
|
|
virDomainHostdevDefPtr hostdev = NULL;
|
2008-07-25 13:50:08 +00:00
|
|
|
int i;
|
|
|
|
const char *defaultArch, *defaultMachine;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(def) < 0)
|
|
|
|
return NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
def->virtType = VIR_DOMAIN_VIRT_XEN;
|
|
|
|
def->id = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigCopyString(conn, conf, "name", &def->name) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigGetUUID(conf, "uuid", def->uuid) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
|
|
|
|
if ((xenXMConfigGetString(conn, conf, "builder", &str, "linux") == 0) &&
|
2008-05-14 19:51:24 +00:00
|
|
|
STREQ(str, "hvm"))
|
2006-11-16 19:06:13 +00:00
|
|
|
hvm = 1;
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (!(def->os.type = strdup(hvm ? "hvm" : "xen")))
|
|
|
|
goto no_memory;
|
|
|
|
|
2009-03-24 11:16:29 +00:00
|
|
|
defaultArch = virCapabilitiesDefaultGuestArch(priv->caps, def->os.type, virDomainVirtTypeToString(def->virtType));
|
2008-07-25 13:50:08 +00:00
|
|
|
if (defaultArch == NULL) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("no supported architecture for os type '%s'"),
|
|
|
|
def->os.type);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (!(def->os.arch = strdup(defaultArch)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
defaultMachine = virCapabilitiesDefaultGuestMachine(priv->caps,
|
|
|
|
def->os.type,
|
|
|
|
def->os.arch);
|
|
|
|
if (defaultMachine != NULL) {
|
|
|
|
if (!(def->os.machine = strdup(defaultMachine)))
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
if (hvm) {
|
2007-01-19 20:23:37 +00:00
|
|
|
const char *boot;
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigCopyString(conn, conf, "kernel", &def->os.loader) < 0)
|
|
|
|
goto cleanup;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "boot", &boot, "c") < 0)
|
|
|
|
goto cleanup;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
for (i = 0 ; i < VIR_DOMAIN_BOOT_LAST && boot[i] ; i++) {
|
2007-01-19 20:23:37 +00:00
|
|
|
switch (*boot) {
|
|
|
|
case 'a':
|
2008-07-25 13:50:08 +00:00
|
|
|
def->os.bootDevs[i] = VIR_DOMAIN_BOOT_FLOPPY;
|
2007-01-19 20:23:37 +00:00
|
|
|
break;
|
|
|
|
case 'd':
|
2008-07-25 13:50:08 +00:00
|
|
|
def->os.bootDevs[i] = VIR_DOMAIN_BOOT_CDROM;
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
def->os.bootDevs[i] = VIR_DOMAIN_BOOT_NET;
|
2007-01-19 20:23:37 +00:00
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
default:
|
2008-07-25 13:50:08 +00:00
|
|
|
def->os.bootDevs[i] = VIR_DOMAIN_BOOT_DISK;
|
2007-01-19 20:23:37 +00:00
|
|
|
break;
|
|
|
|
}
|
2008-07-25 13:50:08 +00:00
|
|
|
def->os.nBootDevs++;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
} else {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "bootloader", &def->os.bootloader) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "bootargs", &def->os.bootloaderArgs) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "kernel", &def->os.kernel) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "ramdisk", &def->os.initrd) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "extra", &def->os.cmdline) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetULong(conn, conf, "memory", &def->memory, MIN_XEN_GUEST_SIZE * 2) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetULong(conn, conf, "maxmem", &def->maxmem, def->memory) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
def->memory *= 1024;
|
|
|
|
def->maxmem *= 1024;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetULong(conn, conf, "vcpus", &def->vcpus, 1) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "cpus", &str, NULL) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (str) {
|
|
|
|
def->cpumasklen = 4096;
|
|
|
|
if (VIR_ALLOC_N(def->cpumask, def->cpumasklen) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (virDomainCpuSetParse(conn, &str, 0,
|
|
|
|
def->cpumask, def->cpumasklen) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (xenXMConfigGetString(conn, conf, "on_poweroff", &str, "destroy") < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if ((def->onPoweroff = virDomainLifecycleTypeFromString(str)) < 0) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected value %s for on_poweroff"), str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xenXMConfigGetString(conn, conf, "on_reboot", &str, "restart") < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if ((def->onReboot = virDomainLifecycleTypeFromString(str)) < 0) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected value %s for on_reboot"), str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xenXMConfigGetString(conn, conf, "on_crash", &str, "restart") < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if ((def->onCrash = virDomainLifecycleTypeFromString(str)) < 0) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected value %s for on_crash"), str);
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2006-11-17 02:03:18 +00:00
|
|
|
if (hvm) {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetBool(conn, conf, "pae", &val, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
else if (val)
|
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_PAE);
|
|
|
|
if (xenXMConfigGetBool(conn, conf, "acpi", &val, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
else if (val)
|
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_ACPI);
|
|
|
|
if (xenXMConfigGetBool(conn, conf, "apic", &val, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
else if (val)
|
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_APIC);
|
|
|
|
}
|
2009-04-01 10:36:52 +00:00
|
|
|
if (xenXMConfigGetBool(conn, conf, "localtime", &def->localtime, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "device_model", &def->emulator) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
list = virConfGetValue(conf, "disk");
|
|
|
|
if (list && list->type == VIR_CONF_LIST) {
|
|
|
|
list = list->list;
|
|
|
|
while (list) {
|
|
|
|
char *head;
|
|
|
|
char *offset;
|
2008-11-28 11:23:34 +00:00
|
|
|
char *tmp;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
|
|
|
|
goto skipdisk;
|
|
|
|
head = list->str;
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (VIR_ALLOC(disk) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/*
|
|
|
|
* Disks have 3 components, SOURCE,DEST-DEVICE,MODE
|
|
|
|
* eg, phy:/dev/HostVG/XenGuest1,xvda,w
|
|
|
|
* The SOURCE is usually prefixed with a driver type,
|
|
|
|
* and optionally driver sub-type
|
|
|
|
* The DEST-DEVICE is optionally post-fixed with disk type
|
|
|
|
*/
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
/* Extract the source file path*/
|
2007-06-15 13:44:19 +00:00
|
|
|
if (!(offset = strchr(head, ',')) || offset[0] == '\0')
|
2006-11-16 19:06:13 +00:00
|
|
|
goto skipdisk;
|
2007-01-19 20:23:37 +00:00
|
|
|
if ((offset - head) >= (PATH_MAX-1))
|
|
|
|
goto skipdisk;
|
2008-11-28 11:23:34 +00:00
|
|
|
|
|
|
|
if (offset == head) {
|
|
|
|
disk->src = NULL; /* No source file given, eg CDROM with no media */
|
|
|
|
} else {
|
|
|
|
if (VIR_ALLOC_N(disk->src, (offset - head) + 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
strncpy(disk->src, head, (offset - head));
|
|
|
|
disk->src[(offset-head)] = '\0';
|
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
head = offset + 1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
/* Remove legacy ioemu: junk */
|
|
|
|
if (STRPREFIX(head, "ioemu:"))
|
|
|
|
head = head + 6;
|
|
|
|
|
|
|
|
/* Extract the dest device name */
|
2007-06-15 13:44:19 +00:00
|
|
|
if (!(offset = strchr(head, ',')) || offset[0] == '\0')
|
2007-01-19 20:23:37 +00:00
|
|
|
goto skipdisk;
|
2008-07-25 13:50:08 +00:00
|
|
|
if (VIR_ALLOC_N(disk->dst, (offset - head) + 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
strncpy(disk->dst, head, (offset - head));
|
|
|
|
disk->dst[(offset-head)] = '\0';
|
2007-01-19 20:23:37 +00:00
|
|
|
head = offset + 1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/* Extract source driver type */
|
2008-11-28 11:23:34 +00:00
|
|
|
if (disk->src) {
|
|
|
|
/* The main type phy:, file:, tap: ... */
|
|
|
|
if ((tmp = strchr(disk->src, ':')) != NULL) {
|
|
|
|
if (VIR_ALLOC_N(disk->driverName, (tmp - disk->src) + 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
strncpy(disk->driverName, disk->src, (tmp - disk->src));
|
|
|
|
disk->driverName[tmp - disk->src] = '\0';
|
|
|
|
|
|
|
|
/* Strip the prefix we found off the source file name */
|
|
|
|
memmove(disk->src, disk->src+(tmp-disk->src)+1,
|
|
|
|
strlen(disk->src)-(tmp-disk->src));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* And the sub-type for tap:XXX: type */
|
|
|
|
if (disk->driverName &&
|
|
|
|
STREQ(disk->driverName, "tap")) {
|
|
|
|
if (!(tmp = strchr(disk->src, ':')))
|
|
|
|
goto skipdisk;
|
|
|
|
if (VIR_ALLOC_N(disk->driverType, (tmp - disk->src) + 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
strncpy(disk->driverType, disk->src, (tmp - disk->src));
|
|
|
|
disk->driverType[tmp - disk->src] = '\0';
|
|
|
|
|
|
|
|
/* Strip the prefix we found off the source file name */
|
|
|
|
memmove(disk->src, disk->src+(tmp-disk->src)+1,
|
|
|
|
strlen(disk->src)-(tmp-disk->src));
|
|
|
|
}
|
2007-11-01 13:33:58 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-11-28 11:23:34 +00:00
|
|
|
/* No source, or driver name, so fix to phy: */
|
|
|
|
if (!disk->driverName &&
|
|
|
|
!(disk->driverName = strdup("phy")))
|
|
|
|
goto no_memory;
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/* phy: type indicates a block device */
|
2008-07-25 13:50:08 +00:00
|
|
|
disk->type = STREQ(disk->driverName, "phy") ?
|
|
|
|
VIR_DOMAIN_DISK_TYPE_BLOCK : VIR_DOMAIN_DISK_TYPE_FILE;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
/* Check for a :cdrom/:disk postfix */
|
2008-07-25 13:50:08 +00:00
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_DISK;
|
|
|
|
if ((tmp = strchr(disk->dst, ':')) != NULL) {
|
2008-05-14 19:51:24 +00:00
|
|
|
if (STREQ(tmp, ":cdrom"))
|
2008-07-25 13:50:08 +00:00
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
|
2007-01-19 20:23:37 +00:00
|
|
|
tmp[0] = '\0';
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (STRPREFIX(disk->dst, "xvd") || !hvm) {
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_XEN;
|
|
|
|
} else if (STRPREFIX(disk->dst, "sd")) {
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
2008-05-08 14:41:56 +00:00
|
|
|
} else {
|
2008-07-25 13:50:08 +00:00
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
2008-05-08 14:41:56 +00:00
|
|
|
}
|
|
|
|
|
2008-05-14 19:51:24 +00:00
|
|
|
if (STREQ(head, "r") ||
|
|
|
|
STREQ(head, "ro"))
|
2008-07-25 13:50:08 +00:00
|
|
|
disk->readonly = 1;
|
2008-05-14 19:51:24 +00:00
|
|
|
else if ((STREQ(head, "w!")) ||
|
|
|
|
(STREQ(head, "!")))
|
2008-07-25 13:50:08 +00:00
|
|
|
disk->shared = 1;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
/* Maintain list in sorted order according to target device name */
|
2008-10-10 16:08:01 +00:00
|
|
|
if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->disks[def->ndisks++] = disk;
|
2008-07-25 13:50:08 +00:00
|
|
|
disk = NULL;
|
|
|
|
|
|
|
|
skipdisk:
|
2007-01-19 20:23:37 +00:00
|
|
|
list = list->next;
|
2008-07-25 13:50:08 +00:00
|
|
|
virDomainDiskDefFree(disk);
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
if (hvm && priv->xendConfigVersion == 1) {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "cdrom", &str, NULL) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (str) {
|
|
|
|
if (VIR_ALLOC(disk) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
|
|
|
|
if (!(disk->driverName = strdup("file")))
|
|
|
|
goto no_memory;
|
|
|
|
if (!(disk->src = strdup(str)))
|
|
|
|
goto no_memory;
|
|
|
|
if (!(disk->dst = strdup("hdc")))
|
|
|
|
goto no_memory;
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
|
|
|
disk->readonly = 1;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->disks[def->ndisks++] = disk;
|
2008-07-25 13:50:08 +00:00
|
|
|
disk = NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
}
|
2008-10-10 16:08:01 +00:00
|
|
|
qsort(def->disks, def->ndisks, sizeof(*def->disks),
|
|
|
|
virDomainDiskQSort);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
list = virConfGetValue(conf, "vif");
|
|
|
|
if (list && list->type == VIR_CONF_LIST) {
|
|
|
|
list = list->list;
|
|
|
|
while (list) {
|
|
|
|
int type = -1;
|
|
|
|
char script[PATH_MAX];
|
2008-04-30 12:30:55 +00:00
|
|
|
char model[10];
|
2007-01-19 20:23:37 +00:00
|
|
|
char ip[16];
|
|
|
|
char mac[18];
|
2007-06-07 18:21:58 +00:00
|
|
|
char bridge[50];
|
2009-04-01 10:16:05 +00:00
|
|
|
char vifname[50];
|
2007-01-19 20:23:37 +00:00
|
|
|
char *key;
|
|
|
|
|
2007-06-07 18:21:58 +00:00
|
|
|
bridge[0] = '\0';
|
2007-01-19 20:23:37 +00:00
|
|
|
mac[0] = '\0';
|
|
|
|
script[0] = '\0';
|
|
|
|
ip[0] = '\0';
|
2008-04-30 12:30:55 +00:00
|
|
|
model[0] = '\0';
|
2009-04-01 10:16:05 +00:00
|
|
|
vifname[0] = '\0';
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
|
|
|
|
goto skipnic;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
key = list->str;
|
|
|
|
while (key) {
|
|
|
|
char *data;
|
2007-06-15 13:44:19 +00:00
|
|
|
char *nextkey = strchr(key, ',');
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2007-06-15 13:44:19 +00:00
|
|
|
if (!(data = strchr(key, '=')) || (data[0] == '\0'))
|
2007-01-19 20:23:37 +00:00
|
|
|
goto skipnic;
|
|
|
|
data++;
|
|
|
|
|
2008-05-14 19:51:24 +00:00
|
|
|
if (STRPREFIX(key, "mac=")) {
|
2007-01-19 20:23:37 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : 17;
|
|
|
|
if (len > 17)
|
|
|
|
len = 17;
|
|
|
|
strncpy(mac, data, len);
|
|
|
|
mac[len] = '\0';
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "bridge=")) {
|
2007-06-07 18:21:58 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(bridge)-1;
|
2007-01-19 20:23:37 +00:00
|
|
|
type = 1;
|
2007-06-07 18:21:58 +00:00
|
|
|
if (len > (sizeof(bridge)-1))
|
|
|
|
len = sizeof(bridge)-1;
|
|
|
|
strncpy(bridge, data, len);
|
|
|
|
bridge[len] = '\0';
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "script=")) {
|
2007-01-19 20:23:37 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : PATH_MAX-1;
|
|
|
|
if (len > (PATH_MAX-1))
|
|
|
|
len = PATH_MAX-1;
|
|
|
|
strncpy(script, data, len);
|
|
|
|
script[len] = '\0';
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "model=")) {
|
2008-04-30 12:30:55 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(model)-1;
|
|
|
|
if (len > (sizeof(model)-1))
|
|
|
|
len = sizeof(model)-1;
|
|
|
|
strncpy(model, data, len);
|
|
|
|
model[len] = '\0';
|
2009-04-01 10:16:05 +00:00
|
|
|
} else if (STRPREFIX(key, "vifname=")) {
|
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(vifname)-1;
|
|
|
|
if (len > (sizeof(vifname)-1))
|
|
|
|
len = sizeof(vifname)-1;
|
|
|
|
strncpy(vifname, data, len);
|
|
|
|
vifname[len] = '\0';
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "ip=")) {
|
2007-01-19 20:23:37 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : 15;
|
|
|
|
if (len > 15)
|
|
|
|
len = 15;
|
|
|
|
strncpy(ip, data, len);
|
|
|
|
ip[len] = '\0';
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
while (nextkey && (nextkey[0] == ',' ||
|
|
|
|
nextkey[0] == ' ' ||
|
|
|
|
nextkey[0] == '\t'))
|
|
|
|
nextkey++;
|
|
|
|
key = nextkey;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/* XXX Forcing to pretend its a bridge */
|
|
|
|
if (type == -1) {
|
2006-11-16 19:06:13 +00:00
|
|
|
type = 1;
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (VIR_ALLOC(net) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (mac[0]) {
|
|
|
|
unsigned int rawmac[6];
|
|
|
|
sscanf(mac, "%02x:%02x:%02x:%02x:%02x:%02x",
|
|
|
|
(unsigned int*)&rawmac[0],
|
|
|
|
(unsigned int*)&rawmac[1],
|
|
|
|
(unsigned int*)&rawmac[2],
|
|
|
|
(unsigned int*)&rawmac[3],
|
|
|
|
(unsigned int*)&rawmac[4],
|
|
|
|
(unsigned int*)&rawmac[5]);
|
|
|
|
net->mac[0] = rawmac[0];
|
|
|
|
net->mac[1] = rawmac[1];
|
|
|
|
net->mac[2] = rawmac[2];
|
|
|
|
net->mac[3] = rawmac[3];
|
|
|
|
net->mac[4] = rawmac[4];
|
|
|
|
net->mac[5] = rawmac[5];
|
|
|
|
}
|
|
|
|
|
2009-01-22 18:29:13 +00:00
|
|
|
if (bridge[0] || STREQ(script, "vif-bridge") ||
|
|
|
|
STREQ(script, "vif-vnic")) {
|
2008-07-25 13:50:08 +00:00
|
|
|
net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
|
2009-01-22 18:29:13 +00:00
|
|
|
} else {
|
2008-07-25 13:50:08 +00:00
|
|
|
net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
|
2009-01-22 18:29:13 +00:00
|
|
|
}
|
2008-07-25 13:50:08 +00:00
|
|
|
|
|
|
|
if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
|
|
|
|
if (bridge[0] &&
|
|
|
|
!(net->data.bridge.brname = strdup(bridge)))
|
|
|
|
goto no_memory;
|
2009-01-22 18:29:13 +00:00
|
|
|
if (script[0] &&
|
|
|
|
!(net->data.bridge.script = strdup(script)))
|
|
|
|
goto no_memory;
|
2009-01-23 01:48:47 +00:00
|
|
|
if (ip[0] &&
|
|
|
|
!(net->data.bridge.ipaddr = strdup(ip)))
|
|
|
|
goto no_memory;
|
2008-07-25 13:50:08 +00:00
|
|
|
} else {
|
|
|
|
if (script[0] &&
|
|
|
|
!(net->data.ethernet.script = strdup(script)))
|
|
|
|
goto no_memory;
|
|
|
|
if (ip[0] &&
|
|
|
|
!(net->data.ethernet.ipaddr = strdup(ip)))
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
if (model[0] &&
|
|
|
|
!(net->model = strdup(model)))
|
|
|
|
goto no_memory;
|
|
|
|
|
2009-04-01 10:16:05 +00:00
|
|
|
if (vifname[0] &&
|
|
|
|
!(net->ifname = strdup(vifname)))
|
|
|
|
goto no_memory;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->nets[def->nnets++] = net;
|
2008-07-25 13:50:08 +00:00
|
|
|
net = NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
skipnic:
|
|
|
|
list = list->next;
|
2008-07-25 13:50:08 +00:00
|
|
|
virDomainNetDefFree(net);
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-03 12:38:52 +00:00
|
|
|
list = virConfGetValue(conf, "pci");
|
|
|
|
if (list && list->type == VIR_CONF_LIST) {
|
|
|
|
list = list->list;
|
|
|
|
while (list) {
|
|
|
|
char domain[5];
|
|
|
|
char bus[3];
|
|
|
|
char slot[3];
|
|
|
|
char func[2];
|
|
|
|
char *key, *nextkey;
|
|
|
|
int domainID;
|
|
|
|
int busID;
|
|
|
|
int slotID;
|
|
|
|
int funcID;
|
|
|
|
|
|
|
|
domain[0] = bus[0] = slot[0] = func[0] = '\0';
|
|
|
|
|
|
|
|
if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
/* pci=['0000:00:1b.0','0000:00:13.0'] */
|
|
|
|
key = list->str;
|
|
|
|
if (!(key = list->str))
|
|
|
|
goto skippci;
|
|
|
|
if (!(nextkey = strchr(key, ':')))
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
if ((nextkey - key) > (sizeof(domain)-1))
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
strncpy(domain, key, sizeof(domain));
|
|
|
|
domain[sizeof(domain)-1] = '\0';
|
|
|
|
|
|
|
|
key = nextkey + 1;
|
|
|
|
if (!(nextkey = strchr(key, ':')))
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
strncpy(bus, key, sizeof(bus));
|
|
|
|
bus[sizeof(bus)-1] = '\0';
|
|
|
|
|
|
|
|
key = nextkey + 1;
|
|
|
|
if (!(nextkey = strchr(key, '.')))
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
strncpy(slot, key, sizeof(slot));
|
|
|
|
slot[sizeof(slot)-1] = '\0';
|
|
|
|
|
|
|
|
key = nextkey + 1;
|
|
|
|
if (strlen(key) != 1)
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
strncpy(func, key, sizeof(func));
|
|
|
|
func[sizeof(func)-1] = '\0';
|
|
|
|
|
|
|
|
if (virStrToLong_i(domain, NULL, 16, &domainID) < 0)
|
|
|
|
goto skippci;
|
|
|
|
if (virStrToLong_i(bus, NULL, 16, &busID) < 0)
|
|
|
|
goto skippci;
|
|
|
|
if (virStrToLong_i(slot, NULL, 16, &slotID) < 0)
|
|
|
|
goto skippci;
|
|
|
|
if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
|
|
|
|
goto skippci;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(hostdev) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
hostdev->managed = 0;
|
|
|
|
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
|
|
|
|
hostdev->source.subsys.u.pci.domain = domainID;
|
|
|
|
hostdev->source.subsys.u.pci.bus = busID;
|
|
|
|
hostdev->source.subsys.u.pci.slot = slotID;
|
|
|
|
hostdev->source.subsys.u.pci.function = funcID;
|
|
|
|
|
|
|
|
if (VIR_REALLOC_N(def->hostdevs, def->nhostdevs+1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->hostdevs[def->nhostdevs++] = hostdev;
|
|
|
|
hostdev = NULL;
|
|
|
|
|
|
|
|
skippci:
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-18 21:08:22 +00:00
|
|
|
if (hvm) {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "usbdevice", &str, NULL) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (str &&
|
|
|
|
(STREQ(str, "tablet") ||
|
|
|
|
STREQ(str, "mouse"))) {
|
|
|
|
virDomainInputDefPtr input;
|
|
|
|
if (VIR_ALLOC(input) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
input->bus = VIR_DOMAIN_INPUT_BUS_USB;
|
|
|
|
input->type = STREQ(str, "tablet") ?
|
|
|
|
VIR_DOMAIN_INPUT_TYPE_TABLET :
|
|
|
|
VIR_DOMAIN_INPUT_TYPE_MOUSE;
|
2008-10-10 16:08:01 +00:00
|
|
|
if (VIR_ALLOC_N(def->inputs, 1) < 0) {
|
|
|
|
virDomainInputDefFree(input);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
def->inputs[0] = input;
|
|
|
|
def->ninputs = 1;
|
2007-07-18 21:08:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/* HVM guests, or old PV guests use this config format */
|
2007-04-04 14:19:49 +00:00
|
|
|
if (hvm || priv->xendConfigVersion < 3) {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetBool(conn, conf, "vnc", &val, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (val) {
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;
|
|
|
|
if (xenXMConfigGetBool(conn, conf, "vncunused", &val, 1) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
graphics->data.vnc.autoport = val ? 1 : 0;
|
|
|
|
|
|
|
|
if (!graphics->data.vnc.autoport) {
|
|
|
|
unsigned long vncdisplay;
|
|
|
|
if (xenXMConfigGetULong(conn, conf, "vncdisplay", &vncdisplay, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
graphics->data.vnc.port = (int)vncdisplay + 5900;
|
|
|
|
}
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "vnclisten", &graphics->data.vnc.listenAddr) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "vncpasswd", &graphics->data.vnc.passwd) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "keymap", &graphics->data.vnc.keymap) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2009-05-07 07:27:49 +00:00
|
|
|
if (VIR_ALLOC_N(def->graphics, 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->graphics[0] = graphics;
|
|
|
|
def->ngraphics = 1;
|
2008-07-25 13:50:08 +00:00
|
|
|
graphics = NULL;
|
|
|
|
} else {
|
|
|
|
if (xenXMConfigGetBool(conn, conf, "sdl", &val, 0) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (val) {
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "display", &graphics->data.sdl.display) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (xenXMConfigCopyStringOpt(conn, conf, "xauthority", &graphics->data.sdl.xauth) < 0)
|
|
|
|
goto cleanup;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (VIR_ALLOC_N(def->graphics, 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->graphics[0] = graphics;
|
|
|
|
def->ngraphics = 1;
|
2008-07-25 13:50:08 +00:00
|
|
|
graphics = NULL;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
2007-10-10 17:55:38 +00:00
|
|
|
}
|
2008-07-25 13:50:08 +00:00
|
|
|
|
|
|
|
if (!hvm && def->graphics == NULL) { /* New PV guests use this format */
|
2007-01-19 20:23:37 +00:00
|
|
|
list = virConfGetValue(conf, "vfb");
|
|
|
|
if (list && list->type == VIR_CONF_LIST &&
|
|
|
|
list->list && list->list->type == VIR_CONF_STRING &&
|
|
|
|
list->list->str) {
|
2008-07-25 13:50:08 +00:00
|
|
|
char vfb[MAX_VFB];
|
2007-01-19 20:23:37 +00:00
|
|
|
char *key = vfb;
|
|
|
|
strncpy(vfb, list->list->str, MAX_VFB-1);
|
|
|
|
vfb[MAX_VFB-1] = '\0';
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (strstr(key, "type=sdl"))
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
|
|
|
|
else
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
while (key) {
|
|
|
|
char *data;
|
2007-06-15 13:44:19 +00:00
|
|
|
char *nextkey = strchr(key, ',');
|
2007-01-19 20:23:37 +00:00
|
|
|
char *end = nextkey;
|
|
|
|
if (nextkey) {
|
|
|
|
*end = '\0';
|
|
|
|
nextkey++;
|
|
|
|
}
|
|
|
|
|
2007-06-15 13:44:19 +00:00
|
|
|
if (!(data = strchr(key, '=')) || (data[0] == '\0'))
|
2007-01-19 20:23:37 +00:00
|
|
|
break;
|
|
|
|
data++;
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
|
|
|
|
if (STRPREFIX(key, "vncunused=")) {
|
|
|
|
if (STREQ(key + 10, "1"))
|
|
|
|
graphics->data.vnc.autoport = 1;
|
|
|
|
} else if (STRPREFIX(key, "vnclisten=")) {
|
|
|
|
if (!(graphics->data.vnc.listenAddr = strdup(key + 10)))
|
|
|
|
goto no_memory;
|
|
|
|
} else if (STRPREFIX(key, "vncpasswd=")) {
|
|
|
|
if (!(graphics->data.vnc.passwd = strdup(key + 10)))
|
|
|
|
goto no_memory;
|
|
|
|
} else if (STRPREFIX(key, "keymap=")) {
|
|
|
|
if (!(graphics->data.vnc.keymap = strdup(key + 7)))
|
|
|
|
goto no_memory;
|
|
|
|
} else if (STRPREFIX(key, "vncdisplay=")) {
|
|
|
|
graphics->data.vnc.port = strtol(key+11, NULL, 10) + 5900;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (STRPREFIX(key, "display=")) {
|
|
|
|
if (!(graphics->data.sdl.display = strdup(key + 8)))
|
|
|
|
goto no_memory;
|
|
|
|
} else if (STRPREFIX(key, "xauthority=")) {
|
|
|
|
if (!(graphics->data.sdl.xauth = strdup(key + 11)))
|
|
|
|
goto no_memory;
|
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
while (nextkey && (nextkey[0] == ',' ||
|
|
|
|
nextkey[0] == ' ' ||
|
|
|
|
nextkey[0] == '\t'))
|
|
|
|
nextkey++;
|
|
|
|
key = nextkey;
|
|
|
|
}
|
2009-05-07 07:27:49 +00:00
|
|
|
if (VIR_ALLOC_N(def->graphics, 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
def->graphics[0] = graphics;
|
|
|
|
def->ngraphics = 1;
|
2008-07-25 13:50:08 +00:00
|
|
|
graphics = NULL;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2006-11-17 02:03:18 +00:00
|
|
|
if (hvm) {
|
2008-10-10 16:08:01 +00:00
|
|
|
virDomainChrDefPtr chr = NULL;
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "parallel", &str, NULL) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (str && STRNEQ(str, "none") &&
|
2008-10-10 16:08:01 +00:00
|
|
|
!(chr = xenDaemonParseSxprChar(conn, str, NULL)))
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
if (chr) {
|
|
|
|
if (VIR_ALLOC_N(def->parallels, 1) < 0) {
|
|
|
|
virDomainChrDefFree(chr);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
def->parallels[0] = chr;
|
|
|
|
def->nparallels++;
|
|
|
|
chr = NULL;
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "serial", &str, NULL) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
if (str && STRNEQ(str, "none") &&
|
2008-10-10 16:08:01 +00:00
|
|
|
!(chr = xenDaemonParseSxprChar(conn, str, NULL)))
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2008-10-10 16:08:01 +00:00
|
|
|
|
|
|
|
if (chr) {
|
|
|
|
if (VIR_ALLOC_N(def->serials, 1) < 0) {
|
|
|
|
virDomainChrDefFree(chr);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
def->serials[0] = chr;
|
|
|
|
def->nserials++;
|
|
|
|
}
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (!(def->console = xenDaemonParseSxprChar(conn, "pty", NULL)))
|
|
|
|
goto cleanup;
|
2006-11-17 02:03:18 +00:00
|
|
|
}
|
|
|
|
|
2008-05-07 14:04:40 +00:00
|
|
|
if (hvm) {
|
2008-07-25 13:50:08 +00:00
|
|
|
if (xenXMConfigGetString(conn, conf, "soundhw", &str, NULL) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (str &&
|
|
|
|
xenDaemonParseSxprSound(conn, def, str) < 0)
|
|
|
|
goto cleanup;
|
2008-07-25 13:39:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return def;
|
2008-05-07 14:04:40 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
no_memory:
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-07-25 13:50:08 +00:00
|
|
|
/* fallthrough */
|
|
|
|
cleanup:
|
|
|
|
virDomainGraphicsDefFree(graphics);
|
|
|
|
virDomainNetDefFree(net);
|
|
|
|
virDomainDiskDefFree(disk);
|
|
|
|
virDomainDefFree(def);
|
2008-05-07 14:04:40 +00:00
|
|
|
return NULL;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/*
|
|
|
|
* Turn a config record into a lump of XML describing the
|
2008-10-10 09:32:27 +00:00
|
|
|
* domain, suitable for later feeding for virDomainCreateXML
|
2007-01-19 20:23:37 +00:00
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
char *xenXMDomainDumpXML(virDomainPtr domain, int flags) {
|
2009-01-20 18:20:09 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2007-01-19 20:23:37 +00:00
|
|
|
const char *filename;
|
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
char *ret = NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return(NULL);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2007-01-19 20:23:37 +00:00
|
|
|
return (NULL);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = virDomainDefFormat(domain->conn, entry->def, flags);
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
/*
|
|
|
|
* Update amount of memory in the config file
|
|
|
|
*/
|
|
|
|
int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO)
|
|
|
|
return (-1);
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
2008-10-31 13:06:17 +00:00
|
|
|
if (memory < 1024 * MIN_XEN_GUEST_SIZE)
|
|
|
|
return (-1);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
entry->def->memory = memory;
|
|
|
|
if (entry->def->memory > entry->def->maxmem)
|
|
|
|
entry->def->memory = entry->def->maxmem;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
/* If this fails, should we try to undo our changes to the
|
|
|
|
* in-memory representation of the config file. I say not!
|
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
|
|
|
ret = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update maximum memory limit in config
|
|
|
|
*/
|
|
|
|
int xenXMDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO)
|
|
|
|
return (-1);
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
entry->def->maxmem = memory;
|
|
|
|
if (entry->def->memory > entry->def->maxmem)
|
|
|
|
entry->def->memory = entry->def->maxmem;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
/* If this fails, should we try to undo our changes to the
|
|
|
|
* in-memory representation of the config file. I say not!
|
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
|
|
|
ret = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get max memory limit from config
|
|
|
|
*/
|
|
|
|
unsigned long xenXMDomainGetMaxMemory(virDomainPtr domain) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
unsigned long ret = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
2009-01-21 18:11:14 +00:00
|
|
|
return (0);
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2009-01-21 18:11:14 +00:00
|
|
|
return (0);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = entry->def->maxmem;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the VCPU count in config
|
|
|
|
*/
|
|
|
|
int xenXMDomainSetVcpus(virDomainPtr domain, unsigned int vcpus) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO)
|
|
|
|
return (-1);
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
entry->def->vcpus = vcpus;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
/* If this fails, should we try to undo our changes to the
|
|
|
|
* in-memory representation of the config file. I say not!
|
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
|
|
|
ret = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2007-11-28 10:11:18 +00:00
|
|
|
/**
|
|
|
|
* xenXMDomainPinVcpu:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @vcpu: virtual CPU number (reserved)
|
|
|
|
* @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes)
|
|
|
|
* @maplen: length of cpumap in bytes
|
|
|
|
*
|
|
|
|
* Set the vcpu affinity in config
|
|
|
|
*
|
|
|
|
* Returns 0 for success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int xenXMDomainPinVcpu(virDomainPtr domain,
|
|
|
|
unsigned int vcpu ATTRIBUTE_UNUSED,
|
|
|
|
unsigned char *cpumap, int maplen)
|
|
|
|
{
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2007-11-28 10:11:18 +00:00
|
|
|
const char *filename;
|
|
|
|
xenXMConfCachePtr entry;
|
2008-04-28 15:14:59 +00:00
|
|
|
virBuffer mapbuf = VIR_BUFFER_INITIALIZER;
|
2009-04-15 09:53:34 +00:00
|
|
|
char *mapstr = NULL, *mapsave = NULL;
|
2007-11-28 10:11:18 +00:00
|
|
|
int i, j, n, comma = 0;
|
|
|
|
int ret = -1;
|
2008-07-25 13:39:02 +00:00
|
|
|
char *cpuset = NULL;
|
|
|
|
int maxcpu = XEN_MAX_PHYSICAL_CPU;
|
2007-11-28 10:11:18 +00:00
|
|
|
|
|
|
|
if (domain == NULL || domain->conn == NULL || domain->name == NULL
|
|
|
|
|| cpumap == NULL || maplen < 1 || maplen > (int)sizeof(cpumap_t)) {
|
|
|
|
xenXMError(domain ? domain->conn : NULL, VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO) {
|
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 13:43:01 +00:00
|
|
|
xenXMError (domain->conn, VIR_ERR_INVALID_ARG,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("read only connection"));
|
2007-11-28 10:11:18 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (domain->id != -1) {
|
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 13:43:01 +00:00
|
|
|
xenXMError (domain->conn, VIR_ERR_INVALID_ARG,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("not inactive domain"));
|
2007-11-28 10:11:18 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name))) {
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("virHashLookup"));
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2007-11-28 10:11:18 +00:00
|
|
|
}
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename))) {
|
2007-11-28 10:11:18 +00:00
|
|
|
xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("can't retrieve config file for domain"));
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2007-11-28 10:11:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* from bit map, build character string of mapped CPU numbers */
|
|
|
|
for (i = 0; i < maplen; i++)
|
|
|
|
for (j = 0; j < 8; j++)
|
|
|
|
if ((cpumap[i] & (1 << j))) {
|
|
|
|
n = i*8 + j;
|
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
if (comma)
|
|
|
|
virBufferAddLit (&mapbuf, ",");
|
2007-11-28 10:11:18 +00:00
|
|
|
comma = 1;
|
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf (&mapbuf, "%d", n);
|
2007-11-28 10:11:18 +00:00
|
|
|
}
|
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
if (virBufferError(&mapbuf)) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(domain->conn);
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2008-04-28 15:14:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mapstr = virBufferContentAndReset(&mapbuf);
|
2009-04-15 09:53:34 +00:00
|
|
|
mapsave = mapstr;
|
2007-11-28 10:11:18 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if (VIR_ALLOC_N(cpuset, maxcpu) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(domain->conn);
|
2008-07-25 13:39:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (virDomainCpuSetParse(domain->conn,
|
|
|
|
(const char **)&mapstr, 0,
|
|
|
|
cpuset, maxcpu) < 0)
|
|
|
|
goto cleanup;
|
2007-11-28 10:11:18 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
VIR_FREE(entry->def->cpumask);
|
|
|
|
entry->def->cpumask = cpuset;
|
|
|
|
entry->def->cpumasklen = maxcpu;
|
|
|
|
cpuset = NULL;
|
2007-11-28 10:11:18 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
|
2007-11-28 10:11:18 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
2009-04-15 09:53:34 +00:00
|
|
|
VIR_FREE(mapsave);
|
2008-07-25 13:39:02 +00:00
|
|
|
VIR_FREE(cpuset);
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2007-11-28 10:11:18 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
/*
|
|
|
|
* Find an inactive domain based on its name
|
|
|
|
*/
|
|
|
|
virDomainPtr xenXMDomainLookupByName(virConnectPtr conn, const char *domname) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
virDomainPtr ret = NULL;
|
2008-07-25 13:39:02 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (domname == NULL) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
if (!xenInotifyActive(conn) && xenXMConfigCacheRefresh (conn) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domname)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
if (!(ret = virGetDomain(conn, domname, entry->def->uuid)))
|
|
|
|
goto cleanup;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
/* Ensure its marked inactive, because may be cached
|
|
|
|
handle to a previously active domain */
|
2007-01-22 16:25:27 +00:00
|
|
|
ret->id = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Hash table iterator to search for a domain based on UUID
|
|
|
|
*/
|
|
|
|
static int xenXMDomainSearchForUUID(const void *payload, const char *name ATTRIBUTE_UNUSED, const void *data) {
|
|
|
|
const unsigned char *wantuuid = (const unsigned char *)data;
|
|
|
|
const xenXMConfCachePtr entry = (const xenXMConfCachePtr)payload;
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if (!memcmp(entry->def->uuid, wantuuid, VIR_UUID_BUFLEN))
|
2006-11-16 19:06:13 +00:00
|
|
|
return (1);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find an inactive domain based on its UUID
|
|
|
|
*/
|
|
|
|
virDomainPtr xenXMDomainLookupByUUID(virConnectPtr conn,
|
|
|
|
const unsigned char *uuid) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
virDomainPtr ret = NULL;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (uuid == NULL) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
if (!xenInotifyActive(conn) && xenXMConfigCacheRefresh (conn) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
if (!(entry = virHashSearch(priv->configCache, xenXMDomainSearchForUUID, (const void *)uuid)))
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
if (!(ret = virGetDomain(conn, entry->def->name, uuid)))
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
/* Ensure its marked inactive, because may be cached
|
|
|
|
handle to a previously active domain */
|
2007-01-22 16:25:27 +00:00
|
|
|
ret->id = -1;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Start a domain from an existing defined config file
|
|
|
|
*/
|
|
|
|
int xenXMDomainCreate(virDomainPtr domain) {
|
|
|
|
char *sexpr;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 13:39:02 +00:00
|
|
|
const char *filename;
|
|
|
|
xenXMConfCachePtr entry;
|
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-04-01 10:01:23 +00:00
|
|
|
if (!(sexpr = xenDaemonFormatSxpr(domain->conn, entry->def, priv->xendConfigVersion)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2008-07-25 13:17:27 +00:00
|
|
|
|
2008-10-10 09:32:27 +00:00
|
|
|
ret = xenDaemonDomainCreateXML(domain->conn, sexpr);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(sexpr);
|
2009-01-21 18:11:14 +00:00
|
|
|
if (ret != 0)
|
|
|
|
goto error;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if ((ret = xenDaemonDomainLookupByName_ids(domain->conn, domain->name,
|
2009-01-21 18:11:14 +00:00
|
|
|
entry->def->uuid)) < 0)
|
|
|
|
goto error;
|
2007-01-22 16:25:27 +00:00
|
|
|
domain->id = ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-02-22 19:09:29 +00:00
|
|
|
if ((ret = xend_wait_for_devices(domain->conn, domain->name)) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2007-02-22 19:09:29 +00:00
|
|
|
|
|
|
|
if ((ret = xenDaemonDomainResume(domain)) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto error;
|
2007-02-22 19:09:29 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2007-02-22 19:09:29 +00:00
|
|
|
return (0);
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
error:
|
2007-02-22 19:09:29 +00:00
|
|
|
if (domain->id != -1) {
|
2006-11-16 19:06:13 +00:00
|
|
|
xenDaemonDomainDestroy(domain);
|
2007-01-22 16:25:27 +00:00
|
|
|
domain->id = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2007-02-22 19:09:29 +00:00
|
|
|
return (-1);
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
static
|
|
|
|
int xenXMConfigSetInt(virConfPtr conf, const char *setting, long l) {
|
|
|
|
virConfValuePtr value = NULL;
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC(value) < 0)
|
2007-01-19 20:23:37 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
value->type = VIR_CONF_LONG;
|
|
|
|
value->next = NULL;
|
|
|
|
value->l = l;
|
|
|
|
|
|
|
|
return virConfSetValue(conf, setting, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) {
|
|
|
|
virConfValuePtr value = NULL;
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC(value) < 0)
|
2007-01-19 20:23:37 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
value->type = VIR_CONF_STRING;
|
|
|
|
value->next = NULL;
|
|
|
|
if (!(value->str = strdup(str))) {
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(value);
|
2007-01-19 20:23:37 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return virConfSetValue(conf, setting, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
static int xenXMDomainConfigFormatDisk(virConnectPtr conn,
|
|
|
|
virConfValuePtr list,
|
|
|
|
virDomainDiskDefPtr disk,
|
|
|
|
int hvm,
|
|
|
|
int xendConfigVersion)
|
|
|
|
{
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
virConfValuePtr val, tmp;
|
|
|
|
char *str;
|
|
|
|
|
|
|
|
if(disk->src) {
|
|
|
|
if (disk->driverName) {
|
|
|
|
virBufferVSprintf(&buf, "%s:", disk->driverName);
|
|
|
|
if (STREQ(disk->driverName, "tap"))
|
|
|
|
virBufferVSprintf(&buf, "%s:", disk->driverType ? disk->driverType : "aio");
|
|
|
|
} else {
|
|
|
|
virBufferVSprintf(&buf, "%s:",
|
|
|
|
disk->type == VIR_DOMAIN_DISK_TYPE_FILE ?
|
|
|
|
"file" : "phy");
|
|
|
|
}
|
|
|
|
virBufferVSprintf(&buf, "%s", disk->src);
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, ",");
|
|
|
|
if (hvm && xendConfigVersion == 1)
|
|
|
|
virBufferAddLit(&buf, "ioemu:");
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, "%s", disk->dst);
|
|
|
|
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
|
|
|
|
virBufferAddLit(&buf, ":cdrom");
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (disk->readonly)
|
|
|
|
virBufferAddLit(&buf, ",r");
|
|
|
|
else if (disk->shared)
|
|
|
|
virBufferAddLit(&buf, ",!");
|
|
|
|
else
|
|
|
|
virBufferAddLit(&buf, ",w");
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (virBufferError(&buf)) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-07-25 14:10:49 +00:00
|
|
|
return -1;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (VIR_ALLOC(val) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-07-25 14:10:49 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
val->type = VIR_CONF_STRING;
|
|
|
|
val->str = virBufferContentAndReset(&buf);
|
|
|
|
tmp = list->list;
|
|
|
|
while (tmp && tmp->next)
|
|
|
|
tmp = tmp->next;
|
|
|
|
if (tmp)
|
|
|
|
tmp->next = val;
|
|
|
|
else
|
|
|
|
list->list = val;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
return 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
cleanup:
|
|
|
|
str = virBufferContentAndReset(&buf);
|
|
|
|
VIR_FREE(str);
|
|
|
|
return -1;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
static int xenXMDomainConfigFormatNet(virConnectPtr conn,
|
|
|
|
virConfValuePtr list,
|
|
|
|
virDomainNetDefPtr net,
|
|
|
|
int hvm)
|
|
|
|
{
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
virConfValuePtr val, tmp;
|
|
|
|
char *str;
|
2009-01-19 15:24:41 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
virBufferVSprintf(&buf, "mac=%02x:%02x:%02x:%02x:%02x:%02x",
|
|
|
|
net->mac[0], net->mac[1],
|
|
|
|
net->mac[2], net->mac[3],
|
|
|
|
net->mac[4], net->mac[5]);
|
|
|
|
|
|
|
|
switch (net->type) {
|
|
|
|
case VIR_DOMAIN_NET_TYPE_BRIDGE:
|
|
|
|
virBufferVSprintf(&buf, ",bridge=%s", net->data.bridge.brname);
|
2009-01-23 01:48:47 +00:00
|
|
|
if (net->data.bridge.ipaddr)
|
|
|
|
virBufferVSprintf(&buf, ",ip=%s", net->data.bridge.ipaddr);
|
2009-04-24 12:17:50 +00:00
|
|
|
virBufferVSprintf(&buf, ",script=%s", DEFAULT_VIF_SCRIPT);
|
2008-07-25 14:10:49 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_NET_TYPE_ETHERNET:
|
|
|
|
if (net->data.ethernet.script)
|
|
|
|
virBufferVSprintf(&buf, ",script=%s", net->data.ethernet.script);
|
|
|
|
if (net->data.ethernet.ipaddr)
|
|
|
|
virBufferVSprintf(&buf, ",ip=%s", net->data.ethernet.ipaddr);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_NET_TYPE_NETWORK:
|
2009-04-24 12:17:50 +00:00
|
|
|
{
|
|
|
|
virNetworkPtr network = virNetworkLookupByName(conn, net->data.network.name);
|
|
|
|
char *bridge;
|
|
|
|
if (!network) {
|
|
|
|
xenXMError(conn, VIR_ERR_NO_NETWORK, "%s",
|
|
|
|
net->data.network.name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
bridge = virNetworkGetBridgeName(network);
|
|
|
|
virNetworkFree(network);
|
|
|
|
if (!bridge) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("network %s is not active"),
|
|
|
|
net->data.network.name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
virBufferVSprintf(&buf, ",bridge=%s", bridge);
|
|
|
|
virBufferVSprintf(&buf, ",script=%s", DEFAULT_VIF_SCRIPT);
|
|
|
|
}
|
|
|
|
break;
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unsupported network type %d"),
|
|
|
|
net->type);
|
2007-01-19 20:23:37 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2009-01-19 18:12:00 +00:00
|
|
|
if (hvm && priv->xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, ",type=ioemu");
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (net->model)
|
|
|
|
virBufferVSprintf(&buf, ",model=%s",
|
|
|
|
net->model);
|
2007-11-01 13:33:58 +00:00
|
|
|
|
2009-04-01 10:16:05 +00:00
|
|
|
if (net->ifname)
|
|
|
|
virBufferVSprintf(&buf, ",vifname=%s",
|
|
|
|
net->ifname);
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (VIR_ALLOC(val) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-07-25 14:10:49 +00:00
|
|
|
goto cleanup;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
val->type = VIR_CONF_STRING;
|
|
|
|
val->str = virBufferContentAndReset(&buf);
|
|
|
|
tmp = list->list;
|
|
|
|
while (tmp && tmp->next)
|
|
|
|
tmp = tmp->next;
|
|
|
|
if (tmp)
|
|
|
|
tmp->next = val;
|
2007-11-01 13:33:58 +00:00
|
|
|
else
|
2008-07-25 14:10:49 +00:00
|
|
|
list->list = val;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
return 0;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
cleanup:
|
|
|
|
str = virBufferContentAndReset(&buf);
|
|
|
|
VIR_FREE(str);
|
|
|
|
return -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
|
2009-04-03 12:38:52 +00:00
|
|
|
static int
|
|
|
|
xenXMDomainConfigFormatPCI(virConnectPtr conn,
|
|
|
|
virConfPtr conf,
|
|
|
|
virDomainDefPtr def)
|
|
|
|
{
|
|
|
|
|
|
|
|
virConfValuePtr pciVal = NULL;
|
|
|
|
int hasPCI = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0 ; i < def->nhostdevs ; i++)
|
|
|
|
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
|
|
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
|
|
hasPCI = 1;
|
|
|
|
|
|
|
|
if (!hasPCI)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(pciVal) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pciVal->type = VIR_CONF_LIST;
|
|
|
|
pciVal->list = NULL;
|
|
|
|
|
|
|
|
for (i = 0 ; i < def->nhostdevs ; i++) {
|
|
|
|
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
|
|
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
|
|
|
|
virConfValuePtr val, tmp;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
if (virAsprintf(&buf, "%04x:%02x:%02x.%x",
|
|
|
|
def->hostdevs[i]->source.subsys.u.pci.domain,
|
|
|
|
def->hostdevs[i]->source.subsys.u.pci.bus,
|
|
|
|
def->hostdevs[i]->source.subsys.u.pci.slot,
|
|
|
|
def->hostdevs[i]->source.subsys.u.pci.function) < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(val) < 0) {
|
|
|
|
VIR_FREE(buf);
|
|
|
|
virReportOOMError(conn);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
val->type = VIR_CONF_STRING;
|
|
|
|
val->str = buf;
|
|
|
|
tmp = pciVal->list;
|
|
|
|
while (tmp && tmp->next)
|
|
|
|
tmp = tmp->next;
|
|
|
|
if (tmp)
|
|
|
|
tmp->next = val;
|
|
|
|
else
|
|
|
|
pciVal->list = val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pciVal->list != NULL) {
|
|
|
|
int ret = virConfSetValue(conf, "pci", pciVal);
|
|
|
|
pciVal = NULL;
|
|
|
|
if (ret < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
VIR_FREE(pciVal);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
virConfFreeValue(pciVal);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def) {
|
2006-11-16 19:06:13 +00:00
|
|
|
virConfPtr conf = NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
int hvm = 0, i;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 14:10:49 +00:00
|
|
|
char *cpus = NULL;
|
|
|
|
const char *lifecycle;
|
|
|
|
char uuid[VIR_UUID_STRING_BUFLEN];
|
|
|
|
virConfValuePtr diskVal = NULL;
|
|
|
|
virConfValuePtr netVal = NULL;
|
2008-07-25 13:39:02 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (!(conf = virConfNew()))
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetString(conf, "name", def->name) < 0)
|
|
|
|
goto no_memory;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
virUUIDFormat(def->uuid, uuid);
|
|
|
|
if (xenXMConfigSetString(conf, "uuid", uuid) < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "maxmem", def->maxmem / 1024) < 0)
|
|
|
|
goto no_memory;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "memory", def->memory / 1024) < 0)
|
|
|
|
goto no_memory;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "vcpus", def->vcpus) < 0)
|
|
|
|
goto no_memory;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (def->cpumask &&
|
|
|
|
!(cpus = virDomainCpuSetFormat(conn, def->cpumask, def->cpumasklen)) < 0)
|
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (cpus &&
|
|
|
|
xenXMConfigSetString(conf, "cpus", cpus) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
VIR_FREE(cpus);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
hvm = STREQ(def->os.type, "hvm") ? 1 : 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (hvm) {
|
|
|
|
char boot[VIR_DOMAIN_BOOT_LAST+1];
|
|
|
|
if (xenXMConfigSetString(conf, "builder", "hvm") < 0)
|
|
|
|
goto no_memory;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (def->os.loader &&
|
|
|
|
xenXMConfigSetString(conf, "kernel", def->os.loader) < 0)
|
|
|
|
goto no_memory;
|
2007-10-31 09:39:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
for (i = 0 ; i < def->os.nBootDevs ; i++) {
|
|
|
|
switch (def->os.bootDevs[i]) {
|
|
|
|
case VIR_DOMAIN_BOOT_FLOPPY:
|
|
|
|
boot[i] = 'a';
|
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_BOOT_CDROM:
|
|
|
|
boot[i] = 'd';
|
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_BOOT_NET:
|
|
|
|
boot[i] = 'n';
|
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_BOOT_DISK:
|
|
|
|
default:
|
|
|
|
boot[i] = 'c';
|
|
|
|
break;
|
|
|
|
}
|
2008-06-03 08:01:45 +00:00
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
if (!def->os.nBootDevs) {
|
|
|
|
boot[0] = 'c';
|
|
|
|
boot[1] = '\0';
|
|
|
|
} else {
|
|
|
|
boot[def->os.nBootDevs] = '\0';
|
2008-04-10 16:54:54 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
if (xenXMConfigSetString(conf, "boot", boot) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "pae",
|
|
|
|
(def->features &
|
|
|
|
(1 << VIR_DOMAIN_FEATURE_PAE)) ? 1 : 0) < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "acpi",
|
|
|
|
(def->features &
|
|
|
|
(1 << VIR_DOMAIN_FEATURE_ACPI)) ? 1 : 0) < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "apic",
|
|
|
|
(def->features &
|
|
|
|
(1 << VIR_DOMAIN_FEATURE_APIC)) ? 1 : 0) < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
if (xenXMConfigSetInt(conf, "localtime", def->localtime ? 1 : 0) < 0)
|
|
|
|
goto no_memory;
|
2007-07-16 21:30:30 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
if (priv->xendConfigVersion == 1) {
|
2008-10-10 16:08:01 +00:00
|
|
|
for (i = 0 ; i < def->ndisks ; i++) {
|
|
|
|
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
|
|
|
|
def->disks[i]->dst &&
|
|
|
|
STREQ(def->disks[i]->dst, "hdc") &&
|
|
|
|
def->disks[i]->src) {
|
|
|
|
if (xenXMConfigSetString(conf, "cdrom",
|
|
|
|
def->disks[i]->src) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
/* XXX floppy disks */
|
2007-01-19 20:23:37 +00:00
|
|
|
} else {
|
2008-07-25 14:10:49 +00:00
|
|
|
if (def->os.bootloader &&
|
|
|
|
xenXMConfigSetString(conf, "bootloader", def->os.bootloader) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (def->os.bootloaderArgs &&
|
|
|
|
xenXMConfigSetString(conf, "bootloader_args", def->os.bootloaderArgs) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (def->os.kernel &&
|
|
|
|
xenXMConfigSetString(conf, "kernel", def->os.kernel) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (def->os.initrd &&
|
|
|
|
xenXMConfigSetString(conf, "ramdisk", def->os.initrd) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (def->os.cmdline &&
|
|
|
|
xenXMConfigSetString(conf, "extra", def->os.cmdline) < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (!(lifecycle = virDomainLifecycleTypeToString(def->onPoweroff))) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected lifecycle action %d"), def->onPoweroff);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (xenXMConfigSetString(conf, "on_poweroff", lifecycle) < 0)
|
|
|
|
goto no_memory;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (!(lifecycle = virDomainLifecycleTypeToString(def->onReboot))) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected lifecycle action %d"), def->onReboot);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (xenXMConfigSetString(conf, "on_reboot", lifecycle) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
|
|
|
|
if (!(lifecycle = virDomainLifecycleTypeToString(def->onCrash))) {
|
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected lifecycle action %d"), def->onCrash);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (xenXMConfigSetString(conf, "on_crash", lifecycle) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
if (hvm) {
|
2008-07-25 14:10:49 +00:00
|
|
|
if (def->emulator &&
|
|
|
|
xenXMConfigSetString(conf, "device_model", def->emulator) < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
for (i = 0 ; i < def->ninputs ; i++) {
|
|
|
|
if (def->inputs[i]->bus == VIR_DOMAIN_INPUT_BUS_USB) {
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "usb", 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (xenXMConfigSetString(conf, "usbdevice",
|
2008-10-10 16:08:01 +00:00
|
|
|
def->inputs[i]->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ?
|
2008-07-25 14:10:49 +00:00
|
|
|
"mouse" : "tablet") < 0)
|
|
|
|
goto no_memory;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->ngraphics == 1) {
|
2009-01-19 19:49:30 +00:00
|
|
|
if (priv->xendConfigVersion < (hvm ? 4 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (xenXMConfigSetInt(conf, "vnc", 0) < 0)
|
|
|
|
goto no_memory;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->data.sdl.display &&
|
2008-07-25 14:10:49 +00:00
|
|
|
xenXMConfigSetString(conf, "display",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.sdl.display) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->data.sdl.xauth &&
|
2008-07-25 14:10:49 +00:00
|
|
|
xenXMConfigSetString(conf, "xauthority",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.sdl.xauth) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
|
|
|
} else {
|
|
|
|
if (xenXMConfigSetInt(conf, "sdl", 0) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (xenXMConfigSetInt(conf, "vnc", 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (xenXMConfigSetInt(conf, "vncunused",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.autoport ? 1 : 0) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (!def->graphics[0]->data.vnc.autoport &&
|
2008-07-25 14:10:49 +00:00
|
|
|
xenXMConfigSetInt(conf, "vncdisplay",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.port - 5900) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->data.vnc.listenAddr &&
|
2008-07-25 14:10:49 +00:00
|
|
|
xenXMConfigSetString(conf, "vnclisten",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.listenAddr) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->data.vnc.passwd &&
|
2008-07-25 14:10:49 +00:00
|
|
|
xenXMConfigSetString(conf, "vncpasswd",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.passwd) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->data.vnc.keymap &&
|
2008-07-25 14:10:49 +00:00
|
|
|
xenXMConfigSetString(conf, "keymap",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.keymap) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2007-10-10 17:55:38 +00:00
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
} else {
|
|
|
|
virConfValuePtr vfb, disp;
|
|
|
|
char *vfbstr = NULL;
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, "type=sdl");
|
2009-05-07 07:27:49 +00:00
|
|
|
if (def->graphics[0]->data.sdl.display)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, ",display=%s",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.sdl.display);
|
|
|
|
if (def->graphics[0]->data.sdl.xauth)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, ",xauthority=%s",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.sdl.xauth);
|
2008-07-25 14:10:49 +00:00
|
|
|
} else {
|
|
|
|
virBufferAddLit(&buf, "type=vnc");
|
|
|
|
virBufferVSprintf(&buf, ",vncunused=%d",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.autoport ? 1 : 0);
|
|
|
|
if (!def->graphics[0]->data.vnc.autoport)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, ",vncdisplay=%d",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.port - 5900);
|
|
|
|
if (def->graphics[0]->data.vnc.listenAddr)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, ",vnclisten=%s",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.listenAddr);
|
|
|
|
if (def->graphics[0]->data.vnc.passwd)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, ",vncpasswd=%s",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.passwd);
|
|
|
|
if (def->graphics[0]->data.vnc.keymap)
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(&buf, ",keymap=%s",
|
2009-05-07 07:27:49 +00:00
|
|
|
def->graphics[0]->data.vnc.keymap);
|
2008-07-25 14:10:49 +00:00
|
|
|
}
|
|
|
|
if (virBufferError(&buf))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
vfbstr = virBufferContentAndReset(&buf);
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC(vfb) < 0) {
|
2008-07-25 14:10:49 +00:00
|
|
|
VIR_FREE(vfbstr);
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (VIR_ALLOC(disp) < 0) {
|
|
|
|
VIR_FREE(vfb);
|
|
|
|
VIR_FREE(vfbstr);
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
vfb->type = VIR_CONF_LIST;
|
|
|
|
vfb->list = disp;
|
|
|
|
disp->type = VIR_CONF_STRING;
|
|
|
|
disp->str = vfbstr;
|
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
if (virConfSetValue(conf, "vfb", vfb) < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* analyze of the devices */
|
2008-07-25 14:10:49 +00:00
|
|
|
if (VIR_ALLOC(diskVal) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
diskVal->type = VIR_CONF_LIST;
|
|
|
|
diskVal->list = NULL;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
for (i = 0 ; i < def->ndisks ; i++) {
|
2008-07-25 14:10:49 +00:00
|
|
|
if (priv->xendConfigVersion == 1 &&
|
2008-10-10 16:08:01 +00:00
|
|
|
def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
|
|
|
|
def->disks[i]->dst &&
|
|
|
|
STREQ(def->disks[i]->dst, "hdc")) {
|
2008-07-25 14:10:49 +00:00
|
|
|
continue;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2008-10-10 16:08:01 +00:00
|
|
|
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)
|
2008-07-25 14:10:49 +00:00
|
|
|
continue;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
if (xenXMDomainConfigFormatDisk(conn, diskVal, def->disks[i],
|
2008-07-25 14:10:49 +00:00
|
|
|
hvm, priv->xendConfigVersion) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-02-05 16:03:11 +00:00
|
|
|
if (diskVal->list != NULL) {
|
|
|
|
int ret = virConfSetValue(conf, "disk", diskVal);
|
2008-07-25 14:10:49 +00:00
|
|
|
diskVal = NULL;
|
2009-02-05 16:03:11 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2009-02-05 16:03:11 +00:00
|
|
|
VIR_FREE(diskVal);
|
2008-04-26 14:22:02 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (VIR_ALLOC(netVal) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
netVal->type = VIR_CONF_LIST;
|
|
|
|
netVal->list = NULL;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
for (i = 0 ; i < def->nnets ; i++) {
|
|
|
|
if (xenXMDomainConfigFormatNet(conn, netVal,
|
|
|
|
def->nets[i],
|
2008-07-25 14:10:49 +00:00
|
|
|
hvm) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-02-05 16:03:11 +00:00
|
|
|
if (netVal->list != NULL) {
|
|
|
|
int ret = virConfSetValue(conf, "vif", netVal);
|
2008-07-25 14:10:49 +00:00
|
|
|
netVal = NULL;
|
2009-02-05 16:03:11 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto no_memory;
|
2008-07-25 14:10:49 +00:00
|
|
|
}
|
2009-02-05 16:03:11 +00:00
|
|
|
VIR_FREE(netVal);
|
2008-04-26 14:22:02 +00:00
|
|
|
|
2009-04-03 12:38:52 +00:00
|
|
|
if (xenXMDomainConfigFormatPCI(conn, conf, def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (hvm) {
|
2008-10-10 16:08:01 +00:00
|
|
|
if (def->nparallels) {
|
2008-07-25 14:10:49 +00:00
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
char *str;
|
|
|
|
int ret;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
ret = xenDaemonFormatSxprChr(conn, def->parallels[0], &buf);
|
2008-07-25 14:10:49 +00:00
|
|
|
str = virBufferContentAndReset(&buf);
|
|
|
|
if (ret == 0)
|
|
|
|
ret = xenXMConfigSetString(conf, "parallel", str);
|
|
|
|
VIR_FREE(str);
|
|
|
|
if (ret < 0)
|
|
|
|
goto no_memory;
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
|
|
|
if (xenXMConfigSetString(conf, "parallel", "none") < 0)
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2008-04-26 14:22:02 +00:00
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
if (def->nserials) {
|
2008-07-25 14:10:49 +00:00
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
char *str;
|
|
|
|
int ret;
|
|
|
|
|
2008-10-10 16:08:01 +00:00
|
|
|
ret = xenDaemonFormatSxprChr(conn, def->serials[0], &buf);
|
2008-07-25 14:10:49 +00:00
|
|
|
str = virBufferContentAndReset(&buf);
|
|
|
|
if (ret == 0)
|
|
|
|
ret = xenXMConfigSetString(conf, "serial", str);
|
|
|
|
VIR_FREE(str);
|
|
|
|
if (ret < 0)
|
|
|
|
goto no_memory;
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2008-07-25 14:10:49 +00:00
|
|
|
if (xenXMConfigSetString(conf, "serial", "none") < 0)
|
|
|
|
goto no_memory;
|
2008-04-26 14:22:02 +00:00
|
|
|
}
|
2008-05-07 14:04:40 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
if (def->sounds) {
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
char *str = NULL;
|
|
|
|
int ret = xenDaemonFormatSxprSound(conn,
|
2008-10-10 16:08:01 +00:00
|
|
|
def,
|
2008-07-25 14:10:49 +00:00
|
|
|
&buf);
|
|
|
|
str = virBufferContentAndReset(&buf);
|
|
|
|
if (ret == 0)
|
|
|
|
ret = xenXMConfigSetString(conf, "soundhw", str);
|
|
|
|
|
|
|
|
VIR_FREE(str);
|
|
|
|
if (ret < 0)
|
|
|
|
goto no_memory;
|
2008-05-07 14:04:40 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return conf;
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
no_memory:
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
cleanup:
|
|
|
|
virConfFreeValue(diskVal);
|
|
|
|
virConfFreeValue(netVal);
|
|
|
|
VIR_FREE(cpus);
|
2007-01-19 20:23:37 +00:00
|
|
|
if (conf)
|
|
|
|
virConfFree(conf);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a config file for a domain, based on an XML
|
|
|
|
* document describing its config
|
|
|
|
*/
|
|
|
|
virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) {
|
|
|
|
virDomainPtr ret;
|
2007-05-22 00:39:59 +00:00
|
|
|
virDomainPtr olddomain;
|
2007-01-19 20:23:37 +00:00
|
|
|
char filename[PATH_MAX];
|
2007-05-22 00:39:59 +00:00
|
|
|
const char * oldfilename;
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDefPtr def = NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
xenXMConfCachePtr entry = NULL;
|
2008-07-25 13:39:02 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (xml == NULL) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (conn->flags & VIR_CONNECT_RO)
|
|
|
|
return (NULL);
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
if (!xenInotifyActive(conn) && xenXMConfigCacheRefresh (conn) < 0) {
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2007-01-19 20:23:37 +00:00
|
|
|
return (NULL);
|
2009-01-21 18:11:14 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2009-01-08 19:52:15 +00:00
|
|
|
if (!(def = virDomainDefParseString(conn, priv->caps, xml,
|
2009-01-21 18:11:14 +00:00
|
|
|
VIR_DOMAIN_XML_INACTIVE))) {
|
2009-01-22 19:18:24 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2008-07-25 13:39:02 +00:00
|
|
|
return (NULL);
|
2009-01-21 18:11:14 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashLookup(priv->nameConfigMap, def->name)) {
|
2007-05-22 00:39:59 +00:00
|
|
|
/* domain exists, we will overwrite it */
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(oldfilename = (char *)virHashLookup(priv->nameConfigMap, def->name))) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("can't retrieve config filename for domain to overwrite"));
|
2007-05-22 00:39:59 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, oldfilename))) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("can't retrieve config entry for domain to overwrite"));
|
2007-05-22 00:39:59 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
/* XXX wtf.com is this line for - it appears to be amemory leak */
|
|
|
|
if (!(olddomain = virGetDomain(conn, def->name, entry->def->uuid)))
|
2007-05-22 00:39:59 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Remove the name -> filename mapping */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashRemoveEntry(priv->nameConfigMap, def->name, NULL) < 0) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("failed to remove old domain from config map"));
|
2007-05-22 00:39:59 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove the config record itself */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashRemoveEntry(priv->configCache, oldfilename, xenXMConfigFree) < 0) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("failed to remove old domain from config map"));
|
2007-05-22 00:39:59 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry = NULL;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if ((strlen(priv->configDir) + 1 + strlen(def->name) + 1) > PATH_MAX) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("config file name is too long"));
|
2006-11-16 19:06:13 +00:00
|
|
|
goto error;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
strcpy(filename, priv->configDir);
|
2006-11-16 19:06:13 +00:00
|
|
|
strcat(filename, "/");
|
2008-07-25 13:39:02 +00:00
|
|
|
strcat(filename, def->name);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(conn, filename, def) < 0)
|
2006-11-16 19:06:13 +00:00
|
|
|
goto error;
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC(entry) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(conn);
|
2006-11-16 19:06:13 +00:00
|
|
|
goto error;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-01-19 20:23:37 +00:00
|
|
|
if ((entry->refreshedAt = time(NULL)) == ((time_t)-1)) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("unable to get current time"));
|
2006-11-16 19:06:13 +00:00
|
|
|
goto error;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
memmove(entry->filename, filename, PATH_MAX);
|
2008-07-25 13:39:02 +00:00
|
|
|
entry->def = def;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashAddEntry(priv->configCache, filename, entry) < 0) {
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("unable to store config file handle"));
|
2006-12-19 21:54:20 +00:00
|
|
|
goto error;
|
2007-01-19 20:23:37 +00:00
|
|
|
}
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashAddEntry(priv->nameConfigMap, def->name, entry->filename) < 0) {
|
|
|
|
virHashRemoveEntry(priv->configCache, filename, NULL);
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(conn, VIR_ERR_INTERNAL_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("unable to store config file handle"));
|
2006-11-16 19:06:13 +00:00
|
|
|
goto error;
|
2006-12-19 21:54:20 +00:00
|
|
|
}
|
|
|
|
|
2009-08-05 09:39:31 +00:00
|
|
|
ret = virGetDomain(conn, def->name, def->uuid);
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (ret);
|
|
|
|
|
|
|
|
error:
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(entry);
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDefFree(def);
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Delete a domain from disk
|
|
|
|
*/
|
|
|
|
int xenXMDomainUndefine(virDomainPtr domain) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-12-19 21:54:20 +00:00
|
|
|
const char *filename;
|
2006-11-16 19:06:13 +00:00
|
|
|
xenXMConfCachePtr entry;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id != -1)
|
2006-11-16 19:06:13 +00:00
|
|
|
return (-1);
|
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO)
|
|
|
|
return (-1);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = domain->conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if (unlink(entry->filename) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2007-02-22 19:09:29 +00:00
|
|
|
/* Remove the name -> filename mapping */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashRemoveEntry(priv->nameConfigMap, domain->name, NULL) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-12-19 21:54:20 +00:00
|
|
|
|
2007-02-22 19:09:29 +00:00
|
|
|
/* Remove the config record itself */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashRemoveEntry(priv->configCache, entry->filename, xenXMConfigFree) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
struct xenXMListIteratorContext {
|
|
|
|
virConnectPtr conn;
|
|
|
|
int max;
|
|
|
|
int count;
|
2007-03-06 21:55:44 +00:00
|
|
|
char ** names;
|
2006-11-16 19:06:13 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static void xenXMListIterator(const void *payload ATTRIBUTE_UNUSED, const char *name, const void *data) {
|
|
|
|
struct xenXMListIteratorContext *ctx = (struct xenXMListIteratorContext *)data;
|
|
|
|
virDomainPtr dom = NULL;
|
|
|
|
|
|
|
|
if (ctx->count == ctx->max)
|
|
|
|
return;
|
|
|
|
|
Fri Jul 6 16:08:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c, src/proxy_internal.h,
src.xen_internal.c, src/xen_internal.h,
src/xen_unified.c, src/xen_unified.h,
src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: The interface
between xen_unified.c and its underlying driver now uses
a custom structure (struct xenUnifiedDriver) instead
of reusing virDriver.
* src/xen_unified.c: virDomainLookup* functions in Xen
now throw VIR_ERR_NO_DOMAIN if the domain does not exist.
* src/xs_internal.c: Fix indentation.
2007-07-06 15:11:22 +00:00
|
|
|
dom = xenDaemonLookupByName(ctx->conn, name);
|
2006-11-16 19:06:13 +00:00
|
|
|
if (!dom) {
|
|
|
|
ctx->names[ctx->count] = strdup(name);
|
|
|
|
ctx->count++;
|
|
|
|
} else {
|
|
|
|
virDomainFree(dom);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* List all defined domains, filtered to remove any which
|
|
|
|
* are currently running
|
|
|
|
*/
|
2007-03-06 21:55:44 +00:00
|
|
|
int xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-11-16 19:06:13 +00:00
|
|
|
struct xenXMListIteratorContext ctx;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
if (!xenInotifyActive(conn) && xenXMConfigCacheRefresh (conn) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (maxnames > virHashSize(priv->configCache))
|
|
|
|
maxnames = virHashSize(priv->configCache);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
ctx.conn = conn;
|
|
|
|
ctx.count = 0;
|
|
|
|
ctx.max = maxnames;
|
|
|
|
ctx.names = names;
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
virHashForEach(priv->nameConfigMap, xenXMListIterator, &ctx);
|
2009-01-21 18:11:14 +00:00
|
|
|
ret = ctx.count;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the maximum number of defined domains - not filtered
|
|
|
|
* based on number running
|
|
|
|
*/
|
|
|
|
int xenXMNumOfDefinedDomains(virConnectPtr conn) {
|
2009-01-20 17:34:56 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2009-01-21 18:11:14 +00:00
|
|
|
int ret = -1;
|
2009-01-20 17:34:56 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
priv = conn->privateData;
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedLock(priv);
|
2009-01-20 17:34:56 +00:00
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
if (!xenInotifyActive(conn) && xenXMConfigCacheRefresh (conn) < 0)
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
ret = virHashSize(priv->nameConfigMap);
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
xenUnifiedUnlock(priv);
|
|
|
|
return ret;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
|
2008-02-06 17:57:10 +00:00
|
|
|
/**
|
|
|
|
* xenXMDomainAttachDevice:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @xml: pointer to XML description of device
|
2008-02-07 12:34:19 +00:00
|
|
|
*
|
2008-02-06 17:57:10 +00:00
|
|
|
* Create a virtual device attachment to backend.
|
|
|
|
* XML description is translated into config file.
|
2008-02-07 12:34:19 +00:00
|
|
|
*
|
2008-02-06 17:57:10 +00:00
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenXMDomainAttachDevice(virDomainPtr domain, const char *xml) {
|
|
|
|
const char *filename = NULL;
|
|
|
|
xenXMConfCachePtr entry = NULL;
|
2008-07-25 13:39:02 +00:00
|
|
|
int ret = -1;
|
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
2008-10-10 16:08:01 +00:00
|
|
|
virDomainDefPtr def;
|
2008-10-24 11:20:08 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
|
|
|
if ((!domain) || (!domain->conn) || (!domain->name) || (!xml)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
2008-07-25 13:39:02 +00:00
|
|
|
return -1;
|
2008-02-06 17:57:10 +00:00
|
|
|
}
|
2008-10-24 11:20:08 +00:00
|
|
|
|
2008-02-06 17:57:10 +00:00
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO)
|
2008-07-25 13:39:02 +00:00
|
|
|
return -1;
|
2008-02-06 17:57:10 +00:00
|
|
|
if (domain->id != -1)
|
2008-07-25 13:39:02 +00:00
|
|
|
return -1;
|
|
|
|
|
2009-01-21 18:11:14 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
xenUnifiedLock(priv);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2008-10-10 16:08:01 +00:00
|
|
|
def = entry->def;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if (!(dev = virDomainDeviceDefParse(domain->conn,
|
2008-10-24 11:20:08 +00:00
|
|
|
priv->caps,
|
2008-07-25 13:39:02 +00:00
|
|
|
entry->def,
|
2009-01-08 19:52:15 +00:00
|
|
|
xml, VIR_DOMAIN_XML_INACTIVE)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
{
|
2008-10-10 16:08:01 +00:00
|
|
|
if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(domain->conn);
|
2008-10-10 16:08:01 +00:00
|
|
|
goto cleanup;
|
2008-07-25 13:39:02 +00:00
|
|
|
}
|
2008-10-10 16:08:01 +00:00
|
|
|
def->disks[def->ndisks++] = dev->data.disk;
|
2008-07-25 13:39:02 +00:00
|
|
|
dev->data.disk = NULL;
|
2008-10-10 16:08:01 +00:00
|
|
|
qsort(def->disks, def->ndisks, sizeof(*def->disks),
|
|
|
|
virDomainDiskQSort);
|
2008-02-06 17:57:10 +00:00
|
|
|
}
|
2008-07-25 13:39:02 +00:00
|
|
|
break;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
|
|
|
{
|
2008-10-10 16:08:01 +00:00
|
|
|
if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(domain->conn);
|
2008-10-10 16:08:01 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
def->nets[def->nnets++] = dev->data.net;
|
2008-07-25 13:39:02 +00:00
|
|
|
dev->data.net = NULL;
|
|
|
|
break;
|
2008-02-06 17:57:10 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
default:
|
2008-03-27 13:45:26 +00:00
|
|
|
xenXMError(domain->conn, VIR_ERR_XML_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("unknown device"));
|
2008-02-06 17:57:10 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If this fails, should we try to undo our changes to the
|
|
|
|
* in-memory representation of the config file. I say not!
|
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
|
2008-02-06 17:57:10 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDeviceDefFree(dev);
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2008-02-06 17:57:10 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenXMDomainDetachDevice:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @xml: pointer to XML description of device
|
2008-02-07 12:34:19 +00:00
|
|
|
*
|
2008-02-06 17:57:10 +00:00
|
|
|
* Destroy a virtual device attachment to backend.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) {
|
|
|
|
const char *filename = NULL;
|
|
|
|
xenXMConfCachePtr entry = NULL;
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
2008-10-10 16:08:01 +00:00
|
|
|
virDomainDefPtr def;
|
2008-02-06 17:57:10 +00:00
|
|
|
int ret = -1;
|
2008-10-10 16:08:01 +00:00
|
|
|
int i;
|
2008-10-24 11:20:08 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
|
|
|
if ((!domain) || (!domain->conn) || (!domain->name) || (!xml)) {
|
|
|
|
xenXMError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
2008-07-25 13:39:02 +00:00
|
|
|
return -1;
|
2008-02-06 17:57:10 +00:00
|
|
|
}
|
2008-10-24 11:20:08 +00:00
|
|
|
|
|
|
|
|
2008-02-06 17:57:10 +00:00
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO)
|
2008-07-25 13:39:02 +00:00
|
|
|
return -1;
|
2008-02-06 17:57:10 +00:00
|
|
|
if (domain->id != -1)
|
2008-07-25 13:39:02 +00:00
|
|
|
return -1;
|
2009-01-21 18:11:14 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
xenUnifiedLock(priv);
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(filename = virHashLookup(priv->nameConfigMap, domain->name)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2009-01-20 17:34:56 +00:00
|
|
|
if (!(entry = virHashLookup(priv->configCache, filename)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2008-10-10 16:08:01 +00:00
|
|
|
def = entry->def;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
if (!(dev = virDomainDeviceDefParse(domain->conn,
|
2008-10-24 11:20:08 +00:00
|
|
|
priv->caps,
|
2008-07-25 13:39:02 +00:00
|
|
|
entry->def,
|
2009-01-08 19:52:15 +00:00
|
|
|
xml, VIR_DOMAIN_XML_INACTIVE)))
|
2009-01-21 18:11:14 +00:00
|
|
|
goto cleanup;
|
2008-02-06 17:57:10 +00:00
|
|
|
|
2008-07-25 13:39:02 +00:00
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
{
|
2008-10-10 16:08:01 +00:00
|
|
|
for (i = 0 ; i < def->ndisks ; i++) {
|
|
|
|
if (def->disks[i]->dst &&
|
2008-07-25 13:39:02 +00:00
|
|
|
dev->data.disk->dst &&
|
2008-10-10 16:08:01 +00:00
|
|
|
STREQ(def->disks[i]->dst, dev->data.disk->dst)) {
|
|
|
|
virDomainDiskDefFree(def->disks[i]);
|
|
|
|
if (i < (def->ndisks - 1))
|
|
|
|
memmove(def->disks + i,
|
|
|
|
def->disks + i + 1,
|
2009-06-04 13:56:49 +00:00
|
|
|
sizeof(*def->disks) *
|
|
|
|
(def->ndisks - (i + 1)));
|
2008-07-25 13:39:02 +00:00
|
|
|
break;
|
2008-02-06 17:57:10 +00:00
|
|
|
}
|
|
|
|
}
|
2008-07-25 13:39:02 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
|
|
|
{
|
2008-10-10 16:08:01 +00:00
|
|
|
for (i = 0 ; i < def->nnets ; i++) {
|
|
|
|
if (!memcmp(def->nets[i]->mac,
|
|
|
|
dev->data.net->mac,
|
2008-10-24 11:20:08 +00:00
|
|
|
sizeof(def->nets[i]->mac))) {
|
2008-10-10 16:08:01 +00:00
|
|
|
virDomainNetDefFree(def->nets[i]);
|
|
|
|
if (i < (def->nnets - 1))
|
|
|
|
memmove(def->nets + i,
|
|
|
|
def->nets + i + 1,
|
2009-06-04 13:56:49 +00:00
|
|
|
sizeof(*def->nets) *
|
|
|
|
(def->nnets - (i + 1)));
|
2008-07-25 13:39:02 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2008-02-06 17:57:10 +00:00
|
|
|
}
|
2008-07-25 13:39:02 +00:00
|
|
|
default:
|
|
|
|
xenXMError(domain->conn, VIR_ERR_XML_ERROR,
|
avoid many format string warnings
Building with --disable-nls exposed many new warnings like these:
virsh.c:4952: warning: format not a string literal and no format ...
util.c:163: warning: format not a string literal and no format arguments
All but one of the following changes add a "%s" argument before
the offending _(...) argument.
This was the only manual change:
* src/lxc_driver.c (lxcVersion): Use %s and strerror(errno)
rather than %m, to avoid a warning from gcc -Wformat-security.
Add "%s" before each warned about format-string-with-no-%-directive:
* src/domain_conf.c (virDomainHostdevSubsysUsbDefParseXML)
(virDomainDefParseString, virDomainDefParseFile):
* src/hash.c (virGetConnect, __virGetDomain, virReleaseDomain)
(__virGetNetwork, virReleaseNetwork, __virGetStoragePool)
(virReleaseStoragePool, __virGetStorageVol, virReleaseStorageVol):
* src/lxc_container.c (lxcContainerChild):
* src/lxc_driver.c (lxcDomainDefine, lxcDomainUndefine)
(lxcDomainGetInfo, lxcGetOSType, lxcDomainDumpXML)
(lxcSetupInterfaces, lxcDomainStart, lxcDomainCreateAndStart)
(lxcVersion, lxcGetSchedulerParameters):
* src/network_conf.c (virNetworkDefParseString)
(virNetworkDefParseFile):
* src/openvz_conf.c (openvzReadNetworkConf, openvzLoadDomains):
* src/openvz_driver.c (openvzDomainDefineCmd)
(openvzDomainGetInfo, openvzDomainDumpXML, openvzDomainShutdown)
(openvzDomainReboot, ADD_ARG_LIT, openvzDomainDefineXML)
(openvzDomainCreateXML, openvzDomainCreate, openvzDomainUndefine)
(openvzDomainSetAutostart, openvzDomainGetAutostart)
(openvzDomainSetVcpus):
* src/qemu_driver.c (qemudDomainBlockPeek, qemudDomainMemoryPeek):
* src/remote_internal.c (remoteDomainBlockPeek)
(remoteDomainMemoryPeek, remoteAuthPolkit):
* src/sexpr.c (sexpr_new, _string2sexpr):
* src/storage_backend_disk.c (virStorageBackendDiskMakeDataVol)
(virStorageBackendDiskCreateVol):
* src/storage_backend_fs.c
(virStorageBackendFileSystemNetFindPoolSources):
* src/storage_backend_logical.c (virStorageBackendLogicalFindLVs)
(virStorageBackendLogicalFindPoolSources):
* src/test.c (testOpenDefault, testOpenFromFile, testOpen)
(testGetDomainInfo, testDomainRestore)
(testNodeGetCellsFreeMemory):
* src/util.c (virExec):
* src/virsh.c (cmdAttachDevice, cmdDetachDevice)
(cmdAttachInterface, cmdDetachInterface, cmdAttachDisk)
(cmdDetachDisk, cmdEdit):
* src/xend_internal.c (do_connect, wr_sync, xend_op_ext)
(urlencode, xenDaemonDomainCreateXML)
(xenDaemonDomainLookupByName_ids, xenDaemonDomainLookupByID)
(xenDaemonParseSxprOS, xend_parse_sexp_desc_char)
(xenDaemonParseSxprChar, xenDaemonParseSxprDisks)
(xenDaemonParseSxpr, sexpr_to_xend_topology, sexpr_to_domain)
(xenDaemonDomainFetch, xenDaemonDomainGetAutostart)
(xenDaemonDomainSetAutostart, xenDaemonDomainMigratePerform)
(xenDaemonDomainDefineXML, xenDaemonGetSchedulerType)
(xenDaemonGetSchedulerParameters)
(xenDaemonSetSchedulerParameters, xenDaemonDomainBlockPeek)
(xenDaemonFormatSxprChr, virDomainXMLDevID):
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu)
(xenXMDomainCreate, xenXMDomainDefineXML)
(xenXMDomainAttachDevice, xenXMDomainDetachDevice):
* src/xml.c (virXPathString, virXPathNumber, virXPathLong)
(virXPathULong, virXPathBoolean, virXPathNode, virXPathNodeSet):
* src/xs_internal.c (xenStoreOpen):
2008-10-13 16:46:28 +00:00
|
|
|
"%s", _("unknown device"));
|
2008-02-06 17:57:10 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If this fails, should we try to undo our changes to the
|
|
|
|
* in-memory representation of the config file. I say not!
|
|
|
|
*/
|
2008-07-25 13:39:02 +00:00
|
|
|
if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0)
|
2008-02-06 17:57:10 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
2008-07-25 13:39:02 +00:00
|
|
|
virDomainDeviceDefFree(dev);
|
2009-01-21 18:11:14 +00:00
|
|
|
xenUnifiedUnlock(priv);
|
2008-02-06 17:57:10 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
int
|
|
|
|
xenXMDomainBlockPeek (virDomainPtr dom,
|
|
|
|
const char *path ATTRIBUTE_UNUSED,
|
|
|
|
unsigned long long offset ATTRIBUTE_UNUSED,
|
|
|
|
size_t size ATTRIBUTE_UNUSED,
|
|
|
|
void *buffer ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
xenXMError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-11-25 11:04:34 +00:00
|
|
|
|
|
|
|
static char *xenXMAutostartLinkName(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
char *ret;
|
2008-12-23 13:03:29 +00:00
|
|
|
virAsprintf(&ret, "/etc/xen/auto/%s", dom->name);
|
2008-11-25 11:04:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *xenXMDomainConfigName(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
char *ret;
|
2008-12-23 13:03:29 +00:00
|
|
|
virAsprintf(&ret, "/etc/xen/%s", dom->name);
|
2008-11-25 11:04:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int xenXMDomainGetAutostart(virDomainPtr dom, int *autostart)
|
|
|
|
{
|
|
|
|
char *linkname = xenXMAutostartLinkName(dom);
|
|
|
|
char *config = xenXMDomainConfigName(dom);
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (!linkname || !config) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(dom->conn);
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
*autostart = virFileLinkPointsTo(linkname, config);
|
|
|
|
if (*autostart < 0) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportSystemError(dom->conn, errno,
|
|
|
|
_("cannot check link %s points to config %s"),
|
|
|
|
linkname, config);
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
VIR_FREE(linkname);
|
|
|
|
VIR_FREE(config);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int xenXMDomainSetAutostart(virDomainPtr dom, int autostart)
|
|
|
|
{
|
|
|
|
char *linkname = xenXMAutostartLinkName(dom);
|
|
|
|
char *config = xenXMDomainConfigName(dom);
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (!linkname || !config) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportOOMError(dom->conn);
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (autostart) {
|
|
|
|
if (symlink(config, linkname) < 0 &&
|
|
|
|
errno != EEXIST) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportSystemError(dom->conn, errno,
|
|
|
|
_("failed to create link %s to %s"),
|
|
|
|
config, linkname);
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (unlink(linkname) < 0 &&
|
|
|
|
errno != ENOENT) {
|
2009-01-20 17:13:33 +00:00
|
|
|
virReportSystemError(dom->conn, errno,
|
|
|
|
_("failed to remove link %s"),
|
|
|
|
linkname);
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
VIR_FREE(linkname);
|
|
|
|
VIR_FREE(config);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|