2006-11-16 19:06:13 +00:00
|
|
|
/*
|
|
|
|
* xm_internal.h: helper routines for dealing with inactive domains
|
|
|
|
*
|
2010-03-12 17:47:26 +00:00
|
|
|
* Copyright (C) 2006-2007, 2009-2010 Red Hat, Inc.
|
2007-01-19 20:23:37 +00:00
|
|
|
* 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"
|
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.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: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 15:38:33 +00:00
|
|
|
#include "xen_driver.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
|
2010-03-09 18:22:22 +00:00
|
|
|
# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
|
|
|
|
# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
|
2009-01-19 18:12:00 +00:00
|
|
|
#else
|
2010-03-09 18:22:22 +00:00
|
|
|
# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
|
|
|
|
# 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);
|
2010-01-14 01:44:26 +00:00
|
|
|
static int xenXMDomainAttachDeviceFlags(virDomainPtr domain, const char *xml,
|
|
|
|
unsigned int flags);
|
|
|
|
static int xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
|
|
|
|
unsigned int flags);
|
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 */
|
2010-01-14 01:44:26 +00:00
|
|
|
xenXMDomainAttachDeviceFlags, /* domainAttachDeviceFlags */
|
|
|
|
xenXMDomainDetachDeviceFlags, /* domainDetachDeviceFlags */
|
2010-03-22 13:13:53 +00:00
|
|
|
NULL, /* domainUpdateDeviceFlags */
|
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
|
|
|
};
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
#define xenXMError(code, ...) \
|
|
|
|
virReportErrorHelper(NULL, VIR_FROM_XENXM, code, __FILE__, \
|
2010-03-01 23:38:28 +00:00
|
|
|
__FUNCTION__, __LINE__, __VA_ARGS__)
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2009-08-05 09:46:33 +00:00
|
|
|
#ifndef WITH_XEN_INOTIFY
|
2009-08-05 10:04:26 +00:00
|
|
|
static int xenInotifyActive(virConnectPtr conn ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2009-08-05 09:46:33 +00:00
|
|
|
#else
|
2009-08-05 10:04:26 +00:00
|
|
|
static int xenInotifyActive(virConnectPtr conn)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
return priv->inotifyWatch > 0;
|
2009-08-05 09:46:33 +00:00
|
|
|
}
|
2009-08-05 10:04:26 +00:00
|
|
|
#endif
|
2009-08-05 09:46:33 +00:00
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
/* Convenience method to grab a int from the config file object */
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMConfigGetBool(virConfPtr conf,
|
2008-07-25 13:50:08 +00:00
|
|
|
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) {
|
|
|
|
*value = STREQ(val->str, "1") ? 1 : 0;
|
|
|
|
} else {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("config value %s was malformed"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convenience method to grab a int from the config file object */
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMConfigGetULong(virConfPtr conf,
|
2008-07-25 13:50:08 +00:00
|
|
|
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;
|
|
|
|
*value = strtol(val->str, &ret, 10);
|
2008-07-25 13:50:08 +00:00
|
|
|
if (ret == val->str) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("config value %s was malformed"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
} else {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("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 */
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMConfigGetString(virConfPtr conf,
|
2008-07-25 13:50:08 +00:00
|
|
|
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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("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;
|
|
|
|
}
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMConfigCopyStringInternal(virConfPtr conf,
|
2008-07-25 13:50:08 +00:00
|
|
|
const char *name,
|
|
|
|
char **value,
|
|
|
|
int allowMissing) {
|
|
|
|
virConfValuePtr val;
|
|
|
|
|
|
|
|
*value = NULL;
|
|
|
|
if (!(val = virConfGetValue(conf, name))) {
|
|
|
|
if (allowMissing)
|
|
|
|
return 0;
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("config value %s was missing"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val->type != VIR_CONF_STRING) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("config value %s was not a string"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!val->str) {
|
|
|
|
if (allowMissing)
|
|
|
|
return 0;
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("config value %s was missing"), name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(*value = strdup(val->str))) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMConfigCopyString(virConfPtr conf,
|
2008-07-25 13:50:08 +00:00
|
|
|
const char *name,
|
|
|
|
char **value) {
|
2010-04-02 23:29:12 +00:00
|
|
|
return xenXMConfigCopyStringInternal(conf, name, value, 0);
|
2008-07-25 13:50:08 +00:00
|
|
|
}
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMConfigCopyStringOpt(virConfPtr conf,
|
2008-07-25 13:50:08 +00:00
|
|
|
const char *name,
|
|
|
|
char **value) {
|
2010-04-02 23:29:12 +00:00
|
|
|
return xenXMConfigCopyStringInternal(conf, name, value, 1);
|
2008-07-25 13:50:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
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)) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-01-20 17:13:33 +00:00
|
|
|
_("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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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);
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-11-25 10:44:52 +00:00
|
|
|
"%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)) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-01-20 17:13:33 +00:00
|
|
|
"%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))) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-01-20 17:13:33 +00:00
|
|
|
_("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;
|
|
|
|
|
2009-11-10 11:56:11 +00:00
|
|
|
closedir(dh);
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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;
|
2010-02-02 17:22:03 +00:00
|
|
|
int vmlocaltime = 0;
|
2008-07-25 13:50:08 +00:00
|
|
|
|
2009-11-08 21:08:54 +00:00
|
|
|
if (VIR_ALLOC(def) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-07-25 13:50:08 +00:00
|
|
|
return NULL;
|
2009-11-08 21:08:54 +00:00
|
|
|
}
|
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
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyString(conf, "name", &def->name) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if ((xenXMConfigGetString(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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("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,
|
2009-10-12 09:52:13 +00:00
|
|
|
def->os.arch,
|
|
|
|
virDomainVirtTypeToString(def->virtType));
|
2008-07-25 13:50:08 +00:00
|
|
|
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;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyString(conf, "kernel", &def->os.loader) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2007-01-19 20:23:37 +00:00
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "boot", &boot, "c") < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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 {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "bootloader", &def->os.bootloader) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "bootargs", &def->os.bootloaderArgs) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "kernel", &def->os.kernel) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "extra", &def->os.cmdline) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
}
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetULong(conf, "memory", &def->memory, MIN_XEN_GUEST_SIZE * 2) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetULong(conf, "maxmem", &def->maxmem, def->memory) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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
|
|
|
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetULong(conf, "vcpus", &def->vcpus, 1) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "cpus", &str, NULL) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if (str) {
|
|
|
|
def->cpumasklen = 4096;
|
|
|
|
if (VIR_ALLOC_N(def->cpumask, def->cpumasklen) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
2010-02-09 18:58:01 +00:00
|
|
|
if (virDomainCpuSetParse(&str, 0,
|
2008-07-25 13:50:08 +00:00
|
|
|
def->cpumask, def->cpumasklen) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "on_poweroff", &str, "destroy") < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if ((def->onPoweroff = virDomainLifecycleTypeFromString(str)) < 0) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("unexpected value %s for on_poweroff"), str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "on_reboot", &str, "restart") < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if ((def->onReboot = virDomainLifecycleTypeFromString(str)) < 0) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("unexpected value %s for on_reboot"), str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "on_crash", &str, "restart") < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if ((def->onCrash = virDomainLifecycleTypeFromString(str)) < 0) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 13:50:08 +00:00
|
|
|
_("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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "pae", &val, 0) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
else if (val)
|
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_PAE);
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "acpi", &val, 0) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
else if (val)
|
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_ACPI);
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "apic", &val, 0) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
else if (val)
|
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_APIC);
|
|
|
|
}
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "localtime", &vmlocaltime, 0) < 0)
|
2009-04-01 10:36:52 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2010-02-02 17:22:03 +00:00
|
|
|
def->clock.offset = vmlocaltime ?
|
|
|
|
VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME :
|
|
|
|
VIR_DOMAIN_CLOCK_OFFSET_UTC;
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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*/
|
2009-09-07 08:09:20 +00:00
|
|
|
if (!(offset = strchr(head, ',')))
|
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;
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(disk->src, head, offset - head,
|
|
|
|
(offset - head) + 1) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Source file %s too big for destination"),
|
|
|
|
head);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-11-28 11:23:34 +00:00
|
|
|
}
|
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 */
|
2009-09-07 08:09:20 +00:00
|
|
|
if (!(offset = strchr(head, ',')))
|
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;
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(disk->dst, head, offset - head,
|
|
|
|
(offset - head) + 1) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Dest file %s too big for destination"), head);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
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;
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(disk->driverName, disk->src,
|
|
|
|
(tmp - disk->src),
|
|
|
|
(tmp - disk->src) + 1) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Driver name %s too big for destination"),
|
|
|
|
disk->src);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-11-28 11:23:34 +00:00
|
|
|
|
|
|
|
/* 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;
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(disk->driverType, disk->src,
|
|
|
|
(tmp - disk->src),
|
|
|
|
(tmp - disk->src) + 1) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Driver type %s too big for destination"),
|
|
|
|
disk->src);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-11-28 11:23:34 +00:00
|
|
|
|
|
|
|
/* 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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "cdrom", &str, NULL) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
}
|
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) {
|
|
|
|
char script[PATH_MAX];
|
2008-04-30 12:30:55 +00:00
|
|
|
char model[10];
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
char type[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';
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
type[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
|
|
|
|
2009-09-07 08:09:20 +00:00
|
|
|
if (!(data = strchr(key, '=')))
|
2007-01-19 20:23:37 +00:00
|
|
|
goto skipnic;
|
|
|
|
data++;
|
|
|
|
|
2008-05-14 19:51:24 +00:00
|
|
|
if (STRPREFIX(key, "mac=")) {
|
2009-08-03 12:37:44 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(mac) - 1;
|
|
|
|
if (virStrncpy(mac, data, len, sizeof(mac)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("MAC address %s too big for destination"),
|
|
|
|
data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "bridge=")) {
|
2009-08-03 12:37:44 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(bridge) - 1;
|
|
|
|
if (virStrncpy(bridge, data, len, sizeof(bridge)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Bridge %s too big for destination"),
|
|
|
|
data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "script=")) {
|
2009-08-03 12:37:44 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(script) - 1;
|
|
|
|
if (virStrncpy(script, data, len, sizeof(script)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Script %s too big for destination"),
|
|
|
|
data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "model=")) {
|
2009-08-03 12:37:44 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(model) - 1;
|
|
|
|
if (virStrncpy(model, data, len, sizeof(model)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Model %s too big for destination"), data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
} else if (STRPREFIX(key, "type=")) {
|
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(type) - 1;
|
|
|
|
if (virStrncpy(type, data, len, sizeof(type)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
_("Type %s too big for destination"), data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
2009-04-01 10:16:05 +00:00
|
|
|
} else if (STRPREFIX(key, "vifname=")) {
|
2009-08-03 12:37:44 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(vifname) - 1;
|
|
|
|
if (virStrncpy(vifname, data, len, sizeof(vifname)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Vifname %s too big for destination"),
|
|
|
|
data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
2008-05-14 19:51:24 +00:00
|
|
|
} else if (STRPREFIX(key, "ip=")) {
|
2009-08-03 12:37:44 +00:00
|
|
|
int len = nextkey ? (nextkey - data) : sizeof(ip) - 1;
|
|
|
|
if (virStrncpy(ip, data, len, sizeof(ip)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("IP %s too big for destination"), data);
|
|
|
|
goto skipnic;
|
|
|
|
}
|
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;
|
|
|
|
}
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (VIR_ALLOC(net) < 0)
|
2009-11-08 21:08:54 +00:00
|
|
|
goto no_memory;
|
2008-07-25 13:50:08 +00:00
|
|
|
|
|
|
|
if (mac[0]) {
|
2010-03-30 14:29:53 +00:00
|
|
|
if (virParseMacAddr(mac, net->mac) < 0) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2010-03-30 14:29:53 +00:00
|
|
|
_("malformed mac address '%s'"), mac);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-07-25 13:50:08 +00:00
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (model[0] &&
|
|
|
|
!(net->model = strdup(model)))
|
|
|
|
goto no_memory;
|
|
|
|
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
if (!model[0] && type[0] &&
|
|
|
|
STREQ(type, "netfront") &&
|
|
|
|
!(net->model = strdup("netfront")))
|
|
|
|
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'] */
|
|
|
|
if (!(key = list->str))
|
|
|
|
goto skippci;
|
|
|
|
if (!(nextkey = strchr(key, ':')))
|
|
|
|
goto skippci;
|
|
|
|
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Domain %s too big for destination"), key);
|
2009-04-03 12:38:52 +00:00
|
|
|
goto skippci;
|
2009-08-03 12:37:44 +00:00
|
|
|
}
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
key = nextkey + 1;
|
|
|
|
if (!(nextkey = strchr(key, ':')))
|
|
|
|
goto skippci;
|
|
|
|
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(bus, key, (nextkey - key), sizeof(bus)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Bus %s too big for destination"), key);
|
|
|
|
goto skippci;
|
|
|
|
}
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
key = nextkey + 1;
|
|
|
|
if (!(nextkey = strchr(key, '.')))
|
|
|
|
goto skippci;
|
|
|
|
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(slot, key, (nextkey - key), sizeof(slot)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Slot %s too big for destination"), key);
|
|
|
|
goto skippci;
|
|
|
|
}
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
key = nextkey + 1;
|
|
|
|
if (strlen(key) != 1)
|
|
|
|
goto skippci;
|
|
|
|
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrncpy(func, key, 1, sizeof(func)) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Function %s too big for destination"), key);
|
|
|
|
goto skippci;
|
|
|
|
}
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
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)
|
2009-11-08 21:08:54 +00:00
|
|
|
goto no_memory;
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "usbdevice", &str, NULL) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "vnc", &val, 0) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (val) {
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "vncunused", &val, 1) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
graphics->data.vnc.autoport = val ? 1 : 0;
|
|
|
|
|
|
|
|
if (!graphics->data.vnc.autoport) {
|
|
|
|
unsigned long vncdisplay;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetULong(conf, "vncdisplay", &vncdisplay, 0) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
graphics->data.vnc.port = (int)vncdisplay + 5900;
|
|
|
|
}
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "vnclisten", &graphics->data.vnc.listenAddr) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.vnc.passwd) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "keymap", &graphics->data.vnc.keymap) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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 {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetBool(conf, "sdl", &val, 0) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if (val) {
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "display", &graphics->data.sdl.display) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigCopyStringOpt(conf, "xauthority", &graphics->data.sdl.xauth) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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;
|
2009-08-03 12:37:44 +00:00
|
|
|
|
|
|
|
if (virStrcpyStatic(vfb, list->list->str) == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("VFB %s too big for destination"),
|
|
|
|
list->list->str);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
|
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) {
|
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++;
|
|
|
|
}
|
|
|
|
|
2010-03-05 15:15:09 +00:00
|
|
|
if (!strchr(key, '='))
|
2007-01-19 20:23:37 +00:00
|
|
|
break;
|
|
|
|
|
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;
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "parallel", &str, NULL) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if (str && STRNEQ(str, "none") &&
|
2010-04-02 23:10:49 +00:00
|
|
|
!(chr = xenDaemonParseSxprChar(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;
|
|
|
|
}
|
2009-11-05 13:19:14 +00:00
|
|
|
chr->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_PARALLEL;
|
2008-10-10 16:08:01 +00:00
|
|
|
def->parallels[0] = chr;
|
|
|
|
def->nparallels++;
|
|
|
|
chr = NULL;
|
|
|
|
}
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "serial", &str, NULL) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
|
|
|
if (str && STRNEQ(str, "none") &&
|
2010-04-02 23:10:49 +00:00
|
|
|
!(chr = xenDaemonParseSxprChar(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;
|
|
|
|
}
|
2009-11-05 13:19:14 +00:00
|
|
|
chr->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_SERIAL;
|
2008-10-10 16:08:01 +00:00
|
|
|
def->serials[0] = chr;
|
|
|
|
def->nserials++;
|
|
|
|
}
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2010-04-02 23:10:49 +00:00
|
|
|
if (!(def->console = xenDaemonParseSxprChar("pty", NULL)))
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2009-11-05 13:19:14 +00:00
|
|
|
def->console->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_CONSOLE;
|
2006-11-17 02:03:18 +00:00
|
|
|
}
|
|
|
|
|
2008-05-07 14:04:40 +00:00
|
|
|
if (hvm) {
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMConfigGetString(conf, "soundhw", &str, NULL) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
goto cleanup;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
if (str &&
|
2010-04-02 23:10:49 +00:00
|
|
|
xenDaemonParseSxprSound(def, str) < 0)
|
2008-07-25 13:50:08 +00:00
|
|
|
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:
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-07-25 13:50:08 +00:00
|
|
|
/* fallthrough */
|
2009-08-03 11:57:23 +00:00
|
|
|
cleanup:
|
2008-07-25 13:50:08 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2007-01-19 20:23:37 +00:00
|
|
|
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;
|
|
|
|
|
2010-02-09 18:58:01 +00:00
|
|
|
ret = virDomainDefFormat(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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2007-11-28 10:11:18 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (domain->conn->flags & VIR_CONNECT_RO) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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-12-09 23:00:50 +00:00
|
|
|
virBufferFreeAndReset(&mapbuf);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-07-25 13:39:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2010-02-09 18:58:01 +00:00
|
|
|
if (virDomainCpuSetParse((const char **)&mapstr, 0,
|
2008-07-25 13:39:02 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_CONN, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (domname == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_CONN, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (uuid == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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
|
|
|
|
2009-09-04 15:22:19 +00:00
|
|
|
if (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
|
|
|
|
2009-09-04 15:22:19 +00:00
|
|
|
if (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;
|
|
|
|
|
2009-11-08 21:08:54 +00:00
|
|
|
if (VIR_ALLOC(value) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2007-01-19 20:23:37 +00:00
|
|
|
return -1;
|
2009-11-08 21:08:54 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
2009-11-08 21:08:54 +00:00
|
|
|
if (VIR_ALLOC(value) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2007-01-19 20:23:37 +00:00
|
|
|
return -1;
|
2009-11-08 21:08:54 +00:00
|
|
|
}
|
2007-01-19 20:23:37 +00:00
|
|
|
|
|
|
|
value->type = VIR_CONF_STRING;
|
|
|
|
value->next = NULL;
|
|
|
|
if (!(value->str = strdup(str))) {
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(value);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2007-01-19 20:23:37 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return virConfSetValue(conf, setting, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
static int xenXMDomainConfigFormatDisk(virConfValuePtr list,
|
2008-07-25 14:10:49 +00:00
|
|
|
virDomainDiskDefPtr disk,
|
|
|
|
int hvm,
|
|
|
|
int xendConfigVersion)
|
|
|
|
{
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
virConfValuePtr val, tmp;
|
|
|
|
|
|
|
|
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 {
|
2009-11-16 18:08:29 +00:00
|
|
|
switch (disk->type) {
|
|
|
|
case VIR_DOMAIN_DISK_TYPE_FILE:
|
|
|
|
virBufferAddLit(&buf, "file:");
|
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_DISK_TYPE_BLOCK:
|
|
|
|
virBufferAddLit(&buf, "phy:");
|
|
|
|
break;
|
|
|
|
default:
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-11-16 18:08:29 +00:00
|
|
|
_("unsupported disk type %s"),
|
|
|
|
virDomainDiskTypeToString(disk->type));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
}
|
|
|
|
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)) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-12-09 23:00:50 +00:00
|
|
|
goto cleanup;
|
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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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:
|
2009-12-09 23:00:50 +00:00
|
|
|
virBufferFreeAndReset(&buf);
|
2008-07-25 14:10:49 +00:00
|
|
|
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;
|
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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_NO_NETWORK, "%s",
|
2009-04-24 12:17:50 +00:00
|
|
|
net->data.network.name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
bridge = virNetworkGetBridgeName(network);
|
|
|
|
virNetworkFree(network);
|
|
|
|
if (!bridge) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2009-04-24 12:17:50 +00:00
|
|
|
_("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:
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 14:10:49 +00:00
|
|
|
_("unsupported network type %d"),
|
|
|
|
net->type);
|
2007-01-19 20:23:37 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
if (!hvm) {
|
|
|
|
if (net->model != NULL)
|
|
|
|
virBufferVSprintf(&buf, ",model=%s", net->model);
|
|
|
|
}
|
|
|
|
else if (net->model == NULL) {
|
|
|
|
/*
|
|
|
|
* apparently type ioemu breaks paravirt drivers on HVM so skip this
|
|
|
|
* from XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
|
|
|
|
*/
|
|
|
|
if (priv->xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU)
|
|
|
|
virBufferAddLit(&buf, ",type=ioemu");
|
|
|
|
}
|
|
|
|
else if (STREQ(net->model, "netfront")) {
|
|
|
|
virBufferAddLit(&buf, ",type=netfront");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
virBufferVSprintf(&buf, ",model=%s", net->model);
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, ",type=ioemu");
|
Support for interface model='netfront'
Xen HVM guests with PV drivers end up with two network interfaces for
each configured interface. One of them being emulated by qemu and the
other one paravirtual. As this might not be desirable, the attached
patch provides a way for users to specify that only paravirtual network
interface should be presented to the guest.
The configuration was inspired by qemu/kvm driver, for which users can
specify model='virtio' to use paravirtual network interface.
The patch adds support for model='netfront' which results in
type=netfront instead of type=ioemu (or nothing for newer xen versions)
in guests native configuration. Xen's qemu ignores interfaces with
type != ioemu and only paravirtual network device will be seen in the
guest.
Four possible configuration scenarios follow:
- no model specified in domain's XML
- libvirt will behave like before this change; it will set
type=ioemu for HVM guests on xen host which is not newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
- covered by existing tests
- PV guest, any model
- no functional change, model is passed as is (and ignored by the
hypervisor)
- covered by existing tests (e.g., *-net-e1000.*)
- HVM guest, model=netfront
- type is set to "netfront", model is not specified
- covered by new *-net-netfront.* tests
- HVM guest, model != netfront
- type is set to "ioemu", model is passed as is
- covered by new *-net-ioemu.* tests
The fourth scenario feels like a regression for xen newer than
XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU as users who had a model specified
in their guest's configuration won't see a paravirtual interface in
their guests any more. On the other hand, the reason for specifying a
model is most likely the fact that they want to use such model which
implies emulated interface. Users of older xen won't be affected at all
as their xen provides paravirtual interface regardless of the type used.
- src/xen/xend_internal.c: add netfront support for the xend backend
- src/xen/xm_internal.c: add netfront support for the XM serialization too
2009-12-04 15:55:59 +00:00
|
|
|
}
|
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);
|
|
|
|
|
2009-12-09 23:00:50 +00:00
|
|
|
if (virBufferError(&buf)) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-09-02 14:09:04 +00:00
|
|
|
goto cleanup;
|
2009-12-09 23:00:50 +00:00
|
|
|
}
|
2009-09-02 14:09:04 +00:00
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (VIR_ALLOC(val) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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:
|
2009-12-09 23:00:50 +00:00
|
|
|
virBufferFreeAndReset(&buf);
|
2008-07-25 14:10:49 +00:00
|
|
|
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
|
2010-02-04 18:19:08 +00:00
|
|
|
xenXMDomainConfigFormatPCI(virConfPtr conf,
|
2009-04-03 12:38:52 +00:00
|
|
|
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;
|
|
|
|
|
2009-11-08 21:08:54 +00:00
|
|
|
if (VIR_ALLOC(pciVal) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-04-03 12:38:52 +00:00
|
|
|
return -1;
|
2009-11-08 21:08:54 +00:00
|
|
|
}
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
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,
|
2009-11-08 21:08:54 +00:00
|
|
|
def->hostdevs[i]->source.subsys.u.pci.function) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-04-03 12:38:52 +00:00
|
|
|
goto error;
|
2009-11-08 21:08:54 +00:00
|
|
|
}
|
2009-04-03 12:38:52 +00:00
|
|
|
|
|
|
|
if (VIR_ALLOC(val) < 0) {
|
|
|
|
VIR_FREE(buf);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-04-03 12:38:52 +00:00
|
|
|
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
|
|
|
|
2009-11-10 11:56:11 +00:00
|
|
|
if ((def->cpumask != NULL) &&
|
2010-02-09 18:58:01 +00:00
|
|
|
((cpus = virDomainCpuSetFormat(def->cpumask,
|
2009-11-10 11:56:11 +00:00
|
|
|
def->cpumasklen)) == NULL))
|
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
|
|
|
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
|
|
|
|
2010-02-02 18:28:44 +00:00
|
|
|
if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME) {
|
|
|
|
if (def->clock.data.timezone) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_CONFIG_UNSUPPORTED,
|
2010-03-09 13:32:06 +00:00
|
|
|
"%s", _("configurable timezones are not supported"));
|
2010-02-02 18:28:44 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (xenXMConfigSetInt(conf, "localtime", 1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
} else if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_UTC) {
|
|
|
|
if (xenXMConfigSetInt(conf, "localtime", 0) < 0)
|
2010-02-02 17:22:03 +00:00
|
|
|
goto no_memory;
|
|
|
|
} else {
|
2010-02-02 18:28:44 +00:00
|
|
|
/* XXX We could support Xen's rtc clock offset */
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_CONFIG_UNSUPPORTED,
|
2010-02-02 17:22:03 +00:00
|
|
|
_("unsupported clock offset '%s'"),
|
|
|
|
virDomainClockOffsetTypeToString(def->clock.offset));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
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))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 14:10:49 +00:00
|
|
|
_("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))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 14:10:49 +00:00
|
|
|
_("unexpected lifecycle action %d"), def->onReboot);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (xenXMConfigSetString(conf, "on_reboot", lifecycle) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
|
|
|
|
if (!(lifecycle = virDomainLifecycleTypeToString(def->onCrash))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INTERNAL_ERROR,
|
2008-07-25 14:10:49 +00:00
|
|
|
_("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
|
|
|
}
|
2009-12-09 23:00:50 +00:00
|
|
|
if (virBufferError(&buf)) {
|
|
|
|
virBufferFreeAndReset(&buf);
|
2008-07-25 14:10:49 +00:00
|
|
|
goto no_memory;
|
2009-12-09 23:00:50 +00:00
|
|
|
}
|
2008-07-25 14:10:49 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
2010-04-02 23:29:12 +00:00
|
|
|
if (xenXMDomainConfigFormatDisk(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
|
|
|
|
2010-02-04 18:19:08 +00:00
|
|
|
if (xenXMDomainConfigFormatPCI(conf, def) < 0)
|
2009-04-03 12:38:52 +00:00
|
|
|
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;
|
|
|
|
|
2010-04-02 23:10:49 +00:00
|
|
|
ret = xenDaemonFormatSxprChr(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;
|
|
|
|
|
2010-04-02 23:10:49 +00:00
|
|
|
ret = xenDaemonFormatSxprChr(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;
|
2010-04-02 23:10:49 +00:00
|
|
|
int ret = xenDaemonFormatSxprSound(def, &buf);
|
2008-07-25 14:10:49 +00:00
|
|
|
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:
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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;
|
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_CONN, __FUNCTION__);
|
2007-01-19 20:23:37 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
if (xml == NULL) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2007-01-19 20:23:37 +00:00
|
|
|
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
|
|
|
|
2010-02-09 18:58:01 +00:00
|
|
|
if (!(def = virDomainDefParseString(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-11-17 11:06:46 +00:00
|
|
|
/*
|
|
|
|
* check that if there is another domain defined with the same uuid
|
|
|
|
* it has the same name
|
|
|
|
*/
|
|
|
|
if ((entry = virHashSearch(priv->configCache, xenXMDomainSearchForUUID,
|
|
|
|
(const void *)&(def->uuid))) != NULL) {
|
|
|
|
if ((entry->def != NULL) && (entry->def->name != NULL) &&
|
|
|
|
(STRNEQ(def->name, entry->def->name))) {
|
|
|
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
|
|
|
|
|
|
|
virUUIDFormat(entry->def->uuid, uuidstr);
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_OPERATION_FAILED,
|
2009-11-17 11:06:46 +00:00
|
|
|
_("domain '%s' is already defined with uuid %s"),
|
|
|
|
entry->def->name, uuidstr);
|
|
|
|
entry = NULL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
entry = NULL;
|
|
|
|
}
|
|
|
|
|
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))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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))) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove the name -> filename mapping */
|
2009-01-20 17:34:56 +00:00
|
|
|
if (virHashRemoveEntry(priv->nameConfigMap, def->name, NULL) < 0) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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);
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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;
|
2009-11-08 21:08:54 +00:00
|
|
|
int oom;
|
2006-11-16 19:06:13 +00:00
|
|
|
int max;
|
|
|
|
int count;
|
2007-03-06 21:55:44 +00:00
|
|
|
char ** names;
|
2006-11-16 19:06:13 +00:00
|
|
|
};
|
|
|
|
|
2009-10-14 10:17:24 +00:00
|
|
|
static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const char *name, void *data) {
|
|
|
|
struct xenXMListIteratorContext *ctx = data;
|
2006-11-16 19:06:13 +00:00
|
|
|
virDomainPtr dom = NULL;
|
|
|
|
|
2009-11-08 21:08:54 +00:00
|
|
|
if (ctx->oom)
|
|
|
|
return;
|
|
|
|
|
2006-11-16 19:06:13 +00:00
|
|
|
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) {
|
2009-11-08 21:08:54 +00:00
|
|
|
if (!(ctx->names[ctx->count] = strdup(name)))
|
|
|
|
ctx->oom = 1;
|
|
|
|
else
|
|
|
|
ctx->count++;
|
2006-11-16 19:06:13 +00:00
|
|
|
} 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-11-08 21:08:54 +00:00
|
|
|
int i, ret = -1;
|
2006-11-16 19:06:13 +00:00
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_CONN, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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;
|
2009-11-08 21:08:54 +00:00
|
|
|
ctx.oom = 0;
|
2006-11-16 19:06:13 +00:00
|
|
|
ctx.count = 0;
|
|
|
|
ctx.max = maxnames;
|
|
|
|
ctx.names = names;
|
|
|
|
|
2009-01-20 17:34:56 +00:00
|
|
|
virHashForEach(priv->nameConfigMap, xenXMListIterator, &ctx);
|
2009-11-08 21:08:54 +00:00
|
|
|
|
|
|
|
if (ctx.oom) {
|
|
|
|
for (i = 0; i < ctx.count; i++)
|
|
|
|
VIR_FREE(ctx.names[i]);
|
|
|
|
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-11-08 21:08:54 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_INVALID_CONN, __FUNCTION__);
|
2006-11-16 19:06:13 +00:00
|
|
|
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
|
|
|
/**
|
2010-01-14 01:44:26 +00:00
|
|
|
* xenXMDomainAttachDeviceFlags:
|
2008-02-06 17:57:10 +00:00
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @xml: pointer to XML description of device
|
2010-01-14 01:44:26 +00:00
|
|
|
* @flags: an OR'ed set of virDomainDeviceModifyFlags
|
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.
|
2010-01-14 01:44:26 +00:00
|
|
|
* This driver only supports device allocation to
|
|
|
|
* persisted config.
|
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
|
2010-01-14 01:44:26 +00:00
|
|
|
xenXMDomainAttachDeviceFlags(virDomainPtr domain, const char *xml,
|
|
|
|
unsigned int flags) {
|
2008-02-06 17:57:10 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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;
|
2010-01-14 01:44:26 +00:00
|
|
|
if (domain->id != -1 && !(flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG))
|
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
|
|
|
|
2010-02-09 18:58:01 +00:00
|
|
|
if (!(dev = virDomainDeviceDefParse(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:
|
|
|
|
{
|
2009-08-14 09:31:36 +00:00
|
|
|
if (virDomainDiskInsert(def, dev->data.disk) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-10-10 16:08:01 +00:00
|
|
|
goto cleanup;
|
2008-07-25 13:39:02 +00:00
|
|
|
}
|
|
|
|
dev->data.disk = NULL;
|
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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
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:
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2010-01-14 01:44:26 +00:00
|
|
|
* xenXMDomainDetachDeviceFlags:
|
2008-02-06 17:57:10 +00:00
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @xml: pointer to XML description of device
|
2010-01-14 01:44:26 +00:00
|
|
|
* @flags: an OR'ed set of virDomainDeviceModifyFlags
|
2008-02-07 12:34:19 +00:00
|
|
|
*
|
2008-02-06 17:57:10 +00:00
|
|
|
* Destroy a virtual device attachment to backend.
|
2010-01-14 01:44:26 +00:00
|
|
|
* This driver only supports device deallocation from
|
|
|
|
* persisted config.
|
2008-02-06 17:57:10 +00:00
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
2010-01-14 01:44:26 +00:00
|
|
|
xenXMDomainDetachDeviceFlags(virDomainPtr domain, const char *xml,
|
|
|
|
unsigned int flags) {
|
2008-02-06 17:57:10 +00:00
|
|
|
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)) {
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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;
|
2010-01-14 01:44:26 +00:00
|
|
|
if (domain->id != -1 && !(flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG))
|
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
|
|
|
|
2010-02-09 18:58:01 +00:00
|
|
|
if (!(dev = virDomainDeviceDefParse(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:
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(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
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMDomainBlockPeek (virDomainPtr dom ATTRIBUTE_UNUSED,
|
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
|
|
|
const char *path ATTRIBUTE_UNUSED,
|
|
|
|
unsigned long long offset ATTRIBUTE_UNUSED,
|
|
|
|
size_t size ATTRIBUTE_UNUSED,
|
|
|
|
void *buffer ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2010-04-02 23:29:12 +00:00
|
|
|
xenXMError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
|
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
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-11-25 11:04:34 +00:00
|
|
|
|
|
|
|
static char *xenXMAutostartLinkName(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
char *ret;
|
2009-10-16 10:09:13 +00:00
|
|
|
if (virAsprintf(&ret, "/etc/xen/auto/%s", dom->name) < 0)
|
|
|
|
return NULL;
|
2008-11-25 11:04:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *xenXMDomainConfigName(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
char *ret;
|
2009-10-16 10:09:13 +00:00
|
|
|
if (virAsprintf(&ret, "/etc/xen/%s", dom->name) < 0)
|
|
|
|
return NULL;
|
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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
*autostart = virFileLinkPointsTo(linkname, config);
|
|
|
|
if (*autostart < 0) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-01-20 17:13:33 +00:00
|
|
|
_("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) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-25 11:04:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (autostart) {
|
|
|
|
if (symlink(config, linkname) < 0 &&
|
|
|
|
errno != EEXIST) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-01-20 17:13:33 +00:00
|
|
|
_("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) {
|
2010-02-04 20:02:58 +00:00
|
|
|
virReportSystemError(errno,
|
2009-01-20 17:13:33 +00:00
|
|
|
_("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;
|
|
|
|
}
|