2013-09-04 05:43:00 +00:00
|
|
|
/*
|
|
|
|
* libxl_driver.c: core driver methods for managing libxenlight domains
|
|
|
|
*
|
2015-05-08 16:55:00 +00:00
|
|
|
* Copyright (C) 2006-2015 Red Hat, Inc.
|
2015-02-02 21:12:58 +00:00
|
|
|
* Copyright (C) 2011-2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
2013-09-04 05:43:00 +00:00
|
|
|
* Copyright (C) 2011 Univention GmbH.
|
2011-02-10 22:42:34 +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
|
2012-09-20 22:30:55 +00:00
|
|
|
* License along with this library. If not, see
|
2012-07-21 10:06:23 +00:00
|
|
|
* <http://www.gnu.org/licenses/>.
|
2011-03-29 12:24:05 +00:00
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Jim Fehlig <jfehlig@novell.com>
|
|
|
|
* Markus Groß <gross@univention.de>
|
|
|
|
* Daniel P. Berrange <berrange@redhat.com>
|
2011-02-10 22:42:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
2011-03-29 12:31:45 +00:00
|
|
|
#include <math.h>
|
2011-02-10 22:42:34 +00:00
|
|
|
#include <libxl.h>
|
2013-07-13 00:27:18 +00:00
|
|
|
#include <libxl_utils.h>
|
2011-05-30 09:53:02 +00:00
|
|
|
#include <fcntl.h>
|
2013-06-19 02:46:26 +00:00
|
|
|
#include <regex.h>
|
2011-02-10 22:42:34 +00:00
|
|
|
|
|
|
|
#include "internal.h"
|
2012-12-12 17:59:27 +00:00
|
|
|
#include "virlog.h"
|
2012-12-13 18:21:53 +00:00
|
|
|
#include "virerror.h"
|
2012-12-12 16:35:35 +00:00
|
|
|
#include "virconf.h"
|
2011-02-10 22:42:34 +00:00
|
|
|
#include "datatypes.h"
|
2011-07-19 18:32:58 +00:00
|
|
|
#include "virfile.h"
|
2012-12-12 18:06:53 +00:00
|
|
|
#include "viralloc.h"
|
2012-12-13 18:01:25 +00:00
|
|
|
#include "viruuid.h"
|
2012-12-12 16:27:01 +00:00
|
|
|
#include "vircommand.h"
|
2013-08-30 17:18:31 +00:00
|
|
|
#include "libxl_domain.h"
|
2011-02-10 22:42:34 +00:00
|
|
|
#include "libxl_driver.h"
|
|
|
|
#include "libxl_conf.h"
|
2014-05-08 21:56:51 +00:00
|
|
|
#include "libxl_migration.h"
|
2011-03-29 12:39:18 +00:00
|
|
|
#include "xen_xm.h"
|
2014-03-07 17:31:45 +00:00
|
|
|
#include "xen_sxpr.h"
|
2014-12-16 04:30:06 +00:00
|
|
|
#include "xen_xl.h"
|
2012-01-07 12:47:43 +00:00
|
|
|
#include "virtypedparam.h"
|
2012-02-24 18:48:55 +00:00
|
|
|
#include "viruri.h"
|
2013-04-03 10:36:23 +00:00
|
|
|
#include "virstring.h"
|
2013-06-12 15:49:27 +00:00
|
|
|
#include "virsysinfo.h"
|
2013-04-23 10:56:22 +00:00
|
|
|
#include "viraccessapicheck.h"
|
2013-08-30 20:54:50 +00:00
|
|
|
#include "viratomic.h"
|
2014-03-06 09:46:11 +00:00
|
|
|
#include "virhostdev.h"
|
2014-07-15 05:03:15 +00:00
|
|
|
#include "network/bridge_driver.h"
|
2015-04-14 20:38:46 +00:00
|
|
|
#include "locking/domain_lock.h"
|
2016-02-24 13:25:46 +00:00
|
|
|
#include "virstats.h"
|
2011-02-10 22:42:34 +00:00
|
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_LIBXL
|
|
|
|
|
2014-02-28 12:16:17 +00:00
|
|
|
VIR_LOG_INIT("libxl.libxl_driver");
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
#define LIBXL_DOM_REQ_POWEROFF 0
|
|
|
|
#define LIBXL_DOM_REQ_REBOOT 1
|
|
|
|
#define LIBXL_DOM_REQ_SUSPEND 2
|
|
|
|
#define LIBXL_DOM_REQ_CRASH 3
|
|
|
|
#define LIBXL_DOM_REQ_HALT 4
|
|
|
|
|
2014-12-16 04:30:06 +00:00
|
|
|
#define LIBXL_CONFIG_FORMAT_XL "xen-xl"
|
2011-03-29 12:39:18 +00:00
|
|
|
#define LIBXL_CONFIG_FORMAT_XM "xen-xm"
|
2014-03-07 17:31:45 +00:00
|
|
|
#define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr"
|
2011-03-29 12:39:18 +00:00
|
|
|
|
2015-11-13 13:14:41 +00:00
|
|
|
#define LIBXL_NB_TOTAL_CPU_STAT_PARAM 1
|
|
|
|
|
2014-03-17 12:14:11 +00:00
|
|
|
#define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities"
|
2015-05-24 15:42:41 +00:00
|
|
|
#define HYPERVISOR_XENSTORED "/dev/xen/xenstored"
|
2014-03-17 12:14:11 +00:00
|
|
|
|
2011-03-29 12:46:55 +00:00
|
|
|
/* Number of Xen scheduler parameters */
|
|
|
|
#define XEN_SCHED_CREDIT_NPARAM 2
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
#define LIBXL_CHECK_DOM0_GOTO(name, label) \
|
|
|
|
do { \
|
|
|
|
if (STREQ_NULLABLE(name, "Domain-0")) { \
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", \
|
|
|
|
_("Domain-0 does not support requested operation")); \
|
|
|
|
goto label; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
|
2014-10-28 18:38:04 +00:00
|
|
|
static libxlDriverPrivatePtr libxl_driver;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2015-02-02 21:12:58 +00:00
|
|
|
/* Object used to store info related to libxl event registrations */
|
|
|
|
typedef struct _libxlOSEventHookInfo libxlOSEventHookInfo;
|
|
|
|
typedef libxlOSEventHookInfo *libxlOSEventHookInfoPtr;
|
|
|
|
struct _libxlOSEventHookInfo {
|
|
|
|
libxl_ctx *ctx;
|
|
|
|
void *xl_priv;
|
|
|
|
int id;
|
|
|
|
};
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
/* Function declarations */
|
2013-01-11 13:54:15 +00:00
|
|
|
static int
|
|
|
|
libxlDomainManagedSaveLoad(virDomainObjPtr vm,
|
2013-01-15 22:44:58 +00:00
|
|
|
void *opaque);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
|
|
|
|
/* Function definitions */
|
2015-02-02 21:12:58 +00:00
|
|
|
static void
|
|
|
|
libxlOSEventHookInfoFree(void *obj)
|
|
|
|
{
|
|
|
|
VIR_FREE(obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
libxlFDEventCallback(int watch ATTRIBUTE_UNUSED,
|
|
|
|
int fd,
|
|
|
|
int vir_events,
|
|
|
|
void *fd_info)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info = fd_info;
|
|
|
|
int events = 0;
|
|
|
|
|
|
|
|
if (vir_events & VIR_EVENT_HANDLE_READABLE)
|
|
|
|
events |= POLLIN;
|
|
|
|
if (vir_events & VIR_EVENT_HANDLE_WRITABLE)
|
|
|
|
events |= POLLOUT;
|
|
|
|
if (vir_events & VIR_EVENT_HANDLE_ERROR)
|
|
|
|
events |= POLLERR;
|
|
|
|
if (vir_events & VIR_EVENT_HANDLE_HANGUP)
|
|
|
|
events |= POLLHUP;
|
|
|
|
|
|
|
|
libxl_osevent_occurred_fd(info->ctx, info->xl_priv, fd, 0, events);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlFDRegisterEventHook(void *priv,
|
|
|
|
int fd,
|
|
|
|
void **hndp,
|
|
|
|
short events,
|
|
|
|
void *xl_priv)
|
|
|
|
{
|
|
|
|
int vir_events = VIR_EVENT_HANDLE_ERROR;
|
|
|
|
libxlOSEventHookInfoPtr info;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(info) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
info->ctx = priv;
|
|
|
|
info->xl_priv = xl_priv;
|
|
|
|
|
|
|
|
if (events & POLLIN)
|
|
|
|
vir_events |= VIR_EVENT_HANDLE_READABLE;
|
|
|
|
if (events & POLLOUT)
|
|
|
|
vir_events |= VIR_EVENT_HANDLE_WRITABLE;
|
|
|
|
|
|
|
|
info->id = virEventAddHandle(fd, vir_events, libxlFDEventCallback,
|
|
|
|
info, libxlOSEventHookInfoFree);
|
|
|
|
if (info->id < 0) {
|
|
|
|
VIR_FREE(info);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
*hndp = info;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlFDModifyEventHook(void *priv ATTRIBUTE_UNUSED,
|
|
|
|
int fd ATTRIBUTE_UNUSED,
|
|
|
|
void **hndp,
|
|
|
|
short events)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info = *hndp;
|
|
|
|
int vir_events = VIR_EVENT_HANDLE_ERROR;
|
|
|
|
|
|
|
|
if (events & POLLIN)
|
|
|
|
vir_events |= VIR_EVENT_HANDLE_READABLE;
|
|
|
|
if (events & POLLOUT)
|
|
|
|
vir_events |= VIR_EVENT_HANDLE_WRITABLE;
|
|
|
|
|
|
|
|
virEventUpdateHandle(info->id, vir_events);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
libxlFDDeregisterEventHook(void *priv ATTRIBUTE_UNUSED,
|
|
|
|
int fd ATTRIBUTE_UNUSED,
|
|
|
|
void *hnd)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info = hnd;
|
|
|
|
|
|
|
|
virEventRemoveHandle(info->id);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
libxlTimerCallback(int timer ATTRIBUTE_UNUSED, void *timer_info)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info = timer_info;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* libxl expects the event to be deregistered when calling
|
|
|
|
* libxl_osevent_occurred_timeout, but we dont want the event info
|
|
|
|
* destroyed. Disable the timeout and only remove it after returning
|
|
|
|
* from libxl.
|
|
|
|
*/
|
|
|
|
virEventUpdateTimeout(info->id, -1);
|
|
|
|
libxl_osevent_occurred_timeout(info->ctx, info->xl_priv);
|
|
|
|
virEventRemoveTimeout(info->id);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlTimeoutRegisterEventHook(void *priv,
|
|
|
|
void **hndp,
|
|
|
|
struct timeval abs_t,
|
|
|
|
void *xl_priv)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info;
|
|
|
|
struct timeval now;
|
|
|
|
struct timeval res;
|
|
|
|
static struct timeval zero;
|
|
|
|
int timeout;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(info) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
info->ctx = priv;
|
|
|
|
info->xl_priv = xl_priv;
|
|
|
|
|
|
|
|
gettimeofday(&now, NULL);
|
|
|
|
timersub(&abs_t, &now, &res);
|
|
|
|
/* Ensure timeout is not overflowed */
|
|
|
|
if (timercmp(&res, &zero, <)) {
|
|
|
|
timeout = 0;
|
|
|
|
} else if (res.tv_sec > INT_MAX / 1000) {
|
|
|
|
timeout = INT_MAX;
|
|
|
|
} else {
|
|
|
|
timeout = res.tv_sec * 1000 + (res.tv_usec + 999) / 1000;
|
|
|
|
}
|
|
|
|
info->id = virEventAddTimeout(timeout, libxlTimerCallback,
|
|
|
|
info, libxlOSEventHookInfoFree);
|
|
|
|
if (info->id < 0) {
|
|
|
|
VIR_FREE(info);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
*hndp = info;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: There are two changes wrt timeouts starting with xen-unstable
|
|
|
|
* changeset 26469:
|
|
|
|
*
|
|
|
|
* 1. Timeout modify callbacks will only be invoked with an abs_t of {0,0},
|
|
|
|
* i.e. make the timeout fire immediately. Prior to this commit, timeout
|
|
|
|
* modify callbacks were never invoked.
|
|
|
|
*
|
|
|
|
* 2. Timeout deregister hooks will no longer be called.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
libxlTimeoutModifyEventHook(void *priv ATTRIBUTE_UNUSED,
|
|
|
|
void **hndp,
|
|
|
|
struct timeval abs_t ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info = *hndp;
|
|
|
|
|
|
|
|
/* Make the timeout fire */
|
|
|
|
virEventUpdateTimeout(info->id, 0);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
libxlTimeoutDeregisterEventHook(void *priv ATTRIBUTE_UNUSED,
|
|
|
|
void *hnd)
|
|
|
|
{
|
|
|
|
libxlOSEventHookInfoPtr info = hnd;
|
|
|
|
|
|
|
|
virEventRemoveTimeout(info->id);
|
|
|
|
}
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
static virDomainObjPtr
|
|
|
|
libxlDomObjFromDomain(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
|
|
|
|
|
|
|
vm = virDomainObjListFindByUUID(driver->domains, dom->uuid);
|
|
|
|
if (!vm) {
|
|
|
|
virUUIDFormat(dom->uuid, uuidstr);
|
|
|
|
virReportError(VIR_ERR_NO_DOMAIN,
|
|
|
|
_("no domain with matching uuid '%s' (%s)"),
|
|
|
|
uuidstr, dom->name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return vm;
|
|
|
|
}
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
static int
|
|
|
|
libxlAutostartDomain(virDomainObjPtr vm,
|
2011-03-28 10:49:22 +00:00
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = opaque;
|
|
|
|
virErrorPtr err;
|
2013-01-11 13:54:15 +00:00
|
|
|
int ret = -1;
|
2011-03-28 10:49:22 +00:00
|
|
|
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectLock(vm);
|
2011-03-28 10:49:22 +00:00
|
|
|
virResetLastError();
|
|
|
|
|
2015-03-02 01:24:26 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) {
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-03-28 10:49:22 +00:00
|
|
|
if (vm->autostart && !virDomainObjIsActive(vm) &&
|
2014-02-26 21:11:30 +00:00
|
|
|
libxlDomainStart(driver, vm, false, -1) < 0) {
|
2011-03-28 10:49:22 +00:00
|
|
|
err = virGetLastError();
|
|
|
|
VIR_ERROR(_("Failed to autostart VM '%s': %s"),
|
|
|
|
vm->def->name,
|
|
|
|
err ? err->message : _("unknown error"));
|
2015-03-02 01:24:26 +00:00
|
|
|
goto endjob;
|
2011-03-28 10:49:22 +00:00
|
|
|
}
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
ret = 0;
|
2015-03-02 01:24:26 +00:00
|
|
|
|
|
|
|
endjob:
|
|
|
|
if (libxlDomainObjEndJob(driver, vm))
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
return ret;
|
2011-03-28 10:49:22 +00:00
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
/*
|
|
|
|
* Reconnect to running domains that were previously started/created
|
|
|
|
* with libxenlight driver.
|
|
|
|
*/
|
2013-01-11 13:54:15 +00:00
|
|
|
static int
|
|
|
|
libxlReconnectDomain(virDomainObjPtr vm,
|
2011-02-10 22:42:34 +00:00
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = opaque;
|
2013-08-21 17:05:18 +00:00
|
|
|
libxlDomainObjPrivatePtr priv = vm->privateData;
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
int rc;
|
|
|
|
libxl_dominfo d_info;
|
|
|
|
int len;
|
|
|
|
uint8_t *data = NULL;
|
2014-03-06 09:46:11 +00:00
|
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectLock(vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2016-01-21 10:21:10 +00:00
|
|
|
libxl_dominfo_init(&d_info);
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
/* Does domain still exist? */
|
2015-02-11 23:40:07 +00:00
|
|
|
rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (rc == ERROR_INVAL) {
|
|
|
|
goto out;
|
|
|
|
} else if (rc != 0) {
|
|
|
|
VIR_DEBUG("libxl_domain_info failed (code %d), ignoring domain %d",
|
|
|
|
rc, vm->def->id);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Is this a domain that was under libvirt control? */
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_userdata_retrieve(cfg->ctx, vm->def->id,
|
2011-02-10 22:42:34 +00:00
|
|
|
"libvirt-xml", &data, &len)) {
|
|
|
|
VIR_DEBUG("libxl_userdata_retrieve failed, ignoring domain %d", vm->def->id);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update domid in case it changed (e.g. reboot) while we were gone? */
|
|
|
|
vm->def->id = d_info.domid;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
|
|
|
/* Update hostdev state */
|
2015-10-26 10:59:41 +00:00
|
|
|
if (virHostdevUpdateActiveDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME,
|
2014-03-06 09:46:11 +00:00
|
|
|
vm->def, VIR_HOSTDEV_SP_PCI) < 0)
|
|
|
|
goto out;
|
|
|
|
|
2013-08-30 20:54:50 +00:00
|
|
|
if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback)
|
2012-10-31 19:03:55 +00:00
|
|
|
driver->inhibitCallback(true, driver->inhibitOpaque);
|
|
|
|
|
2015-02-12 19:02:27 +00:00
|
|
|
/* Enable domain death events */
|
2015-02-11 23:40:07 +00:00
|
|
|
libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW);
|
2015-02-12 19:02:27 +00:00
|
|
|
|
2016-01-21 10:21:10 +00:00
|
|
|
libxl_dominfo_dispose(&d_info);
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2013-01-11 13:54:15 +00:00
|
|
|
return 0;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
out:
|
2016-01-21 10:21:10 +00:00
|
|
|
libxl_dominfo_dispose(&d_info);
|
2015-07-07 18:29:24 +00:00
|
|
|
libxlDomainCleanup(driver, vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!vm->persistent)
|
2013-06-13 01:54:09 +00:00
|
|
|
virDomainObjListRemoveLocked(driver->domains, vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
else
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2013-01-11 13:54:15 +00:00
|
|
|
|
|
|
|
return -1;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
libxlReconnectDomains(libxlDriverPrivatePtr driver)
|
|
|
|
{
|
2013-01-11 13:54:15 +00:00
|
|
|
virDomainObjListForEach(driver->domains, libxlReconnectDomain, driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlStateCleanup(void)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
if (!libxl_driver)
|
|
|
|
return -1;
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
virObjectUnref(libxl_driver->hostdevMgr);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(libxl_driver->config);
|
2013-03-31 18:03:42 +00:00
|
|
|
virObjectUnref(libxl_driver->xmlopt);
|
2013-01-11 13:54:15 +00:00
|
|
|
virObjectUnref(libxl_driver->domains);
|
2015-04-28 00:53:04 +00:00
|
|
|
virObjectUnref(libxl_driver->reservedGraphicsPorts);
|
2014-05-08 21:56:51 +00:00
|
|
|
virObjectUnref(libxl_driver->migrationPorts);
|
2015-04-14 20:38:46 +00:00
|
|
|
virLockManagerPluginUnref(libxl_driver->lockManager);
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-11-21 10:43:10 +00:00
|
|
|
virObjectEventStateFree(libxl_driver->domainEventState);
|
2013-06-12 15:49:27 +00:00
|
|
|
virSysinfoDefFree(libxl_driver->hostsysinfo);
|
2011-03-29 12:18:24 +00:00
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
virMutexDestroy(&libxl_driver->lock);
|
|
|
|
VIR_FREE(libxl_driver);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-30 18:34:48 +00:00
|
|
|
static bool
|
|
|
|
libxlDriverShouldLoad(bool privileged)
|
2012-10-31 19:03:55 +00:00
|
|
|
{
|
2013-08-30 18:34:48 +00:00
|
|
|
bool ret = false;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-08-30 18:34:48 +00:00
|
|
|
/* Don't load if non-root */
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!privileged) {
|
2011-05-09 09:24:09 +00:00
|
|
|
VIR_INFO("Not running privileged, disabling libxenlight driver");
|
2013-08-30 18:34:48 +00:00
|
|
|
return ret;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2015-05-24 15:42:41 +00:00
|
|
|
if (virFileExists(HYPERVISOR_CAPABILITIES)) {
|
|
|
|
int status;
|
|
|
|
char *output = NULL;
|
|
|
|
/*
|
|
|
|
* Don't load if not running on a Xen control domain (dom0). It is not
|
|
|
|
* sufficient to check for the file to exist as any guest can mount
|
|
|
|
* xenfs to /proc/xen.
|
|
|
|
*/
|
|
|
|
status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output);
|
|
|
|
if (status >= 0)
|
|
|
|
status = strncmp(output, "control_d", 9);
|
|
|
|
VIR_FREE(output);
|
|
|
|
if (status) {
|
|
|
|
VIR_INFO("No Xen capabilities detected, probably not running "
|
|
|
|
"in a Xen Dom0. Disabling libxenlight driver");
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
} else if (!virFileExists(HYPERVISOR_XENSTORED)) {
|
|
|
|
VIR_INFO("Disabling driver as neither " HYPERVISOR_CAPABILITIES
|
|
|
|
" nor " HYPERVISOR_XENSTORED " exist");
|
2013-08-30 18:34:48 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Don't load if legacy xen toolstack (xend) is in use */
|
2014-04-28 18:35:44 +00:00
|
|
|
if (virFileExists("/usr/sbin/xend")) {
|
|
|
|
virCommandPtr cmd;
|
|
|
|
|
|
|
|
cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
|
|
|
|
if (virCommandRun(cmd, NULL) == 0) {
|
|
|
|
VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
|
|
|
|
"libxenlight driver.");
|
|
|
|
} else {
|
|
|
|
ret = true;
|
|
|
|
}
|
|
|
|
virCommandFree(cmd);
|
2013-08-30 18:34:48 +00:00
|
|
|
} else {
|
|
|
|
ret = true;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2013-08-30 18:34:48 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-02-02 21:12:58 +00:00
|
|
|
/* Callbacks wrapping libvirt's event loop interface */
|
|
|
|
static const libxl_osevent_hooks libxl_osevent_callbacks = {
|
|
|
|
.fd_register = libxlFDRegisterEventHook,
|
|
|
|
.fd_modify = libxlFDModifyEventHook,
|
|
|
|
.fd_deregister = libxlFDDeregisterEventHook,
|
|
|
|
.timeout_register = libxlTimeoutRegisterEventHook,
|
|
|
|
.timeout_modify = libxlTimeoutModifyEventHook,
|
|
|
|
.timeout_deregister = libxlTimeoutDeregisterEventHook,
|
|
|
|
};
|
|
|
|
|
2015-02-02 23:19:34 +00:00
|
|
|
static const libxl_childproc_hooks libxl_child_hooks = {
|
|
|
|
#ifdef LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP
|
|
|
|
.chldowner = libxl_sigchld_owner_libxl_always_selective_reap,
|
|
|
|
#else
|
|
|
|
.chldowner = libxl_sigchld_owner_libxl,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2015-02-12 18:37:46 +00:00
|
|
|
const struct libxl_event_hooks ev_hooks = {
|
|
|
|
.event_occurs_mask = LIBXL_EVENTMASK_ALL,
|
|
|
|
.event_occurs = libxlDomainEventHandler,
|
|
|
|
.disaster = NULL,
|
|
|
|
};
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
static int
|
|
|
|
libxlAddDom0(libxlDriverPrivatePtr driver)
|
|
|
|
{
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainDefPtr oldDef = NULL;
|
|
|
|
libxl_dominfo d_info;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
libxl_dominfo_init(&d_info);
|
|
|
|
|
|
|
|
/* Ensure we have a dom0 */
|
|
|
|
if (libxl_domain_info(cfg->ctx, &d_info, 0) != 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("unable to get Domain-0 information from libxenlight"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(def = virDomainDefNew()))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
def->id = 0;
|
|
|
|
def->virtType = VIR_DOMAIN_VIRT_XEN;
|
|
|
|
if (VIR_STRDUP(def->name, "Domain-0") < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
def->os.type = VIR_DOMAIN_OSTYPE_XEN;
|
|
|
|
|
|
|
|
if (virUUIDParse("00000000-0000-0000-0000-000000000000", def->uuid) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!(vm = virDomainObjListAdd(driver->domains, def,
|
|
|
|
driver->xmlopt,
|
|
|
|
0,
|
|
|
|
&oldDef)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
def = NULL;
|
|
|
|
|
2015-07-09 21:16:18 +00:00
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED);
|
2015-10-16 14:10:27 +00:00
|
|
|
if (virDomainDefSetVcpusMax(vm->def, d_info.vcpu_max_id + 1))
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-10-22 08:52:05 +00:00
|
|
|
if (virDomainDefSetVcpus(vm->def, d_info.vcpu_online) < 0)
|
|
|
|
goto cleanup;
|
2015-06-22 17:36:59 +00:00
|
|
|
vm->def->mem.cur_balloon = d_info.current_memkb;
|
2015-09-16 12:25:42 +00:00
|
|
|
virDomainDefSetMemoryTotal(vm->def, d_info.max_memkb);
|
2015-06-22 17:36:59 +00:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
libxl_dominfo_dispose(&d_info);
|
|
|
|
virDomainDefFree(def);
|
|
|
|
virDomainDefFree(oldDef);
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
virObjectUnref(cfg);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-08-30 18:34:48 +00:00
|
|
|
static int
|
|
|
|
libxlStateInitialize(bool privileged,
|
|
|
|
virStateInhibitCallback callback ATTRIBUTE_UNUSED,
|
|
|
|
void *opaque ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2013-09-09 15:15:15 +00:00
|
|
|
char *driverConf = NULL;
|
2013-08-30 18:34:48 +00:00
|
|
|
char ebuf[1024];
|
|
|
|
|
|
|
|
if (!libxlDriverShouldLoad(privileged))
|
|
|
|
return 0;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (VIR_ALLOC(libxl_driver) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (virMutexInit(&libxl_driver->lock) < 0) {
|
2013-08-30 18:34:48 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("cannot initialize mutex"));
|
2011-02-10 22:42:34 +00:00
|
|
|
VIR_FREE(libxl_driver);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate bitmap for vnc port reservation */
|
2015-04-28 00:53:04 +00:00
|
|
|
if (!(libxl_driver->reservedGraphicsPorts =
|
2013-10-31 11:46:28 +00:00
|
|
|
virPortAllocatorNew(_("VNC"),
|
|
|
|
LIBXL_VNC_PORT_MIN,
|
2014-06-03 11:02:51 +00:00
|
|
|
LIBXL_VNC_PORT_MAX,
|
|
|
|
0)))
|
2013-01-11 12:09:53 +00:00
|
|
|
goto error;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
/* Allocate bitmap for migration port reservation */
|
|
|
|
if (!(libxl_driver->migrationPorts =
|
|
|
|
virPortAllocatorNew(_("migration"),
|
|
|
|
LIBXL_MIGRATION_PORT_MIN,
|
2014-06-03 11:02:51 +00:00
|
|
|
LIBXL_MIGRATION_PORT_MAX, 0)))
|
2014-05-08 21:56:51 +00:00
|
|
|
goto error;
|
|
|
|
|
2013-01-11 16:04:47 +00:00
|
|
|
if (!(libxl_driver->domains = virDomainObjListNew()))
|
|
|
|
goto error;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
if (!(libxl_driver->hostdevMgr = virHostdevManagerGetDefault()))
|
|
|
|
goto error;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(cfg = libxlDriverConfigNew()))
|
2013-06-07 13:20:35 +00:00
|
|
|
goto error;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-09-09 15:15:15 +00:00
|
|
|
if (virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir) < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
|
|
|
|
goto error;
|
|
|
|
VIR_FREE(driverConf);
|
|
|
|
|
2015-02-02 21:12:58 +00:00
|
|
|
/* Register the callbacks providing access to libvirt's event loop */
|
|
|
|
libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
|
|
|
|
|
2015-02-02 23:19:34 +00:00
|
|
|
/* Setup child process handling. See $xen-src/tools/libxl/libxl_event.h */
|
|
|
|
libxl_childproc_setmode(cfg->ctx, &libxl_child_hooks, cfg->ctx);
|
|
|
|
|
2015-02-12 18:37:46 +00:00
|
|
|
/* Register callback to handle domain events */
|
|
|
|
libxl_event_register_callbacks(cfg->ctx, &ev_hooks, libxl_driver);
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
libxl_driver->config = cfg;
|
|
|
|
if (virFileMakePath(cfg->stateDir) < 0) {
|
2013-08-30 18:34:48 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("failed to create state dir '%s': %s"),
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->stateDir,
|
2013-08-30 18:34:48 +00:00
|
|
|
virStrerror(errno, ebuf, sizeof(ebuf)));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2013-08-30 20:52:14 +00:00
|
|
|
if (virFileMakePath(cfg->libDir) < 0) {
|
2013-08-30 18:34:48 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("failed to create lib dir '%s': %s"),
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->libDir,
|
2013-08-30 18:34:48 +00:00
|
|
|
virStrerror(errno, ebuf, sizeof(ebuf)));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2013-08-30 20:52:14 +00:00
|
|
|
if (virFileMakePath(cfg->saveDir) < 0) {
|
2013-08-30 18:34:48 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("failed to create save dir '%s': %s"),
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->saveDir,
|
2013-08-30 18:34:48 +00:00
|
|
|
virStrerror(errno, ebuf, sizeof(ebuf)));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2014-02-19 23:09:36 +00:00
|
|
|
if (virFileMakePath(cfg->autoDumpDir) < 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("failed to create dump dir '%s': %s"),
|
|
|
|
cfg->autoDumpDir,
|
|
|
|
virStrerror(errno, ebuf, sizeof(ebuf)));
|
|
|
|
goto error;
|
|
|
|
}
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2015-04-14 20:38:46 +00:00
|
|
|
if (!(libxl_driver->lockManager =
|
|
|
|
virLockManagerPluginNew(cfg->lockManagerName ?
|
|
|
|
cfg->lockManagerName : "nop",
|
|
|
|
"libxl",
|
|
|
|
cfg->configBaseDir,
|
|
|
|
0)))
|
|
|
|
goto error;
|
|
|
|
|
2013-06-12 15:49:27 +00:00
|
|
|
/* read the host sysinfo */
|
2013-09-04 22:59:59 +00:00
|
|
|
libxl_driver->hostsysinfo = virSysinfoRead();
|
2013-06-12 15:49:27 +00:00
|
|
|
|
2013-11-21 10:43:10 +00:00
|
|
|
libxl_driver->domainEventState = virObjectEventStateNew();
|
2011-05-13 17:21:59 +00:00
|
|
|
if (!libxl_driver->domainEventState)
|
2011-03-29 12:18:24 +00:00
|
|
|
goto error;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if ((cfg->caps = libxlMakeCapabilities(cfg->ctx)) == NULL) {
|
2013-08-30 18:34:48 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("cannot create capabilities for libxenlight"));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2014-05-30 14:53:12 +00:00
|
|
|
if (!(libxl_driver->xmlopt = libxlCreateXMLConf()))
|
2013-03-05 15:17:24 +00:00
|
|
|
goto error;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
/* Add Domain-0 */
|
|
|
|
if (libxlAddDom0(libxl_driver) < 0)
|
|
|
|
goto error;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
/* Load running domains first. */
|
2013-01-11 16:04:47 +00:00
|
|
|
if (virDomainObjListLoadAllConfigs(libxl_driver->domains,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->stateDir,
|
|
|
|
cfg->autostartDir,
|
2013-03-28 13:55:55 +00:00
|
|
|
1,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps,
|
2013-03-28 13:55:55 +00:00
|
|
|
libxl_driver->xmlopt,
|
2013-01-11 16:04:47 +00:00
|
|
|
NULL, NULL) < 0)
|
2011-02-10 22:42:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
libxlReconnectDomains(libxl_driver);
|
|
|
|
|
|
|
|
/* Then inactive persistent configs */
|
2013-01-11 16:04:47 +00:00
|
|
|
if (virDomainObjListLoadAllConfigs(libxl_driver->domains,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->configDir,
|
|
|
|
cfg->autostartDir,
|
2013-03-28 13:55:55 +00:00
|
|
|
0,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps,
|
2013-03-28 13:55:55 +00:00
|
|
|
libxl_driver->xmlopt,
|
2013-01-11 16:04:47 +00:00
|
|
|
NULL, NULL) < 0)
|
2011-02-10 22:42:34 +00:00
|
|
|
goto error;
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
virDomainObjListForEach(libxl_driver->domains, libxlDomainManagedSaveLoad,
|
|
|
|
libxl_driver);
|
2012-06-11 09:03:27 +00:00
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
return 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
error:
|
2013-09-09 15:15:15 +00:00
|
|
|
VIR_FREE(driverConf);
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlStateCleanup();
|
2013-08-30 20:52:14 +00:00
|
|
|
return -1;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2013-07-25 12:03:38 +00:00
|
|
|
static void
|
|
|
|
libxlStateAutoStart(void)
|
|
|
|
{
|
|
|
|
if (!libxl_driver)
|
|
|
|
return;
|
|
|
|
|
|
|
|
virDomainObjListForEach(libxl_driver->domains, libxlAutostartDomain,
|
|
|
|
libxl_driver);
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlStateReload(void)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!libxl_driver)
|
|
|
|
return 0;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg = libxlDriverConfigGet(libxl_driver);
|
|
|
|
|
2013-01-11 16:04:47 +00:00
|
|
|
virDomainObjListLoadAllConfigs(libxl_driver->domains,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->configDir,
|
|
|
|
cfg->autostartDir,
|
2013-03-28 13:55:55 +00:00
|
|
|
1,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps,
|
2013-03-28 13:55:55 +00:00
|
|
|
libxl_driver->xmlopt,
|
2013-01-11 16:04:47 +00:00
|
|
|
NULL, libxl_driver);
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
virDomainObjListForEach(libxl_driver->domains, libxlAutostartDomain,
|
|
|
|
libxl_driver);
|
2011-03-28 10:49:22 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static virDrvOpenStatus
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectOpen(virConnectPtr conn,
|
|
|
|
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
|
|
|
|
unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
2011-07-06 22:17:10 +00:00
|
|
|
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (conn->uri == NULL) {
|
|
|
|
if (libxl_driver == NULL)
|
|
|
|
return VIR_DRV_OPEN_DECLINED;
|
|
|
|
|
Centralize error reporting for URI parsing/formatting problems
Move error reporting out of the callers, into virURIParse
and virURIFormat, to get consistency.
* include/libvirt/virterror.h, src/util/virterror.c: Add VIR_FROM_URI
* src/util/viruri.c, src/util/viruri.h: Add error reporting
* src/esx/esx_driver.c, src/libvirt.c, src/libxl/libxl_driver.c,
src/lxc/lxc_driver.c, src/openvz/openvz_driver.c,
src/qemu/qemu_driver.c, src/qemu/qemu_migration.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/vmx/vmx.c, src/xen/xen_driver.c,
src/xen/xend_internal.c, tests/viruritest.c: Remove error
reporting
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-03-20 12:16:54 +00:00
|
|
|
if (!(conn->uri = virURIParse("xen:///")))
|
2011-02-10 22:42:34 +00:00
|
|
|
return VIR_DRV_OPEN_ERROR;
|
|
|
|
} else {
|
|
|
|
/* Only xen scheme */
|
|
|
|
if (conn->uri->scheme == NULL || STRNEQ(conn->uri->scheme, "xen"))
|
|
|
|
return VIR_DRV_OPEN_DECLINED;
|
|
|
|
|
|
|
|
/* If server name is given, its for remote driver */
|
|
|
|
if (conn->uri->server != NULL)
|
|
|
|
return VIR_DRV_OPEN_DECLINED;
|
|
|
|
|
|
|
|
/* Error if xen or libxl scheme specified but driver not started. */
|
|
|
|
if (libxl_driver == NULL) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("libxenlight state driver is not active"));
|
2011-02-10 22:42:34 +00:00
|
|
|
return VIR_DRV_OPEN_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* /session isn't supported in libxenlight */
|
|
|
|
if (conn->uri->path &&
|
|
|
|
STRNEQ(conn->uri->path, "") &&
|
|
|
|
STRNEQ(conn->uri->path, "/") &&
|
|
|
|
STRNEQ(conn->uri->path, "/system")) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected Xen URI path '%s', try xen:///"),
|
|
|
|
NULLSTR(conn->uri->path));
|
2011-02-10 22:42:34 +00:00
|
|
|
return VIR_DRV_OPEN_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectOpenEnsureACL(conn) < 0)
|
|
|
|
return VIR_DRV_OPEN_ERROR;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
conn->privateData = libxl_driver;
|
|
|
|
|
|
|
|
return VIR_DRV_OPEN_SUCCESS;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
conn->privateData = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
2013-04-23 10:56:22 +00:00
|
|
|
libxlConnectGetType(virConnectPtr conn)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectGetTypeEnsureACL(conn) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-05-17 15:17:03 +00:00
|
|
|
return "Xen";
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectGetVersion(virConnectPtr conn, unsigned long *version)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectGetVersionEnsureACL(conn) < 0)
|
|
|
|
return 0;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg = libxlDriverConfigGet(driver);
|
|
|
|
*version = cfg->version;
|
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-04-26 16:39:11 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
static char *libxlConnectGetHostname(virConnectPtr conn)
|
2013-04-26 16:39:11 +00:00
|
|
|
{
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectGetHostnameEnsureACL(conn) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-04-26 16:39:11 +00:00
|
|
|
return virGetHostname();
|
|
|
|
}
|
|
|
|
|
2013-06-12 15:49:27 +00:00
|
|
|
static char *
|
|
|
|
libxlConnectGetSysinfo(virConnectPtr conn, unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
|
|
|
|
virCheckFlags(0, NULL);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectGetSysinfoEnsureACL(conn) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-06-12 15:49:27 +00:00
|
|
|
if (!driver->hostsysinfo) {
|
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
|
_("Host SMBIOS information is not available"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virSysinfoFormat(&buf, driver->hostsysinfo) < 0)
|
|
|
|
return NULL;
|
2014-06-27 08:40:15 +00:00
|
|
|
if (virBufferCheckError(&buf) < 0)
|
2013-06-12 15:49:27 +00:00
|
|
|
return NULL;
|
|
|
|
return virBufferContentAndReset(&buf);
|
|
|
|
}
|
2013-04-26 16:39:11 +00:00
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectGetMaxVcpusEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg = libxlDriverConfigGet(driver);
|
|
|
|
ret = libxl_get_max_cpus(cfg->ctx);
|
2013-12-18 14:39:12 +00:00
|
|
|
/* On failure, libxl_get_max_cpus() will return ERROR_FAIL from Xen 4.4
|
|
|
|
* onward, but it ever returning 0 is obviously wrong too (and it is
|
|
|
|
* what happens, on failure, on Xen 4.3 and earlier). Therefore, a 'less
|
|
|
|
* or equal' is the catchall we want. */
|
|
|
|
if (ret <= 0)
|
2013-08-30 20:52:14 +00:00
|
|
|
ret = -1;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
|
|
|
|
{
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virNodeGetInfoEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2014-02-26 20:44:09 +00:00
|
|
|
return libxlDriverNodeGetInfo(conn->privateData, info);
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectGetCapabilities(virConnectPtr conn)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
char *xml;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectGetCapabilitiesEnsureACL(conn) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg = libxlDriverConfigGet(driver);
|
2014-06-27 07:55:44 +00:00
|
|
|
xml = virCapabilitiesFormatXML(cfg->caps);
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return xml;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectListDomains(virConnectPtr conn, int *ids, int nids)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
int n;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectListDomainsEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2013-06-24 16:49:47 +00:00
|
|
|
n = virDomainObjListGetActiveIDs(driver->domains, ids, nids,
|
|
|
|
virConnectListDomainsCheckACL, conn);
|
2011-02-10 22:42:34 +00:00
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectNumOfDomains(virConnectPtr conn)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
int n;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectNumOfDomainsEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2013-06-24 16:49:47 +00:00
|
|
|
n = virDomainObjListNumOfDomains(driver->domains, true,
|
|
|
|
virConnectNumOfDomainsCheckACL, conn);
|
2011-02-10 22:42:34 +00:00
|
|
|
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static virDomainPtr
|
|
|
|
libxlDomainCreateXML(virConnectPtr conn, const char *xml,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
virDomainDefPtr def;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainPtr dom = NULL;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2014-11-18 17:34:42 +00:00
|
|
|
unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-11-18 17:34:42 +00:00
|
|
|
virCheckFlags(VIR_DOMAIN_START_PAUSED |
|
|
|
|
VIR_DOMAIN_START_VALIDATE, NULL);
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_START_VALIDATE)
|
|
|
|
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt,
|
2014-11-18 17:34:42 +00:00
|
|
|
parse_flags)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainCreateXMLEnsureACL(conn, def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2013-03-28 13:55:55 +00:00
|
|
|
if (!(vm = virDomainObjListAdd(driver->domains, def,
|
2013-03-31 18:03:42 +00:00
|
|
|
driver->xmlopt,
|
2015-09-22 14:57:52 +00:00
|
|
|
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
|
|
|
|
NULL)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
def = NULL;
|
|
|
|
|
2015-03-02 01:24:26 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) {
|
|
|
|
if (!vm->persistent) {
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
|
|
|
vm = NULL;
|
|
|
|
}
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-02-26 21:11:30 +00:00
|
|
|
if (libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0,
|
2011-05-30 09:53:02 +00:00
|
|
|
-1) < 0) {
|
2015-06-24 21:14:41 +00:00
|
|
|
if (!vm->persistent) {
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
|
|
|
vm = NULL;
|
2015-09-10 15:45:07 +00:00
|
|
|
goto cleanup;
|
2015-06-24 21:14:41 +00:00
|
|
|
}
|
2015-03-02 01:24:26 +00:00
|
|
|
goto endjob;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
|
|
|
|
if (dom)
|
|
|
|
dom->id = vm->def->id;
|
|
|
|
|
2015-03-02 01:24:26 +00:00
|
|
|
endjob:
|
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainDefFree(def);
|
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return dom;
|
|
|
|
}
|
|
|
|
|
|
|
|
static virDomainPtr
|
|
|
|
libxlDomainLookupByID(virConnectPtr conn, int id)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
virDomainPtr dom = NULL;
|
|
|
|
|
2013-01-11 16:04:47 +00:00
|
|
|
vm = virDomainObjListFindByID(driver->domains, id);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!vm) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_NO_DOMAIN, NULL);
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainLookupByIDEnsureACL(conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
|
|
|
|
if (dom)
|
|
|
|
dom->id = vm->def->id;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
return dom;
|
|
|
|
}
|
|
|
|
|
|
|
|
static virDomainPtr
|
|
|
|
libxlDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
virDomainPtr dom = NULL;
|
|
|
|
|
2013-01-11 16:04:47 +00:00
|
|
|
vm = virDomainObjListFindByUUID(driver->domains, uuid);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!vm) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_NO_DOMAIN, NULL);
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainLookupByUUIDEnsureACL(conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
|
|
|
|
if (dom)
|
|
|
|
dom->id = vm->def->id;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
return dom;
|
|
|
|
}
|
|
|
|
|
|
|
|
static virDomainPtr
|
|
|
|
libxlDomainLookupByName(virConnectPtr conn, const char *name)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
virDomainPtr dom = NULL;
|
|
|
|
|
2013-01-11 16:04:47 +00:00
|
|
|
vm = virDomainObjListFindByName(driver->domains, name);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!vm) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_NO_DOMAIN, NULL);
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainLookupByNameEnsureACL(conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
|
|
|
|
if (dom)
|
|
|
|
dom->id = vm->def->id;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2015-04-23 16:00:01 +00:00
|
|
|
virDomainObjEndAPI(&vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
return dom;
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:55:38 +00:00
|
|
|
static int
|
|
|
|
libxlDomainSuspend(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:55:38 +00:00
|
|
|
virDomainObjPtr vm;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
2011-03-29 12:55:38 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:55:38 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-06 23:21:50 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-29 12:55:38 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2014-02-06 23:21:50 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:55:38 +00:00
|
|
|
}
|
|
|
|
|
2011-05-04 09:07:01 +00:00
|
|
|
if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) {
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_pause(cfg->ctx, vm->def->id) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to suspend domain '%d' with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2014-02-06 23:21:50 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:55:38 +00:00
|
|
|
}
|
|
|
|
|
2011-05-04 09:07:01 +00:00
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER);
|
2011-03-29 12:55:38 +00:00
|
|
|
|
2013-11-21 17:03:26 +00:00
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED,
|
2011-03-29 12:55:38 +00:00
|
|
|
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
|
|
|
|
}
|
|
|
|
|
2016-02-04 12:32:45 +00:00
|
|
|
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0)
|
2014-02-06 23:21:50 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:55:38 +00:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-06 23:21:50 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:55:38 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:57:42 +00:00
|
|
|
if (event)
|
2011-03-29 12:55:38 +00:00
|
|
|
libxlDomainEventQueue(driver, event);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:55:38 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainResume(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:55:38 +00:00
|
|
|
virDomainObjPtr vm;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
2011-03-29 12:55:38 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:55:38 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-06 23:21:50 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-29 12:55:38 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2014-02-06 23:21:50 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:55:38 +00:00
|
|
|
}
|
|
|
|
|
2011-05-04 09:07:01 +00:00
|
|
|
if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_unpause(cfg->ctx, vm->def->id) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to resume domain '%d' with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2014-02-06 23:21:50 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:55:38 +00:00
|
|
|
}
|
|
|
|
|
2011-05-04 09:07:01 +00:00
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
|
|
|
|
VIR_DOMAIN_RUNNING_UNPAUSED);
|
2011-03-29 12:55:38 +00:00
|
|
|
|
2013-11-21 17:03:26 +00:00
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED,
|
2011-03-29 12:55:38 +00:00
|
|
|
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
|
|
|
|
}
|
|
|
|
|
2016-02-04 12:32:45 +00:00
|
|
|
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0)
|
2014-02-06 23:21:50 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:55:38 +00:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-06 23:21:50 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:55:38 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:57:42 +00:00
|
|
|
if (event)
|
2011-03-29 12:55:38 +00:00
|
|
|
libxlDomainEventQueue(driver, event);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:55:38 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
2011-10-05 17:31:55 +00:00
|
|
|
libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
2014-05-01 18:11:51 +00:00
|
|
|
virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN |
|
|
|
|
VIR_DOMAIN_SHUTDOWN_PARAVIRT, -1);
|
|
|
|
if (flags == 0)
|
|
|
|
flags = VIR_DOMAIN_SHUTDOWN_PARAVIRT |
|
|
|
|
VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN;
|
2011-10-05 17:31:55 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
api: require write permission for guest agent interaction
I noticed that we allow virDomainGetVcpusFlags even for read-only
connections, but that with a flag, it can require guest agent
interaction. It is feasible that a malicious guest could
intentionally abuse the replies it sends over the guest agent
connection to possibly trigger a bug in libvirt's JSON parser,
or withhold an answer so as to prevent the use of the agent
in a later command such as a shutdown request. Although we
don't know of any such exploits now (and therefore don't mind
posting this patch publicly without trying to get a CVE assigned),
it is better to err on the side of caution and explicitly require
full access to any domain where the API requires guest interaction
to operate correctly.
I audited all commands that are marked as conditionally using a
guest agent. Note that at least virDomainFSTrim is documented
as needing a guest agent, but that such use is unconditional
depending on the hypervisor (so the existing domain:fs_trim ACL
should be sufficient there, rather than also requirng domain:write).
But when designing future APIs, such as the plans for obtaining
a domain's IP addresses, we should copy the approach of this patch
in making interaction with the guest be specified via a flag, and
use that flag to also require stricter access checks.
* src/libvirt.c (virDomainGetVcpusFlags): Forbid guest interaction
on read-only connection.
(virDomainShutdownFlags, virDomainReboot): Improve docs on agent
interaction.
* src/remote/remote_protocol.x
(REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML)
(REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS)
(REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS, REMOTE_PROC_DOMAIN_REBOOT)
(REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS): Require domain:write for any
conditional use of a guest agent.
* src/xen/xen_driver.c: Fix clients.
* src/libxl/libxl_driver.c: Likewise.
* src/uml/uml_driver.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/lxc/lxc_driver.c: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-21 17:37:29 +00:00
|
|
|
if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
2013-04-23 10:56:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("Domain is not running"));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-05-01 18:11:51 +00:00
|
|
|
if (flags & VIR_DOMAIN_SHUTDOWN_PARAVIRT) {
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxl_domain_shutdown(cfg->ctx, vm->def->id);
|
2014-05-01 18:11:51 +00:00
|
|
|
if (ret == 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (ret != ERROR_NOPARAVIRT) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to shutdown domain '%d' with libxenlight"),
|
|
|
|
vm->def->id);
|
|
|
|
ret = -1;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) {
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxl_send_trigger(cfg->ctx, vm->def->id,
|
2014-05-01 18:11:51 +00:00
|
|
|
LIBXL_TRIGGER_POWER, 0);
|
|
|
|
if (ret == 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to shutdown domain '%d' with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2014-05-01 18:11:51 +00:00
|
|
|
ret = -1;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-10-05 17:31:55 +00:00
|
|
|
static int
|
|
|
|
libxlDomainShutdown(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
return libxlDomainShutdownFlags(dom, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
2011-07-06 22:17:10 +00:00
|
|
|
libxlDomainReboot(virDomainPtr dom, unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
2014-05-01 21:00:47 +00:00
|
|
|
virCheckFlags(VIR_DOMAIN_REBOOT_PARAVIRT, -1);
|
|
|
|
if (flags == 0)
|
|
|
|
flags = VIR_DOMAIN_REBOOT_PARAVIRT;
|
2011-07-06 22:17:10 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
api: require write permission for guest agent interaction
I noticed that we allow virDomainGetVcpusFlags even for read-only
connections, but that with a flag, it can require guest agent
interaction. It is feasible that a malicious guest could
intentionally abuse the replies it sends over the guest agent
connection to possibly trigger a bug in libvirt's JSON parser,
or withhold an answer so as to prevent the use of the agent
in a later command such as a shutdown request. Although we
don't know of any such exploits now (and therefore don't mind
posting this patch publicly without trying to get a CVE assigned),
it is better to err on the side of caution and explicitly require
full access to any domain where the API requires guest interaction
to operate correctly.
I audited all commands that are marked as conditionally using a
guest agent. Note that at least virDomainFSTrim is documented
as needing a guest agent, but that such use is unconditional
depending on the hypervisor (so the existing domain:fs_trim ACL
should be sufficient there, rather than also requirng domain:write).
But when designing future APIs, such as the plans for obtaining
a domain's IP addresses, we should copy the approach of this patch
in making interaction with the guest be specified via a flag, and
use that flag to also require stricter access checks.
* src/libvirt.c (virDomainGetVcpusFlags): Forbid guest interaction
on read-only connection.
(virDomainShutdownFlags, virDomainReboot): Improve docs on agent
interaction.
* src/remote/remote_protocol.x
(REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML)
(REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS)
(REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS, REMOTE_PROC_DOMAIN_REBOOT)
(REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS): Require domain:write for any
conditional use of a guest agent.
* src/xen/xen_driver.c: Fix clients.
* src/libxl/libxl_driver.c: Likewise.
* src/uml/uml_driver.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/lxc/lxc_driver.c: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-21 17:37:29 +00:00
|
|
|
if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0)
|
2013-04-23 10:56:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("Domain is not running"));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-05-01 21:00:47 +00:00
|
|
|
if (flags & VIR_DOMAIN_REBOOT_PARAVIRT) {
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxl_domain_reboot(cfg->ctx, vm->def->id);
|
2014-05-01 21:00:47 +00:00
|
|
|
if (ret == 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to reboot domain '%d' with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2014-05-01 21:00:47 +00:00
|
|
|
ret = -1;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2011-07-20 16:47:46 +00:00
|
|
|
libxlDomainDestroyFlags(virDomainPtr dom,
|
|
|
|
unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2011-07-20 16:47:46 +00:00
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-03-01 23:22:07 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("Domain is not running"));
|
2015-03-01 23:22:07 +00:00
|
|
|
goto endjob;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2015-03-04 00:54:50 +00:00
|
|
|
if (libxlDomainDestroyInternal(driver, vm) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
2014-03-27 16:55:02 +00:00
|
|
|
_("Failed to destroy domain '%d'"), vm->def->id);
|
2015-03-01 23:22:07 +00:00
|
|
|
goto endjob;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2015-07-07 18:29:24 +00:00
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF,
|
|
|
|
VIR_DOMAIN_SHUTOFF_DESTROYED);
|
|
|
|
|
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
|
|
|
|
VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
|
|
|
|
|
|
|
|
libxlDomainCleanup(driver, vm);
|
2015-03-01 23:22:07 +00:00
|
|
|
if (!vm->persistent)
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2015-03-01 23:22:07 +00:00
|
|
|
endjob:
|
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-29 12:18:24 +00:00
|
|
|
if (event)
|
|
|
|
libxlDomainEventQueue(driver, event);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-07-20 16:47:46 +00:00
|
|
|
static int
|
|
|
|
libxlDomainDestroy(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
return libxlDomainDestroyFlags(dom, 0);
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:49:43 +00:00
|
|
|
static char *
|
|
|
|
libxlDomainGetOSType(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
char *type = NULL;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:49:43 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetOSTypeEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-04-17 00:11:06 +00:00
|
|
|
if (VIR_STRDUP(type, virDomainOSTypeToString(vm->def->os.type)) < 0)
|
2013-04-23 10:56:22 +00:00
|
|
|
goto cleanup;
|
2011-03-29 12:49:43 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:49:43 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-29 12:49:43 +00:00
|
|
|
return type;
|
|
|
|
}
|
|
|
|
|
xml: use long long internally, to centralize overflow checks
On 64-bit platforms, unsigned long and unsigned long long are
identical, so we don't have to worry about overflow checks.
On 32-bit platforms, anywhere we narrow unsigned long long back
to unsigned long, we have to worry about overflow; it's easier
to do this in one place by having most of the code use the same
or wider types, and only doing the narrowing at the last minute.
Therefore, the memory set commands remain unsigned long, and
the memory get command now centralizes the overflow check into
libvirt.c, so that drivers don't have to repeat the work.
This also fixes a bug where xen returned the wrong value on
failure (most APIs return -1 on failure, but getMaxMemory
must return 0 on failure).
* src/driver.h (virDrvDomainGetMaxMemory): Use long long.
* src/libvirt.c (virDomainGetMaxMemory): Raise overflow.
* src/test/test_driver.c (testGetMaxMemory): Fix driver.
* src/rpc/gendispatch.pl (name_to_ProcName): Likewise.
* src/xen/xen_hypervisor.c (xenHypervisorGetMaxMemory): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainGetMaxMemory): Likewise.
* src/xen/xend_internal.c (xenDaemonDomainGetMaxMemory):
Likewise.
* src/xen/xend_internal.h (xenDaemonDomainGetMaxMemory):
Likewise.
* src/xen/xm_internal.c (xenXMDomainGetMaxMemory): Likewise.
* src/xen/xm_internal.h (xenXMDomainGetMaxMemory): Likewise.
* src/xen/xs_internal.c (xenStoreDomainGetMaxMemory): Likewise.
* src/xen/xs_internal.h (xenStoreDomainGetMaxMemory): Likewise.
* src/xenapi/xenapi_driver.c (xenapiDomainGetMaxMemory):
Likewise.
* src/esx/esx_driver.c (esxDomainGetMaxMemory): Likewise.
* src/libxl/libxl_driver.c (libxlDomainGetMaxMemory): Likewise.
* src/qemu/qemu_driver.c (qemudDomainGetMaxMemory): Likewise.
* src/lxc/lxc_driver.c (lxcDomainGetMaxMemory): Likewise.
* src/uml/uml_driver.c (umlDomainGetMaxMemory): Likewise.
2012-03-03 00:47:16 +00:00
|
|
|
static unsigned long long
|
2011-03-21 09:35:53 +00:00
|
|
|
libxlDomainGetMaxMemory(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
xml: use long long internally, to centralize overflow checks
On 64-bit platforms, unsigned long and unsigned long long are
identical, so we don't have to worry about overflow checks.
On 32-bit platforms, anywhere we narrow unsigned long long back
to unsigned long, we have to worry about overflow; it's easier
to do this in one place by having most of the code use the same
or wider types, and only doing the narrowing at the last minute.
Therefore, the memory set commands remain unsigned long, and
the memory get command now centralizes the overflow check into
libvirt.c, so that drivers don't have to repeat the work.
This also fixes a bug where xen returned the wrong value on
failure (most APIs return -1 on failure, but getMaxMemory
must return 0 on failure).
* src/driver.h (virDrvDomainGetMaxMemory): Use long long.
* src/libvirt.c (virDomainGetMaxMemory): Raise overflow.
* src/test/test_driver.c (testGetMaxMemory): Fix driver.
* src/rpc/gendispatch.pl (name_to_ProcName): Likewise.
* src/xen/xen_hypervisor.c (xenHypervisorGetMaxMemory): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainGetMaxMemory): Likewise.
* src/xen/xend_internal.c (xenDaemonDomainGetMaxMemory):
Likewise.
* src/xen/xend_internal.h (xenDaemonDomainGetMaxMemory):
Likewise.
* src/xen/xm_internal.c (xenXMDomainGetMaxMemory): Likewise.
* src/xen/xm_internal.h (xenXMDomainGetMaxMemory): Likewise.
* src/xen/xs_internal.c (xenStoreDomainGetMaxMemory): Likewise.
* src/xen/xs_internal.h (xenStoreDomainGetMaxMemory): Likewise.
* src/xenapi/xenapi_driver.c (xenapiDomainGetMaxMemory):
Likewise.
* src/esx/esx_driver.c (esxDomainGetMaxMemory): Likewise.
* src/libxl/libxl_driver.c (libxlDomainGetMaxMemory): Likewise.
* src/qemu/qemu_driver.c (qemudDomainGetMaxMemory): Likewise.
* src/lxc/lxc_driver.c (lxcDomainGetMaxMemory): Likewise.
* src/uml/uml_driver.c (umlDomainGetMaxMemory): Likewise.
2012-03-03 00:47:16 +00:00
|
|
|
unsigned long long ret = 0;
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-21 09:35:53 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
|
|
|
if (virDomainGetMaxMemoryEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-17 17:01:09 +00:00
|
|
|
ret = virDomainDefGetMemoryActual(vm->def);
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-21 09:35:53 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-21 09:35:53 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2011-05-30 09:53:03 +00:00
|
|
|
libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
|
2011-03-21 09:35:53 +00:00
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-21 09:35:53 +00:00
|
|
|
virDomainObjPtr vm;
|
2011-05-30 09:53:03 +00:00
|
|
|
virDomainDefPtr persistentDef = NULL;
|
2011-03-21 09:35:53 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_MEM_LIVE |
|
2011-05-30 09:53:03 +00:00
|
|
|
VIR_DOMAIN_MEM_CONFIG |
|
|
|
|
VIR_DOMAIN_MEM_MAXIMUM, -1);
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-21 09:35:53 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainSetMemoryFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-06 23:10:25 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2016-02-24 08:38:37 +00:00
|
|
|
if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm, &flags,
|
|
|
|
&persistentDef) < 0)
|
2014-02-06 23:10:25 +00:00
|
|
|
goto endjob;
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2011-05-30 09:53:03 +00:00
|
|
|
if (flags & VIR_DOMAIN_MEM_MAXIMUM) {
|
|
|
|
/* resize the maximum memory */
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2011-05-30 09:53:03 +00:00
|
|
|
if (flags & VIR_DOMAIN_MEM_LIVE) {
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_setmaxmem(cfg->ctx, vm->def->id, newmem) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to set maximum memory for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2014-02-06 23:10:25 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_MEM_CONFIG) {
|
|
|
|
/* Help clang 2.8 decipher the logic flow. */
|
|
|
|
sa_assert(persistentDef);
|
2015-09-16 12:25:42 +00:00
|
|
|
virDomainDefSetMemoryTotal(persistentDef, newmem);
|
2011-05-30 09:53:03 +00:00
|
|
|
if (persistentDef->mem.cur_balloon > newmem)
|
|
|
|
persistentDef->mem.cur_balloon = newmem;
|
2016-02-03 21:40:36 +00:00
|
|
|
ret = virDomainSaveConfig(cfg->configDir, cfg->caps, persistentDef);
|
2014-02-06 23:10:25 +00:00
|
|
|
goto endjob;
|
2011-03-21 09:35:53 +00:00
|
|
|
}
|
|
|
|
|
2011-05-30 09:53:03 +00:00
|
|
|
} else {
|
|
|
|
/* resize the current memory */
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2015-02-17 17:01:09 +00:00
|
|
|
if (newmem > virDomainDefGetMemoryActual(vm->def)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG, "%s",
|
|
|
|
_("cannot set memory higher than max memory"));
|
2014-02-06 23:10:25 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_MEM_LIVE) {
|
2014-02-06 23:10:25 +00:00
|
|
|
int res;
|
|
|
|
|
|
|
|
/* Unlock virDomainObj while ballooning memory */
|
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
res = libxl_set_memory_target(cfg->ctx, vm->def->id, newmem, 0,
|
2014-02-06 23:10:25 +00:00
|
|
|
/* force */ 1);
|
|
|
|
virObjectLock(vm);
|
|
|
|
if (res < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to set memory for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2014-02-06 23:10:25 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_MEM_CONFIG) {
|
|
|
|
sa_assert(persistentDef);
|
|
|
|
persistentDef->mem.cur_balloon = newmem;
|
2016-02-03 21:40:36 +00:00
|
|
|
ret = virDomainSaveConfig(cfg->configDir, cfg->caps, persistentDef);
|
2014-02-06 23:10:25 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:03 +00:00
|
|
|
}
|
2011-03-21 09:35:53 +00:00
|
|
|
}
|
|
|
|
|
2011-05-30 09:53:03 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-06 23:10:25 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-21 09:35:53 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-21 09:35:53 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainSetMemory(virDomainPtr dom, unsigned long memory)
|
|
|
|
{
|
|
|
|
return libxlDomainSetMemoryFlags(dom, memory, VIR_DOMAIN_MEM_LIVE);
|
|
|
|
}
|
|
|
|
|
2011-05-30 09:53:03 +00:00
|
|
|
static int
|
|
|
|
libxlDomainSetMaxMemory(virDomainPtr dom, unsigned long memory)
|
|
|
|
{
|
|
|
|
return libxlDomainSetMemoryFlags(dom, memory, VIR_DOMAIN_MEM_MAXIMUM);
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainObjPtr vm;
|
2011-03-21 09:35:51 +00:00
|
|
|
libxl_dominfo d_info;
|
2011-02-10 22:42:34 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetInfoEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-21 09:35:51 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
info->cpuTime = 0;
|
|
|
|
info->memory = vm->def->mem.cur_balloon;
|
2015-02-17 17:01:09 +00:00
|
|
|
info->maxMem = virDomainDefGetMemoryActual(vm->def);
|
2011-03-21 09:35:51 +00:00
|
|
|
} else {
|
2016-01-21 10:21:10 +00:00
|
|
|
libxl_dominfo_init(&d_info);
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
2014-03-27 16:55:02 +00:00
|
|
|
_("libxl_domain_info failed for domain '%d'"),
|
|
|
|
vm->def->id);
|
2011-03-21 09:35:51 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
info->cpuTime = d_info.cpu_time;
|
|
|
|
info->memory = d_info.current_memkb;
|
2011-06-02 12:16:32 +00:00
|
|
|
info->maxMem = d_info.max_memkb;
|
2016-01-21 10:21:10 +00:00
|
|
|
|
|
|
|
libxl_dominfo_dispose(&d_info);
|
2011-03-21 09:35:51 +00:00
|
|
|
}
|
|
|
|
|
2011-05-04 09:07:01 +00:00
|
|
|
info->state = virDomainObjGetState(vm, NULL);
|
2015-10-22 12:59:03 +00:00
|
|
|
info->nrVirtCpu = virDomainDefGetVcpus(vm->def);
|
2011-02-10 22:42:34 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-05-02 09:35:29 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetState(virDomainPtr dom,
|
|
|
|
int *state,
|
|
|
|
int *reason,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-05-02 09:35:29 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetStateEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-05-04 09:07:01 +00:00
|
|
|
*state = virDomainObjGetState(vm, reason);
|
2011-05-02 09:35:29 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-05-02 09:35:29 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-05-02 09:35:29 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-02-07 01:02:06 +00:00
|
|
|
/*
|
|
|
|
* virDomainObjPtr must be locked on invocation
|
|
|
|
*/
|
2011-05-30 09:53:02 +00:00
|
|
|
static int
|
2011-06-02 12:24:30 +00:00
|
|
|
libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
|
|
|
|
const char *to)
|
2011-05-30 09:53:02 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-05-30 09:53:02 +00:00
|
|
|
libxlSavefileHeader hdr;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
2011-05-30 09:53:02 +00:00
|
|
|
char *xml = NULL;
|
|
|
|
uint32_t xml_len;
|
2013-02-28 14:48:16 +00:00
|
|
|
int fd = -1;
|
2011-05-30 09:53:02 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
_("Domain '%d' has to be running because libxenlight will"
|
|
|
|
" suspend it"), vm->def->id);
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((fd = virFileOpenAs(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR,
|
util: refactor virFileOpenAs
virFileOpenAs previously would only try opening a file as the current
user, or as a different user, but wouldn't try both methods in a
single call. This made it cumbersome to use as a replacement for
open(2). Additionally, it had a lot of historical baggage that led to
it being difficult to understand.
This patch refactors virFileOpenAs in the following ways:
* reorganize the code so that everything dealing with both the parent
and child sides of the "fork+setuid+setgid+open" method are in a
separate function. This makes the public function easier to understand.
* Allow a single call to virFileOpenAs() to first attempt the open as
the current user, and if that fails to automatically re-try after
doing fork+setuid (if deemed appropriate, i.e. errno indicates it
would now be successful, and the file is on a networkFS). This makes
it possible (in many, but possibly not all, cases) to drop-in
virFileOpenAs() as a replacement for open(2).
(NB: currently qemuOpenFile() calls virFileOpenAs() twice, once
without forking, then again with forking. That unfortunately can't
be changed without at least some discussion of the ramifications,
because the requested file permissions are different in each case,
which is something that a single call to virFileOpenAs() can't deal
with.)
* Add a flag so that any fchown() of the file to a different uid:gid
is explicitly requested when the function is called, rather than it
being implied by the presence of the O_CREAT flag. This just makes
for less subtle surprises to consumers. (Commit
b1643dc15c5de886fefe56ad18608d65f1325a2c added the check for O_CREAT
before forcing ownership. This patch just makes that restriction
more explicit.)
* If either the uid or gid is specified as "-1", virFileOpenAs will
interpret this to mean "the current [gu]id".
All current consumers of virFileOpenAs should retain their present
behavior (after a few minor changes to their setup code and
arguments).
2012-01-13 20:26:45 +00:00
|
|
|
-1, -1, 0)) < 0) {
|
2011-05-30 09:53:02 +00:00
|
|
|
virReportSystemError(-fd,
|
|
|
|
_("Failed to create domain save file '%s'"), to);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2016-02-03 21:40:35 +00:00
|
|
|
if ((xml = virDomainDefFormat(vm->def, cfg->caps, 0)) == NULL)
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
xml_len = strlen(xml) + 1;
|
|
|
|
|
|
|
|
memset(&hdr, 0, sizeof(hdr));
|
|
|
|
memcpy(hdr.magic, LIBXL_SAVE_MAGIC, sizeof(hdr.magic));
|
|
|
|
hdr.version = LIBXL_SAVE_VERSION;
|
|
|
|
hdr.xmlLen = xml_len;
|
|
|
|
|
|
|
|
if (safewrite(fd, &hdr, sizeof(hdr)) != sizeof(hdr)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
|
|
|
_("Failed to write save file header"));
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (safewrite(fd, xml, xml_len) != xml_len) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
|
|
|
_("Failed to write xml description"));
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-02-06 23:34:58 +00:00
|
|
|
/* Unlock virDomainObj while saving domain */
|
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxl_domain_suspend(cfg->ctx, vm->def->id, fd, 0, NULL);
|
2014-02-06 23:34:58 +00:00
|
|
|
virObjectLock(vm);
|
|
|
|
|
|
|
|
if (ret != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to save domain '%d' with libxenlight"),
|
|
|
|
vm->def->id);
|
2014-02-06 23:34:58 +00:00
|
|
|
ret = -1;
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-07-07 18:29:24 +00:00
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF,
|
|
|
|
VIR_DOMAIN_SHUTOFF_SAVED);
|
|
|
|
|
2013-11-21 17:03:26 +00:00
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
|
2011-05-30 09:53:02 +00:00
|
|
|
VIR_DOMAIN_EVENT_STOPPED_SAVED);
|
|
|
|
|
2015-03-04 00:54:50 +00:00
|
|
|
if (libxlDomainDestroyInternal(driver, vm) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to destroy domain '%d'"), vm->def->id);
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-07-07 18:29:24 +00:00
|
|
|
libxlDomainCleanup(driver, vm);
|
2012-06-11 09:03:27 +00:00
|
|
|
vm->hasManagedSave = true;
|
2011-05-30 09:53:02 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-05-30 09:53:02 +00:00
|
|
|
VIR_FREE(xml);
|
|
|
|
if (VIR_CLOSE(fd) < 0)
|
|
|
|
virReportSystemError(errno, "%s", _("cannot close file"));
|
|
|
|
if (event)
|
|
|
|
libxlDomainEventQueue(driver, event);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-30 09:53:02 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml,
|
|
|
|
unsigned int flags)
|
2011-05-30 09:53:02 +00:00
|
|
|
{
|
2011-06-02 12:24:30 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm;
|
2011-05-30 09:53:02 +00:00
|
|
|
int ret = -1;
|
2014-02-06 23:34:58 +00:00
|
|
|
bool remove_dom = false;
|
2011-05-30 09:53:02 +00:00
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
virCheckFlags(0, -1);
|
|
|
|
if (dxml) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
|
|
|
|
_("xml modification unsupported"));
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-05-30 09:53:02 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainSaveFlagsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-06 23:34:58 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-06-02 12:24:30 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2014-02-06 23:34:58 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:02 +00:00
|
|
|
}
|
|
|
|
|
2013-01-21 17:32:34 +00:00
|
|
|
if (libxlDoDomainSave(driver, vm, to) < 0)
|
2014-02-06 23:34:58 +00:00
|
|
|
goto endjob;
|
2013-01-21 17:32:34 +00:00
|
|
|
|
2014-02-06 23:34:58 +00:00
|
|
|
if (!vm->persistent)
|
|
|
|
remove_dom = true;
|
2013-01-21 17:32:34 +00:00
|
|
|
|
|
|
|
ret = 0;
|
2011-05-30 09:53:02 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-06 23:34:58 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2014-02-06 23:34:58 +00:00
|
|
|
if (remove_dom && vm) {
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
|
|
|
vm = NULL;
|
|
|
|
}
|
2011-06-02 12:24:30 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-06-02 12:24:30 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2011-05-30 09:53:02 +00:00
|
|
|
|
2011-06-02 12:24:30 +00:00
|
|
|
static int
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
libxlDomainSave(virDomainPtr dom, const char *to)
|
|
|
|
{
|
|
|
|
return libxlDomainSaveFlags(dom, to, NULL, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
|
|
|
|
const char *dxml, unsigned int flags)
|
2011-06-02 12:24:30 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:57:42 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-06-02 12:24:30 +00:00
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
libxlSavefileHeader hdr;
|
|
|
|
int fd = -1;
|
|
|
|
int ret = -1;
|
2011-05-30 09:53:02 +00:00
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
|
2013-06-13 01:54:11 +00:00
|
|
|
virCheckFlags(VIR_DOMAIN_SAVE_PAUSED, -1);
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
if (dxml) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
|
|
|
|
_("xml modification unsupported"));
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-02-26 04:28:51 +00:00
|
|
|
fd = libxlDomainSaveImageOpen(driver, cfg, from, &def, &hdr);
|
2011-06-02 12:24:30 +00:00
|
|
|
if (fd < 0)
|
2015-03-02 01:24:26 +00:00
|
|
|
goto cleanup;
|
2011-05-30 09:53:02 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainRestoreFlagsEnsureACL(conn, def) < 0)
|
2015-03-02 01:33:48 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
2013-03-28 13:55:55 +00:00
|
|
|
if (!(vm = virDomainObjListAdd(driver->domains, def,
|
2013-03-31 18:03:42 +00:00
|
|
|
driver->xmlopt,
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
|
|
|
|
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
|
|
|
|
NULL)))
|
2015-03-02 01:33:48 +00:00
|
|
|
goto cleanup;
|
2011-05-30 09:53:02 +00:00
|
|
|
|
|
|
|
def = NULL;
|
|
|
|
|
2015-03-02 01:24:26 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) {
|
|
|
|
if (!vm->persistent) {
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
|
|
|
vm = NULL;
|
|
|
|
}
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-02-26 21:11:30 +00:00
|
|
|
ret = libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_SAVE_PAUSED) != 0, fd);
|
2015-03-02 01:24:26 +00:00
|
|
|
if (ret < 0 && !vm->persistent)
|
2013-01-11 16:04:47 +00:00
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
2015-03-02 01:24:26 +00:00
|
|
|
|
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
2011-05-30 09:53:02 +00:00
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-06-02 21:41:13 +00:00
|
|
|
if (VIR_CLOSE(fd) < 0)
|
|
|
|
virReportSystemError(errno, "%s", _("cannot close file"));
|
2011-05-30 09:53:02 +00:00
|
|
|
virDomainDefFree(def);
|
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:57:42 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-30 09:53:02 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
static int
|
|
|
|
libxlDomainRestore(virConnectPtr conn, const char *from)
|
|
|
|
{
|
|
|
|
return libxlDomainRestoreFlags(conn, from, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2011-05-30 09:53:01 +00:00
|
|
|
static int
|
2011-07-06 20:40:19 +00:00
|
|
|
libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags)
|
2011-05-30 09:53:01 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-05-30 09:53:01 +00:00
|
|
|
virDomainObjPtr vm;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
2014-02-06 23:54:39 +00:00
|
|
|
bool remove_dom = false;
|
2011-05-30 09:53:01 +00:00
|
|
|
bool paused = false;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-05-30 09:53:01 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainCoreDumpEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-06 23:54:39 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-05-30 09:53:01 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2014-02-06 23:54:39 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!(flags & VIR_DUMP_LIVE) &&
|
|
|
|
virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_pause(cfg->ctx, vm->def->id) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Before dumping core, failed to suspend domain '%d'"
|
|
|
|
" with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2014-02-06 23:54:39 +00:00
|
|
|
goto endjob;
|
2011-05-30 09:53:01 +00:00
|
|
|
}
|
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_DUMP);
|
|
|
|
paused = true;
|
|
|
|
}
|
|
|
|
|
2014-02-06 23:54:39 +00:00
|
|
|
/* Unlock virDomainObj while dumping core */
|
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxl_domain_core_dump(cfg->ctx, vm->def->id, to, NULL);
|
2014-02-06 23:54:39 +00:00
|
|
|
virObjectLock(vm);
|
|
|
|
if (ret != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to dump core of domain '%d' with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2014-02-06 23:54:39 +00:00
|
|
|
ret = -1;
|
|
|
|
goto unpause;
|
2011-05-30 09:53:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DUMP_CRASH) {
|
2015-03-04 00:54:50 +00:00
|
|
|
if (libxlDomainDestroyInternal(driver, vm) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
2014-03-27 16:55:02 +00:00
|
|
|
_("Failed to destroy domain '%d'"), vm->def->id);
|
2014-02-06 23:54:39 +00:00
|
|
|
goto unpause;
|
2011-05-30 09:53:01 +00:00
|
|
|
}
|
|
|
|
|
2015-07-07 18:29:24 +00:00
|
|
|
libxlDomainCleanup(driver, vm);
|
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF,
|
|
|
|
VIR_DOMAIN_SHUTOFF_CRASHED);
|
2013-11-21 17:03:26 +00:00
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
|
2011-05-30 09:53:01 +00:00
|
|
|
VIR_DOMAIN_EVENT_STOPPED_CRASHED);
|
2014-02-06 23:54:39 +00:00
|
|
|
if (!vm->persistent)
|
|
|
|
remove_dom = true;
|
2011-05-30 09:53:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
unpause:
|
2014-02-06 23:54:39 +00:00
|
|
|
if (virDomainObjIsActive(vm) && paused) {
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_unpause(cfg->ctx, vm->def->id) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("After dumping core, failed to resume domain '%d' with"
|
2014-03-27 16:55:02 +00:00
|
|
|
" libxenlight"), vm->def->id);
|
2011-05-30 09:53:01 +00:00
|
|
|
} else {
|
|
|
|
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
|
|
|
|
VIR_DOMAIN_RUNNING_UNPAUSED);
|
|
|
|
}
|
|
|
|
}
|
2014-02-06 23:54:39 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-06 23:54:39 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2014-02-06 23:54:39 +00:00
|
|
|
if (remove_dom && vm) {
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
|
|
|
vm = NULL;
|
|
|
|
}
|
2011-05-30 09:53:01 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:57:42 +00:00
|
|
|
if (event)
|
2011-05-30 09:53:01 +00:00
|
|
|
libxlDomainEventQueue(driver, event);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-30 09:53:01 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-06-02 12:24:30 +00:00
|
|
|
static int
|
|
|
|
libxlDomainManagedSave(virDomainPtr dom, unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
char *name = NULL;
|
|
|
|
int ret = -1;
|
2014-02-06 23:34:58 +00:00
|
|
|
bool remove_dom = false;
|
2011-06-02 12:24:30 +00:00
|
|
|
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-06-02 12:24:30 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainManagedSaveEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-06 23:34:58 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-06-02 12:24:30 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2014-02-06 23:34:58 +00:00
|
|
|
goto endjob;
|
2011-06-02 12:24:30 +00:00
|
|
|
}
|
2011-08-10 14:51:36 +00:00
|
|
|
if (!vm->persistent) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("cannot do managed save for transient domain"));
|
2014-02-06 23:34:58 +00:00
|
|
|
goto endjob;
|
2011-08-10 14:51:36 +00:00
|
|
|
}
|
2011-06-02 12:24:30 +00:00
|
|
|
|
|
|
|
name = libxlDomainManagedSavePath(driver, vm);
|
|
|
|
if (name == NULL)
|
2014-02-06 23:34:58 +00:00
|
|
|
goto endjob;
|
2011-06-02 12:24:30 +00:00
|
|
|
|
|
|
|
VIR_INFO("Saving state to %s", name);
|
|
|
|
|
2013-01-21 17:32:34 +00:00
|
|
|
if (libxlDoDomainSave(driver, vm, name) < 0)
|
2014-02-06 23:34:58 +00:00
|
|
|
goto endjob;
|
2013-01-21 17:32:34 +00:00
|
|
|
|
2014-02-06 23:34:58 +00:00
|
|
|
if (!vm->persistent)
|
|
|
|
remove_dom = true;
|
2013-01-21 17:32:34 +00:00
|
|
|
|
|
|
|
ret = 0;
|
2011-06-02 12:24:30 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-06 23:34:58 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2014-02-06 23:34:58 +00:00
|
|
|
if (remove_dom && vm) {
|
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
|
|
|
vm = NULL;
|
|
|
|
}
|
2011-06-02 12:24:30 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-06-02 12:24:30 +00:00
|
|
|
VIR_FREE(name);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
static int
|
|
|
|
libxlDomainManagedSaveLoad(virDomainObjPtr vm,
|
2012-06-11 09:03:27 +00:00
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = opaque;
|
|
|
|
char *name;
|
2013-01-11 13:54:15 +00:00
|
|
|
int ret = -1;
|
2012-06-11 09:03:27 +00:00
|
|
|
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectLock(vm);
|
2012-06-11 09:03:27 +00:00
|
|
|
|
|
|
|
if (!(name = libxlDomainManagedSavePath(driver, vm)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
vm->hasManagedSave = virFileExists(name);
|
|
|
|
|
2013-01-11 13:54:15 +00:00
|
|
|
ret = 0;
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2012-06-11 09:03:27 +00:00
|
|
|
VIR_FREE(name);
|
2013-01-11 13:54:15 +00:00
|
|
|
return ret;
|
2012-06-11 09:03:27 +00:00
|
|
|
}
|
|
|
|
|
2011-06-02 12:24:30 +00:00
|
|
|
static int
|
|
|
|
libxlDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-06-02 12:24:30 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainHasManagedSaveImageEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2012-06-11 09:03:27 +00:00
|
|
|
ret = vm->hasManagedSave;
|
2011-06-02 12:24:30 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-06-02 12:24:30 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-06-02 12:24:30 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
char *name = NULL;
|
|
|
|
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-06-02 12:24:30 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainManagedSaveRemoveEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-06-02 12:24:30 +00:00
|
|
|
name = libxlDomainManagedSavePath(driver, vm);
|
|
|
|
if (name == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = unlink(name);
|
2012-06-11 09:03:27 +00:00
|
|
|
vm->hasManagedSave = false;
|
2011-06-02 12:24:30 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-06-02 12:24:30 +00:00
|
|
|
VIR_FREE(name);
|
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-06-02 12:24:30 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:31:45 +00:00
|
|
|
static int
|
|
|
|
libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:31:45 +00:00
|
|
|
virDomainDefPtr def;
|
|
|
|
virDomainObjPtr vm;
|
2012-11-26 16:28:56 +00:00
|
|
|
libxl_bitmap map;
|
2011-03-29 12:31:45 +00:00
|
|
|
uint8_t *bitmask = NULL;
|
|
|
|
unsigned int maplen;
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
|
|
|
unsigned int pos;
|
2011-03-29 12:31:45 +00:00
|
|
|
int max;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
|
|
|
|
VIR_DOMAIN_VCPU_CONFIG |
|
|
|
|
VIR_DOMAIN_VCPU_MAXIMUM, -1);
|
|
|
|
|
|
|
|
/* At least one of LIVE or CONFIG must be set. MAXIMUM cannot be
|
|
|
|
* mixed with LIVE. */
|
|
|
|
if ((flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) == 0 ||
|
|
|
|
(flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) ==
|
|
|
|
(VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("invalid flag combination: (0x%x)"), flags);
|
2011-03-29 12:31:45 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!nvcpus) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG, "%s", _("nvcpus is zero"));
|
2011-03-29 12:31:45 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainSetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-07 00:16:14 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-29 12:31:45 +00:00
|
|
|
if (!virDomainObjIsActive(vm) && (flags & VIR_DOMAIN_VCPU_LIVE)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("cannot set vcpus on an inactive domain"));
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!vm->persistent && (flags & VIR_DOMAIN_VCPU_CONFIG)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("cannot change persistent config of a transient domain"));
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
|
|
|
|
2013-04-23 12:50:18 +00:00
|
|
|
if ((max = libxlConnectGetMaxVcpus(dom->conn, NULL)) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("could not determine max vcpus for the domain"));
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
|
|
|
|
2015-10-19 17:21:24 +00:00
|
|
|
if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM) && virDomainDefGetVcpusMax(vm->def) < max)
|
|
|
|
max = virDomainDefGetVcpusMax(vm->def);
|
2011-03-29 12:31:45 +00:00
|
|
|
|
|
|
|
if (nvcpus > max) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("requested vcpus is greater than max allowable"
|
|
|
|
" vcpus for the domain: %d > %d"), nvcpus, max);
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(def = virDomainObjGetPersistentDef(cfg->caps, driver->xmlopt, vm)))
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
|
2011-04-05 16:07:57 +00:00
|
|
|
maplen = VIR_CPU_MAPLEN(nvcpus);
|
2013-07-04 10:10:38 +00:00
|
|
|
if (VIR_ALLOC_N(bitmask, maplen) < 0)
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
|
|
|
|
for (i = 0; i < nvcpus; ++i) {
|
2011-04-05 16:07:57 +00:00
|
|
|
pos = i / 8;
|
2011-03-29 12:31:45 +00:00
|
|
|
bitmask[pos] |= 1 << (i % 8);
|
|
|
|
}
|
|
|
|
|
|
|
|
map.size = maplen;
|
|
|
|
map.map = bitmask;
|
|
|
|
|
|
|
|
switch (flags) {
|
|
|
|
case VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_CONFIG:
|
2015-10-16 14:10:27 +00:00
|
|
|
if (virDomainDefSetVcpusMax(def, nvcpus) < 0)
|
|
|
|
goto cleanup;
|
2011-03-29 12:31:45 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_VCPU_CONFIG:
|
2015-10-22 08:52:05 +00:00
|
|
|
if (virDomainDefSetVcpus(def, nvcpus) < 0)
|
|
|
|
goto cleanup;
|
2011-03-29 12:31:45 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_VCPU_LIVE:
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_set_vcpuonline(cfg->ctx, vm->def->id, &map) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to set vcpus for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
2015-10-22 08:52:05 +00:00
|
|
|
if (virDomainDefSetVcpus(vm->def, nvcpus) < 0)
|
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG:
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_set_vcpuonline(cfg->ctx, vm->def->id, &map) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to set vcpus for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
2015-10-22 08:52:05 +00:00
|
|
|
if (virDomainDefSetVcpus(vm->def, nvcpus) < 0 ||
|
|
|
|
virDomainDefSetVcpus(def, nvcpus) < 0)
|
|
|
|
goto endjob;
|
2011-03-29 12:31:45 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2015-06-29 16:46:36 +00:00
|
|
|
if (flags & VIR_DOMAIN_VCPU_LIVE) {
|
2016-02-04 12:32:45 +00:00
|
|
|
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) {
|
2015-06-29 16:46:36 +00:00
|
|
|
VIR_WARN("Unable to save status on vm %s after changing vcpus",
|
|
|
|
vm->def->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (flags & VIR_DOMAIN_VCPU_CONFIG) {
|
2016-02-03 21:40:36 +00:00
|
|
|
if (virDomainSaveConfig(cfg->configDir, cfg->caps, def) < 0) {
|
2015-06-29 16:46:36 +00:00
|
|
|
VIR_WARN("Unable to save configuration of vm %s after changing vcpus",
|
|
|
|
vm->def->name);
|
|
|
|
}
|
|
|
|
}
|
2011-03-29 12:31:45 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-07 00:16:14 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:31:45 +00:00
|
|
|
VIR_FREE(bitmask);
|
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:31:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
|
|
|
|
{
|
|
|
|
return libxlDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
virDomainDefPtr def;
|
|
|
|
int ret = -1;
|
2011-07-15 23:35:47 +00:00
|
|
|
bool active;
|
2011-03-29 12:31:45 +00:00
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_VCPU_LIVE |
|
|
|
|
VIR_DOMAIN_VCPU_CONFIG |
|
|
|
|
VIR_DOMAIN_VCPU_MAXIMUM, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
api: require write permission for guest agent interaction
I noticed that we allow virDomainGetVcpusFlags even for read-only
connections, but that with a flag, it can require guest agent
interaction. It is feasible that a malicious guest could
intentionally abuse the replies it sends over the guest agent
connection to possibly trigger a bug in libvirt's JSON parser,
or withhold an answer so as to prevent the use of the agent
in a later command such as a shutdown request. Although we
don't know of any such exploits now (and therefore don't mind
posting this patch publicly without trying to get a CVE assigned),
it is better to err on the side of caution and explicitly require
full access to any domain where the API requires guest interaction
to operate correctly.
I audited all commands that are marked as conditionally using a
guest agent. Note that at least virDomainFSTrim is documented
as needing a guest agent, but that such use is unconditional
depending on the hypervisor (so the existing domain:fs_trim ACL
should be sufficient there, rather than also requirng domain:write).
But when designing future APIs, such as the plans for obtaining
a domain's IP addresses, we should copy the approach of this patch
in making interaction with the guest be specified via a flag, and
use that flag to also require stricter access checks.
* src/libvirt.c (virDomainGetVcpusFlags): Forbid guest interaction
on read-only connection.
(virDomainShutdownFlags, virDomainReboot): Improve docs on agent
interaction.
* src/remote/remote_protocol.x
(REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML)
(REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS)
(REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS, REMOTE_PROC_DOMAIN_REBOOT)
(REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS): Require domain:write for any
conditional use of a guest agent.
* src/xen/xen_driver.c: Fix clients.
* src/libxl/libxl_driver.c: Likewise.
* src/uml/uml_driver.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/lxc/lxc_driver.c: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-21 17:37:29 +00:00
|
|
|
if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
2013-04-23 10:56:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2011-07-15 23:35:47 +00:00
|
|
|
active = virDomainObjIsActive(vm);
|
|
|
|
|
|
|
|
if ((flags & (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG)) == 0) {
|
|
|
|
if (active)
|
|
|
|
flags |= VIR_DOMAIN_VCPU_LIVE;
|
|
|
|
else
|
|
|
|
flags |= VIR_DOMAIN_VCPU_CONFIG;
|
|
|
|
}
|
|
|
|
if ((flags & VIR_DOMAIN_VCPU_LIVE) && (flags & VIR_DOMAIN_VCPU_CONFIG)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("invalid flag combination: (0x%x)"), flags);
|
2011-07-15 23:35:47 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:31:45 +00:00
|
|
|
if (flags & VIR_DOMAIN_VCPU_LIVE) {
|
2011-07-15 23:35:47 +00:00
|
|
|
if (!active) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("Domain is not running"));
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
def = vm->def;
|
|
|
|
} else {
|
2011-07-15 23:35:47 +00:00
|
|
|
if (!vm->persistent) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("domain is transient"));
|
2011-07-15 23:35:47 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2011-03-29 12:31:45 +00:00
|
|
|
def = vm->newDef ? vm->newDef : vm->def;
|
|
|
|
}
|
|
|
|
|
2015-10-19 17:21:24 +00:00
|
|
|
if (flags & VIR_DOMAIN_VCPU_MAXIMUM)
|
|
|
|
ret = virDomainDefGetVcpusMax(def);
|
|
|
|
else
|
2015-10-22 12:59:03 +00:00
|
|
|
ret = virDomainDefGetVcpus(def);
|
2011-03-29 12:31:45 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:31:45 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-29 12:31:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-12-20 15:01:39 +00:00
|
|
|
libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu,
|
|
|
|
unsigned char *cpumap, int maplen,
|
|
|
|
unsigned int flags)
|
2011-03-29 12:31:45 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2013-12-20 15:01:39 +00:00
|
|
|
virDomainDefPtr targetDef = NULL;
|
2013-12-20 15:01:46 +00:00
|
|
|
virBitmapPtr pcpumap = NULL;
|
2016-01-29 09:20:44 +00:00
|
|
|
virDomainVcpuInfoPtr vcpuinfo;
|
2011-03-29 12:31:45 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
2013-12-20 15:01:39 +00:00
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
|
|
|
VIR_DOMAIN_AFFECT_CONFIG, -1);
|
2011-03-29 12:31:45 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-12-20 15:01:39 +00:00
|
|
|
if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
2013-04-23 10:56:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-07 00:16:14 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2013-12-20 15:01:39 +00:00
|
|
|
if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm,
|
|
|
|
&flags, &targetDef) < 0)
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2013-12-20 15:01:39 +00:00
|
|
|
|
2014-11-13 14:27:11 +00:00
|
|
|
if (flags & VIR_DOMAIN_AFFECT_LIVE)
|
2013-12-20 15:01:39 +00:00
|
|
|
targetDef = vm->def;
|
|
|
|
|
|
|
|
/* Make sure coverity knows targetDef is valid at this point. */
|
|
|
|
sa_assert(targetDef);
|
|
|
|
|
2013-12-20 15:01:46 +00:00
|
|
|
pcpumap = virBitmapNewData(cpumap, maplen);
|
|
|
|
if (!pcpumap)
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2013-12-20 15:01:46 +00:00
|
|
|
|
2016-01-29 09:20:44 +00:00
|
|
|
if (!(vcpuinfo = virDomainDefGetVcpu(targetDef, vcpu)) ||
|
|
|
|
!vcpuinfo->online) {
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("vcpu '%u' is not active"), vcpu);
|
|
|
|
goto endjob;
|
|
|
|
}
|
|
|
|
|
2013-12-20 15:01:39 +00:00
|
|
|
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
|
|
|
|
libxl_bitmap map = { .size = maplen, .map = cpumap };
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_set_vcpuaffinity(cfg->ctx, vm->def->id, vcpu, &map) != 0) {
|
2013-12-20 15:01:39 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to pin vcpu '%d' with libxenlight"),
|
|
|
|
vcpu);
|
2014-02-07 00:16:14 +00:00
|
|
|
goto endjob;
|
2013-12-20 15:01:39 +00:00
|
|
|
}
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
2011-04-18 09:16:33 +00:00
|
|
|
|
2016-01-29 09:20:44 +00:00
|
|
|
virBitmapFree(vcpuinfo->cpumask);
|
|
|
|
vcpuinfo->cpumask = pcpumap;
|
|
|
|
pcpumap = NULL;
|
2011-04-18 09:16:33 +00:00
|
|
|
|
2011-03-29 12:31:45 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2013-12-20 15:01:39 +00:00
|
|
|
if (flags & VIR_DOMAIN_AFFECT_LIVE) {
|
2016-02-04 12:32:45 +00:00
|
|
|
ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps);
|
2013-12-20 15:01:39 +00:00
|
|
|
} else if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
|
2016-02-03 21:40:36 +00:00
|
|
|
ret = virDomainSaveConfig(cfg->configDir, cfg->caps, targetDef);
|
2013-12-20 15:01:39 +00:00
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-07 00:16:14 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:31:45 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-12-20 15:01:46 +00:00
|
|
|
virBitmapFree(pcpumap);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:31:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-12-20 15:01:39 +00:00
|
|
|
static int
|
|
|
|
libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap,
|
|
|
|
int maplen)
|
|
|
|
{
|
|
|
|
return libxlDomainPinVcpuFlags(dom, vcpu, cpumap, maplen,
|
|
|
|
VIR_DOMAIN_AFFECT_LIVE);
|
|
|
|
}
|
|
|
|
|
2013-12-20 15:01:31 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps,
|
|
|
|
unsigned char *cpumaps, int maplen,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainDefPtr targetDef = NULL;
|
2016-02-22 14:29:25 +00:00
|
|
|
int ret = -1;
|
2013-12-20 15:01:31 +00:00
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
|
|
|
VIR_DOMAIN_AFFECT_CONFIG, -1);
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainGetVcpuPinInfoEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm,
|
|
|
|
&flags, &targetDef) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-11-13 14:27:11 +00:00
|
|
|
if (flags & VIR_DOMAIN_AFFECT_LIVE)
|
2013-12-20 15:01:31 +00:00
|
|
|
targetDef = vm->def;
|
|
|
|
|
|
|
|
/* Make sure coverity knows targetDef is valid at this point. */
|
|
|
|
sa_assert(targetDef);
|
|
|
|
|
2016-02-22 14:29:25 +00:00
|
|
|
ret = virDomainDefGetVcpuPinInfoHelper(targetDef, maplen, ncpumaps, cpumaps,
|
|
|
|
libxl_get_max_cpus(cfg->ctx), NULL);
|
2013-12-20 15:01:31 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-12-20 15:01:31 +00:00
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
virObjectUnref(cfg);
|
|
|
|
return ret;
|
|
|
|
}
|
2011-03-29 12:31:45 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo,
|
|
|
|
unsigned char *cpumaps, int maplen)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:31:45 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
libxl_vcpuinfo *vcpuinfo;
|
|
|
|
int maxcpu, hostcpus;
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2011-03-29 12:31:45 +00:00
|
|
|
unsigned char *cpumap;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetVcpusEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-29 12:31:45 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if ((vcpuinfo = libxl_list_vcpu(cfg->ctx, vm->def->id, &maxcpu,
|
2011-03-29 12:31:45 +00:00
|
|
|
&hostcpus)) == NULL) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to list vcpus for domain '%d' with libxenlight"),
|
2014-03-27 16:55:02 +00:00
|
|
|
vm->def->id);
|
2011-03-29 12:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cpumaps && maplen > 0)
|
|
|
|
memset(cpumaps, 0, maplen * maxinfo);
|
|
|
|
for (i = 0; i < maxcpu && i < maxinfo; ++i) {
|
|
|
|
info[i].number = vcpuinfo[i].vcpuid;
|
|
|
|
info[i].cpu = vcpuinfo[i].cpu;
|
|
|
|
info[i].cpuTime = vcpuinfo[i].vcpu_time;
|
|
|
|
if (vcpuinfo[i].running)
|
|
|
|
info[i].state = VIR_VCPU_RUNNING;
|
|
|
|
else if (vcpuinfo[i].blocked)
|
|
|
|
info[i].state = VIR_VCPU_BLOCKED;
|
|
|
|
else
|
|
|
|
info[i].state = VIR_VCPU_OFFLINE;
|
|
|
|
|
|
|
|
if (cpumaps && maplen > 0) {
|
|
|
|
cpumap = VIR_GET_CPUMAP(cpumaps, maplen, i);
|
|
|
|
memcpy(cpumap, vcpuinfo[i].cpumap.map,
|
|
|
|
MIN(maplen, vcpuinfo[i].cpumap.size));
|
|
|
|
}
|
|
|
|
|
2012-11-26 16:28:56 +00:00
|
|
|
libxl_vcpuinfo_dispose(&vcpuinfo[i]);
|
2011-03-29 12:31:45 +00:00
|
|
|
}
|
|
|
|
VIR_FREE(vcpuinfo);
|
|
|
|
|
|
|
|
ret = maxinfo;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:31:45 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:31:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static char *
|
2011-07-06 20:40:19 +00:00
|
|
|
libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
2016-02-03 21:40:35 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainObjPtr vm;
|
2015-06-24 22:15:22 +00:00
|
|
|
virDomainDefPtr def;
|
2011-02-10 22:42:34 +00:00
|
|
|
char *ret = NULL;
|
|
|
|
|
2011-07-13 22:24:38 +00:00
|
|
|
/* Flags checked by virDomainDefFormat */
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-24 22:15:22 +00:00
|
|
|
if ((flags & VIR_DOMAIN_XML_INACTIVE) && vm->newDef)
|
|
|
|
def = vm->newDef;
|
|
|
|
else
|
|
|
|
def = vm->def;
|
|
|
|
|
2016-02-03 21:40:35 +00:00
|
|
|
ret = virDomainDefFormat(def, cfg->caps,
|
2015-06-24 22:15:22 +00:00
|
|
|
virDomainDefFormatConvertXMLFlags(flags));
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2016-02-03 21:40:35 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:39:18 +00:00
|
|
|
static char *
|
2014-03-07 17:31:45 +00:00
|
|
|
libxlConnectDomainXMLFromNative(virConnectPtr conn,
|
|
|
|
const char *nativeFormat,
|
|
|
|
const char *nativeConfig,
|
2013-04-23 12:50:18 +00:00
|
|
|
unsigned int flags)
|
2011-03-29 12:39:18 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:39:18 +00:00
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
virConfPtr conf = NULL;
|
|
|
|
char *xml = NULL;
|
|
|
|
|
2011-07-06 22:17:10 +00:00
|
|
|
virCheckFlags(0, NULL);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-12-16 04:30:06 +00:00
|
|
|
if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XL)) {
|
|
|
|
if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0)))
|
|
|
|
goto cleanup;
|
|
|
|
if (!(def = xenParseXL(conf,
|
|
|
|
cfg->caps,
|
2015-12-05 02:11:39 +00:00
|
|
|
driver->xmlopt)))
|
2014-12-16 04:30:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
} else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) {
|
2014-03-07 17:31:45 +00:00
|
|
|
if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!(def = xenParseXM(conf,
|
2015-11-28 04:33:55 +00:00
|
|
|
cfg->caps,
|
|
|
|
driver->xmlopt)))
|
2014-03-07 17:31:45 +00:00
|
|
|
goto cleanup;
|
|
|
|
} else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_SEXPR)) {
|
|
|
|
/* only support latest xend config format */
|
|
|
|
if (!(def = xenParseSxprString(nativeConfig,
|
|
|
|
NULL,
|
2015-11-28 04:33:55 +00:00
|
|
|
-1,
|
|
|
|
cfg->caps,
|
|
|
|
driver->xmlopt))) {
|
2014-03-07 17:31:45 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("parsing sxpr config failed"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
} else {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("unsupported config type %s"), nativeFormat);
|
2011-03-29 12:39:18 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2016-02-03 21:40:35 +00:00
|
|
|
xml = virDomainDefFormat(def, cfg->caps, VIR_DOMAIN_DEF_FORMAT_INACTIVE);
|
2011-03-29 12:39:18 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:39:18 +00:00
|
|
|
virDomainDefFree(def);
|
|
|
|
if (conf)
|
|
|
|
virConfFree(conf);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:39:18 +00:00
|
|
|
return xml;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MAX_CONFIG_SIZE (1024 * 65)
|
|
|
|
static char *
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat,
|
|
|
|
const char * domainXml,
|
|
|
|
unsigned int flags)
|
2011-03-29 12:39:18 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:39:18 +00:00
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
virConfPtr conf = NULL;
|
|
|
|
int len = MAX_CONFIG_SIZE;
|
|
|
|
char *ret = NULL;
|
|
|
|
|
2011-07-06 22:17:10 +00:00
|
|
|
virCheckFlags(0, NULL);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectDomainXMLToNativeEnsureACL(conn) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2013-03-28 13:55:55 +00:00
|
|
|
if (!(def = virDomainDefParseString(domainXml,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2011-03-29 12:39:18 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2014-12-16 04:30:06 +00:00
|
|
|
if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XL)) {
|
2015-12-05 02:11:39 +00:00
|
|
|
if (!(conf = xenFormatXL(def, conn)))
|
2014-12-16 04:30:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
} else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) {
|
2015-12-05 02:11:39 +00:00
|
|
|
if (!(conf = xenFormatXM(conn, def)))
|
2014-12-16 04:30:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("unsupported config type %s"), nativeFormat);
|
2011-03-29 12:39:18 +00:00
|
|
|
goto cleanup;
|
2014-12-16 04:30:06 +00:00
|
|
|
}
|
2011-03-29 12:39:18 +00:00
|
|
|
|
2013-07-04 10:10:38 +00:00
|
|
|
if (VIR_ALLOC_N(ret, len) < 0)
|
2011-03-29 12:39:18 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virConfWriteMem(ret, &len, conf) < 0) {
|
|
|
|
VIR_FREE(ret);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:39:18 +00:00
|
|
|
virDomainDefFree(def);
|
|
|
|
if (conf)
|
|
|
|
virConfFree(conf);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:39:18 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectListDefinedDomains(virConnectPtr conn,
|
|
|
|
char **const names, int nnames)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
int n;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectListDefinedDomainsEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2013-06-24 16:49:47 +00:00
|
|
|
n = virDomainObjListGetInactiveNames(driver->domains, names, nnames,
|
|
|
|
virConnectListDefinedDomainsCheckACL, conn);
|
2011-02-10 22:42:34 +00:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectNumOfDefinedDomains(virConnectPtr conn)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
int n;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2013-06-24 16:49:47 +00:00
|
|
|
n = virDomainObjListNumOfDomains(driver->domains, false,
|
2013-07-04 14:55:53 +00:00
|
|
|
virConnectNumOfDefinedDomainsCheckACL,
|
|
|
|
conn);
|
2011-02-10 22:42:34 +00:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainCreateWithFlags(virDomainPtr dom,
|
2011-07-06 22:17:10 +00:00
|
|
|
unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_START_PAUSED, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-03-02 01:24:26 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("Domain is already running"));
|
2015-03-02 01:24:26 +00:00
|
|
|
goto endjob;
|
2011-02-10 22:42:34 +00:00
|
|
|
}
|
|
|
|
|
2014-02-26 21:11:30 +00:00
|
|
|
ret = libxlDomainStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0, -1);
|
2015-02-05 05:17:07 +00:00
|
|
|
if (ret < 0)
|
2015-03-02 01:24:26 +00:00
|
|
|
goto endjob;
|
2015-02-05 05:17:07 +00:00
|
|
|
dom->id = vm->def->id;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2015-03-02 01:24:26 +00:00
|
|
|
endjob:
|
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainCreate(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
return libxlDomainCreateWithFlags(dom, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static virDomainPtr
|
2014-11-18 14:19:38 +00:00
|
|
|
libxlDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainPtr dom = NULL;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
virDomainDefPtr oldDef = NULL;
|
2014-11-18 17:34:42 +00:00
|
|
|
unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-11-18 17:34:42 +00:00
|
|
|
virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL);
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEFINE_VALIDATE)
|
|
|
|
parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE;
|
2014-11-18 14:19:38 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(def = virDomainDefParseString(xml, cfg->caps, driver->xmlopt,
|
2014-11-18 17:34:42 +00:00
|
|
|
parse_flags)))
|
2014-09-18 21:05:34 +00:00
|
|
|
goto cleanup;
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2014-11-18 14:19:38 +00:00
|
|
|
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)
|
2014-09-18 21:05:34 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
2013-03-28 13:55:55 +00:00
|
|
|
if (!(vm = virDomainObjListAdd(driver->domains, def,
|
2013-03-31 18:03:42 +00:00
|
|
|
driver->xmlopt,
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
0,
|
|
|
|
&oldDef)))
|
2014-09-18 21:05:34 +00:00
|
|
|
goto cleanup;
|
2013-08-30 20:57:42 +00:00
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
def = NULL;
|
|
|
|
vm->persistent = 1;
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (virDomainSaveConfig(cfg->configDir,
|
2016-02-03 21:40:36 +00:00
|
|
|
cfg->caps,
|
2011-02-10 22:42:34 +00:00
|
|
|
vm->newDef ? vm->newDef : vm->def) < 0) {
|
2013-01-11 16:04:47 +00:00
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
2011-02-10 22:42:34 +00:00
|
|
|
vm = NULL;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
|
|
|
|
if (dom)
|
|
|
|
dom->id = vm->def->id;
|
|
|
|
|
2013-11-21 17:03:26 +00:00
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED,
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
!oldDef ?
|
2011-03-29 12:18:24 +00:00
|
|
|
VIR_DOMAIN_EVENT_DEFINED_ADDED :
|
|
|
|
VIR_DOMAIN_EVENT_DEFINED_UPDATED);
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainDefFree(def);
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
virDomainDefFree(oldDef);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-29 12:18:24 +00:00
|
|
|
if (event)
|
|
|
|
libxlDomainEventQueue(driver, event);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return dom;
|
|
|
|
}
|
|
|
|
|
2014-11-18 14:19:38 +00:00
|
|
|
static virDomainPtr
|
|
|
|
libxlDomainDefineXML(virConnectPtr conn, const char *xml)
|
|
|
|
{
|
|
|
|
return libxlDomainDefineXMLFlags(conn, xml, 0);
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
2011-07-20 03:05:20 +00:00
|
|
|
libxlDomainUndefineFlags(virDomainPtr dom,
|
|
|
|
unsigned int flags)
|
2011-02-10 22:42:34 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-02-10 22:42:34 +00:00
|
|
|
virDomainObjPtr vm;
|
2013-11-22 14:38:05 +00:00
|
|
|
virObjectEventPtr event = NULL;
|
2011-07-20 03:05:20 +00:00
|
|
|
char *name = NULL;
|
2011-02-10 22:42:34 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2011-07-20 03:05:20 +00:00
|
|
|
virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainUndefineFlagsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
if (!vm->persistent) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("cannot undefine transient domain"));
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2011-07-20 03:05:20 +00:00
|
|
|
name = libxlDomainManagedSavePath(driver, vm);
|
|
|
|
if (name == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virFileExists(name)) {
|
|
|
|
if (flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE) {
|
|
|
|
if (unlink(name) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("Failed to remove domain managed save image"));
|
2011-07-20 03:05:20 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
} else {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("Refusing to undefine while domain managed "
|
|
|
|
"save image exists"));
|
2011-07-20 03:05:20 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0)
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-11-21 17:03:26 +00:00
|
|
|
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED,
|
2011-03-29 12:18:24 +00:00
|
|
|
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
|
|
|
|
|
2011-08-19 13:46:22 +00:00
|
|
|
if (virDomainObjIsActive(vm)) {
|
|
|
|
vm->persistent = 0;
|
|
|
|
} else {
|
2013-01-11 16:04:47 +00:00
|
|
|
virDomainObjListRemove(driver->domains, vm);
|
2011-08-19 13:46:22 +00:00
|
|
|
vm = NULL;
|
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-07-20 03:05:20 +00:00
|
|
|
VIR_FREE(name);
|
2011-02-10 22:42:34 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-29 12:18:24 +00:00
|
|
|
if (event)
|
|
|
|
libxlDomainEventQueue(driver, event);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-07-20 03:05:20 +00:00
|
|
|
static int
|
|
|
|
libxlDomainUndefine(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
return libxlDomainUndefineFlags(dom, 0);
|
|
|
|
}
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
static int
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDomainChangeEjectableMedia(virDomainObjPtr vm, virDomainDiskDefPtr disk)
|
2011-05-26 15:27:06 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(libxl_driver);
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDiskDefPtr origdisk = NULL;
|
|
|
|
libxl_device_disk x_disk;
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2011-05-26 15:27:06 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2013-05-21 07:21:16 +00:00
|
|
|
for (i = 0; i < vm->def->ndisks; i++) {
|
2011-05-26 15:27:06 +00:00
|
|
|
if (vm->def->disks[i]->bus == disk->bus &&
|
|
|
|
STREQ(vm->def->disks[i]->dst, disk->dst)) {
|
|
|
|
origdisk = vm->def->disks[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!origdisk) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("No device with bus '%s' and target '%s'"),
|
|
|
|
virDomainDiskBusTypeToString(disk->bus), disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (origdisk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Removable media not supported for %s device"),
|
|
|
|
virDomainDiskDeviceTypeToString(disk->device));
|
2011-05-26 15:27:06 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-11-26 16:28:56 +00:00
|
|
|
if (libxlMakeDisk(disk, &x_disk) < 0)
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if ((ret = libxl_cdrom_insert(cfg->ctx, vm->def->id, &x_disk, NULL)) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxenlight failed to change media for disk '%s'"),
|
|
|
|
disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-03-17 20:14:11 +00:00
|
|
|
if (virDomainDiskSetSource(origdisk, virDomainDiskGetSource(disk)) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
virDomainDiskSetType(origdisk, virDomainDiskGetType(disk));
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
virDomainDiskDefFree(disk);
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-26 15:27:06 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev)
|
2011-05-26 15:27:06 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(libxl_driver);
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDiskDefPtr l_disk = dev->data.disk;
|
|
|
|
libxl_device_disk x_disk;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
switch (l_disk->device) {
|
|
|
|
case VIR_DOMAIN_DISK_DEVICE_CDROM:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainChangeEjectableMedia(vm, l_disk);
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_DISK_DEVICE_DISK:
|
|
|
|
if (l_disk->bus == VIR_DOMAIN_DISK_BUS_XEN) {
|
snapshot: also support disks by path
I got confused when 'virsh domblkinfo dom disk' required the
path to a disk (which can be ambiguous, since a single file
can back multiple disks), rather than the unambiguous target
device name that I was using in disk snapshots. So, in true
developer fashion, I went for the best of both worlds - all
interfaces that operate on a disk (aka block) now accept
either the target name or the unambiguous path to the backing
file used by the disk.
* src/conf/domain_conf.h (virDomainDiskIndexByName): Add
parameter.
(virDomainDiskPathByName): New prototype.
* src/libvirt_private.syms (domain_conf.h): Export it.
* src/conf/domain_conf.c (virDomainDiskIndexByName): Also allow
searching by path, and decide whether ambiguity is okay.
(virDomainDiskPathByName): New function.
(virDomainDiskRemoveByName, virDomainSnapshotAlignDisks): Update
callers.
* src/qemu/qemu_driver.c (qemudDomainBlockPeek)
(qemuDomainAttachDeviceConfig, qemuDomainUpdateDeviceConfig)
(qemuDomainGetBlockInfo, qemuDiskPathToAlias): Likewise.
* src/qemu/qemu_process.c (qemuProcessFindDomainDiskByPath):
Likewise.
* src/libxl/libxl_driver.c (libxlDomainAttachDeviceDiskLive)
(libxlDomainDetachDeviceDiskLive, libxlDomainAttachDeviceConfig)
(libxlDomainUpdateDeviceConfig): Likewise.
* src/uml/uml_driver.c (umlDomainBlockPeek): Likewise.
* src/xen/xend_internal.c (xenDaemonDomainBlockPeek): Likewise.
* docs/formatsnapshot.html.in: Update documentation.
* tools/virsh.pod (domblkstat, domblkinfo): Likewise.
* docs/schemas/domaincommon.rng (diskTarget): Tighten pattern on
disk targets.
* docs/schemas/domainsnapshot.rng (disksnapshot): Update to match.
* tests/domainsnapshotxml2xmlin/disk_snapshot.xml: Update test.
2011-08-20 02:38:36 +00:00
|
|
|
if (virDomainDiskIndexByName(vm->def, l_disk->dst, true) >= 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("target %s already exists"), l_disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-03-17 20:14:11 +00:00
|
|
|
if (!virDomainDiskGetSource(l_disk)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s", _("disk source path is missing"));
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2013-07-04 10:10:38 +00:00
|
|
|
if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0)
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2012-11-26 16:28:56 +00:00
|
|
|
if (libxlMakeDisk(l_disk, &x_disk) < 0)
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-04-14 20:38:46 +00:00
|
|
|
if (virDomainLockDiskAttach(libxl_driver->lockManager,
|
|
|
|
"xen:///system",
|
|
|
|
vm, l_disk) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if ((ret = libxl_device_disk_add(cfg->ctx, vm->def->id,
|
2012-11-26 16:28:56 +00:00
|
|
|
&x_disk, NULL)) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxenlight failed to attach disk '%s'"),
|
|
|
|
l_disk->dst);
|
2015-04-14 20:38:46 +00:00
|
|
|
if (virDomainLockDiskDetach(libxl_driver->lockManager,
|
|
|
|
vm, l_disk) < 0) {
|
|
|
|
VIR_WARN("Unable to release lock on %s",
|
|
|
|
virDomainDiskGetSource(l_disk));
|
|
|
|
}
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
virDomainDiskInsertPreAlloced(vm->def, l_disk);
|
|
|
|
|
|
|
|
} else {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("disk bus '%s' cannot be hotplugged."),
|
|
|
|
virDomainDiskBusTypeToString(l_disk->bus));
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("disk device type '%s' cannot be hotplugged"),
|
|
|
|
virDomainDiskDeviceTypeToString(l_disk->device));
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-26 15:27:06 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
static int
|
|
|
|
libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
|
|
|
virDomainHostdevDefPtr hostdev)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2015-04-24 15:56:23 +00:00
|
|
|
libxl_device_pci pcidev;
|
2014-03-06 09:46:11 +00:00
|
|
|
virDomainHostdevDefPtr found;
|
|
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
2014-07-03 20:31:39 +00:00
|
|
|
virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci;
|
2015-02-11 23:40:07 +00:00
|
|
|
int ret = -1;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2015-04-24 15:56:23 +00:00
|
|
|
libxl_device_pci_init(&pcidev);
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
if (virDomainHostdevFind(vm->def, hostdev, &found) >= 0) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("target pci device %.4x:%.2x:%.2x.%.1x already exists"),
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc->addr.domain, pcisrc->addr.bus,
|
|
|
|
pcisrc->addr.slot, pcisrc->addr.function);
|
2015-02-11 23:40:07 +00:00
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0)
|
2015-02-11 23:40:07 +00:00
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
|
|
|
if (virHostdevPreparePCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME,
|
|
|
|
vm->def->name, vm->def->uuid,
|
|
|
|
&hostdev, 1, 0) < 0)
|
2015-02-11 23:40:07 +00:00
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2014-03-13 11:59:32 +00:00
|
|
|
if (libxlMakePCI(hostdev, &pcidev) < 0)
|
2014-03-19 03:15:25 +00:00
|
|
|
goto error;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_device_pci_add(cfg->ctx, vm->def->id, &pcidev, 0) < 0) {
|
2014-03-06 09:46:11 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxenlight failed to attach pci device %.4x:%.2x:%.2x.%.1x"),
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc->addr.domain, pcisrc->addr.bus,
|
|
|
|
pcisrc->addr.slot, pcisrc->addr.function);
|
2014-03-19 03:15:25 +00:00
|
|
|
goto error;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = 0;
|
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
error:
|
2014-03-06 09:46:11 +00:00
|
|
|
virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME,
|
|
|
|
vm->def->name, &hostdev, 1, NULL);
|
2015-02-11 23:40:07 +00:00
|
|
|
|
|
|
|
cleanup:
|
|
|
|
virObjectUnref(cfg);
|
2015-04-24 15:56:23 +00:00
|
|
|
libxl_device_pci_dispose(&pcidev);
|
2015-02-11 23:40:07 +00:00
|
|
|
return ret;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainAttachHostDevice(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
2014-07-15 05:03:15 +00:00
|
|
|
virDomainHostdevDefPtr hostdev)
|
2014-03-06 09:46:11 +00:00
|
|
|
{
|
|
|
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
|
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("hostdev mode '%s' not supported"),
|
|
|
|
virDomainHostdevModeTypeToString(hostdev->mode));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (hostdev->source.subsys.type) {
|
|
|
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxlDomainAttachHostPCIDevice(driver, vm, hostdev) < 0)
|
2014-03-19 03:15:25 +00:00
|
|
|
return -1;
|
2014-03-06 09:46:11 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("hostdev subsys type '%s' not supported"),
|
|
|
|
virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
|
2014-03-19 03:15:25 +00:00
|
|
|
return -1;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
static int
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDomainDetachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev)
|
2011-05-26 15:27:06 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(libxl_driver);
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDiskDefPtr l_disk = NULL;
|
|
|
|
libxl_device_disk x_disk;
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
int idx;
|
2011-05-26 15:27:06 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
switch (dev->data.disk->device) {
|
|
|
|
case VIR_DOMAIN_DISK_DEVICE_DISK:
|
|
|
|
if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_XEN) {
|
|
|
|
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
if ((idx = virDomainDiskIndexByName(vm->def,
|
|
|
|
dev->data.disk->dst,
|
|
|
|
false)) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("disk %s not found"), dev->data.disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
l_disk = vm->def->disks[idx];
|
2011-05-26 15:27:06 +00:00
|
|
|
|
2012-11-26 16:28:56 +00:00
|
|
|
if (libxlMakeDisk(l_disk, &x_disk) < 0)
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if ((ret = libxl_device_disk_remove(cfg->ctx, vm->def->id,
|
2012-11-26 16:28:56 +00:00
|
|
|
&x_disk, NULL)) < 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxenlight failed to detach disk '%s'"),
|
|
|
|
l_disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-04-14 20:38:46 +00:00
|
|
|
if (virDomainLockDiskDetach(libxl_driver->lockManager,
|
|
|
|
vm, l_disk) < 0)
|
|
|
|
VIR_WARN("Unable to release lock on %s",
|
|
|
|
virDomainDiskGetSource(l_disk));
|
|
|
|
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
virDomainDiskRemove(vm->def, idx);
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDiskDefFree(l_disk);
|
|
|
|
|
|
|
|
} else {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("disk bus '%s' cannot be hot unplugged."),
|
|
|
|
virDomainDiskBusTypeToString(dev->data.disk->bus));
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("device type '%s' cannot hot unplugged"),
|
|
|
|
virDomainDiskDeviceTypeToString(dev->data.disk->device));
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-26 15:27:06 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
static int
|
|
|
|
libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
|
|
|
virDomainNetDefPtr net)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2014-07-15 05:03:15 +00:00
|
|
|
int actualType;
|
|
|
|
libxl_device_nic nic;
|
|
|
|
int ret = -1;
|
2015-03-06 14:36:16 +00:00
|
|
|
char mac[VIR_MAC_STRING_BUFLEN];
|
2014-07-15 05:03:15 +00:00
|
|
|
|
2016-03-21 08:11:36 +00:00
|
|
|
libxl_device_nic_init(&nic);
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
/* preallocate new slot for device */
|
|
|
|
if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0)
|
2016-03-21 08:11:36 +00:00
|
|
|
goto cleanup;
|
2014-07-15 05:03:15 +00:00
|
|
|
|
|
|
|
/* If appropriate, grab a physical device from the configured
|
|
|
|
* network's pool of devices, or resolve bridge device name
|
|
|
|
* to the one defined in the network definition.
|
|
|
|
*/
|
|
|
|
if (networkAllocateActualDevice(vm->def, net) < 0)
|
2016-03-21 08:11:36 +00:00
|
|
|
goto cleanup;
|
2014-07-15 05:03:15 +00:00
|
|
|
|
|
|
|
actualType = virDomainNetGetActualType(net);
|
|
|
|
|
2015-03-06 14:36:16 +00:00
|
|
|
if (virDomainHasNet(vm->def, net)) {
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("network device with mac %s already exists"),
|
|
|
|
virMacAddrFormat(&net->mac, mac));
|
2016-03-21 08:11:36 +00:00
|
|
|
goto cleanup;
|
2015-03-06 14:36:16 +00:00
|
|
|
}
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
|
2016-03-21 08:11:40 +00:00
|
|
|
virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net);
|
|
|
|
virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci;
|
|
|
|
|
|
|
|
/* For those just allocated from a network pool whose backend is
|
|
|
|
* still VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, we need to set
|
|
|
|
* backend correctly.
|
|
|
|
*/
|
|
|
|
if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
|
|
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
|
|
pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
/* This is really a "smart hostdev", so it should be attached
|
|
|
|
* as a hostdev (the hostdev code will reach over into the
|
|
|
|
* netdev-specific code as appropriate), then also added to
|
|
|
|
* the nets list (see out:) if successful.
|
|
|
|
*/
|
2016-03-21 08:11:40 +00:00
|
|
|
ret = libxlDomainAttachHostDevice(driver, vm, hostdev);
|
2016-03-21 08:11:36 +00:00
|
|
|
goto cleanup;
|
2014-07-15 05:03:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (libxlMakeNic(vm->def, net, &nic) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_device_nic_add(cfg->ctx, vm->def->id, &nic, 0)) {
|
2014-07-15 05:03:15 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("libxenlight failed to attach network device"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2016-03-21 08:11:36 +00:00
|
|
|
vm->def->nets[vm->def->nnets++] = net;
|
2014-07-15 05:03:15 +00:00
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
libxl_device_nic_dispose(&nic);
|
2016-03-21 08:11:36 +00:00
|
|
|
if (ret) {
|
|
|
|
virDomainNetRemoveHostdev(vm->def, net);
|
|
|
|
networkReleaseActualDevice(vm->def, net);
|
|
|
|
}
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2014-07-15 05:03:15 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
static int
|
2014-03-06 09:46:11 +00:00
|
|
|
libxlDomainAttachDeviceLive(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDeviceDefPtr dev)
|
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainAttachDeviceDiskLive(vm, dev);
|
2011-05-26 15:27:06 +00:00
|
|
|
if (!ret)
|
|
|
|
dev->data.disk = NULL;
|
|
|
|
break;
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainAttachNetDevice(driver, vm,
|
2014-07-15 05:03:15 +00:00
|
|
|
dev->data.net);
|
|
|
|
if (!ret)
|
|
|
|
dev->data.net = NULL;
|
|
|
|
break;
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_HOSTDEV:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainAttachHostDevice(driver, vm,
|
2014-07-15 05:03:15 +00:00
|
|
|
dev->data.hostdev);
|
2014-03-06 09:46:11 +00:00
|
|
|
if (!ret)
|
|
|
|
dev->data.hostdev = NULL;
|
|
|
|
break;
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("device type '%s' cannot be attached"),
|
|
|
|
virDomainDeviceTypeToString(dev->type));
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
|
|
|
|
{
|
|
|
|
virDomainDiskDefPtr disk;
|
2014-07-15 05:03:15 +00:00
|
|
|
virDomainNetDefPtr net;
|
2014-03-06 09:46:11 +00:00
|
|
|
virDomainHostdevDefPtr hostdev;
|
|
|
|
virDomainHostdevDefPtr found;
|
2014-07-03 20:31:39 +00:00
|
|
|
virDomainHostdevSubsysPCIPtr pcisrc;
|
2015-03-06 14:36:16 +00:00
|
|
|
char mac[VIR_MAC_STRING_BUFLEN];
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
disk = dev->data.disk;
|
snapshot: also support disks by path
I got confused when 'virsh domblkinfo dom disk' required the
path to a disk (which can be ambiguous, since a single file
can back multiple disks), rather than the unambiguous target
device name that I was using in disk snapshots. So, in true
developer fashion, I went for the best of both worlds - all
interfaces that operate on a disk (aka block) now accept
either the target name or the unambiguous path to the backing
file used by the disk.
* src/conf/domain_conf.h (virDomainDiskIndexByName): Add
parameter.
(virDomainDiskPathByName): New prototype.
* src/libvirt_private.syms (domain_conf.h): Export it.
* src/conf/domain_conf.c (virDomainDiskIndexByName): Also allow
searching by path, and decide whether ambiguity is okay.
(virDomainDiskPathByName): New function.
(virDomainDiskRemoveByName, virDomainSnapshotAlignDisks): Update
callers.
* src/qemu/qemu_driver.c (qemudDomainBlockPeek)
(qemuDomainAttachDeviceConfig, qemuDomainUpdateDeviceConfig)
(qemuDomainGetBlockInfo, qemuDiskPathToAlias): Likewise.
* src/qemu/qemu_process.c (qemuProcessFindDomainDiskByPath):
Likewise.
* src/libxl/libxl_driver.c (libxlDomainAttachDeviceDiskLive)
(libxlDomainDetachDeviceDiskLive, libxlDomainAttachDeviceConfig)
(libxlDomainUpdateDeviceConfig): Likewise.
* src/uml/uml_driver.c (umlDomainBlockPeek): Likewise.
* src/xen/xend_internal.c (xenDaemonDomainBlockPeek): Likewise.
* docs/formatsnapshot.html.in: Update documentation.
* tools/virsh.pod (domblkstat, domblkinfo): Likewise.
* docs/schemas/domaincommon.rng (diskTarget): Tighten pattern on
disk targets.
* docs/schemas/domainsnapshot.rng (disksnapshot): Update to match.
* tests/domainsnapshotxml2xmlin/disk_snapshot.xml: Update test.
2011-08-20 02:38:36 +00:00
|
|
|
if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("target %s already exists."), disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2013-07-04 10:10:38 +00:00
|
|
|
if (virDomainDiskInsert(vmdef, disk))
|
2011-05-26 15:27:06 +00:00
|
|
|
return -1;
|
|
|
|
/* vmdef has the pointer. Generic codes for vmdef will do all jobs */
|
|
|
|
dev->data.disk = NULL;
|
|
|
|
break;
|
2014-07-15 05:03:15 +00:00
|
|
|
|
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
|
|
|
net = dev->data.net;
|
2015-03-06 14:36:16 +00:00
|
|
|
if (virDomainHasNet(vmdef, net)) {
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("network device with mac %s already exists"),
|
|
|
|
virMacAddrFormat(&net->mac, mac));
|
|
|
|
return -1;
|
|
|
|
}
|
2014-07-15 05:03:15 +00:00
|
|
|
if (virDomainNetInsert(vmdef, net))
|
|
|
|
return -1;
|
|
|
|
dev->data.net = NULL;
|
|
|
|
break;
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_HOSTDEV:
|
|
|
|
hostdev = dev->data.hostdev;
|
|
|
|
|
|
|
|
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (virDomainHostdevFind(vmdef, hostdev, &found) >= 0) {
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc = &hostdev->source.subsys.u.pci;
|
2014-03-06 09:46:11 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("target pci device %.4x:%.2x:%.2x.%.1x\
|
|
|
|
already exists"),
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc->addr.domain, pcisrc->addr.bus,
|
|
|
|
pcisrc->addr.slot, pcisrc->addr.function);
|
2014-03-06 09:46:11 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-09-11 21:52:58 +00:00
|
|
|
if (virDomainHostdevInsert(vmdef, hostdev) < 0)
|
|
|
|
return -1;
|
2015-09-17 05:15:22 +00:00
|
|
|
dev->data.hostdev = NULL;
|
2014-03-06 09:46:11 +00:00
|
|
|
break;
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
|
_("persistent attach of device is not supported"));
|
2011-05-26 15:27:06 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2014-03-06 09:46:11 +00:00
|
|
|
libxlComparePCIDevice(virDomainDefPtr def ATTRIBUTE_UNUSED,
|
|
|
|
virDomainDeviceDefPtr device ATTRIBUTE_UNUSED,
|
|
|
|
virDomainDeviceInfoPtr info1,
|
|
|
|
void *opaque)
|
|
|
|
{
|
|
|
|
virDomainDeviceInfoPtr info2 = opaque;
|
|
|
|
|
|
|
|
if (info1->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI ||
|
|
|
|
info2->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (info1->addr.pci.domain == info2->addr.pci.domain &&
|
|
|
|
info1->addr.pci.bus == info2->addr.pci.bus &&
|
|
|
|
info1->addr.pci.slot == info2->addr.pci.slot &&
|
|
|
|
info1->addr.pci.function != info2->addr.pci.function)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
libxlIsMultiFunctionDevice(virDomainDefPtr def,
|
|
|
|
virDomainDeviceInfoPtr dev)
|
|
|
|
{
|
|
|
|
if (virDomainDeviceInfoIterate(def, libxlComparePCIDevice, dev) < 0)
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
|
|
|
virDomainHostdevDefPtr hostdev)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2014-03-06 09:46:11 +00:00
|
|
|
virDomainHostdevSubsysPtr subsys = &hostdev->source.subsys;
|
2014-07-03 20:31:39 +00:00
|
|
|
virDomainHostdevSubsysPCIPtr pcisrc = &subsys->u.pci;
|
2014-03-06 09:46:11 +00:00
|
|
|
libxl_device_pci pcidev;
|
|
|
|
virDomainHostdevDefPtr detach;
|
|
|
|
int idx;
|
|
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
2015-02-11 23:40:07 +00:00
|
|
|
int ret = -1;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2015-04-24 15:56:23 +00:00
|
|
|
libxl_device_pci_init(&pcidev);
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
idx = virDomainHostdevFind(vm->def, hostdev, &detach);
|
|
|
|
if (idx < 0) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("host pci device %.4x:%.2x:%.2x.%.1x not found"),
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc->addr.domain, pcisrc->addr.bus,
|
|
|
|
pcisrc->addr.slot, pcisrc->addr.function);
|
2015-02-11 23:40:07 +00:00
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (libxlIsMultiFunctionDevice(vm->def, detach->info)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("cannot hot unplug multifunction PCI device: %.4x:%.2x:%.2x.%.1x"),
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc->addr.domain, pcisrc->addr.bus,
|
|
|
|
pcisrc->addr.slot, pcisrc->addr.function);
|
2014-03-19 03:15:25 +00:00
|
|
|
goto error;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-03-13 11:59:32 +00:00
|
|
|
if (libxlMakePCI(detach, &pcidev) < 0)
|
2014-03-19 03:15:25 +00:00
|
|
|
goto error;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_device_pci_remove(cfg->ctx, vm->def->id, &pcidev, 0) < 0) {
|
2014-03-06 09:46:11 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxenlight failed to detach pci device\
|
|
|
|
%.4x:%.2x:%.2x.%.1x"),
|
2014-07-03 20:31:39 +00:00
|
|
|
pcisrc->addr.domain, pcisrc->addr.bus,
|
|
|
|
pcisrc->addr.slot, pcisrc->addr.function);
|
2014-03-19 03:15:25 +00:00
|
|
|
goto error;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
virDomainHostdevRemove(vm->def, idx);
|
|
|
|
|
|
|
|
virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME,
|
|
|
|
vm->def->name, &hostdev, 1, NULL);
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = 0;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
error:
|
2014-03-06 09:46:11 +00:00
|
|
|
virDomainHostdevDefFree(detach);
|
2015-02-11 23:40:07 +00:00
|
|
|
|
|
|
|
cleanup:
|
|
|
|
virObjectUnref(cfg);
|
2015-04-24 15:56:23 +00:00
|
|
|
libxl_device_pci_dispose(&pcidev);
|
2015-02-11 23:40:07 +00:00
|
|
|
return ret;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainDetachHostDevice(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
2014-07-15 05:03:15 +00:00
|
|
|
virDomainHostdevDefPtr hostdev)
|
2014-03-06 09:46:11 +00:00
|
|
|
{
|
|
|
|
virDomainHostdevSubsysPtr subsys = &hostdev->source.subsys;
|
|
|
|
|
|
|
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
|
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("hostdev mode '%s' not supported"),
|
|
|
|
virDomainHostdevModeTypeToString(hostdev->mode));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (subsys->type) {
|
|
|
|
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
|
2015-02-11 23:40:07 +00:00
|
|
|
return libxlDomainDetachHostPCIDevice(driver, vm, hostdev);
|
2014-03-06 09:46:11 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected hostdev type %d"), subsys->type);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
static int
|
|
|
|
libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
|
|
|
virDomainNetDefPtr net)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2014-07-15 05:03:15 +00:00
|
|
|
int detachidx;
|
|
|
|
virDomainNetDefPtr detach = NULL;
|
|
|
|
libxl_device_nic nic;
|
|
|
|
char mac[VIR_MAC_STRING_BUFLEN];
|
|
|
|
int ret = -1;
|
|
|
|
|
2016-03-21 08:11:37 +00:00
|
|
|
libxl_device_nic_init(&nic);
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0)
|
2016-03-21 08:11:37 +00:00
|
|
|
goto cleanup;
|
2014-07-15 05:03:15 +00:00
|
|
|
|
|
|
|
detach = vm->def->nets[detachidx];
|
|
|
|
|
|
|
|
if (virDomainNetGetActualType(detach) == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
|
|
|
|
/* This is really a "smart hostdev", so it should be attached as a
|
|
|
|
* hostdev, then also removed from nets list (see out:) if successful.
|
|
|
|
*/
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainDetachHostDevice(driver, vm,
|
2014-07-15 05:03:15 +00:00
|
|
|
virDomainNetGetActualHostdev(detach));
|
2016-03-21 08:11:37 +00:00
|
|
|
goto cleanup;
|
2014-07-15 05:03:15 +00:00
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_mac_to_device_nic(cfg->ctx, vm->def->id,
|
2014-07-15 05:03:15 +00:00
|
|
|
virMacAddrFormat(&detach->mac, mac), &nic))
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_device_nic_remove(cfg->ctx, vm->def->id, &nic, 0)) {
|
2014-07-15 05:03:15 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("libxenlight failed to detach network device"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2016-03-21 08:11:38 +00:00
|
|
|
networkReleaseActualDevice(vm->def, detach);
|
2016-03-21 08:11:37 +00:00
|
|
|
virDomainNetRemove(vm->def, detachidx);
|
2014-07-15 05:03:15 +00:00
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
libxl_device_nic_dispose(&nic);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2014-07-15 05:03:15 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
static int
|
|
|
|
libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDeviceDefPtr dev)
|
|
|
|
{
|
2016-03-21 08:11:38 +00:00
|
|
|
virDomainHostdevDefPtr hostdev;
|
2011-05-26 15:27:06 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainDetachDeviceDiskLive(vm, dev);
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainDetachNetDevice(driver, vm,
|
2014-07-15 05:03:15 +00:00
|
|
|
dev->data.net);
|
|
|
|
break;
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_HOSTDEV:
|
2016-03-21 08:11:38 +00:00
|
|
|
hostdev = dev->data.hostdev;
|
|
|
|
|
|
|
|
/* If this is a network hostdev, we need to use the higher-level
|
|
|
|
* detach function so that mac address / virtualport are reset
|
|
|
|
*/
|
|
|
|
if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET)
|
|
|
|
ret = libxlDomainDetachNetDevice(driver, vm,
|
|
|
|
hostdev->parent.data.net);
|
|
|
|
else
|
|
|
|
ret = libxlDomainDetachHostDevice(driver, vm, hostdev);
|
2014-03-06 09:46:11 +00:00
|
|
|
break;
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("device type '%s' cannot be detached"),
|
|
|
|
virDomainDeviceTypeToString(dev->type));
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
static int
|
|
|
|
libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
|
|
|
|
{
|
util: eliminate device object leaks related to virDomain*Remove*()
There are several functions in domain_conf.c that remove a device
object from the domain's list of that object type, but don't free the
object or return it to the caller to free. In many cases this isn't a
problem because the caller already had a pointer to the object and
frees it afterward, but in several cases the removed object was just
left floating around with no references to it.
In particular, the function qemuDomainDetachDeviceConfig() calls
functions to locate and remove net (virDomainNetRemoveByMac), disk
(virDomainDiskRemoveByName()), and lease (virDomainLeaseRemove())
devices, but neither it nor its caller qemuDomainModifyDeviceConfig()
ever obtain a pointer to the device being removed, much less free it.
This patch modifies the following "remove" functions to return a
pointer to the device object being removed from the domain device
arrays, to give the caller the option of freeing the device object
using that pointer if needed. In places where the object was
previously leaked, it is now freed:
virDomainDiskRemove
virDomainDiskRemoveByName
virDomainNetRemove
virDomainNetRemoveByMac
virDomainHostdevRemove
virDomainLeaseRemove
virDomainLeaseRemoveAt
The functions that had been leaking:
libxlDomainDetachConfig - leaked a virDomainDiskDef
qemuDomainDetachDeviceConfig - could leak a virDomainDiskDef,
a virDomainNetDef, or a
virDomainLeaseDef
qemuDomainDetachLease - leaked a virDomainLeaseDef
2012-03-06 23:06:14 +00:00
|
|
|
virDomainDiskDefPtr disk, detach;
|
2014-07-15 05:03:14 +00:00
|
|
|
virDomainHostdevDefPtr hostdev, det_hostdev;
|
2014-07-15 05:03:15 +00:00
|
|
|
virDomainNetDefPtr net;
|
2014-07-15 05:03:14 +00:00
|
|
|
int idx;
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
disk = dev->data.disk;
|
util: eliminate device object leaks related to virDomain*Remove*()
There are several functions in domain_conf.c that remove a device
object from the domain's list of that object type, but don't free the
object or return it to the caller to free. In many cases this isn't a
problem because the caller already had a pointer to the object and
frees it afterward, but in several cases the removed object was just
left floating around with no references to it.
In particular, the function qemuDomainDetachDeviceConfig() calls
functions to locate and remove net (virDomainNetRemoveByMac), disk
(virDomainDiskRemoveByName()), and lease (virDomainLeaseRemove())
devices, but neither it nor its caller qemuDomainModifyDeviceConfig()
ever obtain a pointer to the device being removed, much less free it.
This patch modifies the following "remove" functions to return a
pointer to the device object being removed from the domain device
arrays, to give the caller the option of freeing the device object
using that pointer if needed. In places where the object was
previously leaked, it is now freed:
virDomainDiskRemove
virDomainDiskRemoveByName
virDomainNetRemove
virDomainNetRemoveByMac
virDomainHostdevRemove
virDomainLeaseRemove
virDomainLeaseRemoveAt
The functions that had been leaking:
libxlDomainDetachConfig - leaked a virDomainDiskDef
qemuDomainDetachDeviceConfig - could leak a virDomainDiskDef,
a virDomainNetDef, or a
virDomainLeaseDef
qemuDomainDetachLease - leaked a virDomainLeaseDef
2012-03-06 23:06:14 +00:00
|
|
|
if (!(detach = virDomainDiskRemoveByName(vmdef, disk->dst))) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("no target device %s"), disk->dst);
|
2014-07-15 05:03:14 +00:00
|
|
|
return -1;
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
util: eliminate device object leaks related to virDomain*Remove*()
There are several functions in domain_conf.c that remove a device
object from the domain's list of that object type, but don't free the
object or return it to the caller to free. In many cases this isn't a
problem because the caller already had a pointer to the object and
frees it afterward, but in several cases the removed object was just
left floating around with no references to it.
In particular, the function qemuDomainDetachDeviceConfig() calls
functions to locate and remove net (virDomainNetRemoveByMac), disk
(virDomainDiskRemoveByName()), and lease (virDomainLeaseRemove())
devices, but neither it nor its caller qemuDomainModifyDeviceConfig()
ever obtain a pointer to the device being removed, much less free it.
This patch modifies the following "remove" functions to return a
pointer to the device object being removed from the domain device
arrays, to give the caller the option of freeing the device object
using that pointer if needed. In places where the object was
previously leaked, it is now freed:
virDomainDiskRemove
virDomainDiskRemoveByName
virDomainNetRemove
virDomainNetRemoveByMac
virDomainHostdevRemove
virDomainLeaseRemove
virDomainLeaseRemoveAt
The functions that had been leaking:
libxlDomainDetachConfig - leaked a virDomainDiskDef
qemuDomainDetachDeviceConfig - could leak a virDomainDiskDef,
a virDomainNetDef, or a
virDomainLeaseDef
qemuDomainDetachLease - leaked a virDomainLeaseDef
2012-03-06 23:06:14 +00:00
|
|
|
virDomainDiskDefFree(detach);
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
2014-07-15 05:03:14 +00:00
|
|
|
|
2014-07-15 05:03:15 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
|
|
|
net = dev->data.net;
|
|
|
|
if ((idx = virDomainNetFindIdx(vmdef, net)) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* this is guaranteed to succeed */
|
|
|
|
virDomainNetDefFree(virDomainNetRemove(vmdef, idx));
|
|
|
|
break;
|
|
|
|
|
2014-07-15 05:03:14 +00:00
|
|
|
case VIR_DOMAIN_DEVICE_HOSTDEV: {
|
|
|
|
hostdev = dev->data.hostdev;
|
|
|
|
if ((idx = virDomainHostdevFind(vmdef, hostdev, &det_hostdev)) < 0) {
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG, "%s",
|
|
|
|
_("device not present in domain configuration"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
virDomainHostdevRemove(vmdef, idx);
|
|
|
|
virDomainHostdevDefFree(det_hostdev);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
|
_("persistent detach of device is not supported"));
|
2014-07-15 05:03:14 +00:00
|
|
|
return -1;
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
|
2014-07-15 05:03:14 +00:00
|
|
|
return 0;
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDomainUpdateDeviceLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev)
|
2011-05-26 15:27:06 +00:00
|
|
|
{
|
|
|
|
virDomainDiskDefPtr disk;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
disk = dev->data.disk;
|
|
|
|
switch (disk->device) {
|
|
|
|
case VIR_DOMAIN_DISK_DEVICE_CDROM:
|
2015-02-11 23:40:07 +00:00
|
|
|
ret = libxlDomainChangeEjectableMedia(vm, disk);
|
2011-05-26 15:27:06 +00:00
|
|
|
if (ret == 0)
|
|
|
|
dev->data.disk = NULL;
|
|
|
|
break;
|
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("disk bus '%s' cannot be updated."),
|
|
|
|
virDomainDiskBusTypeToString(disk->bus));
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
|
_("device type '%s' cannot be updated"),
|
|
|
|
virDomainDeviceTypeToString(dev->type));
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
|
|
|
|
{
|
|
|
|
virDomainDiskDefPtr orig;
|
|
|
|
virDomainDiskDefPtr disk;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
disk = dev->data.disk;
|
2015-05-21 09:21:51 +00:00
|
|
|
if (!(orig = virDomainDiskByName(vmdef, disk->dst, false))) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("target %s doesn't exist."), disk->dst);
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INVALID_ARG, "%s",
|
|
|
|
_("this disk doesn't support update"));
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-03-17 20:14:11 +00:00
|
|
|
if (virDomainDiskSetSource(orig, virDomainDiskGetSource(disk)) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
virDomainDiskSetType(orig, virDomainDiskGetType(disk));
|
|
|
|
virDomainDiskSetFormat(orig, virDomainDiskGetFormat(disk));
|
|
|
|
if (virDomainDiskSetDriver(orig, virDomainDiskGetDriver(disk)) < 0)
|
|
|
|
goto cleanup;
|
2011-05-26 15:27:06 +00:00
|
|
|
break;
|
|
|
|
default:
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
|
_("persistent update of device is not supported"));
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-05-26 15:27:06 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2013-04-29 15:59:42 +00:00
|
|
|
libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
|
|
|
|
unsigned int flags)
|
2011-05-26 15:27:06 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainDefPtr vmdef = NULL;
|
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE |
|
|
|
|
VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-05-26 15:27:06 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainAttachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-07 00:21:41 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2016-03-02 14:30:04 +00:00
|
|
|
if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
|
|
|
|
goto endjob;
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
|
2013-03-28 13:55:55 +00:00
|
|
|
if (!(dev = virDomainDeviceDefParse(xml, vm->def,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
/* Make a copy for updated domain. */
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(vmdef = virDomainObjCopyPersistentDef(vm, cfg->caps,
|
2013-03-28 13:55:55 +00:00
|
|
|
driver->xmlopt)))
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2011-05-26 15:27:06 +00:00
|
|
|
|
2014-07-15 05:03:16 +00:00
|
|
|
if (libxlDomainAttachDeviceConfig(vmdef, dev) < 0)
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
}
|
2011-05-26 15:27:06 +00:00
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
|
|
|
|
/* If dev exists it was created to modify the domain config. Free it. */
|
|
|
|
virDomainDeviceDefFree(dev);
|
2013-03-28 13:55:55 +00:00
|
|
|
if (!(dev = virDomainDeviceDefParse(xml, vm->def,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2011-05-26 15:27:06 +00:00
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxlDomainAttachDeviceLive(driver, vm, dev) < 0)
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
/*
|
|
|
|
* update domain status forcibly because the domain status may be
|
|
|
|
* changed even if we attach the device failed.
|
|
|
|
*/
|
2016-02-04 12:32:45 +00:00
|
|
|
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0)
|
2014-07-15 05:03:16 +00:00
|
|
|
goto endjob;
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
|
2014-07-15 05:03:16 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2011-05-26 15:27:06 +00:00
|
|
|
/* Finally, if no error until here, we can save config. */
|
2014-07-15 05:03:16 +00:00
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
|
2016-02-03 21:40:36 +00:00
|
|
|
ret = virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef);
|
2011-05-26 15:27:06 +00:00
|
|
|
if (!ret) {
|
Merge virDomainObjListIsDuplicate into virDomainObjListAdd
The duplicate VM checking should be done atomically with
virDomainObjListAdd, so shoud not be a separate function.
Instead just use flags to indicate what kind of checks are
required.
This pair, used in virDomainCreateXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainRestoreFlags:
if (virDomainObjListIsDuplicate(privconn->domains, def, 1) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, true)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE,
NULL)))
goto cleanup;
This pair, used in virDomainDefineXML:
if (virDomainObjListIsDuplicate(privconn->domains, def, 0) < 0)
goto cleanup;
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def, false)))
goto cleanup;
Changes to
if (!(dom = virDomainObjListAdd(privconn->domains,
privconn->caps,
def,
0, NULL)))
goto cleanup;
2013-01-14 14:46:58 +00:00
|
|
|
virDomainObjAssignDef(vm, vmdef, false, NULL);
|
2011-05-26 15:27:06 +00:00
|
|
|
vmdef = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-07 00:21:41 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-05-26 15:27:06 +00:00
|
|
|
virDomainDefFree(vmdef);
|
|
|
|
virDomainDeviceDefFree(dev);
|
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-05-26 15:27:06 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainAttachDevice(virDomainPtr dom, const char *xml)
|
|
|
|
{
|
|
|
|
return libxlDomainAttachDeviceFlags(dom, xml,
|
|
|
|
VIR_DOMAIN_DEVICE_MODIFY_LIVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
2013-04-29 15:59:42 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2013-04-29 15:59:42 +00:00
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainDefPtr vmdef = NULL;
|
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE |
|
|
|
|
VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2013-04-29 15:59:42 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainDetachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-07 00:21:41 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2016-03-02 14:30:04 +00:00
|
|
|
if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
|
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
|
|
|
|
if (!(dev = virDomainDeviceDefParse(xml, vm->def,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
|
|
|
/* Make a copy for updated domain. */
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(vmdef = virDomainObjCopyPersistentDef(vm, cfg->caps,
|
2013-04-29 15:59:42 +00:00
|
|
|
driver->xmlopt)))
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
2014-07-15 05:03:16 +00:00
|
|
|
if (libxlDomainDetachDeviceConfig(vmdef, dev) < 0)
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
|
|
|
|
/* If dev exists it was created to modify the domain config. Free it. */
|
|
|
|
virDomainDeviceDefFree(dev);
|
|
|
|
if (!(dev = virDomainDeviceDefParse(xml, vm->def,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxlDomainDetachDeviceLive(driver, vm, dev) < 0)
|
2014-02-07 00:21:41 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* update domain status forcibly because the domain status may be
|
|
|
|
* changed even if we attach the device failed.
|
|
|
|
*/
|
2016-02-04 12:32:45 +00:00
|
|
|
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0)
|
2014-07-15 05:03:16 +00:00
|
|
|
goto endjob;
|
2013-04-29 15:59:42 +00:00
|
|
|
}
|
|
|
|
|
2014-07-15 05:03:16 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2013-04-29 15:59:42 +00:00
|
|
|
/* Finally, if no error until here, we can save config. */
|
2014-07-15 05:03:16 +00:00
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
|
2016-02-03 21:40:36 +00:00
|
|
|
ret = virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef);
|
2013-04-29 15:59:42 +00:00
|
|
|
if (!ret) {
|
|
|
|
virDomainObjAssignDef(vm, vmdef, false, NULL);
|
|
|
|
vmdef = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-07 00:21:41 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-04-29 15:59:42 +00:00
|
|
|
virDomainDefFree(vmdef);
|
|
|
|
virDomainDeviceDefFree(dev);
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2013-04-29 15:59:42 +00:00
|
|
|
return ret;
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainDetachDevice(virDomainPtr dom, const char *xml)
|
|
|
|
{
|
|
|
|
return libxlDomainDetachDeviceFlags(dom, xml,
|
|
|
|
VIR_DOMAIN_DEVICE_MODIFY_LIVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
2013-04-29 15:59:42 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2013-04-29 15:59:42 +00:00
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
virDomainDefPtr vmdef = NULL;
|
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE |
|
|
|
|
VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2013-04-29 15:59:42 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainUpdateDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2016-03-02 14:30:04 +00:00
|
|
|
if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
|
|
|
|
goto cleanup;
|
2013-04-29 15:59:42 +00:00
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
|
|
|
|
if (!(dev = virDomainDeviceDefParse(xml, vm->def,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2013-04-29 15:59:42 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
/* Make a copy for updated domain. */
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(vmdef = virDomainObjCopyPersistentDef(vm, cfg->caps,
|
2013-04-29 15:59:42 +00:00
|
|
|
driver->xmlopt)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if ((ret = libxlDomainUpdateDeviceConfig(vmdef, dev)) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
|
|
|
|
/* If dev exists it was created to modify the domain config. Free it. */
|
|
|
|
virDomainDeviceDefFree(dev);
|
|
|
|
if (!(dev = virDomainDeviceDefParse(xml, vm->def,
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->caps, driver->xmlopt,
|
2014-11-18 16:44:00 +00:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
2013-04-29 15:59:42 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if ((ret = libxlDomainUpdateDeviceLive(vm, dev)) < 0)
|
2013-04-29 15:59:42 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* update domain status forcibly because the domain status may be
|
|
|
|
* changed even if we attach the device failed.
|
|
|
|
*/
|
2016-02-04 12:32:45 +00:00
|
|
|
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0)
|
2013-04-29 15:59:42 +00:00
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally, if no error until here, we can save config. */
|
|
|
|
if (!ret && (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)) {
|
2016-02-03 21:40:36 +00:00
|
|
|
ret = virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef);
|
2013-04-29 15:59:42 +00:00
|
|
|
if (!ret) {
|
|
|
|
virDomainObjAssignDef(vm, vmdef, false, NULL);
|
|
|
|
vmdef = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-04-29 15:59:42 +00:00
|
|
|
virDomainDefFree(vmdef);
|
|
|
|
virDomainDeviceDefFree(dev);
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2013-04-29 15:59:42 +00:00
|
|
|
return ret;
|
2011-05-26 15:27:06 +00:00
|
|
|
}
|
|
|
|
|
2011-03-21 09:35:53 +00:00
|
|
|
static unsigned long long
|
|
|
|
libxlNodeGetFreeMemory(virConnectPtr conn)
|
|
|
|
{
|
|
|
|
libxl_physinfo phy_info;
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
|
|
|
unsigned long long ret = 0;
|
2011-03-21 09:35:53 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virNodeGetFreeMemoryEnsureACL(conn) < 0)
|
2013-08-30 20:52:14 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
if (libxl_get_physinfo(cfg->ctx, &phy_info)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("libxl_get_physinfo_info failed"));
|
2013-08-30 20:52:14 +00:00
|
|
|
goto cleanup;
|
2011-03-21 09:35:53 +00:00
|
|
|
}
|
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
ret = phy_info.free_pages * cfg->verInfo->pagesize;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
|
|
|
return ret;
|
2011-03-21 09:35:53 +00:00
|
|
|
}
|
|
|
|
|
2013-06-28 14:32:52 +00:00
|
|
|
static int
|
|
|
|
libxlNodeGetCellsFreeMemory(virConnectPtr conn,
|
|
|
|
unsigned long long *freeMems,
|
|
|
|
int startCell,
|
|
|
|
int maxCells)
|
|
|
|
{
|
|
|
|
int n, lastCell, numCells;
|
|
|
|
int ret = -1, nr_nodes = 0;
|
|
|
|
libxl_numainfo *numa_info = NULL;
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2013-06-28 14:32:52 +00:00
|
|
|
|
|
|
|
if (virNodeGetCellsFreeMemoryEnsureACL(conn) < 0)
|
2013-08-30 20:52:14 +00:00
|
|
|
goto cleanup;
|
2013-06-28 14:32:52 +00:00
|
|
|
|
2013-08-30 20:52:14 +00:00
|
|
|
numa_info = libxl_get_numainfo(cfg->ctx, &nr_nodes);
|
2013-06-28 14:32:52 +00:00
|
|
|
if (numa_info == NULL || nr_nodes == 0) {
|
2013-08-09 09:05:58 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("libxl_get_numainfo failed"));
|
|
|
|
goto cleanup;
|
2013-06-28 14:32:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check/sanitize the cell range */
|
2013-08-09 09:05:58 +00:00
|
|
|
if (startCell >= nr_nodes) {
|
2013-06-28 14:32:52 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("start cell %d out of range (0-%d)"),
|
2013-08-09 09:05:58 +00:00
|
|
|
startCell, nr_nodes - 1);
|
2013-06-28 14:32:52 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
lastCell = startCell + maxCells - 1;
|
2013-08-09 09:05:58 +00:00
|
|
|
if (lastCell >= nr_nodes)
|
|
|
|
lastCell = nr_nodes - 1;
|
2013-06-28 14:32:52 +00:00
|
|
|
|
|
|
|
for (numCells = 0, n = startCell; n <= lastCell; n++) {
|
|
|
|
if (numa_info[n].size == LIBXL_NUMAINFO_INVALID_ENTRY)
|
|
|
|
freeMems[numCells++] = 0;
|
|
|
|
else
|
|
|
|
freeMems[numCells++] = numa_info[n].free;
|
|
|
|
}
|
2013-08-14 21:33:48 +00:00
|
|
|
|
2013-06-28 14:32:52 +00:00
|
|
|
ret = numCells;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-06-28 14:32:52 +00:00
|
|
|
libxl_numainfo_list_free(numa_info, nr_nodes);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2013-06-28 14:32:52 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:18:24 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectDomainEventRegister(virConnectPtr conn,
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
virConnectDomainEventCallback callback,
|
|
|
|
void *opaque,
|
2013-04-23 12:50:18 +00:00
|
|
|
virFreeCallback freecb)
|
2011-03-29 12:18:24 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectDomainEventRegisterEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
if (virDomainEventStateRegister(conn,
|
|
|
|
driver->domainEventState,
|
|
|
|
callback, opaque, freecb) < 0)
|
|
|
|
return -1;
|
2011-03-29 12:18:24 +00:00
|
|
|
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
return 0;
|
2011-03-29 12:18:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectDomainEventDeregister(virConnectPtr conn,
|
|
|
|
virConnectDomainEventCallback callback)
|
2011-03-29 12:18:24 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectDomainEventDeregisterEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
if (virDomainEventStateDeregister(conn,
|
|
|
|
driver->domainEventState,
|
|
|
|
callback) < 0)
|
|
|
|
return -1;
|
2011-03-29 12:18:24 +00:00
|
|
|
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
return 0;
|
2011-03-29 12:18:24 +00:00
|
|
|
}
|
|
|
|
|
2011-03-28 10:49:22 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetAutostart(virDomainPtr dom, int *autostart)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-28 10:49:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetAutostartEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-28 10:49:22 +00:00
|
|
|
*autostart = vm->autostart;
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-28 10:49:22 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-03-28 10:49:22 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainSetAutostart(virDomainPtr dom, int autostart)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2013-08-30 20:52:14 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-28 10:49:22 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
char *configFile = NULL, *autostartLink = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-28 10:49:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainSetAutostartEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-07 00:24:48 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-28 10:49:22 +00:00
|
|
|
if (!vm->persistent) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("cannot set autostart for transient domain"));
|
2014-02-07 00:24:48 +00:00
|
|
|
goto endjob;
|
2011-03-28 10:49:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
autostart = (autostart != 0);
|
|
|
|
|
|
|
|
if (vm->autostart != autostart) {
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(configFile = virDomainConfigFile(cfg->configDir, vm->def->name)))
|
2014-02-07 00:24:48 +00:00
|
|
|
goto endjob;
|
2013-08-30 20:52:14 +00:00
|
|
|
if (!(autostartLink = virDomainConfigFile(cfg->autostartDir, vm->def->name)))
|
2014-02-07 00:24:48 +00:00
|
|
|
goto endjob;
|
2011-03-28 10:49:22 +00:00
|
|
|
|
|
|
|
if (autostart) {
|
2013-08-30 20:52:14 +00:00
|
|
|
if (virFileMakePath(cfg->autostartDir) < 0) {
|
2011-07-05 21:02:53 +00:00
|
|
|
virReportSystemError(errno,
|
2011-03-28 10:49:22 +00:00
|
|
|
_("cannot create autostart directory %s"),
|
2013-08-30 20:52:14 +00:00
|
|
|
cfg->autostartDir);
|
2014-02-07 00:24:48 +00:00
|
|
|
goto endjob;
|
2011-03-28 10:49:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (symlink(configFile, autostartLink) < 0) {
|
|
|
|
virReportSystemError(errno,
|
|
|
|
_("Failed to create symlink '%s to '%s'"),
|
|
|
|
autostartLink, configFile);
|
2014-02-07 00:24:48 +00:00
|
|
|
goto endjob;
|
2011-03-28 10:49:22 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) {
|
|
|
|
virReportSystemError(errno,
|
|
|
|
_("Failed to delete symlink '%s'"),
|
|
|
|
autostartLink);
|
2014-02-07 00:24:48 +00:00
|
|
|
goto endjob;
|
2011-03-28 10:49:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
vm->autostart = autostart;
|
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-07 00:24:48 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-28 10:49:22 +00:00
|
|
|
VIR_FREE(configFile);
|
|
|
|
VIR_FREE(autostartLink);
|
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2013-08-30 20:52:14 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-28 10:49:22 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-03-29 12:46:55 +00:00
|
|
|
static char *
|
|
|
|
libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-03-29 12:46:55 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
char * ret = NULL;
|
2013-05-03 12:42:47 +00:00
|
|
|
const char *name = NULL;
|
2012-11-26 16:28:56 +00:00
|
|
|
libxl_scheduler sched_id;
|
2011-03-29 12:46:55 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-03-29 12:46:55 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetSchedulerTypeEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-03-29 12:46:55 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2011-03-29 12:46:55 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
sched_id = libxl_get_scheduler(cfg->ctx);
|
2011-03-29 12:46:55 +00:00
|
|
|
|
2011-05-18 07:55:32 +00:00
|
|
|
if (nparams)
|
|
|
|
*nparams = 0;
|
2012-10-17 09:23:12 +00:00
|
|
|
switch (sched_id) {
|
2012-11-26 16:28:56 +00:00
|
|
|
case LIBXL_SCHEDULER_SEDF:
|
2013-05-03 12:42:47 +00:00
|
|
|
name = "sedf";
|
2011-03-29 12:46:55 +00:00
|
|
|
break;
|
2012-11-26 16:28:56 +00:00
|
|
|
case LIBXL_SCHEDULER_CREDIT:
|
2013-05-03 12:42:47 +00:00
|
|
|
name = "credit";
|
2011-05-18 07:55:32 +00:00
|
|
|
if (nparams)
|
|
|
|
*nparams = XEN_SCHED_CREDIT_NPARAM;
|
2011-03-29 12:46:55 +00:00
|
|
|
break;
|
2012-11-26 16:28:56 +00:00
|
|
|
case LIBXL_SCHEDULER_CREDIT2:
|
2013-05-03 12:42:47 +00:00
|
|
|
name = "credit2";
|
2011-03-29 12:46:55 +00:00
|
|
|
break;
|
2012-11-26 16:28:56 +00:00
|
|
|
case LIBXL_SCHEDULER_ARINC653:
|
2013-05-03 12:42:47 +00:00
|
|
|
name = "arinc653";
|
2011-03-29 12:46:55 +00:00
|
|
|
break;
|
|
|
|
default:
|
2012-11-26 16:28:56 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to get scheduler id for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2011-03-29 12:46:55 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2013-05-03 12:42:47 +00:00
|
|
|
ignore_value(VIR_STRDUP(ret, name));
|
2011-03-29 12:46:55 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-03-29 12:46:55 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-03-29 12:46:55 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-04-06 08:58:40 +00:00
|
|
|
static int
|
2011-05-17 22:33:53 +00:00
|
|
|
libxlDomainGetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int *nparams,
|
|
|
|
unsigned int flags)
|
2011-04-06 08:58:40 +00:00
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-04-06 08:58:40 +00:00
|
|
|
virDomainObjPtr vm;
|
2012-11-26 16:28:56 +00:00
|
|
|
libxl_domain_sched_params sc_info;
|
|
|
|
libxl_scheduler sched_id;
|
2011-04-06 08:58:40 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2013-07-13 00:27:10 +00:00
|
|
|
virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
|
|
|
|
|
|
|
|
/* We don't return strings, and thus trivially support this flag. */
|
|
|
|
flags &= ~VIR_TYPED_PARAM_STRING_OKAY;
|
2011-05-17 22:33:53 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-04-06 08:58:40 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainGetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-04-06 08:58:40 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-11-26 16:28:56 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("Domain is not running"));
|
2011-04-06 08:58:40 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
sched_id = libxl_get_scheduler(cfg->ctx);
|
2011-04-06 08:58:40 +00:00
|
|
|
|
2012-11-26 16:28:56 +00:00
|
|
|
if (sched_id != LIBXL_SCHEDULER_CREDIT) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("Only 'credit' scheduler is supported"));
|
2011-04-06 08:58:40 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_sched_params_get(cfg->ctx, vm->def->id, &sc_info) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to get scheduler parameters for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2011-04-06 08:58:40 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2012-01-07 12:47:43 +00:00
|
|
|
if (virTypedParameterAssign(¶ms[0], VIR_DOMAIN_SCHEDULER_WEIGHT,
|
|
|
|
VIR_TYPED_PARAM_UINT, sc_info.weight) < 0)
|
2011-04-06 08:58:40 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2011-11-02 17:42:38 +00:00
|
|
|
if (*nparams > 1) {
|
2012-01-07 12:47:43 +00:00
|
|
|
if (virTypedParameterAssign(¶ms[0], VIR_DOMAIN_SCHEDULER_CAP,
|
|
|
|
VIR_TYPED_PARAM_UINT, sc_info.cap) < 0)
|
2011-11-02 17:42:38 +00:00
|
|
|
goto cleanup;
|
2011-04-06 08:58:40 +00:00
|
|
|
}
|
|
|
|
|
2011-11-02 17:42:38 +00:00
|
|
|
if (*nparams > XEN_SCHED_CREDIT_NPARAM)
|
|
|
|
*nparams = XEN_SCHED_CREDIT_NPARAM;
|
2011-04-06 08:58:40 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-04-06 08:58:40 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-04-06 08:58:40 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2011-05-17 22:33:53 +00:00
|
|
|
libxlDomainGetSchedulerParameters(virDomainPtr dom, virTypedParameterPtr params,
|
|
|
|
int *nparams)
|
|
|
|
{
|
|
|
|
return libxlDomainGetSchedulerParametersFlags(dom, params, nparams, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainSetSchedulerParametersFlags(virDomainPtr dom,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int nparams,
|
|
|
|
unsigned int flags)
|
2011-04-06 08:58:40 +00:00
|
|
|
{
|
2014-02-07 00:29:09 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2011-04-06 08:58:40 +00:00
|
|
|
virDomainObjPtr vm;
|
2012-11-26 16:28:56 +00:00
|
|
|
libxl_domain_sched_params sc_info;
|
2011-04-06 08:58:40 +00:00
|
|
|
int sched_id;
|
Convert 'int i' to 'size_t i' in src/libxl/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2011-04-06 08:58:40 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
2011-05-17 22:33:53 +00:00
|
|
|
virCheckFlags(0, -1);
|
2013-05-03 13:34:10 +00:00
|
|
|
if (virTypedParamsValidate(params, nparams,
|
|
|
|
VIR_DOMAIN_SCHEDULER_WEIGHT,
|
|
|
|
VIR_TYPED_PARAM_UINT,
|
|
|
|
VIR_DOMAIN_SCHEDULER_CAP,
|
|
|
|
VIR_TYPED_PARAM_UINT,
|
|
|
|
NULL) < 0)
|
2012-01-07 12:47:43 +00:00
|
|
|
return -1;
|
2011-05-17 22:33:53 +00:00
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-04-06 08:58:40 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2014-02-07 00:29:09 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-04-06 08:58:40 +00:00
|
|
|
if (!virDomainObjIsActive(vm)) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running"));
|
2014-02-07 00:29:09 +00:00
|
|
|
goto endjob;
|
2011-04-06 08:58:40 +00:00
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
sched_id = libxl_get_scheduler(cfg->ctx);
|
2011-04-06 08:58:40 +00:00
|
|
|
|
2012-11-26 16:28:56 +00:00
|
|
|
if (sched_id != LIBXL_SCHEDULER_CREDIT) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("Only 'credit' scheduler is supported"));
|
2014-02-07 00:29:09 +00:00
|
|
|
goto endjob;
|
2011-04-06 08:58:40 +00:00
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_sched_params_get(cfg->ctx, vm->def->id, &sc_info) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to get scheduler parameters for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2014-02-07 00:29:09 +00:00
|
|
|
goto endjob;
|
2011-04-06 08:58:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nparams; ++i) {
|
2011-05-26 17:39:04 +00:00
|
|
|
virTypedParameterPtr param = ¶ms[i];
|
2011-04-06 08:58:40 +00:00
|
|
|
|
2013-08-14 21:33:48 +00:00
|
|
|
if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_WEIGHT))
|
2011-04-06 08:58:40 +00:00
|
|
|
sc_info.weight = params[i].value.ui;
|
2013-08-14 21:33:48 +00:00
|
|
|
else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CAP))
|
2011-04-06 08:58:40 +00:00
|
|
|
sc_info.cap = params[i].value.ui;
|
|
|
|
}
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_domain_sched_params_set(cfg->ctx, vm->def->id, &sc_info) != 0) {
|
2012-07-18 13:32:10 +00:00
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to set scheduler parameters for domain '%d'"
|
2014-03-27 16:55:02 +00:00
|
|
|
" with libxenlight"), vm->def->id);
|
2014-02-07 00:29:09 +00:00
|
|
|
goto endjob;
|
2011-04-06 08:58:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
endjob:
|
2014-02-07 00:29:09 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-04-06 08:58:40 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2011-04-06 08:58:40 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-07-26 03:30:50 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainOpenConsole(virDomainPtr dom,
|
|
|
|
const char *dev_name,
|
|
|
|
virStreamPtr st,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
virDomainChrDefPtr chr = NULL;
|
|
|
|
libxlDomainObjPrivatePtr priv;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_DOMAIN_CONSOLE_FORCE, -1);
|
|
|
|
|
|
|
|
if (dev_name) {
|
|
|
|
/* XXX support device aliases in future */
|
|
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
|
_("Named device aliases are not supported"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2013-07-26 03:30:50 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup);
|
|
|
|
|
2013-07-26 03:30:50 +00:00
|
|
|
if (virDomainOpenConsoleEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("domain is not running"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
priv = vm->privateData;
|
|
|
|
|
2014-04-25 15:54:20 +00:00
|
|
|
if (vm->def->nconsoles)
|
|
|
|
chr = vm->def->consoles[0];
|
2013-07-26 03:30:50 +00:00
|
|
|
|
|
|
|
if (!chr) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("cannot find character device %s"),
|
|
|
|
NULLSTR(dev_name));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("character device %s is not using a PTY"),
|
2015-06-15 13:58:36 +00:00
|
|
|
dev_name ? dev_name : NULLSTR(chr->info.alias));
|
2013-07-26 03:30:50 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* handle mutually exclusive access to console devices */
|
|
|
|
ret = virChrdevOpen(priv->devs,
|
|
|
|
&chr->source,
|
|
|
|
st,
|
|
|
|
(flags & VIR_DOMAIN_CONSOLE_FORCE) != 0);
|
|
|
|
|
|
|
|
if (ret == 1) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
|
|
|
|
_("Active console session exists for this domain"));
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-07-26 03:30:50 +00:00
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-05-17 22:33:53 +00:00
|
|
|
static int
|
|
|
|
libxlDomainSetSchedulerParameters(virDomainPtr dom, virTypedParameterPtr params,
|
|
|
|
int nparams)
|
|
|
|
{
|
|
|
|
return libxlDomainSetSchedulerParametersFlags(dom, params, nparams, 0);
|
|
|
|
}
|
|
|
|
|
2013-07-13 00:27:18 +00:00
|
|
|
/* NUMA node affinity information is available through libxl
|
|
|
|
* starting from Xen 4.3. */
|
|
|
|
#ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY
|
|
|
|
|
|
|
|
/* Number of Xen NUMA parameters */
|
|
|
|
# define LIBXL_NUMA_NPARAM 2
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainGetNumaParameters(virDomainPtr dom,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int *nparams,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
2015-02-11 23:40:07 +00:00
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
|
2013-07-13 00:27:18 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
libxl_bitmap nodemap;
|
|
|
|
virBitmapPtr nodes = NULL;
|
|
|
|
char *nodeset = NULL;
|
|
|
|
int rc, ret = -1;
|
|
|
|
size_t i, j;
|
|
|
|
|
|
|
|
/* In Xen 4.3, it is possible to query the NUMA node affinity of a domain
|
|
|
|
* via libxl, but not to change it. We therefore only allow AFFECT_LIVE. */
|
|
|
|
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
|
|
|
VIR_TYPED_PARAM_STRING_OKAY, -1);
|
|
|
|
|
|
|
|
/* We blindly return a string, and let libvirt.c and remote_driver.c do
|
|
|
|
* the filtering on behalf of older clients that can't parse it. */
|
|
|
|
flags &= ~VIR_TYPED_PARAM_STRING_OKAY;
|
|
|
|
|
2013-12-20 15:29:47 +00:00
|
|
|
libxl_bitmap_init(&nodemap);
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2013-07-13 00:27:18 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("Domain is not running"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((*nparams) == 0) {
|
|
|
|
*nparams = LIBXL_NUMA_NPARAM;
|
|
|
|
ret = 0;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < LIBXL_NUMA_NPARAM && i < *nparams; i++) {
|
|
|
|
virMemoryParameterPtr param = ¶ms[i];
|
2013-12-18 14:39:12 +00:00
|
|
|
int numnodes;
|
2013-07-13 00:27:18 +00:00
|
|
|
|
|
|
|
switch (i) {
|
|
|
|
case 0:
|
|
|
|
/* NUMA mode */
|
|
|
|
|
|
|
|
/* Xen implements something that is really close to numactl's
|
|
|
|
* 'interleave' policy (see `man 8 numactl' for details). */
|
|
|
|
if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_MODE,
|
|
|
|
VIR_TYPED_PARAM_INT,
|
|
|
|
VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
/* Node affinity */
|
|
|
|
|
|
|
|
/* Let's allocate both libxl and libvirt bitmaps */
|
2015-02-11 23:40:07 +00:00
|
|
|
numnodes = libxl_get_max_nodes(cfg->ctx);
|
2013-12-18 14:39:12 +00:00
|
|
|
if (numnodes <= 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
if (libxl_node_bitmap_alloc(cfg->ctx, &nodemap, 0)) {
|
2013-07-13 00:27:18 +00:00
|
|
|
virReportOOMError();
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2014-06-27 06:44:15 +00:00
|
|
|
if (!(nodes = virBitmapNew(numnodes)))
|
|
|
|
goto cleanup;
|
2013-07-13 00:27:18 +00:00
|
|
|
|
2015-02-11 23:40:07 +00:00
|
|
|
rc = libxl_domain_get_nodeaffinity(cfg->ctx,
|
2013-07-13 00:27:18 +00:00
|
|
|
vm->def->id,
|
|
|
|
&nodemap);
|
|
|
|
if (rc != 0) {
|
|
|
|
virReportSystemError(-rc, "%s",
|
|
|
|
_("unable to get numa affinity"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* First, we convert libxl_bitmap into virBitmap. After that,
|
|
|
|
* we format virBitmap as a string that can be returned. */
|
|
|
|
virBitmapClearAll(nodes);
|
|
|
|
libxl_for_each_set_bit(j, nodemap) {
|
|
|
|
if (virBitmapSetBit(nodes, j)) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Node %zu out of range"), j);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-05 10:42:40 +00:00
|
|
|
if (!(nodeset = virBitmapFormat(nodes)))
|
2013-07-13 00:27:18 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET,
|
|
|
|
VIR_TYPED_PARAM_STRING, nodeset) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
nodeset = NULL;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*nparams > LIBXL_NUMA_NPARAM)
|
|
|
|
*nparams = LIBXL_NUMA_NPARAM;
|
|
|
|
ret = 0;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2013-07-13 00:27:18 +00:00
|
|
|
VIR_FREE(nodeset);
|
|
|
|
virBitmapFree(nodes);
|
|
|
|
libxl_bitmap_dispose(&nodemap);
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
2015-02-11 23:40:07 +00:00
|
|
|
virObjectUnref(cfg);
|
2013-07-13 00:27:18 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static int
|
|
|
|
libxlDomainIsActive(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
virDomainObjPtr obj;
|
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(obj = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
|
|
|
if (virDomainIsActiveEnsureACL(dom->conn, obj->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
ret = virDomainObjIsActive(obj);
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (obj)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(obj);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainIsPersistent(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
virDomainObjPtr obj;
|
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(obj = libxlDomObjFromDomain(dom)))
|
2011-02-10 22:42:34 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
|
|
|
if (virDomainIsPersistentEnsureACL(dom->conn, obj->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
ret = obj->persistent;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-02-10 22:42:34 +00:00
|
|
|
if (obj)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(obj);
|
2011-02-10 22:42:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-04-06 08:58:39 +00:00
|
|
|
static int
|
|
|
|
libxlDomainIsUpdated(virDomainPtr dom)
|
|
|
|
{
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
2013-08-30 20:58:31 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
2011-04-06 08:58:39 +00:00
|
|
|
goto cleanup;
|
2013-04-23 10:56:22 +00:00
|
|
|
|
|
|
|
if (virDomainIsUpdatedEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-04-06 08:58:39 +00:00
|
|
|
ret = vm->updated;
|
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2011-04-06 08:58:39 +00:00
|
|
|
if (vm)
|
2013-01-09 21:00:32 +00:00
|
|
|
virObjectUnlock(vm);
|
2011-04-06 08:58:39 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-02-24 13:25:46 +00:00
|
|
|
static int
|
|
|
|
libxlDomainInterfaceStats(virDomainPtr dom,
|
|
|
|
const char *path,
|
|
|
|
virDomainInterfaceStatsPtr stats)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
size_t i;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainInterfaceStatsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("domain is not running"));
|
|
|
|
goto endjob;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check the path is one of the domain's network interfaces. */
|
|
|
|
for (i = 0; i < vm->def->nnets; i++) {
|
|
|
|
if (vm->def->nets[i]->ifname &&
|
|
|
|
STREQ(vm->def->nets[i]->ifname, path)) {
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == 0)
|
|
|
|
ret = virNetInterfaceStats(path, stats);
|
|
|
|
else
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("'%s' is not a known interface"), path);
|
|
|
|
|
|
|
|
endjob:
|
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-11-13 13:14:41 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetTotalCPUStats(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
unsigned int nparams)
|
|
|
|
{
|
2015-11-18 22:47:24 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2015-11-13 13:14:41 +00:00
|
|
|
libxl_dominfo d_info;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (nparams == 0)
|
|
|
|
return LIBXL_NB_TOTAL_CPU_STAT_PARAM;
|
|
|
|
|
2015-11-18 22:47:24 +00:00
|
|
|
libxl_dominfo_init(&d_info);
|
|
|
|
cfg = libxlDriverConfigGet(driver);
|
|
|
|
|
2015-11-13 13:14:41 +00:00
|
|
|
if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxl_domain_info failed for domain '%d'"),
|
|
|
|
vm->def->id);
|
2015-11-18 22:47:24 +00:00
|
|
|
goto cleanup;
|
2015-11-13 13:14:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (virTypedParameterAssign(¶ms[0], VIR_DOMAIN_CPU_STATS_CPUTIME,
|
|
|
|
VIR_TYPED_PARAM_ULLONG, d_info.cpu_time) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = nparams;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
libxl_dominfo_dispose(&d_info);
|
2015-11-18 22:47:24 +00:00
|
|
|
virObjectUnref(cfg);
|
2015-11-13 13:14:41 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainGetPerCPUStats(libxlDriverPrivatePtr driver,
|
|
|
|
virDomainObjPtr vm,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
unsigned int nparams,
|
|
|
|
int start_cpu,
|
|
|
|
unsigned int ncpus)
|
|
|
|
{
|
|
|
|
libxl_vcpuinfo *vcpuinfo;
|
|
|
|
int maxcpu, hostcpus;
|
|
|
|
size_t i;
|
2015-11-18 22:47:24 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2015-11-13 13:14:41 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (nparams == 0 && ncpus != 0)
|
|
|
|
return LIBXL_NB_TOTAL_CPU_STAT_PARAM;
|
|
|
|
else if (nparams == 0)
|
2015-10-19 17:21:24 +00:00
|
|
|
return virDomainDefGetVcpusMax(vm->def);
|
2015-11-13 13:14:41 +00:00
|
|
|
|
2015-11-18 22:47:24 +00:00
|
|
|
cfg = libxlDriverConfigGet(driver);
|
2015-11-13 13:14:41 +00:00
|
|
|
if ((vcpuinfo = libxl_list_vcpu(cfg->ctx, vm->def->id, &maxcpu,
|
|
|
|
&hostcpus)) == NULL) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to list vcpus for domain '%d' with libxenlight"),
|
|
|
|
vm->def->id);
|
2015-11-18 22:47:24 +00:00
|
|
|
goto cleanup;
|
2015-11-13 13:14:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = start_cpu; i < maxcpu && i < ncpus; ++i) {
|
|
|
|
if (virTypedParameterAssign(¶ms[(i-start_cpu)],
|
|
|
|
VIR_DOMAIN_CPU_STATS_CPUTIME,
|
|
|
|
VIR_TYPED_PARAM_ULLONG,
|
|
|
|
vcpuinfo[i].vcpu_time) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
ret = nparams;
|
|
|
|
|
|
|
|
cleanup:
|
2015-11-18 22:47:24 +00:00
|
|
|
if (vcpuinfo)
|
|
|
|
libxl_vcpuinfo_list_free(vcpuinfo, maxcpu);
|
|
|
|
virObjectUnref(cfg);
|
2015-11-13 13:14:41 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainGetCPUStats(virDomainPtr dom,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
unsigned int nparams,
|
|
|
|
int start_cpu,
|
|
|
|
unsigned int ncpus,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainGetCPUStatsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("domain is not running"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (start_cpu == -1)
|
|
|
|
ret = libxlDomainGetTotalCPUStats(driver, vm, params, nparams);
|
|
|
|
else
|
|
|
|
ret = libxlDomainGetPerCPUStats(driver, vm, params, nparams,
|
|
|
|
start_cpu, ncpus);
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-11-13 13:14:42 +00:00
|
|
|
#define LIBXL_SET_MEMSTAT(TAG, VAL) \
|
|
|
|
if (i < nr_stats) { \
|
|
|
|
stats[i].tag = TAG; \
|
|
|
|
stats[i].val = VAL; \
|
|
|
|
i++; \
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainMemoryStats(virDomainPtr dom,
|
|
|
|
virDomainMemoryStatPtr stats,
|
|
|
|
unsigned int nr_stats,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
2015-11-18 22:47:24 +00:00
|
|
|
libxlDriverConfigPtr cfg;
|
2015-11-13 13:14:42 +00:00
|
|
|
virDomainObjPtr vm;
|
|
|
|
libxl_dominfo d_info;
|
|
|
|
unsigned mem, maxmem;
|
|
|
|
size_t i = 0;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
2016-01-21 10:21:10 +00:00
|
|
|
libxl_dominfo_init(&d_info);
|
2015-11-18 22:47:24 +00:00
|
|
|
cfg = libxlDriverConfigGet(driver);
|
|
|
|
|
2015-11-13 13:14:42 +00:00
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainMemoryStatsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("domain is not running"));
|
|
|
|
goto endjob;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("libxl_domain_info failed for domain '%d'"),
|
|
|
|
vm->def->id);
|
|
|
|
goto endjob;
|
|
|
|
}
|
|
|
|
mem = d_info.current_memkb;
|
|
|
|
maxmem = d_info.max_memkb;
|
|
|
|
|
|
|
|
LIBXL_SET_MEMSTAT(VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, mem);
|
|
|
|
LIBXL_SET_MEMSTAT(VIR_DOMAIN_MEMORY_STAT_AVAILABLE, maxmem);
|
|
|
|
|
|
|
|
ret = i;
|
|
|
|
|
|
|
|
endjob:
|
2015-11-18 22:47:25 +00:00
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
2015-11-13 13:14:42 +00:00
|
|
|
vm = NULL;
|
|
|
|
|
|
|
|
cleanup:
|
2016-01-21 10:21:10 +00:00
|
|
|
libxl_dominfo_dispose(&d_info);
|
2015-11-13 13:14:42 +00:00
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
2015-11-18 22:47:24 +00:00
|
|
|
virObjectUnref(cfg);
|
2015-11-13 13:14:42 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef LIBXL_SET_MEMSTAT
|
|
|
|
|
2015-11-13 13:14:47 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetJobInfo(virDomainPtr dom,
|
|
|
|
virDomainJobInfoPtr info)
|
|
|
|
{
|
|
|
|
libxlDomainObjPrivatePtr priv;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainGetJobInfoEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
priv = vm->privateData;
|
|
|
|
if (!priv->job.active) {
|
|
|
|
memset(info, 0, sizeof(*info));
|
|
|
|
info->type = VIR_DOMAIN_JOB_NONE;
|
|
|
|
ret = 0;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* In libxl we don't have an estimated completion time
|
|
|
|
* thus we always set to unbounded and update time
|
|
|
|
* for the active job. */
|
|
|
|
if (libxlDomainJobUpdateTime(&priv->job) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
memcpy(info, priv->job.current, sizeof(virDomainJobInfo));
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-11-13 13:14:48 +00:00
|
|
|
static int
|
|
|
|
libxlDomainGetJobStats(virDomainPtr dom,
|
|
|
|
int *type,
|
|
|
|
virTypedParameterPtr *params,
|
|
|
|
int *nparams,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDomainObjPrivatePtr priv;
|
|
|
|
virDomainObjPtr vm;
|
|
|
|
virDomainJobInfoPtr jobInfo;
|
|
|
|
int ret = -1;
|
|
|
|
int maxparams = 0;
|
|
|
|
|
|
|
|
/* VIR_DOMAIN_JOB_STATS_COMPLETED not supported yet */
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainGetJobStatsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
priv = vm->privateData;
|
|
|
|
jobInfo = priv->job.current;
|
|
|
|
if (!priv->job.active) {
|
|
|
|
*type = VIR_DOMAIN_JOB_NONE;
|
|
|
|
*params = NULL;
|
|
|
|
*nparams = 0;
|
|
|
|
ret = 0;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* In libxl we don't have an estimated completion time
|
|
|
|
* thus we always set to unbounded and update time
|
|
|
|
* for the active job. */
|
|
|
|
if (libxlDomainJobUpdateTime(&priv->job) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virTypedParamsAddULLong(params, nparams, &maxparams,
|
|
|
|
VIR_DOMAIN_JOB_TIME_ELAPSED,
|
|
|
|
jobInfo->timeElapsed) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
*type = jobInfo->type;
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
2015-11-13 13:14:47 +00:00
|
|
|
|
2011-03-29 12:18:24 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectDomainEventRegisterAny(virConnectPtr conn, virDomainPtr dom, int eventID,
|
|
|
|
virConnectDomainEventGenericCallback callback,
|
|
|
|
void *opaque, virFreeCallback freecb)
|
2011-03-29 12:18:24 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
int ret;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectDomainEventRegisterAnyEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2011-12-13 11:14:46 +00:00
|
|
|
if (virDomainEventStateRegisterID(conn,
|
|
|
|
driver->domainEventState,
|
|
|
|
dom, eventID, callback, opaque,
|
|
|
|
freecb, &ret) < 0)
|
Return count of callbacks when registering callbacks
When registering a callback for a particular event some callers
need to know how many callbacks already exist for that event.
While it is possible to ask for a count, this is not free from
race conditions when threaded. Thus the API for registering
callbacks should return the count of callbacks. Also rename
virDomainEventStateDeregisterAny to virDomainEventStateDeregisterID
* src/conf/domain_event.c, src/conf/domain_event.h,
src/libvirt_private.syms: Return count of callbacks when
registering callbacks
* src/libxl/libxl_driver.c, src/libxl/libxl_driver.c,
src/qemu/qemu_driver.c, src/remote/remote_driver.c,
src/remote/remote_driver.c, src/uml/uml_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xen_driver.c: Update
for change in APIs
2011-12-13 23:38:54 +00:00
|
|
|
ret = -1;
|
2011-03-29 12:18:24 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectDomainEventDeregisterAny(virConnectPtr conn, int callbackID)
|
2011-03-29 12:18:24 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectDomainEventDeregisterAnyEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
if (virObjectEventStateDeregisterID(conn,
|
|
|
|
driver->domainEventState,
|
|
|
|
callbackID) < 0)
|
|
|
|
return -1;
|
2011-03-29 12:18:24 +00:00
|
|
|
|
event: make deregister return value match docs
Ever since their introduction (commit 1509b80 in v0.5.0 for
virConnectDomainEventRegister, commit 4445723 in v0.8.0 for
virConnectDomainEventDeregisterAny), the event deregistration
functions have been documented as returning 0 on success;
likewise for older registration (only the newer RegisterAny
must return a non-zero callbackID). And now that we are
adding virConnectNetworkEventDeregisterAny for v1.2.1, it
should have the same semantics.
Fortunately, all of the stateful drivers have been obeying
the docs and returning 0, thanks to the way the remote_driver
tracks things (in fact, the RPC wire protocol is unable to
send a return value for DomainEventRegisterAny, at least not
without adding a new RPC number). Well, except for vbox,
which was always failing deregistration, due to failure to
set the return value to anything besides its initial -1.
But for local drivers, such as test:///default, we've been
returning non-zero numbers; worse, the non-zero numbers have
differed over time. For example, in Fedora 12 (libvirt 0.8.2),
calling Register twice would return 0 and 1 [the callbackID
generated under the hood]; while in Fedora 20 (libvirt 1.1.3),
it returns 1 and 2 [the number of callbacks registered for
that event type]. Since we have changed the behavior over
time, and since it differs by local vs. remote, we can safely
argue that no one could have been reasonably relying on any
particular behavior, so we might as well obey the docs, as well
as prepare callers that might deal with older clients to not be
surprised if the docs are not strictly followed.
For consistency, this patch fixes the code for all drivers,
even though it only makes an impact for vbox and for local
drivers. By fixing all drivers, future copy and paste from
a remote driver to a local driver is less likely to
reintroduce the bug.
Finally, update the testsuite to gain some coverage of the
issue for local drivers, including the first test of old-style
domain event registration via function pointer instead of
event id.
* src/libvirt.c (virConnectDomainEventRegister)
(virConnectDomainEventDeregister)
(virConnectDomainEventDeregisterAny): Clarify docs.
* src/libxl/libxl_driver.c (libxlConnectDomainEventRegister)
(libxlConnectDomainEventDeregister)
(libxlConnectDomainEventDeregisterAny): Match documentation.
* src/lxc/lxc_driver.c (lxcConnectDomainEventRegister)
(lxcConnectDomainEventDeregister)
(lxcConnectDomainEventDeregisterAny): Likewise.
* src/test/test_driver.c (testConnectDomainEventRegister)
(testConnectDomainEventDeregister)
(testConnectDomainEventDeregisterAny)
(testConnectNetworkEventDeregisterAny): Likewise.
* src/uml/uml_driver.c (umlConnectDomainEventRegister)
(umlConnectDomainEventDeregister)
(umlConnectDomainEventDeregisterAny): Likewise.
* src/vbox/vbox_tmpl.c (vboxConnectDomainEventRegister)
(vboxConnectDomainEventDeregister)
(vboxConnectDomainEventDeregisterAny): Likewise.
* src/xen/xen_driver.c (xenUnifiedConnectDomainEventRegister)
(xenUnifiedConnectDomainEventDeregister)
(xenUnifiedConnectDomainEventDeregisterAny): Likewise.
* src/network/bridge_driver.c
(networkConnectNetworkEventDeregisterAny): Likewise.
* tests/objecteventtest.c (testDomainCreateXMLOld): New test.
(mymain): Run it.
(testDomainCreateXML): Check return values.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-01-03 21:21:17 +00:00
|
|
|
return 0;
|
2011-03-29 12:18:24 +00:00
|
|
|
}
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
|
2011-09-23 06:56:13 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
|
2011-09-23 06:56:13 +00:00
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-06-11 09:04:57 +00:00
|
|
|
static int
|
2013-04-23 12:50:18 +00:00
|
|
|
libxlConnectListAllDomains(virConnectPtr conn,
|
|
|
|
virDomainPtr **domains,
|
|
|
|
unsigned int flags)
|
2012-06-11 09:04:57 +00:00
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = conn->privateData;
|
|
|
|
int ret = -1;
|
|
|
|
|
2012-08-03 15:48:05 +00:00
|
|
|
virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1);
|
2012-06-11 09:04:57 +00:00
|
|
|
|
2013-04-23 10:56:22 +00:00
|
|
|
if (virConnectListAllDomainsEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2013-06-24 16:49:47 +00:00
|
|
|
ret = virDomainObjListExport(driver->domains, conn, domains,
|
|
|
|
virConnectListAllDomainsCheckACL, flags);
|
2012-06-11 09:04:57 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-07-13 00:27:10 +00:00
|
|
|
/* Which features are supported by this driver? */
|
|
|
|
static int
|
|
|
|
libxlConnectSupportsFeature(virConnectPtr conn, int feature)
|
|
|
|
{
|
|
|
|
if (virConnectSupportsFeatureEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
switch (feature) {
|
|
|
|
case VIR_DRV_FEATURE_TYPED_PARAM_STRING:
|
2014-05-08 21:56:51 +00:00
|
|
|
case VIR_DRV_FEATURE_MIGRATION_PARAMS:
|
2016-02-05 20:45:02 +00:00
|
|
|
case VIR_DRV_FEATURE_MIGRATION_P2P:
|
2013-07-13 00:27:10 +00:00
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2012-06-11 09:04:57 +00:00
|
|
|
|
2014-03-06 09:46:11 +00:00
|
|
|
static int
|
|
|
|
libxlNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def,
|
|
|
|
unsigned *domain,
|
|
|
|
unsigned *bus,
|
|
|
|
unsigned *slot,
|
|
|
|
unsigned *function)
|
|
|
|
{
|
|
|
|
virNodeDevCapsDefPtr cap;
|
|
|
|
|
|
|
|
cap = def->caps;
|
|
|
|
while (cap) {
|
2015-05-08 16:55:00 +00:00
|
|
|
if (cap->data.type == VIR_NODE_DEV_CAP_PCI_DEV) {
|
2014-03-06 09:46:11 +00:00
|
|
|
*domain = cap->data.pci_dev.domain;
|
|
|
|
*bus = cap->data.pci_dev.bus;
|
|
|
|
*slot = cap->data.pci_dev.slot;
|
|
|
|
*function = cap->data.pci_dev.function;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
cap = cap->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!cap) {
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("device %s is not a PCI device"), def->name);
|
2014-03-19 03:15:25 +00:00
|
|
|
return -1;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
2014-03-19 03:15:25 +00:00
|
|
|
return 0;
|
2014-03-06 09:46:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlNodeDeviceDetachFlags(virNodeDevicePtr dev,
|
|
|
|
const char *driverName,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
virPCIDevicePtr pci = NULL;
|
|
|
|
unsigned domain = 0, bus = 0, slot = 0, function = 0;
|
|
|
|
int ret = -1;
|
|
|
|
virNodeDeviceDefPtr def = NULL;
|
|
|
|
char *xml = NULL;
|
|
|
|
libxlDriverPrivatePtr driver = dev->conn->privateData;
|
|
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
|
|
|
|
|
|
|
virCheckFlags(0, -1);
|
|
|
|
|
|
|
|
xml = virNodeDeviceGetXMLDesc(dev, 0);
|
|
|
|
if (!xml)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
|
|
|
|
if (!def)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virNodeDeviceDetachFlagsEnsureACL(dev->conn, def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (libxlNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
pci = virPCIDeviceNew(domain, bus, slot, function);
|
|
|
|
if (!pci)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!driverName || STREQ(driverName, "xen")) {
|
2015-10-23 09:54:07 +00:00
|
|
|
virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_XEN);
|
2014-03-06 09:46:11 +00:00
|
|
|
} else {
|
|
|
|
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
_("unsupported driver name '%s'"), driverName);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virHostdevPCINodeDeviceDetach(hostdev_mgr, pci) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = 0;
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2014-03-06 09:46:11 +00:00
|
|
|
virPCIDeviceFree(pci);
|
|
|
|
virNodeDeviceDefFree(def);
|
|
|
|
VIR_FREE(xml);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlNodeDeviceDettach(virNodeDevicePtr dev)
|
|
|
|
{
|
|
|
|
return libxlNodeDeviceDetachFlags(dev, NULL, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlNodeDeviceReAttach(virNodeDevicePtr dev)
|
|
|
|
{
|
|
|
|
virPCIDevicePtr pci = NULL;
|
|
|
|
unsigned domain = 0, bus = 0, slot = 0, function = 0;
|
|
|
|
int ret = -1;
|
|
|
|
virNodeDeviceDefPtr def = NULL;
|
|
|
|
char *xml = NULL;
|
|
|
|
libxlDriverPrivatePtr driver = dev->conn->privateData;
|
|
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
|
|
|
|
|
|
|
xml = virNodeDeviceGetXMLDesc(dev, 0);
|
|
|
|
if (!xml)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
|
|
|
|
if (!def)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (libxlNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
pci = virPCIDeviceNew(domain, bus, slot, function);
|
|
|
|
if (!pci)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virHostdevPCINodeDeviceReAttach(hostdev_mgr, pci) < 0)
|
2014-03-19 03:15:25 +00:00
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
|
|
|
ret = 0;
|
2014-03-19 03:15:25 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2014-03-19 03:15:25 +00:00
|
|
|
virPCIDeviceFree(pci);
|
2014-03-06 09:46:11 +00:00
|
|
|
virNodeDeviceDefFree(def);
|
|
|
|
VIR_FREE(xml);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlNodeDeviceReset(virNodeDevicePtr dev)
|
|
|
|
{
|
2014-03-19 03:15:25 +00:00
|
|
|
virPCIDevicePtr pci = NULL;
|
2014-03-06 09:46:11 +00:00
|
|
|
unsigned domain = 0, bus = 0, slot = 0, function = 0;
|
|
|
|
int ret = -1;
|
|
|
|
virNodeDeviceDefPtr def = NULL;
|
|
|
|
char *xml = NULL;
|
|
|
|
libxlDriverPrivatePtr driver = dev->conn->privateData;
|
|
|
|
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
|
|
|
|
|
|
|
xml = virNodeDeviceGetXMLDesc(dev, 0);
|
|
|
|
if (!xml)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL);
|
|
|
|
if (!def)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virNodeDeviceResetEnsureACL(dev->conn, def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (libxlNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &function) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
pci = virPCIDeviceNew(domain, bus, slot, function);
|
|
|
|
if (!pci)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virHostdevPCINodeDeviceReset(hostdev_mgr, pci) < 0)
|
2014-03-19 03:15:25 +00:00
|
|
|
goto cleanup;
|
2014-03-06 09:46:11 +00:00
|
|
|
|
|
|
|
ret = 0;
|
2014-03-19 03:15:25 +00:00
|
|
|
|
2014-03-25 06:51:17 +00:00
|
|
|
cleanup:
|
2014-03-19 03:15:25 +00:00
|
|
|
virPCIDeviceFree(pci);
|
2014-03-06 09:46:11 +00:00
|
|
|
virNodeDeviceDefFree(def);
|
|
|
|
VIR_FREE(xml);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
static char *
|
|
|
|
libxlDomainMigrateBegin3Params(virDomainPtr domain,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int nparams,
|
|
|
|
char **cookieout ATTRIBUTE_UNUSED,
|
|
|
|
int *cookieoutlen ATTRIBUTE_UNUSED,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
const char *xmlin = NULL;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL);
|
|
|
|
if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_XML,
|
|
|
|
&xmlin) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(domain)))
|
|
|
|
return NULL;
|
|
|
|
|
2015-06-22 17:36:59 +00:00
|
|
|
if (STREQ_NULLABLE(vm->def->name, "Domain-0")) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
|
|
_("Domain-0 cannot be migrated"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) {
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!virDomainObjIsActive(vm)) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"%s", _("domain is not running"));
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return libxlDomainMigrationBegin(domain->conn, vm, xmlin);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainMigratePrepare3Params(virConnectPtr dconn,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int nparams,
|
|
|
|
const char *cookiein ATTRIBUTE_UNUSED,
|
|
|
|
int cookieinlen ATTRIBUTE_UNUSED,
|
|
|
|
char **cookieout ATTRIBUTE_UNUSED,
|
|
|
|
int *cookieoutlen ATTRIBUTE_UNUSED,
|
|
|
|
char **uri_out,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dconn->privateData;
|
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
const char *dom_xml = NULL;
|
|
|
|
const char *dname = NULL;
|
|
|
|
const char *uri_in = NULL;
|
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
virCheckFlags(LIBXL_MIGRATION_FLAGS, -1);
|
|
|
|
if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_XML,
|
|
|
|
&dom_xml) < 0 ||
|
|
|
|
virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_NAME,
|
|
|
|
&dname) < 0 ||
|
|
|
|
virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_URI,
|
|
|
|
&uri_in) < 0)
|
|
|
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname)))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0)
|
|
|
|
goto error;
|
|
|
|
|
2014-07-08 17:15:34 +00:00
|
|
|
if (libxlDomainMigrationPrepare(dconn, &def, uri_in, uri_out, flags) < 0)
|
2014-05-08 21:56:51 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
virDomainDefFree(def);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainMigratePerform3Params(virDomainPtr dom,
|
|
|
|
const char *dconnuri,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int nparams,
|
|
|
|
const char *cookiein ATTRIBUTE_UNUSED,
|
|
|
|
int cookieinlen ATTRIBUTE_UNUSED,
|
|
|
|
char **cookieout ATTRIBUTE_UNUSED,
|
|
|
|
int *cookieoutlen ATTRIBUTE_UNUSED,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dom->conn->privateData;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
const char *dom_xml = NULL;
|
|
|
|
const char *dname = NULL;
|
|
|
|
const char *uri = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
virCheckFlags(LIBXL_MIGRATION_FLAGS, -1);
|
|
|
|
if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_XML,
|
|
|
|
&dom_xml) < 0 ||
|
|
|
|
virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_NAME,
|
|
|
|
&dname) < 0 ||
|
|
|
|
virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_URI,
|
|
|
|
&uri) < 0)
|
|
|
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(dom)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2016-02-05 20:45:02 +00:00
|
|
|
if (flags & VIR_MIGRATE_PEER2PEER) {
|
|
|
|
if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml,
|
|
|
|
dconnuri, uri, dname, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
} else {
|
|
|
|
if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri,
|
|
|
|
uri, dname, flags) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2014-05-08 21:56:51 +00:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (vm)
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static virDomainPtr
|
|
|
|
libxlDomainMigrateFinish3Params(virConnectPtr dconn,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int nparams,
|
|
|
|
const char *cookiein ATTRIBUTE_UNUSED,
|
|
|
|
int cookieinlen ATTRIBUTE_UNUSED,
|
|
|
|
char **cookieout ATTRIBUTE_UNUSED,
|
|
|
|
int *cookieoutlen ATTRIBUTE_UNUSED,
|
|
|
|
unsigned int flags,
|
|
|
|
int cancelled)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = dconn->privateData;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
const char *dname = NULL;
|
2014-11-13 21:41:56 +00:00
|
|
|
virDomainPtr ret = NULL;
|
2014-05-08 21:56:51 +00:00
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL);
|
|
|
|
if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (virTypedParamsGetString(params, nparams,
|
|
|
|
VIR_MIGRATE_PARAM_DEST_NAME,
|
|
|
|
&dname) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!dname ||
|
|
|
|
!(vm = virDomainObjListFindByName(driver->domains, dname))) {
|
|
|
|
/* Migration obviously failed if the domain doesn't exist */
|
|
|
|
virReportError(VIR_ERR_OPERATION_FAILED,
|
|
|
|
_("Migration failed. No domain on destination host "
|
|
|
|
"with matching name '%s'"),
|
|
|
|
NULLSTR(dname));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virDomainMigrateFinish3ParamsEnsureACL(dconn, vm->def) < 0) {
|
2015-04-23 16:00:01 +00:00
|
|
|
virDomainObjEndAPI(&vm);
|
2014-05-08 21:56:51 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-11-13 21:41:56 +00:00
|
|
|
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) {
|
2015-04-23 16:00:01 +00:00
|
|
|
virDomainObjEndAPI(&vm);
|
2014-11-13 21:41:56 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = libxlDomainMigrationFinish(dconn, vm, flags, cancelled);
|
|
|
|
|
|
|
|
if (!libxlDomainObjEndJob(driver, vm))
|
|
|
|
vm = NULL;
|
|
|
|
|
2015-04-23 16:00:01 +00:00
|
|
|
virDomainObjEndAPI(&vm);
|
2014-11-13 21:41:56 +00:00
|
|
|
|
|
|
|
return ret;
|
2014-05-08 21:56:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
libxlDomainMigrateConfirm3Params(virDomainPtr domain,
|
|
|
|
virTypedParameterPtr params,
|
|
|
|
int nparams,
|
|
|
|
const char *cookiein ATTRIBUTE_UNUSED,
|
|
|
|
int cookieinlen ATTRIBUTE_UNUSED,
|
|
|
|
unsigned int flags,
|
|
|
|
int cancelled)
|
|
|
|
{
|
|
|
|
libxlDriverPrivatePtr driver = domain->conn->privateData;
|
|
|
|
virDomainObjPtr vm = NULL;
|
|
|
|
|
2014-06-24 17:10:49 +00:00
|
|
|
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
|
|
|
|
virReportUnsupportedError();
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
|
2014-05-08 21:56:51 +00:00
|
|
|
virCheckFlags(LIBXL_MIGRATION_FLAGS, -1);
|
|
|
|
if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (!(vm = libxlDomObjFromDomain(domain)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) {
|
|
|
|
virObjectUnlock(vm);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return libxlDomainMigrationConfirm(driver, vm, flags, cancelled);
|
|
|
|
}
|
|
|
|
|
2015-05-15 18:26:30 +00:00
|
|
|
static int libxlNodeGetSecurityModel(virConnectPtr conn,
|
|
|
|
virSecurityModelPtr secmodel)
|
|
|
|
{
|
|
|
|
memset(secmodel, 0, sizeof(*secmodel));
|
|
|
|
|
|
|
|
if (virNodeGetSecurityModelEnsureACL(conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Currently the libxl driver does not support security model.
|
|
|
|
* Similar to the qemu driver, treat this as success and simply
|
|
|
|
* return no data in secmodel. Avoids spamming the libvirt log
|
|
|
|
* with "this function is not supported by the connection driver:
|
|
|
|
* virNodeGetSecurityModel"
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
2011-09-23 06:56:13 +00:00
|
|
|
|
2015-01-20 16:16:26 +00:00
|
|
|
static virHypervisorDriver libxlHypervisorDriver = {
|
2014-03-06 09:46:11 +00:00
|
|
|
.name = LIBXL_DRIVER_NAME,
|
2013-04-23 12:50:18 +00:00
|
|
|
.connectOpen = libxlConnectOpen, /* 0.9.0 */
|
|
|
|
.connectClose = libxlConnectClose, /* 0.9.0 */
|
|
|
|
.connectGetType = libxlConnectGetType, /* 0.9.0 */
|
|
|
|
.connectGetVersion = libxlConnectGetVersion, /* 0.9.0 */
|
2013-04-26 16:39:11 +00:00
|
|
|
.connectGetHostname = libxlConnectGetHostname, /* 0.9.0 */
|
2013-06-25 13:25:29 +00:00
|
|
|
.connectGetSysinfo = libxlConnectGetSysinfo, /* 1.1.0 */
|
2013-04-23 12:50:18 +00:00
|
|
|
.connectGetMaxVcpus = libxlConnectGetMaxVcpus, /* 0.9.0 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.nodeGetInfo = libxlNodeGetInfo, /* 0.9.0 */
|
2013-04-23 12:50:18 +00:00
|
|
|
.connectGetCapabilities = libxlConnectGetCapabilities, /* 0.9.0 */
|
|
|
|
.connectListDomains = libxlConnectListDomains, /* 0.9.0 */
|
|
|
|
.connectNumOfDomains = libxlConnectNumOfDomains, /* 0.9.0 */
|
|
|
|
.connectListAllDomains = libxlConnectListAllDomains, /* 0.9.13 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainCreateXML = libxlDomainCreateXML, /* 0.9.0 */
|
|
|
|
.domainLookupByID = libxlDomainLookupByID, /* 0.9.0 */
|
|
|
|
.domainLookupByUUID = libxlDomainLookupByUUID, /* 0.9.0 */
|
|
|
|
.domainLookupByName = libxlDomainLookupByName, /* 0.9.0 */
|
|
|
|
.domainSuspend = libxlDomainSuspend, /* 0.9.0 */
|
|
|
|
.domainResume = libxlDomainResume, /* 0.9.0 */
|
|
|
|
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */
|
2011-10-05 17:31:55 +00:00
|
|
|
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainReboot = libxlDomainReboot, /* 0.9.0 */
|
|
|
|
.domainDestroy = libxlDomainDestroy, /* 0.9.0 */
|
2011-07-20 16:47:46 +00:00
|
|
|
.domainDestroyFlags = libxlDomainDestroyFlags, /* 0.9.4 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainGetOSType = libxlDomainGetOSType, /* 0.9.0 */
|
|
|
|
.domainGetMaxMemory = libxlDomainGetMaxMemory, /* 0.9.0 */
|
2011-05-30 09:53:03 +00:00
|
|
|
.domainSetMaxMemory = libxlDomainSetMaxMemory, /* 0.9.2 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainSetMemory = libxlDomainSetMemory, /* 0.9.0 */
|
|
|
|
.domainSetMemoryFlags = libxlDomainSetMemoryFlags, /* 0.9.0 */
|
|
|
|
.domainGetInfo = libxlDomainGetInfo, /* 0.9.0 */
|
|
|
|
.domainGetState = libxlDomainGetState, /* 0.9.2 */
|
2011-05-30 09:53:02 +00:00
|
|
|
.domainSave = libxlDomainSave, /* 0.9.2 */
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
.domainSaveFlags = libxlDomainSaveFlags, /* 0.9.4 */
|
2011-05-30 09:53:02 +00:00
|
|
|
.domainRestore = libxlDomainRestore, /* 0.9.2 */
|
save: wire up trivial save/restore flags implementations
For all hypervisors that support save and restore, the new API
now performs the same functions as the old.
VBox is excluded from this list, because its existing domainsave
is broken (there is no corresponding domainrestore, and there
is no control over the filename used in the save). A later
patch should change vbox to use its implementation for
managedsave, and teach start to use managedsave results.
* src/libxl/libxl_driver.c (libxlDomainSave): Move guts...
(libxlDomainSaveFlags): ...to new function.
(libxlDomainRestore): Move guts...
(libxlDomainRestoreFlags): ...to new function.
* src/test/test_driver.c (testDomainSave, testDomainSaveFlags)
(testDomainRestore, testDomainRestoreFlags): Likewise.
* src/xen/xen_driver.c (xenUnifiedDomainSave)
(xenUnifiedDomainSaveFlags, xenUnifiedDomainRestore)
(xenUnifiedDomainRestoreFlags): Likewise.
* src/qemu/qemu_driver.c (qemudDomainSave, qemudDomainRestore):
Rename and move guts.
(qemuDomainSave, qemuDomainSaveFlags, qemuDomainRestore)
(qemuDomainRestoreFlags): ...here.
(qemudDomainSaveFlag): Rename...
(qemuDomainSaveInternal): ...to this, and update callers.
2011-07-09 02:55:29 +00:00
|
|
|
.domainRestoreFlags = libxlDomainRestoreFlags, /* 0.9.4 */
|
2011-05-30 09:53:01 +00:00
|
|
|
.domainCoreDump = libxlDomainCoreDump, /* 0.9.2 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainSetVcpus = libxlDomainSetVcpus, /* 0.9.0 */
|
|
|
|
.domainSetVcpusFlags = libxlDomainSetVcpusFlags, /* 0.9.0 */
|
|
|
|
.domainGetVcpusFlags = libxlDomainGetVcpusFlags, /* 0.9.0 */
|
|
|
|
.domainPinVcpu = libxlDomainPinVcpu, /* 0.9.0 */
|
2013-12-20 15:01:39 +00:00
|
|
|
.domainPinVcpuFlags = libxlDomainPinVcpuFlags, /* 1.2.1 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainGetVcpus = libxlDomainGetVcpus, /* 0.9.0 */
|
2013-12-20 15:01:31 +00:00
|
|
|
.domainGetVcpuPinInfo = libxlDomainGetVcpuPinInfo, /* 1.2.1 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainGetXMLDesc = libxlDomainGetXMLDesc, /* 0.9.0 */
|
2013-04-23 12:50:18 +00:00
|
|
|
.connectDomainXMLFromNative = libxlConnectDomainXMLFromNative, /* 0.9.0 */
|
|
|
|
.connectDomainXMLToNative = libxlConnectDomainXMLToNative, /* 0.9.0 */
|
|
|
|
.connectListDefinedDomains = libxlConnectListDefinedDomains, /* 0.9.0 */
|
|
|
|
.connectNumOfDefinedDomains = libxlConnectNumOfDefinedDomains, /* 0.9.0 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainCreate = libxlDomainCreate, /* 0.9.0 */
|
|
|
|
.domainCreateWithFlags = libxlDomainCreateWithFlags, /* 0.9.0 */
|
|
|
|
.domainDefineXML = libxlDomainDefineXML, /* 0.9.0 */
|
2014-11-18 14:19:38 +00:00
|
|
|
.domainDefineXMLFlags = libxlDomainDefineXMLFlags, /* 1.2.12 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainUndefine = libxlDomainUndefine, /* 0.9.0 */
|
2011-07-20 03:05:20 +00:00
|
|
|
.domainUndefineFlags = libxlDomainUndefineFlags, /* 0.9.4 */
|
2011-05-26 15:27:06 +00:00
|
|
|
.domainAttachDevice = libxlDomainAttachDevice, /* 0.9.2 */
|
|
|
|
.domainAttachDeviceFlags = libxlDomainAttachDeviceFlags, /* 0.9.2 */
|
|
|
|
.domainDetachDevice = libxlDomainDetachDevice, /* 0.9.2 */
|
|
|
|
.domainDetachDeviceFlags = libxlDomainDetachDeviceFlags, /* 0.9.2 */
|
|
|
|
.domainUpdateDeviceFlags = libxlDomainUpdateDeviceFlags, /* 0.9.2 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainGetAutostart = libxlDomainGetAutostart, /* 0.9.0 */
|
|
|
|
.domainSetAutostart = libxlDomainSetAutostart, /* 0.9.0 */
|
|
|
|
.domainGetSchedulerType = libxlDomainGetSchedulerType, /* 0.9.0 */
|
|
|
|
.domainGetSchedulerParameters = libxlDomainGetSchedulerParameters, /* 0.9.0 */
|
2011-05-17 22:33:53 +00:00
|
|
|
.domainGetSchedulerParametersFlags = libxlDomainGetSchedulerParametersFlags, /* 0.9.2 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainSetSchedulerParameters = libxlDomainSetSchedulerParameters, /* 0.9.0 */
|
2011-05-17 22:33:53 +00:00
|
|
|
.domainSetSchedulerParametersFlags = libxlDomainSetSchedulerParametersFlags, /* 0.9.2 */
|
2013-07-13 00:27:18 +00:00
|
|
|
#ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY
|
|
|
|
.domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */
|
|
|
|
#endif
|
2011-05-13 13:35:01 +00:00
|
|
|
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
|
2013-06-28 14:32:52 +00:00
|
|
|
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */
|
2015-11-13 13:14:47 +00:00
|
|
|
.domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */
|
2015-11-13 13:14:48 +00:00
|
|
|
.domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */
|
2015-11-24 11:48:50 +00:00
|
|
|
.domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */
|
|
|
|
.domainGetCPUStats = libxlDomainGetCPUStats, /* 1.3.0 */
|
2016-02-24 13:25:46 +00:00
|
|
|
.domainInterfaceStats = libxlDomainInterfaceStats, /* 1.3.2 */
|
2013-04-23 12:50:18 +00:00
|
|
|
.connectDomainEventRegister = libxlConnectDomainEventRegister, /* 0.9.0 */
|
|
|
|
.connectDomainEventDeregister = libxlConnectDomainEventDeregister, /* 0.9.0 */
|
2011-06-02 12:39:40 +00:00
|
|
|
.domainManagedSave = libxlDomainManagedSave, /* 0.9.2 */
|
|
|
|
.domainHasManagedSaveImage = libxlDomainHasManagedSaveImage, /* 0.9.2 */
|
|
|
|
.domainManagedSaveRemove = libxlDomainManagedSaveRemove, /* 0.9.2 */
|
2013-07-26 03:30:50 +00:00
|
|
|
.domainOpenConsole = libxlDomainOpenConsole, /* 1.1.2 */
|
2011-05-13 13:35:01 +00:00
|
|
|
.domainIsActive = libxlDomainIsActive, /* 0.9.0 */
|
|
|
|
.domainIsPersistent = libxlDomainIsPersistent, /* 0.9.0 */
|
|
|
|
.domainIsUpdated = libxlDomainIsUpdated, /* 0.9.0 */
|
2013-04-23 12:50:18 +00:00
|
|
|
.connectDomainEventRegisterAny = libxlConnectDomainEventRegisterAny, /* 0.9.0 */
|
|
|
|
.connectDomainEventDeregisterAny = libxlConnectDomainEventDeregisterAny, /* 0.9.0 */
|
|
|
|
.connectIsAlive = libxlConnectIsAlive, /* 0.9.8 */
|
2013-07-13 00:27:10 +00:00
|
|
|
.connectSupportsFeature = libxlConnectSupportsFeature, /* 1.1.1 */
|
2014-03-06 09:46:11 +00:00
|
|
|
.nodeDeviceDettach = libxlNodeDeviceDettach, /* 1.2.3 */
|
|
|
|
.nodeDeviceDetachFlags = libxlNodeDeviceDetachFlags, /* 1.2.3 */
|
|
|
|
.nodeDeviceReAttach = libxlNodeDeviceReAttach, /* 1.2.3 */
|
|
|
|
.nodeDeviceReset = libxlNodeDeviceReset, /* 1.2.3 */
|
2014-06-24 17:12:21 +00:00
|
|
|
.domainMigrateBegin3Params = libxlDomainMigrateBegin3Params, /* 1.2.6 */
|
|
|
|
.domainMigratePrepare3Params = libxlDomainMigratePrepare3Params, /* 1.2.6 */
|
|
|
|
.domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.6 */
|
|
|
|
.domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */
|
|
|
|
.domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */
|
2015-05-15 18:26:30 +00:00
|
|
|
.nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */
|
2011-02-10 22:42:34 +00:00
|
|
|
};
|
|
|
|
|
2015-01-20 16:16:26 +00:00
|
|
|
static virConnectDriver libxlConnectDriver = {
|
|
|
|
.hypervisorDriver = &libxlHypervisorDriver,
|
|
|
|
};
|
|
|
|
|
2011-02-10 22:42:34 +00:00
|
|
|
static virStateDriver libxlStateDriver = {
|
|
|
|
.name = "LIBXL",
|
2013-04-23 12:50:18 +00:00
|
|
|
.stateInitialize = libxlStateInitialize,
|
2013-07-25 12:03:38 +00:00
|
|
|
.stateAutoStart = libxlStateAutoStart,
|
2013-04-23 12:50:18 +00:00
|
|
|
.stateCleanup = libxlStateCleanup,
|
|
|
|
.stateReload = libxlStateReload,
|
2011-02-10 22:42:34 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
libxlRegister(void)
|
|
|
|
{
|
2015-01-20 16:16:26 +00:00
|
|
|
if (virRegisterConnectDriver(&libxlConnectDriver,
|
|
|
|
true) < 0)
|
2011-02-10 22:42:34 +00:00
|
|
|
return -1;
|
|
|
|
if (virRegisterStateDriver(&libxlStateDriver) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|