2006-01-12 15:38:07 +00:00
|
|
|
/*
|
|
|
|
* xend_internal.c: access to Xen though the Xen Daemon interface
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005
|
|
|
|
*
|
|
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
|
|
*
|
|
|
|
* This file is subject to the terms and conditions of the GNU Lesser General
|
|
|
|
* Public License. See the file COPYING.LIB in the main directory of this
|
|
|
|
* archive for more details.
|
|
|
|
*/
|
|
|
|
|
2008-01-29 18:15:54 +00:00
|
|
|
#include <config.h>
|
2007-08-21 09:31:12 +00:00
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/un.h>
|
|
|
|
#include <sys/errno.h>
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
2006-01-12 15:38:07 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <netdb.h>
|
2006-03-22 13:44:01 +00:00
|
|
|
#include <libxml/uri.h>
|
2007-06-15 15:24:20 +00:00
|
|
|
#include <errno.h>
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
#include "xend_internal.h"
|
2006-03-22 13:44:01 +00:00
|
|
|
#include "driver.h"
|
2008-02-08 09:15:16 +00:00
|
|
|
#include "util.h"
|
2006-01-12 15:38:07 +00:00
|
|
|
#include "sexpr.h"
|
2007-06-26 22:33:22 +00:00
|
|
|
#include "buf.h"
|
2007-08-09 20:19:12 +00:00
|
|
|
#include "uuid.h"
|
2007-04-04 14:19:49 +00:00
|
|
|
#include "xen_unified.h"
|
2006-06-13 16:31:44 +00:00
|
|
|
#include "xen_internal.h" /* for DOM0_INTERFACE_VERSION */
|
2006-08-08 20:14:40 +00:00
|
|
|
#include "xs_internal.h" /* To extract VNC port & Serial console TTY */
|
2008-05-29 19:20:22 +00:00
|
|
|
#include "memory.h"
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-03-15 07:43:16 +00:00
|
|
|
/* required for cpumap_t */
|
|
|
|
#include <xen/dom0_ops.h>
|
|
|
|
|
2008-01-19 18:36:01 +00:00
|
|
|
#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt,__VA_ARGS__)
|
|
|
|
#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
|
|
|
|
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2008-03-24 09:23:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The number of Xen scheduler parameters
|
|
|
|
*/
|
|
|
|
#define XEN_SCHED_SEDF_NPARAM 6
|
|
|
|
#define XEN_SCHED_CRED_NPARAM 2
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* PROXY */
|
2006-03-29 12:46:03 +00:00
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* xend_connection_type:
|
|
|
|
*
|
|
|
|
* The connection to the Xen Daemon can be done either though a normal TCP
|
|
|
|
* socket or a local domain direct connection.
|
|
|
|
*/
|
|
|
|
enum xend_connection_type {
|
|
|
|
XEND_DOMAIN,
|
|
|
|
XEND_TCP,
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xend:
|
|
|
|
*
|
|
|
|
* Structure associated to a connection to a Xen daemon
|
|
|
|
*/
|
|
|
|
struct xend {
|
|
|
|
int len;
|
|
|
|
int type;
|
|
|
|
struct sockaddr *addr;
|
|
|
|
struct sockaddr_un addr_un;
|
|
|
|
struct sockaddr_in addr_in;
|
|
|
|
};
|
|
|
|
|
2006-02-27 16:27:18 +00:00
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
#ifndef PROXY
|
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|
|
|
virDomainDiskDefPtr def,
|
|
|
|
virBufferPtr buf,
|
|
|
|
int hvm,
|
2008-08-06 11:26:47 +00:00
|
|
|
int xendConfigVersion,
|
|
|
|
int isAttach);
|
2008-07-25 13:17:27 +00:00
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprNet(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|
|
|
virDomainNetDefPtr def,
|
|
|
|
virBufferPtr buf,
|
|
|
|
int hvm,
|
2008-08-06 11:26:47 +00:00
|
|
|
int xendConfigVersion,
|
|
|
|
int isAttach);
|
2008-07-25 13:17:27 +00:00
|
|
|
static int
|
|
|
|
virDomainXMLDevID(virDomainPtr domain,
|
|
|
|
virDomainDeviceDefPtr dev,
|
|
|
|
char *class,
|
|
|
|
char *ref,
|
|
|
|
int ref_len);
|
|
|
|
#endif
|
|
|
|
|
2008-06-09 12:16:03 +00:00
|
|
|
static void virXendError(virConnectPtr conn, virErrorNumber error,
|
|
|
|
const char *fmt, ...)
|
|
|
|
ATTRIBUTE_FORMAT(printf,3,4);
|
|
|
|
|
|
|
|
#define MAX_ERROR_MESSAGE_LEN 1024
|
|
|
|
|
2006-02-27 16:27:18 +00:00
|
|
|
/**
|
|
|
|
* virXendError:
|
|
|
|
* @conn: the connection if available
|
2008-04-04 07:58:29 +00:00
|
|
|
* @error: the error number
|
2008-06-09 12:16:03 +00:00
|
|
|
* @fmt: format string followed by variable args
|
2006-02-27 16:27:18 +00:00
|
|
|
*
|
|
|
|
* Handle an error at the xend daemon interface
|
|
|
|
*/
|
|
|
|
static void
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError(virConnectPtr conn, virErrorNumber error,
|
|
|
|
const char *fmt, ...)
|
2006-03-15 12:13:25 +00:00
|
|
|
{
|
2008-06-09 12:16:03 +00:00
|
|
|
va_list args;
|
|
|
|
char msg[MAX_ERROR_MESSAGE_LEN];
|
|
|
|
const char *msg2;
|
2006-03-15 12:13:25 +00:00
|
|
|
|
2008-06-09 12:16:03 +00:00
|
|
|
if (fmt) {
|
|
|
|
va_start (args, fmt);
|
|
|
|
vsnprintf (msg, sizeof (msg), fmt, args);
|
|
|
|
va_end (args);
|
2008-07-25 10:49:33 +00:00
|
|
|
} else {
|
|
|
|
msg[0] = '\0';
|
2008-06-09 12:16:03 +00:00
|
|
|
}
|
2006-02-27 16:27:18 +00:00
|
|
|
|
2008-06-09 12:16:03 +00:00
|
|
|
msg2 = __virErrorMsg (error, fmt ? msg : NULL);
|
Tue Feb 14 15:37:17 EST 2007 Mark McLoughlin <markmc@redhat.com>
Note: potential ABI break here, but people should
only really be using virError structs returned from
libvirt itself.
* include/libvirt/virterror.h: add virNetwork
to virError
* src/internal.h, src/virterror.c: add network param
to __virRaiseError()
* src/conf.c, src/hash.c, src/libvirt.c, src/proxy_internal.c,
src/qemu_internal.c, src/sexpr.c, src/test.c, src/xen_internal.c,
src/xend_internal.c, src/xm_internal.c, src/xml.c, src/xmlrpc.c,
src/xs_internal.c: update.
2007-02-14 15:40:53 +00:00
|
|
|
__virRaiseError(conn, NULL, NULL, VIR_FROM_XEND, error, VIR_ERR_ERROR,
|
2008-06-09 12:16:03 +00:00
|
|
|
msg2, msg, NULL, 0, 0, msg2, msg);
|
2006-02-27 16:27:18 +00:00
|
|
|
}
|
|
|
|
|
2006-02-27 19:56:23 +00:00
|
|
|
/**
|
|
|
|
* virXendErrorInt:
|
|
|
|
* @conn: the connection if available
|
2008-04-04 07:58:29 +00:00
|
|
|
* @error: the error number
|
2006-02-27 19:56:23 +00:00
|
|
|
* @val: extra integer information
|
|
|
|
*
|
|
|
|
* Handle an error at the xend daemon interface
|
|
|
|
*/
|
|
|
|
static void
|
2006-03-15 12:13:25 +00:00
|
|
|
virXendErrorInt(virConnectPtr conn, virErrorNumber error, int val)
|
|
|
|
{
|
2006-02-27 19:56:23 +00:00
|
|
|
const char *errmsg;
|
2006-03-15 12:13:25 +00:00
|
|
|
|
2006-02-27 19:56:23 +00:00
|
|
|
if (error == VIR_ERR_OK)
|
|
|
|
return;
|
|
|
|
|
|
|
|
errmsg = __virErrorMsg(error, NULL);
|
Tue Feb 14 15:37:17 EST 2007 Mark McLoughlin <markmc@redhat.com>
Note: potential ABI break here, but people should
only really be using virError structs returned from
libvirt itself.
* include/libvirt/virterror.h: add virNetwork
to virError
* src/internal.h, src/virterror.c: add network param
to __virRaiseError()
* src/conf.c, src/hash.c, src/libvirt.c, src/proxy_internal.c,
src/qemu_internal.c, src/sexpr.c, src/test.c, src/xen_internal.c,
src/xend_internal.c, src/xm_internal.c, src/xml.c, src/xmlrpc.c,
src/xs_internal.c: update.
2007-02-14 15:40:53 +00:00
|
|
|
__virRaiseError(conn, NULL, NULL, VIR_FROM_XEND, error, VIR_ERR_ERROR,
|
2006-02-27 19:56:23 +00:00
|
|
|
errmsg, NULL, NULL, val, 0, errmsg, val);
|
|
|
|
}
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* do_connect:
|
|
|
|
* @xend: pointer to the Xen Daemon structure
|
|
|
|
*
|
|
|
|
* Internal routine to (re)connect to the daemon
|
|
|
|
*
|
|
|
|
* Returns the socket file descriptor or -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
2006-01-13 16:41:01 +00:00
|
|
|
do_connect(virConnectPtr xend)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
int s;
|
|
|
|
int serrno;
|
2006-07-11 16:57:03 +00:00
|
|
|
int no_slow_start = 1;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) xend->privateData;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
s = socket(priv->type, SOCK_STREAM, 0);
|
2006-02-27 16:27:18 +00:00
|
|
|
if (s == -1) {
|
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("failed to create a socket"));
|
2006-01-12 15:38:07 +00:00
|
|
|
return -1;
|
2006-02-27 16:27:18 +00:00
|
|
|
}
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-07-11 16:57:03 +00:00
|
|
|
/*
|
|
|
|
* try to desactivate slow-start
|
|
|
|
*/
|
|
|
|
setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (void *)&no_slow_start,
|
|
|
|
sizeof(no_slow_start));
|
|
|
|
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
if (connect(s, priv->addr, priv->len) == -1) {
|
2006-01-12 15:38:07 +00:00
|
|
|
serrno = errno;
|
|
|
|
close(s);
|
|
|
|
errno = serrno;
|
|
|
|
s = -1;
|
2008-03-17 17:30:48 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Connecting to XenD as root is mandatory, so log this error
|
|
|
|
*/
|
|
|
|
if (getuid() == 0) {
|
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("failed to connect to xend"));
|
2007-11-27 14:39:42 +00:00
|
|
|
}
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* wr_sync:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-01-12 15:38:07 +00:00
|
|
|
* @fd: the file descriptor
|
|
|
|
* @buffer: the I/O buffer
|
|
|
|
* @size: the size of the I/O
|
|
|
|
* @do_read: write operation if 0, read operation otherwise
|
|
|
|
*
|
|
|
|
* Do a synchronous read or write on the file descriptor
|
|
|
|
*
|
|
|
|
* Returns the number of bytes exchanged, or -1 in case of error
|
|
|
|
*/
|
|
|
|
static size_t
|
2006-11-07 21:52:44 +00:00
|
|
|
wr_sync(virConnectPtr xend, int fd, void *buffer, size_t size, int do_read)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
size_t offset = 0;
|
|
|
|
|
|
|
|
while (offset < size) {
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
if (do_read) {
|
2006-03-15 12:13:25 +00:00
|
|
|
len = read(fd, ((char *) buffer) + offset, size - offset);
|
2006-01-12 15:38:07 +00:00
|
|
|
} else {
|
2006-03-15 12:13:25 +00:00
|
|
|
len = write(fd, ((char *) buffer) + offset, size - offset);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* recoverable error, retry */
|
|
|
|
if ((len == -1) && ((errno == EAGAIN) || (errno == EINTR))) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* eof */
|
|
|
|
if (len == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* unrecoverable error */
|
|
|
|
if (len == -1) {
|
2006-03-15 12:13:25 +00:00
|
|
|
if (do_read)
|
2006-11-07 21:52:44 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("failed to read from Xen Daemon"));
|
2006-03-15 12:13:25 +00:00
|
|
|
else
|
2006-11-07 21:52:44 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("failed to read from Xen Daemon"));
|
2006-03-15 12:13:25 +00:00
|
|
|
|
|
|
|
return (-1);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
offset += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sread:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-01-12 15:38:07 +00:00
|
|
|
* @fd: the file descriptor
|
|
|
|
* @buffer: the I/O buffer
|
|
|
|
* @size: the size of the I/O
|
|
|
|
*
|
|
|
|
* Internal routine to do a synchronous read
|
|
|
|
*
|
|
|
|
* Returns the number of bytes read, or -1 in case of error
|
|
|
|
*/
|
|
|
|
static ssize_t
|
2006-11-07 21:52:44 +00:00
|
|
|
sread(virConnectPtr xend, int fd, void *buffer, size_t size)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
2006-11-07 21:52:44 +00:00
|
|
|
return wr_sync(xend, fd, buffer, size, 1);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* swrite:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-01-12 15:38:07 +00:00
|
|
|
* @fd: the file descriptor
|
|
|
|
* @buffer: the I/O buffer
|
|
|
|
* @size: the size of the I/O
|
|
|
|
*
|
|
|
|
* Internal routine to do a synchronous write
|
|
|
|
*
|
|
|
|
* Returns the number of bytes written, or -1 in case of error
|
|
|
|
*/
|
|
|
|
static ssize_t
|
2006-11-07 21:52:44 +00:00
|
|
|
swrite(virConnectPtr xend, int fd, const void *buffer, size_t size)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
2006-11-07 21:52:44 +00:00
|
|
|
return wr_sync(xend, fd, (void *) buffer, size, 0);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* swrites:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-01-12 15:38:07 +00:00
|
|
|
* @fd: the file descriptor
|
|
|
|
* @string: the string to write
|
|
|
|
*
|
|
|
|
* Internal routine to do a synchronous write of a string
|
|
|
|
*
|
|
|
|
* Returns the number of bytes written, or -1 in case of error
|
|
|
|
*/
|
|
|
|
static ssize_t
|
2006-11-07 21:52:44 +00:00
|
|
|
swrites(virConnectPtr xend, int fd, const char *string)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
2006-11-07 21:52:44 +00:00
|
|
|
return swrite(xend, fd, string, strlen(string));
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2006-07-06 09:29:34 +00:00
|
|
|
/**
|
|
|
|
* sreads:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-07-06 09:29:34 +00:00
|
|
|
* @fd: the file descriptor
|
|
|
|
* @buffer: the I/O buffer
|
|
|
|
* @n_buffer: the size of the I/O buffer
|
|
|
|
*
|
|
|
|
* Internal routine to do a synchronous read of a line
|
|
|
|
*
|
|
|
|
* Returns the number of bytes read, or -1 in case of error
|
|
|
|
*/
|
|
|
|
static ssize_t
|
2006-11-07 21:52:44 +00:00
|
|
|
sreads(virConnectPtr xend, int fd, char *buffer, size_t n_buffer)
|
2006-07-06 09:29:34 +00:00
|
|
|
{
|
|
|
|
size_t offset;
|
|
|
|
|
|
|
|
if (n_buffer < 1)
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
for (offset = 0; offset < (n_buffer - 1); offset++) {
|
|
|
|
ssize_t ret;
|
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
ret = sread(xend, fd, buffer + offset, 1);
|
2006-07-06 09:29:34 +00:00
|
|
|
if (ret == 0)
|
|
|
|
break;
|
|
|
|
else if (ret == -1)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (buffer[offset] == '\n') {
|
|
|
|
offset++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buffer[offset] = 0;
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
2006-01-12 15:38:07 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
istartswith(const char *haystack, const char *needle)
|
|
|
|
{
|
2008-05-14 19:51:24 +00:00
|
|
|
return STRCASEEQLEN(haystack, needle, strlen(needle));
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2006-03-30 16:37:15 +00:00
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* xend_req:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-01-12 15:38:07 +00:00
|
|
|
* @fd: the file descriptor
|
|
|
|
* @content: the buffer to store the content
|
|
|
|
* @n_content: the size of the buffer
|
|
|
|
*
|
|
|
|
* Read the HTTP response from a Xen Daemon request.
|
|
|
|
*
|
|
|
|
* Returns the HTTP return code.
|
|
|
|
*/
|
|
|
|
static int
|
2006-11-07 21:52:44 +00:00
|
|
|
xend_req(virConnectPtr xend, int fd, char *content, size_t n_content)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
char buffer[4096];
|
|
|
|
int content_length = -1;
|
|
|
|
int retcode = 0;
|
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
while (sreads(xend, fd, buffer, sizeof(buffer)) > 0) {
|
2008-05-14 19:51:24 +00:00
|
|
|
if (STREQ(buffer, "\r\n"))
|
2006-01-12 15:38:07 +00:00
|
|
|
break;
|
2006-07-06 09:29:34 +00:00
|
|
|
|
|
|
|
if (istartswith(buffer, "Content-Length: "))
|
|
|
|
content_length = atoi(buffer + 16);
|
|
|
|
else if (istartswith(buffer, "HTTP/1.1 "))
|
|
|
|
retcode = atoi(buffer + 9);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2006-07-06 09:29:34 +00:00
|
|
|
if (content_length > -1) {
|
|
|
|
ssize_t ret;
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
if ((unsigned int) content_length > (n_content + 1))
|
|
|
|
content_length = n_content - 1;
|
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
ret = sread(xend, fd, content, content_length);
|
2006-07-06 09:29:34 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return -1;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-07-06 09:29:34 +00:00
|
|
|
content[ret] = 0;
|
|
|
|
} else {
|
2006-01-12 15:38:07 +00:00
|
|
|
content[0] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return retcode;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xend_get:
|
|
|
|
* @xend: pointer to the Xen Daemon structure
|
|
|
|
* @path: the path used for the HTTP request
|
|
|
|
* @content: the buffer to store the content
|
|
|
|
* @n_content: the size of the buffer
|
|
|
|
*
|
|
|
|
* Do an HTTP GET RPC with the Xen Daemon
|
|
|
|
*
|
|
|
|
* Returns the HTTP return code or -1 in case or error.
|
|
|
|
*/
|
|
|
|
static int
|
2006-01-13 16:41:01 +00:00
|
|
|
xend_get(virConnectPtr xend, const char *path,
|
2006-01-12 15:38:07 +00:00
|
|
|
char *content, size_t n_content)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
int s = do_connect(xend);
|
|
|
|
|
|
|
|
if (s == -1)
|
|
|
|
return s;
|
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
swrites(xend, s, "GET ");
|
|
|
|
swrites(xend, s, path);
|
|
|
|
swrites(xend, s, " HTTP/1.1\r\n");
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
swrites(xend, s,
|
2006-01-12 15:38:07 +00:00
|
|
|
"Host: localhost:8000\r\n"
|
|
|
|
"Accept-Encoding: identity\r\n"
|
|
|
|
"Content-Type: application/x-www-form-urlencoded\r\n" "\r\n");
|
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
ret = xend_req(xend, s, content, n_content);
|
2006-01-12 15:38:07 +00:00
|
|
|
close(s);
|
|
|
|
|
2006-10-31 10:25:13 +00:00
|
|
|
if (((ret < 0) || (ret >= 300)) &&
|
2008-05-15 14:21:34 +00:00
|
|
|
((ret != 404) || (!STRPREFIX(path, "/xend/domain/")))) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError(xend, VIR_ERR_GET_FAILED,
|
|
|
|
_("xend_get: error from xen daemon: %s"), content);
|
2006-02-27 16:27:18 +00:00
|
|
|
}
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#ifndef PROXY
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* xend_post:
|
|
|
|
* @xend: pointer to the Xen Daemon structure
|
|
|
|
* @path: the path used for the HTTP request
|
2006-07-19 22:24:37 +00:00
|
|
|
* @ops: the information sent for the POST
|
2006-01-12 15:38:07 +00:00
|
|
|
* @content: the buffer to store the content
|
|
|
|
* @n_content: the size of the buffer
|
|
|
|
*
|
|
|
|
* Do an HTTP POST RPC with the Xen Daemon, this usually makes changes at the
|
|
|
|
* Xen level.
|
|
|
|
*
|
|
|
|
* Returns the HTTP return code or -1 in case or error.
|
|
|
|
*/
|
|
|
|
static int
|
2006-01-13 16:41:01 +00:00
|
|
|
xend_post(virConnectPtr xend, const char *path, const char *ops,
|
2006-01-12 15:38:07 +00:00
|
|
|
char *content, size_t n_content)
|
|
|
|
{
|
|
|
|
char buffer[100];
|
|
|
|
int ret;
|
|
|
|
int s = do_connect(xend);
|
|
|
|
|
|
|
|
if (s == -1)
|
|
|
|
return s;
|
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
swrites(xend, s, "POST ");
|
|
|
|
swrites(xend, s, path);
|
|
|
|
swrites(xend, s, " HTTP/1.1\r\n");
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
swrites(xend, s,
|
2006-01-12 15:38:07 +00:00
|
|
|
"Host: localhost:8000\r\n"
|
|
|
|
"Accept-Encoding: identity\r\n"
|
|
|
|
"Content-Type: application/x-www-form-urlencoded\r\n"
|
|
|
|
"Content-Length: ");
|
2006-08-08 22:22:55 +00:00
|
|
|
snprintf(buffer, sizeof(buffer), "%d", (int) strlen(ops));
|
2006-11-07 21:52:44 +00:00
|
|
|
swrites(xend ,s, buffer);
|
|
|
|
swrites(xend, s, "\r\n\r\n");
|
|
|
|
swrites(xend, s, ops);
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-11-07 21:52:44 +00:00
|
|
|
ret = xend_req(xend, s, content, n_content);
|
2006-01-12 15:38:07 +00:00
|
|
|
close(s);
|
|
|
|
|
2006-02-27 16:27:18 +00:00
|
|
|
if ((ret < 0) || (ret >= 300)) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError(xend, VIR_ERR_POST_FAILED,
|
|
|
|
_("xend_post: error from xen daemon: %s"), content);
|
2007-02-27 15:50:03 +00:00
|
|
|
} else if ((ret == 202) && (strstr(content, "failed") != NULL)) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError(xend, VIR_ERR_POST_FAILED,
|
|
|
|
_("xend_post: error from xen daemon: %s"), content);
|
2007-02-27 15:50:03 +00:00
|
|
|
ret = -1;
|
2007-03-01 23:24:09 +00:00
|
|
|
} else if (((ret >= 200) && (ret <= 202)) && (strstr(content, "xend.err") != NULL)) {
|
|
|
|
/* This is to catch case of things like 'virsh dump Domain-0 foo'
|
|
|
|
* which returns a success code, but the word 'xend.err'
|
|
|
|
* in body to indicate error :-(
|
2007-02-27 15:50:03 +00:00
|
|
|
*/
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError(xend, VIR_ERR_POST_FAILED,
|
|
|
|
_("xend_post: error from xen daemon: %s"), content);
|
2006-04-20 14:28:01 +00:00
|
|
|
ret = -1;
|
2006-02-27 16:27:18 +00:00
|
|
|
}
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* http2unix:
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-01-12 15:38:07 +00:00
|
|
|
* @ret: the http return code
|
|
|
|
*
|
|
|
|
* Convert the HTTP return code to 0/-1 and set errno if needed
|
|
|
|
*
|
|
|
|
* Return -1 in case of error code 0 otherwise
|
|
|
|
*/
|
|
|
|
static int
|
2006-11-07 21:52:44 +00:00
|
|
|
http2unix(virConnectPtr xend, int ret)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
switch (ret) {
|
|
|
|
case -1:
|
|
|
|
break;
|
|
|
|
case 200:
|
|
|
|
case 201:
|
|
|
|
case 202:
|
|
|
|
return 0;
|
|
|
|
case 404:
|
|
|
|
errno = ESRCH;
|
|
|
|
break;
|
2006-08-29 18:12:22 +00:00
|
|
|
case 500:
|
|
|
|
errno = EIO;
|
|
|
|
break;
|
2006-01-12 15:38:07 +00:00
|
|
|
default:
|
2006-11-07 21:52:44 +00:00
|
|
|
virXendErrorInt(xend, VIR_ERR_HTTP_ERROR, ret);
|
2006-01-12 15:38:07 +00:00
|
|
|
errno = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#ifndef PROXY
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
2008-07-25 09:51:23 +00:00
|
|
|
* xend_op_ext:
|
2006-01-12 15:38:07 +00:00
|
|
|
* @xend: pointer to the Xen Daemon structure
|
|
|
|
* @path: path for the object
|
|
|
|
* @error: buffer for the error output
|
|
|
|
* @n_error: size of @error
|
|
|
|
* @key: the key for the operation
|
|
|
|
* @ap: input values to pass to the operation
|
|
|
|
*
|
|
|
|
* internal routine to run a POST RPC operation to the Xen Daemon
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
2008-07-25 09:51:23 +00:00
|
|
|
xend_op_ext(virConnectPtr xend, const char *path, char *error,
|
|
|
|
size_t n_error, const char *key, va_list ap)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
const char *k = key, *v;
|
2008-04-28 15:14:59 +00:00
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
2007-04-24 13:44:16 +00:00
|
|
|
int ret;
|
2008-04-28 15:14:59 +00:00
|
|
|
char *content;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
|
|
|
while (k) {
|
|
|
|
v = va_arg(ap, const char *);
|
|
|
|
|
2007-04-24 13:44:16 +00:00
|
|
|
virBufferVSprintf(&buf, "%s", k);
|
|
|
|
virBufferVSprintf(&buf, "%s", "=");
|
|
|
|
virBufferVSprintf(&buf, "%s", v);
|
2006-01-12 15:38:07 +00:00
|
|
|
k = va_arg(ap, const char *);
|
|
|
|
|
|
|
|
if (k)
|
2007-04-24 13:44:16 +00:00
|
|
|
virBufferVSprintf(&buf, "%s", "&");
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
if (virBufferError(&buf)) {
|
|
|
|
virXendError(NULL, VIR_ERR_NO_MEMORY, _("allocate buffer"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
content = virBufferContentAndReset(&buf);
|
|
|
|
ret = http2unix(xend, xend_post(xend, path, content, error, n_error));
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(content);
|
2007-04-24 13:44:16 +00:00
|
|
|
|
|
|
|
return ret;
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
2008-07-25 09:51:23 +00:00
|
|
|
* xend_op:
|
2006-01-12 15:38:07 +00:00
|
|
|
* @xend: pointer to the Xen Daemon structure
|
|
|
|
* @name: the domain name target of this operation
|
|
|
|
* @error: buffer for the error output
|
|
|
|
* @n_error: size of @error
|
|
|
|
* @key: the key for the operation
|
|
|
|
* @ap: input values to pass to the operation
|
|
|
|
* @...: input values to pass to the operation
|
|
|
|
*
|
|
|
|
* internal routine to run a POST RPC operation to the Xen Daemon targetting
|
|
|
|
* a given domain.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
2007-09-29 18:16:26 +00:00
|
|
|
xend_op(virConnectPtr xend, const char *name, const char *key, ...)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
char buffer[1024];
|
2007-09-29 18:16:26 +00:00
|
|
|
char error[1024];
|
2006-01-12 15:38:07 +00:00
|
|
|
va_list ap;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
snprintf(buffer, sizeof(buffer), "/xend/domain/%s", name);
|
|
|
|
|
|
|
|
va_start(ap, key);
|
2008-07-25 09:51:23 +00:00
|
|
|
ret = xend_op_ext(xend, buffer, error, sizeof(error), key, ap);
|
2006-01-12 15:38:07 +00:00
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|
2006-01-12 15:38:07 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* sexpr_get:
|
|
|
|
* @xend: pointer to the Xen Daemon structure
|
|
|
|
* @fmt: format string for the path of the operation
|
|
|
|
* @...: extra data to build the path of the operation
|
|
|
|
*
|
|
|
|
* Internal routine to run a simple GET RPC operation to the Xen Daemon
|
|
|
|
*
|
|
|
|
* Returns a parsed S-Expression in case of success, NULL in case of failure
|
|
|
|
*/
|
2007-10-17 10:33:16 +00:00
|
|
|
static struct sexpr *sexpr_get(virConnectPtr xend, const char *fmt, ...)
|
|
|
|
ATTRIBUTE_FORMAT(printf,2,3);
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
static struct sexpr *
|
2006-01-13 16:41:01 +00:00
|
|
|
sexpr_get(virConnectPtr xend, const char *fmt, ...)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
char buffer[4096];
|
|
|
|
char path[1024];
|
|
|
|
va_list ap;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
vsnprintf(path, sizeof(path), fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
ret = xend_get(xend, path, buffer, sizeof(buffer));
|
2006-11-07 21:52:44 +00:00
|
|
|
ret = http2unix(xend ,ret);
|
2006-01-12 15:38:07 +00:00
|
|
|
if (ret == -1)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return string2sexpr(buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sexpr_int:
|
|
|
|
* @sexpr: an S-Expression
|
|
|
|
* @name: the name for the value
|
|
|
|
*
|
|
|
|
* convenience function to lookup an int value in the S-Expression
|
|
|
|
*
|
|
|
|
* Returns the value found or 0 if not found (but may not be an error)
|
|
|
|
*/
|
|
|
|
static int
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_int(const struct sexpr *sexpr, const char *name)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
const char *value = sexpr_node(sexpr, name);
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
return strtol(value, NULL, 0);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* sexpr_float:
|
|
|
|
* @sexpr: an S-Expression
|
|
|
|
* @name: the name for the value
|
|
|
|
*
|
|
|
|
* convenience function to lookup a float value in the S-Expression
|
|
|
|
*
|
|
|
|
* Returns the value found or 0 if not found (but may not be an error)
|
|
|
|
*/
|
|
|
|
static double
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_float(const struct sexpr *sexpr, const char *name)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
const char *value = sexpr_node(sexpr, name);
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
return strtod(value, NULL);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sexpr_u64:
|
|
|
|
* @sexpr: an S-Expression
|
|
|
|
* @name: the name for the value
|
|
|
|
*
|
|
|
|
* convenience function to lookup a 64bits unsigned int value in the
|
|
|
|
* S-Expression
|
|
|
|
*
|
|
|
|
* Returns the value found or 0 if not found (but may not be an error)
|
|
|
|
*/
|
|
|
|
static uint64_t
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_u64(const struct sexpr *sexpr, const char *name)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
const char *value = sexpr_node(sexpr, name);
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
return strtoll(value, NULL, 0);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sexpr_uuid:
|
|
|
|
* @ptr: where to store the UUID, incremented
|
|
|
|
* @sexpr: an S-Expression
|
|
|
|
* @name: the name for the value
|
|
|
|
*
|
|
|
|
* convenience function to lookup an UUID value from the S-Expression
|
|
|
|
*
|
2007-08-09 20:19:12 +00:00
|
|
|
* Returns a -1 on error, 0 on success
|
2006-01-12 15:38:07 +00:00
|
|
|
*/
|
2007-08-09 20:19:12 +00:00
|
|
|
static int
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_uuid(unsigned char *ptr, const struct sexpr *node, const char *path)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
const char *r = sexpr_node(node, path);
|
2007-08-09 20:19:12 +00:00
|
|
|
if (!r)
|
|
|
|
return -1;
|
|
|
|
return virUUIDParse(r, ptr);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#ifndef PROXY
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* urlencode:
|
|
|
|
* @string: the input URL
|
|
|
|
*
|
|
|
|
* Encode an URL see RFC 2396 and following
|
|
|
|
*
|
|
|
|
* Returns the new string or NULL in case of error.
|
|
|
|
*/
|
|
|
|
static char *
|
|
|
|
urlencode(const char *string)
|
|
|
|
{
|
|
|
|
size_t len = strlen(string);
|
2008-05-29 19:20:22 +00:00
|
|
|
char *buffer;
|
|
|
|
char *ptr;
|
2006-01-12 15:38:07 +00:00
|
|
|
size_t i;
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC_N(buffer, len * 3 + 1) < 0) {
|
2008-04-10 16:54:54 +00:00
|
|
|
virXendError(NULL, VIR_ERR_NO_MEMORY, _("allocate new buffer"));
|
2006-03-15 12:13:25 +00:00
|
|
|
return (NULL);
|
2007-04-24 13:44:16 +00:00
|
|
|
}
|
2008-05-29 19:20:22 +00:00
|
|
|
ptr = buffer;
|
2006-01-12 15:38:07 +00:00
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
switch (string[i]) {
|
|
|
|
case ' ':
|
|
|
|
case '\n':
|
2007-03-23 16:15:07 +00:00
|
|
|
snprintf(ptr, 4, "%%%02x", string[i]);
|
2006-01-12 15:38:07 +00:00
|
|
|
ptr += 3;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
*ptr = string[i];
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*ptr = 0;
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
2008-05-07 18:50:23 +00:00
|
|
|
#endif /* ! PROXY */
|
2008-05-07 14:04:40 +00:00
|
|
|
|
|
|
|
/* Applicable sound models */
|
2008-05-09 08:02:44 +00:00
|
|
|
static const char *const sound_models[] = { "sb16", "es1370" };
|
2008-05-07 14:04:40 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* is_sound_model_valid:
|
|
|
|
* @model : model string to check against whitelist
|
|
|
|
*
|
|
|
|
* checks passed model string against whitelist of acceptable models
|
|
|
|
*
|
|
|
|
* Returns 0 if invalid, 1 otherwise
|
|
|
|
*/
|
|
|
|
int is_sound_model_valid(const char *model) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < sizeof(sound_models)/sizeof(*sound_models); ++i) {
|
|
|
|
if (STREQ(model, sound_models[i])) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* is_sound_model_conflict:
|
|
|
|
* @model : model string to look for duplicates of
|
|
|
|
* @soundstr : soundhw string for the form m1,m2,m3 ...
|
|
|
|
*
|
|
|
|
* Returns 0 if no conflict, 1 otherwise
|
|
|
|
*/
|
|
|
|
int is_sound_model_conflict(const char *model, const char *soundstr) {
|
|
|
|
|
|
|
|
char *dupe;
|
|
|
|
char *cur = (char *) soundstr;
|
|
|
|
while ((dupe = strstr(cur, model))) {
|
|
|
|
if (( (dupe == cur) || // (Start of line |
|
|
|
|
(*(dupe - 1) == ',') ) && // Preceded by comma) &
|
|
|
|
( (dupe[strlen(model)] == ',') || // (Ends with comma |
|
|
|
|
(dupe[strlen(model)] == '\0') )) // Ends whole string)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
cur = dupe + strlen(model);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
|
|
|
|
/* PUBLIC FUNCTIONS */
|
|
|
|
|
|
|
|
/**
|
2006-03-22 13:44:01 +00:00
|
|
|
* xenDaemonOpen_unix:
|
2006-01-13 16:41:01 +00:00
|
|
|
* @conn: an existing virtual connection block
|
2006-01-12 15:38:07 +00:00
|
|
|
* @path: the path for the Xen Daemon socket
|
|
|
|
*
|
|
|
|
* Creates a localhost Xen Daemon connection
|
|
|
|
* Note: this doesn't try to check if the connection actually works
|
|
|
|
*
|
2006-01-13 16:41:01 +00:00
|
|
|
* Returns 0 in case of success, -1 in case of error.
|
2006-01-12 15:38:07 +00:00
|
|
|
*/
|
2006-01-13 16:41:01 +00:00
|
|
|
int
|
2006-06-29 14:44:37 +00:00
|
|
|
xenDaemonOpen_unix(virConnectPtr conn, const char *path)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
struct sockaddr_un *addr;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-06-29 14:44:37 +00:00
|
|
|
if ((conn == NULL) || (path == NULL))
|
2006-03-15 12:13:25 +00:00
|
|
|
return (-1);
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
addr = &priv->addr_un;
|
2006-01-12 15:38:07 +00:00
|
|
|
addr->sun_family = AF_UNIX;
|
|
|
|
memset(addr->sun_path, 0, sizeof(addr->sun_path));
|
|
|
|
strncpy(addr->sun_path, path, sizeof(addr->sun_path));
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv->len = sizeof(addr->sun_family) + strlen(addr->sun_path);
|
|
|
|
if ((unsigned int) priv->len > sizeof(addr->sun_path))
|
|
|
|
priv->len = sizeof(addr->sun_path);
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv->addr = (struct sockaddr *) addr;
|
|
|
|
priv->type = PF_UNIX;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-03-15 12:13:25 +00:00
|
|
|
return (0);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#ifndef PROXY
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
2006-03-22 13:44:01 +00:00
|
|
|
* xenDaemonOpen_tcp:
|
2006-01-13 16:41:01 +00:00
|
|
|
* @conn: an existing virtual connection block
|
2006-01-12 15:38:07 +00:00
|
|
|
* @host: the host name for the Xen Daemon
|
2008-02-05 19:27:37 +00:00
|
|
|
* @port: the port
|
2006-01-12 15:38:07 +00:00
|
|
|
*
|
|
|
|
* Creates a possibly remote Xen Daemon connection
|
|
|
|
* Note: this doesn't try to check if the connection actually works
|
|
|
|
*
|
2006-01-13 16:41:01 +00:00
|
|
|
* Returns 0 in case of success, -1 in case of error.
|
2006-01-12 15:38:07 +00:00
|
|
|
*/
|
2008-07-25 09:51:23 +00:00
|
|
|
static int
|
2006-06-29 14:44:37 +00:00
|
|
|
xenDaemonOpen_tcp(virConnectPtr conn, const char *host, int port)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
struct in_addr ip;
|
|
|
|
struct hostent *pent;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-06-29 14:44:37 +00:00
|
|
|
if ((conn == NULL) || (host == NULL) || (port <= 0))
|
2006-03-15 12:13:25 +00:00
|
|
|
return (-1);
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
pent = gethostbyname(host);
|
|
|
|
if (pent == NULL) {
|
|
|
|
if (inet_aton(host, &ip) == 0) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError(NULL, VIR_ERR_UNKNOWN_HOST,
|
|
|
|
_("gethostbyname failed: %s"), host);
|
2006-01-12 15:38:07 +00:00
|
|
|
errno = ESRCH;
|
2006-03-15 12:13:25 +00:00
|
|
|
return (-1);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
memcpy(&ip, pent->h_addr_list[0], sizeof(ip));
|
|
|
|
}
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv->len = sizeof(struct sockaddr_in);
|
|
|
|
priv->addr = (struct sockaddr *) &priv->addr_in;
|
|
|
|
priv->type = PF_INET;
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv->addr_in.sin_family = AF_INET;
|
|
|
|
priv->addr_in.sin_port = htons(port);
|
|
|
|
memcpy(&priv->addr_in.sin_addr, &ip, sizeof(ip));
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2006-03-15 12:13:25 +00:00
|
|
|
return (0);
|
2006-01-12 15:38:07 +00:00
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
|
|
|
* xend_wait_for_devices:
|
|
|
|
* @xend: pointer to the Xem Daemon block
|
|
|
|
* @name: name for the domain
|
|
|
|
*
|
|
|
|
* Block the domain until all the virtual devices are ready. This operation
|
|
|
|
* is needed when creating a domain before resuming it.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
2006-01-13 16:41:01 +00:00
|
|
|
xend_wait_for_devices(virConnectPtr xend, const char *name)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
return xend_op(xend, name, "op", "wait_for_devices", NULL);
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
|
|
|
|
#endif /* PROXY */
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
|
|
|
|
/**
|
2006-06-14 15:44:14 +00:00
|
|
|
* xenDaemonListDomainsOld:
|
2006-01-12 15:38:07 +00:00
|
|
|
* @xend: pointer to the Xem Daemon block
|
|
|
|
*
|
|
|
|
* This method will return an array of names of currently running
|
|
|
|
* domains. The memory should be released will a call to free().
|
|
|
|
*
|
|
|
|
* Returns a list of names or NULL in case of error.
|
|
|
|
*/
|
2006-06-29 23:53:31 +00:00
|
|
|
char **
|
2006-06-14 15:44:14 +00:00
|
|
|
xenDaemonListDomainsOld(virConnectPtr xend)
|
2006-01-12 15:38:07 +00:00
|
|
|
{
|
|
|
|
size_t extra = 0;
|
|
|
|
struct sexpr *root = NULL;
|
|
|
|
char **ret = NULL;
|
|
|
|
int count = 0;
|
|
|
|
int i;
|
|
|
|
char *ptr;
|
|
|
|
struct sexpr *_for_i, *node;
|
|
|
|
|
|
|
|
root = sexpr_get(xend, "/xend/domain");
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
2007-09-29 18:16:26 +00:00
|
|
|
for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS;
|
|
|
|
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
|
2006-01-12 15:38:07 +00:00
|
|
|
if (node->kind != SEXPR_VALUE)
|
|
|
|
continue;
|
2007-09-29 18:16:26 +00:00
|
|
|
extra += strlen(node->u.value) + 1;
|
2006-01-12 15:38:07 +00:00
|
|
|
count++;
|
|
|
|
}
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC_N(ptr, count + 1 + extra) < 0)
|
2006-01-12 15:38:07 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = (char **) ptr;
|
|
|
|
ptr += sizeof(char *) * (count + 1);
|
|
|
|
|
|
|
|
i = 0;
|
2007-09-29 18:16:26 +00:00
|
|
|
for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS;
|
|
|
|
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
|
2006-01-12 15:38:07 +00:00
|
|
|
if (node->kind != SEXPR_VALUE)
|
|
|
|
continue;
|
|
|
|
ret[i] = ptr;
|
2007-09-29 18:16:26 +00:00
|
|
|
strcpy(ptr, node->u.value);
|
|
|
|
ptr += strlen(node->u.value) + 1;
|
2006-01-12 15:38:07 +00:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret[i] = NULL;
|
|
|
|
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#ifndef PROXY
|
2006-01-12 15:38:07 +00:00
|
|
|
/**
|
2006-03-22 13:44:01 +00:00
|
|
|
* xenDaemonDomainCreateLinux:
|
2006-02-16 22:50:52 +00:00
|
|
|
* @xend: A xend instance
|
|
|
|
* @sexpr: An S-Expr description of the domain.
|
|
|
|
*
|
|
|
|
* This method will create a domain based the passed in description. The
|
|
|
|
* domain will be paused after creation and must be unpaused with
|
2006-03-22 13:44:01 +00:00
|
|
|
* xenDaemonResumeDomain() to begin execution.
|
2006-02-16 22:50:52 +00:00
|
|
|
* This method may be deprecated once switching to XML-RPC based communcations
|
|
|
|
* with xend.
|
|
|
|
*
|
|
|
|
* Returns 0 for success, -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2006-03-22 13:44:01 +00:00
|
|
|
xenDaemonDomainCreateLinux(virConnectPtr xend, const char *sexpr)
|
2006-02-16 22:50:52 +00:00
|
|
|
{
|
|
|
|
int ret, serrno;
|
|
|
|
char *ptr;
|
|
|
|
|
|
|
|
ptr = urlencode(sexpr);
|
2006-02-27 19:56:23 +00:00
|
|
|
if (ptr == NULL) {
|
2006-03-15 12:13:25 +00:00
|
|
|
/* this should be caught at the interface but ... */
|
2006-02-27 19:56:23 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("failed to urlencode the create S-Expr"));
|
2006-03-15 12:13:25 +00:00
|
|
|
return (-1);
|
2006-02-27 19:56:23 +00:00
|
|
|
}
|
2006-02-16 22:50:52 +00:00
|
|
|
|
|
|
|
ret = xend_op(xend, "", "op", "create", "config", ptr, NULL);
|
|
|
|
|
|
|
|
serrno = errno;
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(ptr);
|
2006-02-16 22:50:52 +00:00
|
|
|
errno = serrno;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|
2006-02-16 22:50:52 +00:00
|
|
|
|
2006-01-19 10:23:15 +00:00
|
|
|
/**
|
2006-03-22 13:44:01 +00:00
|
|
|
* xenDaemonDomainLookupByName_ids:
|
2006-01-19 10:23:15 +00:00
|
|
|
* @xend: A xend instance
|
2006-02-23 10:13:55 +00:00
|
|
|
* @domname: The name of the domain
|
|
|
|
* @uuid: return value for the UUID if not NULL
|
2006-01-19 10:23:15 +00:00
|
|
|
*
|
|
|
|
* This method looks up the id of a domain
|
|
|
|
*
|
|
|
|
* Returns the id on success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int
|
2006-03-22 13:44:01 +00:00
|
|
|
xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname,
|
2008-04-10 16:54:54 +00:00
|
|
|
unsigned char *uuid)
|
2006-01-19 10:23:15 +00:00
|
|
|
{
|
|
|
|
struct sexpr *root;
|
|
|
|
const char *value;
|
|
|
|
int ret = -1;
|
|
|
|
|
2006-03-15 12:13:25 +00:00
|
|
|
if (uuid != NULL)
|
Mon Jan 23 14:36:18 IST 2007 Mark McLoughlin <markmc@redhat.com>
* include/libvirt/libvirt.h.in: add VIR_UUID_BUFLEN and
VIR_UUID_STRING_BUFLEN
* libvirt/proxy/libvirt_proxy.c, libvirt/src/hash.c,
libvirt/src/internal.h, libvirt/src/libvirt.c,
libvirt/src/proxy_internal.c, libvirt/src/test.c,
libvirt/src/virsh.c, libvirt/src/xend_internal.c,
libvirt/src/xm_internal.c, libvirt/src/xml.c,
libvirt/python/libvir.c: use them
2007-01-23 14:39:45 +00:00
|
|
|
memset(uuid, 0, VIR_UUID_BUFLEN);
|
2006-01-19 10:23:15 +00:00
|
|
|
root = sexpr_get(xend, "/xend/domain/%s?detail=1", domname);
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
value = sexpr_node(root, "domain/domid");
|
2006-02-27 19:56:23 +00:00
|
|
|
if (value == NULL) {
|
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("domain information incomplete, missing domid"));
|
2006-01-19 10:23:15 +00:00
|
|
|
goto error;
|
2006-02-27 19:56:23 +00:00
|
|
|
}
|
2006-01-19 10:23:15 +00:00
|
|
|
ret = strtol(value, NULL, 0);
|
2006-02-23 10:13:55 +00:00
|
|
|
if ((ret == 0) && (value[0] != '0')) {
|
2006-02-27 19:56:23 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("domain information incorrect domid not numeric"));
|
2006-01-19 10:23:15 +00:00
|
|
|
ret = -1;
|
2006-02-23 10:13:55 +00:00
|
|
|
} else if (uuid != NULL) {
|
2007-08-09 20:19:12 +00:00
|
|
|
if (sexpr_uuid(uuid, root, "domain/uuid") < 0) {
|
2006-03-15 12:13:25 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("domain information incomplete, missing uuid"));
|
2006-03-15 12:13:25 +00:00
|
|
|
}
|
2006-02-23 10:13:55 +00:00
|
|
|
}
|
2006-01-19 10:23:15 +00:00
|
|
|
|
2006-03-15 12:13:25 +00:00
|
|
|
error:
|
2006-01-19 10:23:15 +00:00
|
|
|
sexpr_free(root);
|
2006-03-15 12:13:25 +00:00
|
|
|
return (ret);
|
2006-01-19 10:23:15 +00:00
|
|
|
}
|
|
|
|
|
2006-07-07 18:58:35 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDomainLookupByID:
|
|
|
|
* @xend: A xend instance
|
|
|
|
* @id: The id of the domain
|
|
|
|
* @name: return value for the name if not NULL
|
|
|
|
* @uuid: return value for the UUID if not NULL
|
|
|
|
*
|
|
|
|
* This method looks up the name of a domain based on its id
|
|
|
|
*
|
|
|
|
* Returns the 0 on success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainLookupByID(virConnectPtr xend,
|
2008-04-10 16:54:54 +00:00
|
|
|
int id,
|
|
|
|
char **domname,
|
|
|
|
unsigned char *uuid)
|
2006-07-07 18:58:35 +00:00
|
|
|
{
|
|
|
|
const char *name = NULL;
|
|
|
|
struct sexpr *root;
|
|
|
|
|
Mon Jan 23 14:36:18 IST 2007 Mark McLoughlin <markmc@redhat.com>
* include/libvirt/libvirt.h.in: add VIR_UUID_BUFLEN and
VIR_UUID_STRING_BUFLEN
* libvirt/proxy/libvirt_proxy.c, libvirt/src/hash.c,
libvirt/src/internal.h, libvirt/src/libvirt.c,
libvirt/src/proxy_internal.c, libvirt/src/test.c,
libvirt/src/virsh.c, libvirt/src/xend_internal.c,
libvirt/src/xm_internal.c, libvirt/src/xml.c,
libvirt/python/libvir.c: use them
2007-01-23 14:39:45 +00:00
|
|
|
memset(uuid, 0, VIR_UUID_BUFLEN);
|
2006-07-07 18:58:35 +00:00
|
|
|
|
|
|
|
root = sexpr_get(xend, "/xend/domain/%d?detail=1", id);
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
name = sexpr_node(root, "domain/name");
|
|
|
|
if (name == NULL) {
|
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("domain information incomplete, missing name"));
|
2006-07-07 18:58:35 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (domname)
|
|
|
|
*domname = strdup(name);
|
|
|
|
|
2007-08-09 20:19:12 +00:00
|
|
|
if (sexpr_uuid(uuid, root, "domain/uuid") < 0) {
|
2006-07-07 18:58:35 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("domain information incomplete, missing uuid"));
|
2006-07-07 18:58:35 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
sexpr_free(root);
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
2008-05-29 19:20:22 +00:00
|
|
|
if (domname)
|
|
|
|
VIR_FREE(*domname);
|
2006-07-07 18:58:35 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2006-01-12 15:38:07 +00:00
|
|
|
|
2007-03-06 21:55:44 +00:00
|
|
|
#ifndef PROXY
|
2006-12-14 01:56:14 +00:00
|
|
|
static int
|
|
|
|
xend_detect_config_version(virConnectPtr conn) {
|
2006-09-12 01:16:22 +00:00
|
|
|
struct sexpr *root;
|
|
|
|
const char *value;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-09-12 01:16:22 +00:00
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2006-09-12 01:16:22 +00:00
|
|
|
root = sexpr_get(conn, "/xend/node/");
|
|
|
|
if (root == NULL)
|
|
|
|
return (-1);
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2006-09-12 01:16:22 +00:00
|
|
|
value = sexpr_node(root, "node/xend_config_format");
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2006-09-12 01:16:22 +00:00
|
|
|
if (value) {
|
2007-04-04 14:19:49 +00:00
|
|
|
priv->xendConfigVersion = strtol(value, NULL, 10);
|
2006-12-14 01:56:14 +00:00
|
|
|
} else {
|
|
|
|
/* Xen prior to 3.0.3 did not have the xend_config_format
|
|
|
|
field, and is implicitly version 1. */
|
2007-04-04 14:19:49 +00:00
|
|
|
priv->xendConfigVersion = 1;
|
2006-12-14 01:56:14 +00:00
|
|
|
}
|
2006-09-12 01:16:22 +00:00
|
|
|
sexpr_free(root);
|
2007-04-13 00:43:57 +00:00
|
|
|
return (0);
|
2006-09-12 01:16:22 +00:00
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* PROXY */
|
2006-02-20 17:22:16 +00:00
|
|
|
|
2006-03-23 15:42:10 +00:00
|
|
|
/*****************************************************************
|
|
|
|
******
|
2008-07-25 10:49:33 +00:00
|
|
|
****** Parsing of SEXPR into virDomainDef objects
|
2006-03-23 15:42:10 +00:00
|
|
|
******
|
|
|
|
*****************************************************************/
|
2006-07-10 11:21:24 +00:00
|
|
|
|
|
|
|
/**
|
2008-07-25 10:49:33 +00:00
|
|
|
* xenDaemonParseSxprOS
|
2006-11-07 21:52:44 +00:00
|
|
|
* @xend: the xend connection object
|
2006-07-10 11:21:24 +00:00
|
|
|
* @node: the root of the parsed S-Expression
|
2008-07-25 10:49:33 +00:00
|
|
|
* @def: the domain config
|
2008-02-05 19:27:37 +00:00
|
|
|
* @hvm: true or 1 if no contains HVM S-Expression
|
2007-04-13 00:43:57 +00:00
|
|
|
* @bootloader: true or 1 if a bootloader is defined
|
2006-07-10 11:21:24 +00:00
|
|
|
*
|
|
|
|
* Parse the xend sexp for description of os and append it to buf.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
2008-08-01 14:43:12 +00:00
|
|
|
xenDaemonParseSxprOS(virConnectPtr xend,
|
2008-08-04 06:33:25 +00:00
|
|
|
const struct sexpr *node,
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainDefPtr def,
|
|
|
|
int hvm)
|
2006-07-10 11:21:24 +00:00
|
|
|
{
|
|
|
|
if (hvm) {
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_node_copy(node, "domain/image/hvm/loader", &def->os.loader) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (def->os.loader == NULL) {
|
|
|
|
if (sexpr_node_copy(node, "domain/image/hvm/kernel", &def->os.loader) < 0)
|
|
|
|
goto no_memory;
|
2008-02-05 16:21:25 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (def->os.loader == NULL) {
|
2008-02-05 16:21:25 +00:00
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing HVM loader"));
|
|
|
|
return(-1);
|
2007-04-13 00:43:57 +00:00
|
|
|
}
|
2008-02-05 16:21:25 +00:00
|
|
|
} else {
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_node_copy(node, "domain/image/hvm/kernel", &def->os.kernel) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (sexpr_node_copy(node, "domain/image/hvm/ramdisk", &def->os.initrd) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (sexpr_node_copy(node, "domain/image/hvm/args", &def->os.cmdline) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (sexpr_node_copy(node, "domain/image/hvm/root", &def->os.root) < 0)
|
|
|
|
goto no_memory;
|
2006-07-10 11:21:24 +00:00
|
|
|
}
|
|
|
|
} else {
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_node_copy(node, "domain/image/linux/kernel", &def->os.kernel) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (sexpr_node_copy(node, "domain/image/linux/ramdisk", &def->os.initrd) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (sexpr_node_copy(node, "domain/image/linux/args", &def->os.cmdline) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (sexpr_node_copy(node, "domain/image/linux/root", &def->os.root) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If HVM kenrel == loader, then old xend, so kill off kernel */
|
|
|
|
if (hvm &&
|
|
|
|
def->os.kernel &&
|
|
|
|
STREQ(def->os.kernel, def->os.loader)) {
|
|
|
|
VIR_FREE(def->os.kernel);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!def->os.kernel &&
|
|
|
|
hvm) {
|
|
|
|
const char *boot = sexpr_node(node, "domain/image/hvm/boot");
|
|
|
|
if ((boot != NULL) && (boot[0] != 0)) {
|
|
|
|
while (*boot &&
|
|
|
|
def->os.nBootDevs < VIR_DOMAIN_BOOT_LAST) {
|
|
|
|
if (*boot == 'a')
|
|
|
|
def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_FLOPPY;
|
|
|
|
else if (*boot == 'c')
|
|
|
|
def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_DISK;
|
|
|
|
else if (*boot == 'd')
|
|
|
|
def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_CDROM;
|
|
|
|
else if (*boot == 'n')
|
|
|
|
def->os.bootDevs[def->os.nBootDevs++] = VIR_DOMAIN_BOOT_NET;
|
|
|
|
boot++;
|
2008-02-05 16:21:25 +00:00
|
|
|
}
|
2007-04-13 00:43:57 +00:00
|
|
|
}
|
2006-07-10 11:21:24 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!hvm &&
|
|
|
|
!def->os.kernel &&
|
|
|
|
!def->os.bootloader) {
|
|
|
|
virXendError(xend, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing kernel & bootloader"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(xend, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
return -1;
|
2006-07-10 11:21:24 +00:00
|
|
|
}
|
|
|
|
|
2008-04-26 14:22:02 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
xend_parse_sexp_desc_char(virConnectPtr conn,
|
|
|
|
virBufferPtr buf,
|
|
|
|
const char *devtype,
|
|
|
|
int portNum,
|
|
|
|
const char *value,
|
|
|
|
const char *tty)
|
|
|
|
{
|
|
|
|
const char *type;
|
|
|
|
int telnet = 0;
|
|
|
|
char *bindPort = NULL;
|
|
|
|
char *bindHost = NULL;
|
|
|
|
char *connectPort = NULL;
|
|
|
|
char *connectHost = NULL;
|
|
|
|
char *path = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (value[0] == '/') {
|
|
|
|
type = "dev";
|
|
|
|
} else if (STRPREFIX(value, "null")) {
|
|
|
|
type = "null";
|
|
|
|
value = NULL;
|
|
|
|
} else if (STRPREFIX(value, "vc")) {
|
|
|
|
type = "vc";
|
|
|
|
value = NULL;
|
|
|
|
} else if (STRPREFIX(value, "pty")) {
|
|
|
|
type = "pty";
|
|
|
|
value = NULL;
|
|
|
|
} else if (STRPREFIX(value, "stdio")) {
|
|
|
|
type = "stdio";
|
|
|
|
value = NULL;
|
|
|
|
} else if (STRPREFIX(value, "file:")) {
|
|
|
|
type = "file";
|
|
|
|
value += sizeof("file:")-1;
|
|
|
|
} else if (STRPREFIX(value, "pipe:")) {
|
|
|
|
type = "pipe";
|
|
|
|
value += sizeof("pipe:")-1;
|
|
|
|
} else if (STRPREFIX(value, "tcp:")) {
|
|
|
|
type = "tcp";
|
|
|
|
value += sizeof("tcp:")-1;
|
|
|
|
} else if (STRPREFIX(value, "telnet:")) {
|
|
|
|
type = "tcp";
|
|
|
|
value += sizeof("telnet:")-1;
|
|
|
|
telnet = 1;
|
|
|
|
} else if (STRPREFIX(value, "udp:")) {
|
|
|
|
type = "udp";
|
|
|
|
value += sizeof("udp:")-1;
|
|
|
|
} else if (STRPREFIX(value, "unix:")) {
|
|
|
|
type = "unix";
|
|
|
|
value += sizeof("unix:")-1;
|
|
|
|
} else {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Unknown char device type"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compat with legacy <console tty='/dev/pts/5'/> syntax */
|
|
|
|
if (STREQ(devtype, "console") &&
|
|
|
|
STREQ(type, "pty") &&
|
|
|
|
tty != NULL) {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf, " <%s type='%s' tty='%s'>\n",
|
|
|
|
devtype, type, tty);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf, " <%s type='%s'>\n",
|
|
|
|
devtype, type);
|
2008-04-26 14:22:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (STREQ(type, "null") ||
|
|
|
|
STREQ(type, "vc") ||
|
|
|
|
STREQ(type, "stdio")) {
|
|
|
|
/* no source needed */
|
|
|
|
} else if (STREQ(type, "pty")) {
|
2008-04-28 15:14:59 +00:00
|
|
|
if (tty)
|
2008-04-26 14:22:02 +00:00
|
|
|
virBufferVSprintf(buf, " <source path='%s'/>\n",
|
2008-04-28 15:14:59 +00:00
|
|
|
tty);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else if (STREQ(type, "file") ||
|
|
|
|
STREQ(type, "pipe")) {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf, " <source path='%s'/>\n",
|
|
|
|
value);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else if (STREQ(type, "tcp")) {
|
|
|
|
const char *offset = strchr(value, ':');
|
|
|
|
const char *offset2;
|
|
|
|
const char *mode, *protocol;
|
|
|
|
|
|
|
|
if (offset == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed char device string"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset != value &&
|
|
|
|
(bindHost = strndup(value, offset - value)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
offset2 = strchr(offset, ',');
|
|
|
|
if (offset2 == NULL)
|
|
|
|
bindPort = strdup(offset+1);
|
|
|
|
else
|
|
|
|
bindPort = strndup(offset+1, offset2-(offset+1));
|
|
|
|
if (bindPort == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (offset2 && strstr(offset2, ",listen"))
|
|
|
|
mode = "bind";
|
|
|
|
else
|
|
|
|
mode = "connect";
|
|
|
|
protocol = telnet ? "telnet":"raw";
|
|
|
|
|
|
|
|
if (bindHost) {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <source mode='%s' host='%s' service='%s'/>\n",
|
|
|
|
mode, bindHost, bindPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <source mode='%s' service='%s'/>\n",
|
|
|
|
mode, bindPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
}
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <protocol type='%s'/>\n",
|
|
|
|
protocol);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else if (STREQ(type, "udp")) {
|
|
|
|
const char *offset = strchr(value, ':');
|
|
|
|
const char *offset2, *offset3;
|
|
|
|
|
|
|
|
if (offset == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed char device string"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset != value &&
|
|
|
|
(connectHost = strndup(value, offset - value)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
offset2 = strchr(offset, '@');
|
|
|
|
if (offset2 != NULL) {
|
|
|
|
if ((connectPort = strndup(offset + 1, offset2-(offset+1))) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
offset3 = strchr(offset2, ':');
|
|
|
|
if (offset3 == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed char device string"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset3 > (offset2 + 1) &&
|
|
|
|
(bindHost = strndup(offset2 + 1, offset3 - (offset2+1))) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if ((bindPort = strdup(offset3 + 1)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
} else {
|
|
|
|
if ((connectPort = strdup(offset + 1)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (connectPort) {
|
|
|
|
if (connectHost) {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <source mode='connect' host='%s' service='%s'/>\n",
|
|
|
|
connectHost, connectPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <source mode='connect' service='%s'/>\n",
|
|
|
|
connectPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bindPort) {
|
|
|
|
if (bindHost) {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <source mode='bind' host='%s' service='%s'/>\n",
|
|
|
|
bindHost, bindPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
} else {
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf,
|
|
|
|
" <source mode='bind' service='%s'/>\n",
|
|
|
|
bindPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (STREQ(type, "unix")) {
|
|
|
|
const char *offset = strchr(value, ',');
|
|
|
|
int dolisten = 0;
|
|
|
|
if (offset)
|
|
|
|
path = strndup(value, (offset - value));
|
|
|
|
else
|
|
|
|
path = strdup(value);
|
|
|
|
if (path == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (offset != NULL &&
|
|
|
|
strstr(offset, ",listen") != NULL)
|
|
|
|
dolisten = 1;
|
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf, " <source mode='%s' path='%s'/>\n",
|
|
|
|
dolisten ? "bind" : "connect", path);
|
2008-04-26 14:22:02 +00:00
|
|
|
}
|
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf, " <target port='%d'/>\n",
|
|
|
|
portNum);
|
2008-04-26 14:22:02 +00:00
|
|
|
|
2008-04-28 15:14:59 +00:00
|
|
|
virBufferVSprintf(buf, " </%s>\n",
|
|
|
|
devtype);
|
2008-04-26 14:22:02 +00:00
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
if (ret == -1) {
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY,
|
|
|
|
_("no memory for char device config"));
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(path);
|
|
|
|
VIR_FREE(bindHost);
|
|
|
|
VIR_FREE(bindPort);
|
|
|
|
VIR_FREE(connectHost);
|
|
|
|
VIR_FREE(connectPort);
|
2008-04-26 14:22:02 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
virDomainChrDefPtr
|
2008-07-25 10:49:33 +00:00
|
|
|
xenDaemonParseSxprChar(virConnectPtr conn,
|
|
|
|
const char *value,
|
|
|
|
const char *tty)
|
|
|
|
{
|
|
|
|
char prefix[10];
|
|
|
|
char *tmp;
|
|
|
|
virDomainChrDefPtr def;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(def) < 0) {
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
strncpy(prefix, value, sizeof(prefix)-1);
|
|
|
|
NUL_TERMINATE(prefix);
|
|
|
|
|
|
|
|
if (value[0] == '/') {
|
|
|
|
def->type = VIR_DOMAIN_CHR_TYPE_DEV;
|
|
|
|
} else {
|
|
|
|
if ((tmp = strchr(prefix, ':')) != NULL) {
|
|
|
|
*tmp = '\0';
|
|
|
|
value += (tmp - prefix) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (STREQ(prefix, "telnet")) {
|
|
|
|
def->type = VIR_DOMAIN_CHR_TYPE_TCP;
|
|
|
|
def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET;
|
|
|
|
} else {
|
|
|
|
if ((def->type = virDomainChrTypeFromString(prefix)) < 0) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unknown chr device type '%s'"), prefix);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compat with legacy <console tty='/dev/pts/5'/> syntax */
|
|
|
|
switch (def->type) {
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_PTY:
|
|
|
|
if (tty != NULL &&
|
|
|
|
!(def->data.file.path = strdup(tty)))
|
|
|
|
goto no_memory;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_FILE:
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_PIPE:
|
|
|
|
if (!(def->data.file.path = strdup(value)))
|
|
|
|
goto no_memory;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_TCP:
|
|
|
|
{
|
|
|
|
const char *offset = strchr(value, ':');
|
|
|
|
const char *offset2;
|
|
|
|
|
|
|
|
if (offset == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed char device string"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset != value &&
|
|
|
|
(def->data.tcp.host = strndup(value, offset - value)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
offset2 = strchr(offset, ',');
|
|
|
|
if (offset2 == NULL)
|
|
|
|
def->data.tcp.service = strdup(offset+1);
|
|
|
|
else
|
|
|
|
def->data.tcp.service = strndup(offset+1, offset2-(offset+1));
|
|
|
|
if (def->data.tcp.service == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (offset2 && strstr(offset2, ",listen"))
|
|
|
|
def->data.tcp.listen = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_UDP:
|
|
|
|
{
|
|
|
|
const char *offset = strchr(value, ':');
|
|
|
|
const char *offset2, *offset3;
|
|
|
|
|
|
|
|
if (offset == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed char device string"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset != value &&
|
|
|
|
(def->data.udp.connectHost = strndup(value, offset - value)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
offset2 = strchr(offset, '@');
|
|
|
|
if (offset2 != NULL) {
|
|
|
|
if ((def->data.udp.connectService = strndup(offset + 1, offset2-(offset+1))) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
offset3 = strchr(offset2, ':');
|
|
|
|
if (offset3 == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed char device string"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset3 > (offset2 + 1) &&
|
|
|
|
(def->data.udp.bindHost = strndup(offset2 + 1, offset3 - (offset2+1))) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if ((def->data.udp.bindService = strdup(offset3 + 1)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
} else {
|
|
|
|
if ((def->data.udp.connectService = strdup(offset + 1)) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_UNIX:
|
|
|
|
{
|
|
|
|
const char *offset = strchr(value, ',');
|
|
|
|
if (offset)
|
|
|
|
def->data.nix.path = strndup(value, (offset - value));
|
|
|
|
else
|
|
|
|
def->data.nix.path = strdup(value);
|
|
|
|
if (def->data.nix.path == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (offset != NULL &&
|
|
|
|
strstr(offset, ",listen") != NULL)
|
|
|
|
def->data.nix.listen = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return def;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
error:
|
|
|
|
virDomainChrDefFree(def);
|
|
|
|
return NULL;
|
|
|
|
}
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
|
|
|
/**
|
2008-07-25 10:49:33 +00:00
|
|
|
* xend_parse_sexp_desc_disks
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
* @conn: connection
|
|
|
|
* @root: root sexpr
|
|
|
|
* @xendConfigVersion: version of xend
|
|
|
|
*
|
2008-07-25 10:49:33 +00:00
|
|
|
* This parses out block devices from the domain sexpr
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
*
|
|
|
|
* Returns 0 if successful or -1 if failed.
|
|
|
|
*/
|
|
|
|
static int
|
2008-07-25 10:49:33 +00:00
|
|
|
xenDaemonParseSxprDisks(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *root,
|
2008-07-25 10:49:33 +00:00
|
|
|
int hvm,
|
|
|
|
int xendConfigVersion)
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
{
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *cur, *node;
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainDiskDefPtr disk = NULL, prev = def->disks;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
|
|
|
for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
|
|
|
|
node = cur->u.s.car;
|
|
|
|
/* Normally disks are in a (device (vbd ...)) block
|
|
|
|
but blktap disks ended up in a differently named
|
|
|
|
(device (tap ....)) block.... */
|
|
|
|
if (sexpr_lookup(node, "device/vbd") ||
|
|
|
|
sexpr_lookup(node, "device/tap")) {
|
|
|
|
char *offset;
|
|
|
|
const char *src = NULL;
|
|
|
|
const char *dst = NULL;
|
|
|
|
const char *mode = NULL;
|
|
|
|
|
|
|
|
/* Again dealing with (vbd...) vs (tap ...) differences */
|
|
|
|
if (sexpr_lookup(node, "device/vbd")) {
|
|
|
|
src = sexpr_node(node, "device/vbd/uname");
|
|
|
|
dst = sexpr_node(node, "device/vbd/dev");
|
|
|
|
mode = sexpr_node(node, "device/vbd/mode");
|
|
|
|
} else {
|
|
|
|
src = sexpr_node(node, "device/tap/uname");
|
|
|
|
dst = sexpr_node(node, "device/tap/dev");
|
|
|
|
mode = sexpr_node(node, "device/tap/mode");
|
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (VIR_ALLOC(disk) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
if (dst == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, vbd has no dev"));
|
2008-07-25 10:49:33 +00:00
|
|
|
goto error;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (src == NULL) {
|
|
|
|
/* There is a case without the uname to the CD-ROM device */
|
|
|
|
offset = strchr(dst, ':');
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!offset ||
|
|
|
|
!hvm ||
|
|
|
|
STRNEQ(offset, ":cdrom")) {
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, vbd has no src"));
|
2008-07-25 10:49:33 +00:00
|
|
|
goto error;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (src != NULL) {
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
offset = strchr(src, ':');
|
|
|
|
if (!offset) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("cannot parse vbd filename, missing driver name"));
|
2008-07-25 10:49:33 +00:00
|
|
|
goto error;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (VIR_ALLOC_N(disk->driverName, (offset-src)+1) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
strncpy(disk->driverName, src, (offset-src));
|
|
|
|
disk->driverName[offset-src] = '\0';
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
|
|
|
src = offset + 1;
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (STREQ (disk->driverName, "tap")) {
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
offset = strchr(src, ':');
|
|
|
|
if (!offset) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("cannot parse vbd filename, missing driver type"));
|
2008-07-25 10:49:33 +00:00
|
|
|
goto error;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (VIR_ALLOC_N(disk->driverType, (offset-src)+1)< 0)
|
|
|
|
goto no_memory;
|
|
|
|
strncpy(disk->driverType, src, (offset-src));
|
|
|
|
disk->driverType[offset-src] = '\0';
|
|
|
|
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
src = offset + 1;
|
|
|
|
/* Its possible to use blktap driver for block devs
|
|
|
|
too, but kinda pointless because blkback is better,
|
|
|
|
so we assume common case here. If blktap becomes
|
|
|
|
omnipotent, we can revisit this, perhaps stat()'ing
|
|
|
|
the src file in question */
|
2008-07-25 10:49:33 +00:00
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
|
|
|
} else if (STREQ(disk->driverName, "phy")) {
|
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_BLOCK;
|
|
|
|
} else if (STREQ(disk->driverName, "file")) {
|
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
} else {
|
|
|
|
/* No CDROM media so can't really tell. We'll just
|
|
|
|
call if a FILE for now and update when media
|
|
|
|
is inserted later */
|
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (STREQLEN (dst, "ioemu:", 6))
|
|
|
|
dst += 6;
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_DISK;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
/* New style disk config from Xen >= 3.0.3 */
|
|
|
|
if (xendConfigVersion > 1) {
|
|
|
|
offset = strrchr(dst, ':');
|
|
|
|
if (offset) {
|
|
|
|
if (STREQ (offset, ":cdrom")) {
|
2008-07-25 10:49:33 +00:00
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
} else if (STREQ (offset, ":disk")) {
|
|
|
|
/* The default anyway */
|
|
|
|
} else {
|
|
|
|
/* Unknown, lets pretend its a disk too */
|
|
|
|
}
|
|
|
|
offset[0] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!(disk->dst = strdup(dst)))
|
|
|
|
goto no_memory;
|
|
|
|
if (src &&
|
|
|
|
!(disk->src = strdup(src)))
|
|
|
|
goto no_memory;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (STRPREFIX(disk->dst, "xvd"))
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_XEN;
|
|
|
|
else if (STRPREFIX(disk->dst, "hd"))
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
|
|
|
else if (STRPREFIX(disk->dst, "sd"))
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
|
|
|
else
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
|
|
|
|
|
|
|
if (mode &&
|
|
|
|
strchr(mode, 'r'))
|
|
|
|
disk->readonly = 1;
|
|
|
|
if (mode &&
|
|
|
|
strchr(mode, '!'))
|
|
|
|
disk->shared = 1;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = disk;
|
|
|
|
else
|
|
|
|
def->disks = disk;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
prev = disk;
|
|
|
|
disk = NULL;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2008-07-25 10:49:33 +00:00
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
|
|
|
|
error:
|
|
|
|
virDomainDiskDefFree(disk);
|
|
|
|
return -1;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
static int
|
2008-07-25 10:49:33 +00:00
|
|
|
xenDaemonParseSxprNets(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *root)
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
{
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainNetDefPtr net = NULL, prev = def->nets;
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *cur, *node;
|
2008-07-25 10:49:33 +00:00
|
|
|
const char *tmp;
|
|
|
|
int vif_index = 0;
|
|
|
|
|
|
|
|
for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
|
|
|
|
node = cur->u.s.car;
|
|
|
|
if (sexpr_lookup(node, "device/vif")) {
|
|
|
|
const char *tmp2, *model;
|
|
|
|
char buf[50];
|
|
|
|
tmp2 = sexpr_node(node, "device/vif/script");
|
|
|
|
tmp = sexpr_node(node, "device/vif/bridge");
|
|
|
|
model = sexpr_node(node, "device/vif/model");
|
|
|
|
|
|
|
|
if (VIR_ALLOC(net) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if ((tmp2 && strstr(tmp2, "bridge")) || tmp) {
|
|
|
|
net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
|
|
|
|
/* XXX virtual network reverse resolve */
|
|
|
|
|
|
|
|
if (tmp &&
|
|
|
|
!(net->data.bridge.brname = strdup(tmp)))
|
|
|
|
goto no_memory;
|
|
|
|
} else {
|
|
|
|
net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = sexpr_node(node, "device/vif/vifname");
|
|
|
|
if (!tmp) {
|
|
|
|
snprintf(buf, sizeof(buf), "vif%d.%d", def->id, vif_index);
|
|
|
|
tmp = buf;
|
|
|
|
}
|
|
|
|
if (!(net->ifname = strdup(tmp)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
tmp = sexpr_node(node, "device/vif/mac");
|
|
|
|
if (tmp) {
|
|
|
|
unsigned int mac[6];
|
|
|
|
if (sscanf(tmp, "%02x:%02x:%02x:%02x:%02x:%02x",
|
|
|
|
(unsigned int*)&mac[0],
|
|
|
|
(unsigned int*)&mac[1],
|
|
|
|
(unsigned int*)&mac[2],
|
|
|
|
(unsigned int*)&mac[3],
|
|
|
|
(unsigned int*)&mac[4],
|
|
|
|
(unsigned int*)&mac[5]) != 6) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("malformed mac address '%s'"),
|
|
|
|
tmp);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
net->mac[0] = mac[0];
|
|
|
|
net->mac[1] = mac[1];
|
|
|
|
net->mac[2] = mac[2];
|
|
|
|
net->mac[3] = mac[3];
|
|
|
|
net->mac[4] = mac[4];
|
|
|
|
net->mac[5] = mac[5];
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = sexpr_node(node, "device/vif/ip");
|
|
|
|
if (tmp &&
|
|
|
|
!(net->data.ethernet.ipaddr = strdup(tmp)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (tmp2 &&
|
|
|
|
net->type == VIR_DOMAIN_NET_TYPE_ETHERNET &&
|
|
|
|
!(net->data.ethernet.script = strdup(tmp2)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (model &&
|
|
|
|
!(net->model = strdup(model)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = net;
|
|
|
|
else
|
|
|
|
def->nets = net;
|
|
|
|
vif_index++;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
cleanup:
|
|
|
|
virDomainNetDefFree(net);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:50:08 +00:00
|
|
|
|
|
|
|
int
|
2008-07-25 10:49:33 +00:00
|
|
|
xenDaemonParseSxprSound(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
|
|
|
const char *str)
|
|
|
|
{
|
|
|
|
if (STREQ(str, "all")) {
|
|
|
|
int i;
|
|
|
|
virDomainSoundDefPtr prev = NULL;
|
|
|
|
for (i = 0 ; i < VIR_DOMAIN_SOUND_MODEL_LAST ; i++) {
|
|
|
|
virDomainSoundDefPtr sound;
|
|
|
|
if (VIR_ALLOC(sound) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
sound->model = i;
|
|
|
|
if (prev)
|
|
|
|
prev->next = sound;
|
|
|
|
else
|
|
|
|
def->sounds = sound;
|
|
|
|
prev = sound;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
} else {
|
2008-07-25 10:49:33 +00:00
|
|
|
char model[10];
|
|
|
|
const char *offset = str, *offset2;
|
|
|
|
virDomainSoundDefPtr prev = NULL;
|
|
|
|
do {
|
|
|
|
int len;
|
|
|
|
virDomainSoundDefPtr sound;
|
|
|
|
offset2 = strchr(offset, ',');
|
|
|
|
if (offset2)
|
|
|
|
len = (offset2 - offset);
|
|
|
|
else
|
|
|
|
len = strlen(offset);
|
|
|
|
if (len > (sizeof(model)-1)) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected sound model %s"), offset);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
strncpy(model, offset, len);
|
|
|
|
model[len] = '\0';
|
|
|
|
|
|
|
|
if (VIR_ALLOC(sound) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if ((sound->model = virDomainSoundModelTypeFromString(model)) < 0) {
|
|
|
|
VIR_FREE(sound);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = sound;
|
|
|
|
else
|
|
|
|
def->sounds = sound;
|
|
|
|
prev = sound;
|
|
|
|
offset = offset2 ? offset2 + 1 : NULL;
|
|
|
|
} while (offset);
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
error:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
xenDaemonParseSxprUSB(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *root)
|
2008-07-25 10:49:33 +00:00
|
|
|
{
|
|
|
|
virDomainInputDefPtr prev = def->inputs;
|
|
|
|
struct sexpr *cur, *node;
|
|
|
|
const char *tmp;
|
|
|
|
|
|
|
|
for (cur = sexpr_lookup(root, "domain/image/hvm"); cur && cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
|
|
|
|
node = cur->u.s.car;
|
|
|
|
if (sexpr_lookup(node, "usbdevice")) {
|
|
|
|
tmp = sexpr_node(node, "usbdevice");
|
|
|
|
if (tmp && *tmp) {
|
|
|
|
if (STREQ(tmp, "tablet") ||
|
|
|
|
STREQ(tmp, "mouse")) {
|
|
|
|
virDomainInputDefPtr input;
|
|
|
|
if (VIR_ALLOC(input) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
input->bus = VIR_DOMAIN_INPUT_BUS_USB;
|
|
|
|
if (STREQ(tmp, "tablet"))
|
|
|
|
input->type = VIR_DOMAIN_INPUT_TYPE_TABLET;
|
|
|
|
else
|
|
|
|
input->type = VIR_DOMAIN_INPUT_TYPE_MOUSE;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = input;
|
|
|
|
else
|
|
|
|
def->inputs = input;
|
|
|
|
prev = input;
|
|
|
|
} else {
|
|
|
|
/* XXX Handle other non-input USB devices later */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
xenDaemonParseSxprGraphicsOld(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *root,
|
2008-07-25 10:49:33 +00:00
|
|
|
int hvm,
|
|
|
|
int xendConfigVersion)
|
|
|
|
{
|
|
|
|
const char *tmp;
|
|
|
|
virDomainGraphicsDefPtr graphics = NULL;
|
|
|
|
|
|
|
|
if ((tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux")) &&
|
|
|
|
tmp[0] == '1') {
|
|
|
|
/* Graphics device (HVM, or old (pre-3.0.4) style PV VNC config) */
|
|
|
|
int port = xenStoreDomainGetVNCPort(conn, def->id);
|
|
|
|
const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
|
|
|
|
const char *vncPasswd = sexpr_fmt_node(root, "domain/image/%s/vncpasswd", hvm ? "hvm" : "linux");
|
|
|
|
const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
|
|
|
|
const char *unused = sexpr_fmt_node(root, "domain/image/%s/vncunused", hvm ? "hvm" : "linux");
|
|
|
|
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;
|
|
|
|
/* For Xen >= 3.0.3, don't generate a fixed port mapping
|
|
|
|
* because it will almost certainly be wrong ! Just leave
|
|
|
|
* it as -1 which lets caller see that the VNC server isn't
|
|
|
|
* present yet. Subsquent dumps of the XML will eventually
|
|
|
|
* find the port in XenStore once VNC server has started
|
|
|
|
*/
|
|
|
|
if (port == -1 && xendConfigVersion < 2)
|
|
|
|
port = 5900 + def->id;
|
|
|
|
|
|
|
|
if ((unused && STREQ(unused, "1")) || port == -1)
|
|
|
|
graphics->data.vnc.autoport = 1;
|
|
|
|
graphics->data.vnc.port = port;
|
|
|
|
|
|
|
|
if (listenAddr &&
|
|
|
|
!(graphics->data.vnc.listenAddr = strdup(listenAddr)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (vncPasswd &&
|
|
|
|
!(graphics->data.vnc.passwd = strdup(vncPasswd)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (keymap &&
|
|
|
|
!(graphics->data.vnc.keymap = strdup(keymap)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
def->graphics = graphics;
|
|
|
|
} else if ((tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux")) &&
|
|
|
|
tmp[0] == '1') {
|
|
|
|
/* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
|
|
|
|
const char *display = sexpr_fmt_node(root, "domain/image/%s/display", hvm ? "hvm" : "linux");
|
|
|
|
const char *xauth = sexpr_fmt_node(root, "domain/image/%s/xauthority", hvm ? "hvm" : "linux");
|
|
|
|
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
|
|
|
|
if (display &&
|
|
|
|
!(graphics->data.sdl.display = strdup(display)))
|
|
|
|
goto no_memory;
|
|
|
|
if (xauth &&
|
|
|
|
!(graphics->data.sdl.xauth = strdup(xauth)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
def->graphics = graphics;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
virDomainGraphicsDefFree(graphics);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
xenDaemonParseSxprGraphicsNew(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *root)
|
2008-07-25 10:49:33 +00:00
|
|
|
{
|
|
|
|
virDomainGraphicsDefPtr graphics = NULL;
|
2008-08-01 14:43:12 +00:00
|
|
|
const struct sexpr *cur, *node;
|
2008-07-25 10:49:33 +00:00
|
|
|
const char *tmp;
|
|
|
|
|
|
|
|
/* append network devices and framebuffer */
|
|
|
|
for (cur = root; cur->kind == SEXPR_CONS; cur = cur->u.s.cdr) {
|
|
|
|
node = cur->u.s.car;
|
|
|
|
if (sexpr_lookup(node, "device/vfb")) {
|
|
|
|
/* New style graphics config for PV guests in >= 3.0.4,
|
|
|
|
* or for HVM guests in >= 3.0.5 */
|
|
|
|
tmp = sexpr_node(node, "device/vfb/type");
|
|
|
|
|
|
|
|
if (VIR_ALLOC(graphics) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if ((graphics->type = virDomainGraphicsTypeFromString(tmp)) < 0) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unknown graphics type '%s'"), tmp);
|
|
|
|
goto error;
|
|
|
|
}
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
|
|
|
|
const char *display = sexpr_node(node, "device/vfb/display");
|
|
|
|
const char *xauth = sexpr_node(node, "device/vfb/xauthority");
|
|
|
|
if (display &&
|
|
|
|
!(graphics->data.sdl.display = strdup(display)))
|
|
|
|
goto no_memory;
|
|
|
|
if (xauth &&
|
|
|
|
!(graphics->data.sdl.xauth = strdup(xauth)))
|
|
|
|
goto no_memory;
|
|
|
|
} else {
|
|
|
|
int port = xenStoreDomainGetVNCPort(conn, def->id);
|
|
|
|
const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten");
|
|
|
|
const char *vncPasswd = sexpr_node(node, "device/vfb/vncpasswd");;
|
|
|
|
const char *keymap = sexpr_node(node, "device/vfb/keymap");
|
|
|
|
const char *unused = sexpr_node(node, "device/vfb/vncunused");
|
|
|
|
|
|
|
|
if ((unused && STREQ(unused, "1")) || port == -1)
|
|
|
|
graphics->data.vnc.autoport = 1;
|
|
|
|
graphics->data.vnc.port = port;
|
|
|
|
|
|
|
|
if (listenAddr &&
|
|
|
|
!(graphics->data.vnc.listenAddr = strdup(listenAddr)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (vncPasswd &&
|
|
|
|
!(graphics->data.vnc.passwd = strdup(vncPasswd)))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (keymap &&
|
|
|
|
!(graphics->data.vnc.keymap = strdup(keymap)))
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
|
|
|
|
def->graphics = graphics;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
|
|
|
return 0;
|
2008-07-25 10:49:33 +00:00
|
|
|
|
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
error:
|
|
|
|
virDomainGraphicsDefFree(graphics);
|
|
|
|
return -1;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
|
2006-02-20 17:22:16 +00:00
|
|
|
/**
|
2008-07-25 10:49:33 +00:00
|
|
|
* xenDaemonParseSxpr:
|
2006-10-09 14:32:07 +00:00
|
|
|
* @conn: the connection associated with the XML
|
2006-02-20 17:22:16 +00:00
|
|
|
* @root: the root of the parsed S-Expression
|
2007-09-30 13:09:07 +00:00
|
|
|
* @xendConfigVersion: version of xend
|
2007-10-31 09:39:13 +00:00
|
|
|
* @cpus: set of cpus the domain may be pinned to
|
2006-02-20 17:22:16 +00:00
|
|
|
*
|
|
|
|
* Parse the xend sexp description and turn it into the XML format similar
|
|
|
|
* to the one unsed for creation.
|
|
|
|
*
|
|
|
|
* Returns the 0 terminated XML string or NULL in case of error.
|
|
|
|
* the caller must free() the returned value.
|
|
|
|
*/
|
2008-07-25 10:49:33 +00:00
|
|
|
static virDomainDefPtr
|
|
|
|
xenDaemonParseSxpr(virConnectPtr conn,
|
2008-08-01 15:32:28 +00:00
|
|
|
const struct sexpr *root,
|
2008-07-25 10:49:33 +00:00
|
|
|
int xendConfigVersion,
|
|
|
|
const char *cpus)
|
2006-03-15 12:13:25 +00:00
|
|
|
{
|
2006-02-20 17:22:16 +00:00
|
|
|
const char *tmp;
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainDefPtr def;
|
|
|
|
int hvm = 0;
|
|
|
|
char *tty = NULL;
|
2006-02-20 17:22:16 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (VIR_ALLOC(def) < 0)
|
|
|
|
goto no_memory;
|
2006-02-20 17:22:16 +00:00
|
|
|
|
2007-03-02 20:19:08 +00:00
|
|
|
tmp = sexpr_node(root, "domain/domid");
|
|
|
|
if (tmp == NULL && xendConfigVersion < 3) { /* Old XenD, domid was mandatory */
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing id"));
|
|
|
|
goto error;
|
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
def->virtType = VIR_DOMAIN_VIRT_XEN;
|
2007-03-02 20:19:08 +00:00
|
|
|
if (tmp)
|
2008-07-25 10:49:33 +00:00
|
|
|
def->id = sexpr_int(root, "domain/domid");
|
2007-03-02 20:19:08 +00:00
|
|
|
else
|
2008-07-25 10:49:33 +00:00
|
|
|
def->id = -1;
|
2006-09-21 15:24:37 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_node_copy(root, "domain/name", &def->name) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (def->name == NULL) {
|
2006-10-09 14:32:07 +00:00
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("domain information incomplete, missing name"));
|
2006-03-15 12:13:25 +00:00
|
|
|
goto error;
|
2006-02-20 17:22:16 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
|
2006-04-27 14:14:23 +00:00
|
|
|
tmp = sexpr_node(root, "domain/uuid");
|
2007-08-09 20:19:12 +00:00
|
|
|
if (tmp == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing name"));
|
|
|
|
goto error;
|
2006-04-27 14:14:23 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
virUUIDParse(tmp, def->uuid);
|
2007-08-09 20:19:12 +00:00
|
|
|
|
2007-09-30 15:36:47 +00:00
|
|
|
hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0;
|
|
|
|
if (!hvm) {
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_node_copy(root, "domain/bootloader",
|
|
|
|
&def->os.bootloader) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (!def->os.bootloader &&
|
|
|
|
sexpr_has(root, "domain/bootloader") &&
|
|
|
|
(def->os.bootloader = strdup("")) == NULL)
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (def->os.bootloader &&
|
|
|
|
sexpr_node_copy(root, "domain/bootloader_args",
|
|
|
|
&def->os.bootloaderArgs) < 0)
|
|
|
|
goto no_memory;
|
2007-06-07 13:50:18 +00:00
|
|
|
}
|
2006-07-10 11:21:24 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!(def->os.type = strdup(hvm ? "hvm" : "linux")))
|
|
|
|
goto no_memory;
|
|
|
|
|
|
|
|
if (def->id != 0) {
|
2007-04-13 00:43:57 +00:00
|
|
|
if (sexpr_lookup(root, "domain/image")) {
|
2008-07-25 10:49:33 +00:00
|
|
|
if (xenDaemonParseSxprOS(conn, root, def, hvm) < 0)
|
2007-09-29 18:31:05 +00:00
|
|
|
goto error;
|
2007-04-13 00:43:57 +00:00
|
|
|
}
|
2006-02-20 17:22:16 +00:00
|
|
|
}
|
2006-07-10 11:21:24 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
def->maxmem = (unsigned long) (sexpr_u64(root, "domain/maxmem") << 10);
|
|
|
|
def->memory = (unsigned long) (sexpr_u64(root, "domain/memory") << 10);
|
|
|
|
if (def->memory > def->maxmem)
|
|
|
|
def->maxmem = def->memory;
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2007-10-31 09:39:13 +00:00
|
|
|
if (cpus != NULL) {
|
2008-07-25 10:49:33 +00:00
|
|
|
if (virDomainCpuSetParse(conn, &cpus,
|
|
|
|
0, def->cpumask,
|
|
|
|
def->cpumasklen) < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
def->vcpus = sexpr_int(root, "domain/vcpus");
|
|
|
|
|
2006-04-10 08:32:34 +00:00
|
|
|
tmp = sexpr_node(root, "domain/on_poweroff");
|
2008-07-25 10:49:33 +00:00
|
|
|
if (tmp != NULL) {
|
|
|
|
if ((def->onPoweroff = virDomainLifecycleTypeFromString(tmp)) < 0) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unknown lifecycle type %s"), tmp);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY;
|
|
|
|
|
2006-04-10 08:32:34 +00:00
|
|
|
tmp = sexpr_node(root, "domain/on_reboot");
|
2008-07-25 10:49:33 +00:00
|
|
|
if (tmp != NULL) {
|
|
|
|
if ((def->onReboot = virDomainLifecycleTypeFromString(tmp)) < 0) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unknown lifecycle type %s"), tmp);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART;
|
|
|
|
|
2006-04-10 08:32:34 +00:00
|
|
|
tmp = sexpr_node(root, "domain/on_crash");
|
2008-07-25 10:49:33 +00:00
|
|
|
if (tmp != NULL) {
|
|
|
|
if ((def->onCrash = virDomainLifecycleTypeFromString(tmp)) < 0) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unknown lifecycle type %s"), tmp);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
|
2006-04-10 08:32:34 +00:00
|
|
|
|
2007-07-16 21:30:30 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (hvm) {
|
2006-08-15 17:01:42 +00:00
|
|
|
if (sexpr_int(root, "domain/image/hvm/acpi"))
|
2008-07-25 10:49:33 +00:00
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_ACPI);
|
2006-08-15 17:01:42 +00:00
|
|
|
if (sexpr_int(root, "domain/image/hvm/apic"))
|
2008-07-25 10:49:33 +00:00
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_APIC);
|
2006-08-15 17:01:42 +00:00
|
|
|
if (sexpr_int(root, "domain/image/hvm/pae"))
|
2008-07-25 10:49:33 +00:00
|
|
|
def->features |= (1 << VIR_DOMAIN_FEATURE_PAE);
|
2007-07-16 21:30:30 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_int(root, "domain/image/hvm/localtime"))
|
|
|
|
def->localtime = 1;
|
2006-08-15 17:01:42 +00:00
|
|
|
}
|
2006-09-21 15:24:37 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (sexpr_node_copy(root, hvm ?
|
|
|
|
"domain/image/hvm/device_model" :
|
|
|
|
"domain/image/linux/device_model",
|
|
|
|
&def->emulator) < 0)
|
|
|
|
goto no_memory;
|
2006-07-10 11:21:24 +00:00
|
|
|
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
/* append block devices */
|
2008-07-25 10:49:33 +00:00
|
|
|
if (xenDaemonParseSxprDisks(conn, def, root, hvm, xendConfigVersion) < 0)
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
goto error;
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (xenDaemonParseSxprNets(conn, def, root) < 0)
|
|
|
|
goto error;
|
2006-11-15 00:38:13 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
/* New style graphics device config */
|
|
|
|
if (xenDaemonParseSxprGraphicsNew(conn, def, root) < 0)
|
|
|
|
goto error;
|
2006-12-06 23:44:17 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
/* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
|
|
|
|
if (!def->graphics &&
|
|
|
|
xenDaemonParseSxprGraphicsOld(conn, def, root, hvm, xendConfigVersion) < 0)
|
|
|
|
goto error;
|
2006-03-15 12:13:25 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
|
|
|
|
/* Old style cdrom config from Xen <= 3.0.2 */
|
|
|
|
if (hvm &&
|
|
|
|
xendConfigVersion == 1) {
|
|
|
|
tmp = sexpr_node(root, "domain/image/hvm/cdrom");
|
2006-08-11 14:40:04 +00:00
|
|
|
if ((tmp != NULL) && (tmp[0] != 0)) {
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainDiskDefPtr disk, prev;
|
|
|
|
if (VIR_ALLOC(disk) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (!(disk->src = strdup(tmp))) {
|
|
|
|
VIR_FREE(disk);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
|
|
|
|
if (!(disk->dst = strdup("hdc"))) {
|
|
|
|
VIR_FREE(disk);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
if (!(disk->driverName = strdup("file"))) {
|
|
|
|
VIR_FREE(disk);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
|
|
|
disk->readonly = 1;
|
2006-09-12 01:16:22 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
prev = def->disks;
|
|
|
|
while (prev && prev->next) {
|
|
|
|
prev = prev->next;
|
2006-09-12 01:16:22 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
if (prev)
|
|
|
|
prev->next = disk;
|
|
|
|
else
|
|
|
|
def->disks = disk;
|
2006-08-11 14:40:04 +00:00
|
|
|
}
|
2006-08-26 15:30:44 +00:00
|
|
|
}
|
2006-10-09 14:32:07 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
|
|
|
|
/* Floppy disk config */
|
2007-07-18 21:08:22 +00:00
|
|
|
if (hvm) {
|
2008-07-25 10:49:33 +00:00
|
|
|
const char *const fds[] = { "fda", "fdb" };
|
|
|
|
int i;
|
|
|
|
for (i = 0 ; i < sizeof(fds)/sizeof(fds[0]) ; i++) {
|
|
|
|
tmp = sexpr_fmt_node(root, "domain/image/hvm/%s", fds[i]);
|
|
|
|
if ((tmp != NULL) && (tmp[0] != 0)) {
|
|
|
|
virDomainDiskDefPtr disk, prev;
|
|
|
|
if (VIR_ALLOC(disk) < 0)
|
|
|
|
goto no_memory;
|
|
|
|
if (!(disk->src = strdup(tmp))) {
|
|
|
|
VIR_FREE(disk);
|
|
|
|
goto no_memory;
|
2007-07-18 21:08:22 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
|
|
|
disk->device = VIR_DOMAIN_DISK_DEVICE_FLOPPY;
|
|
|
|
if (!(disk->dst = strdup(fds[i]))) {
|
|
|
|
VIR_FREE(disk);
|
|
|
|
goto no_memory;
|
2008-04-10 16:54:54 +00:00
|
|
|
}
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!(disk->driverName = strdup("file"))) {
|
|
|
|
VIR_FREE(disk);
|
|
|
|
goto no_memory;
|
|
|
|
}
|
|
|
|
disk->bus = VIR_DOMAIN_DISK_BUS_FDC;
|
2006-10-09 14:32:07 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
prev = def->disks;
|
|
|
|
while (prev && prev->next) {
|
|
|
|
prev = prev->next;
|
|
|
|
}
|
|
|
|
if (prev)
|
|
|
|
prev->next = disk;
|
|
|
|
else
|
|
|
|
def->disks = disk;
|
2007-07-18 21:08:22 +00:00
|
|
|
}
|
2007-05-11 14:21:28 +00:00
|
|
|
}
|
2006-02-20 17:22:16 +00:00
|
|
|
}
|
2006-10-09 14:32:07 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
/* in case of HVM we have USB device emulation */
|
|
|
|
if (hvm &&
|
|
|
|
xenDaemonParseSxprUSB(conn, def, root) < 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Character device config */
|
|
|
|
tty = xenStoreDomainGetConsolePath(conn, def->id);
|
2008-04-26 14:22:02 +00:00
|
|
|
if (hvm) {
|
|
|
|
tmp = sexpr_node(root, "domain/image/hvm/serial");
|
|
|
|
if (tmp && STRNEQ(tmp, "none")) {
|
2008-07-25 10:49:33 +00:00
|
|
|
if ((def->serials = xenDaemonParseSxprChar(conn, tmp, tty)) == NULL)
|
2008-04-26 14:22:02 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
tmp = sexpr_node(root, "domain/image/hvm/parallel");
|
|
|
|
if (tmp && STRNEQ(tmp, "none")) {
|
|
|
|
/* XXX does XenD stuff parallel port tty info into xenstore somewhere ? */
|
2008-07-25 10:49:33 +00:00
|
|
|
if ((def->parallels = xenDaemonParseSxprChar(conn, tmp, NULL)) == NULL)
|
2008-04-26 14:22:02 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else {
|
2008-07-25 10:49:33 +00:00
|
|
|
/* Fake a paravirt console, since that's not in the sexpr */
|
|
|
|
if (!(def->console = xenDaemonParseSxprChar(conn, "pty", tty)))
|
|
|
|
goto error;
|
2006-08-08 20:14:40 +00:00
|
|
|
}
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(tty);
|
2006-08-08 20:14:40 +00:00
|
|
|
|
2006-02-20 17:22:16 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
/* Sound device config */
|
|
|
|
if (hvm &&
|
|
|
|
(tmp = sexpr_node(root, "domain/image/hvm/soundhw")) != NULL &&
|
|
|
|
*tmp) {
|
|
|
|
if (xenDaemonParseSxprSound(conn, def, tmp) < 0)
|
|
|
|
goto error;
|
2008-04-28 15:14:59 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
return def;
|
2006-02-20 17:22:16 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
no_memory:
|
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, NULL);
|
|
|
|
error:
|
|
|
|
VIR_FREE(tty);
|
|
|
|
virDomainDefFree(def);
|
|
|
|
return NULL;
|
2006-02-20 17:22:16 +00:00
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainDefPtr
|
|
|
|
xenDaemonParseSxprString(virConnectPtr conn,
|
|
|
|
const char *sexpr,
|
|
|
|
int xendConfigVersion)
|
|
|
|
{
|
|
|
|
struct sexpr *root = string2sexpr(sexpr);
|
|
|
|
virDomainDefPtr def;
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!root)
|
|
|
|
return NULL;
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
def = xenDaemonParseSxpr(conn, root, xendConfigVersion, NULL);
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
sexpr_free(root);
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
return def;
|
2006-08-24 15:05:19 +00:00
|
|
|
}
|
2006-02-20 17:22:16 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
|
2006-02-20 17:22:16 +00:00
|
|
|
/**
|
2006-03-22 13:44:01 +00:00
|
|
|
* sexpr_to_xend_domain_info:
|
|
|
|
* @root: an S-Expression describing a domain
|
|
|
|
* @info: a info data structure to fill=up
|
|
|
|
*
|
|
|
|
* Internal routine filling up the info structure with the values from
|
|
|
|
* the domain root provided.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root,
|
|
|
|
virDomainInfoPtr info)
|
2006-03-22 13:44:01 +00:00
|
|
|
{
|
|
|
|
const char *flags;
|
|
|
|
|
|
|
|
|
|
|
|
if ((root == NULL) || (info == NULL))
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
info->memory = sexpr_u64(root, "domain/memory") << 10;
|
|
|
|
info->maxMem = sexpr_u64(root, "domain/maxmem") << 10;
|
|
|
|
flags = sexpr_node(root, "domain/state");
|
|
|
|
|
|
|
|
if (flags) {
|
|
|
|
if (strchr(flags, 'c'))
|
|
|
|
info->state = VIR_DOMAIN_CRASHED;
|
|
|
|
else if (strchr(flags, 's'))
|
|
|
|
info->state = VIR_DOMAIN_SHUTOFF;
|
2007-03-14 13:14:50 +00:00
|
|
|
else if (strchr(flags, 'd'))
|
|
|
|
info->state = VIR_DOMAIN_SHUTDOWN;
|
2006-03-22 13:44:01 +00:00
|
|
|
else if (strchr(flags, 'p'))
|
|
|
|
info->state = VIR_DOMAIN_PAUSED;
|
|
|
|
else if (strchr(flags, 'b'))
|
|
|
|
info->state = VIR_DOMAIN_BLOCKED;
|
|
|
|
else if (strchr(flags, 'r'))
|
|
|
|
info->state = VIR_DOMAIN_RUNNING;
|
|
|
|
} else {
|
2006-12-14 01:56:14 +00:00
|
|
|
/* Inactive domains don't have a state reported, so
|
|
|
|
mark them SHUTOFF, rather than NOSTATE */
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-12-14 01:56:14 +00:00
|
|
|
info->state = VIR_DOMAIN_SHUTOFF;
|
|
|
|
else
|
|
|
|
info->state = VIR_DOMAIN_NOSTATE;
|
2006-03-22 13:44:01 +00:00
|
|
|
}
|
|
|
|
info->cpuTime = sexpr_float(root, "domain/cpu_time") * 1000000000;
|
|
|
|
info->nrVirtCpu = sexpr_int(root, "domain/vcpus");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2006-03-29 12:46:03 +00:00
|
|
|
/**
|
|
|
|
* sexpr_to_xend_node_info:
|
|
|
|
* @root: an S-Expression describing a domain
|
|
|
|
* @info: a info data structure to fill up
|
|
|
|
*
|
|
|
|
* Internal routine filling up the info structure with the values from
|
|
|
|
* the node root provided.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_to_xend_node_info(const struct sexpr *root, virNodeInfoPtr info)
|
2006-03-29 12:46:03 +00:00
|
|
|
{
|
|
|
|
const char *machine;
|
|
|
|
|
|
|
|
|
|
|
|
if ((root == NULL) || (info == NULL))
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
machine = sexpr_node(root, "node/machine");
|
2007-12-17 23:04:33 +00:00
|
|
|
if (machine == NULL) {
|
2006-03-29 12:46:03 +00:00
|
|
|
info->model[0] = 0;
|
2007-12-17 23:04:33 +00:00
|
|
|
} else {
|
2006-03-29 12:46:03 +00:00
|
|
|
snprintf(&info->model[0], sizeof(info->model) - 1, "%s", machine);
|
2007-12-17 23:04:33 +00:00
|
|
|
info->model[sizeof(info->model) - 1] = 0;
|
2006-03-29 12:46:03 +00:00
|
|
|
}
|
|
|
|
info->memory = (unsigned long) sexpr_u64(root, "node/total_memory") << 10;
|
|
|
|
|
|
|
|
info->cpus = sexpr_int(root, "node/nr_cpus");
|
|
|
|
info->mhz = sexpr_int(root, "node/cpu_mhz");
|
|
|
|
info->nodes = sexpr_int(root, "node/nr_nodes");
|
|
|
|
info->sockets = sexpr_int(root, "node/sockets_per_node");
|
2008-01-20 15:56:49 +00:00
|
|
|
info->cores = sexpr_int(root, "node/cores_per_socket");
|
|
|
|
info->threads = sexpr_int(root, "node/threads_per_core");
|
|
|
|
|
2007-12-17 23:04:33 +00:00
|
|
|
/* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
|
|
|
|
* Old Xen calculated sockets_per_node using its internal
|
|
|
|
* nr_cpus / (nodes*cores*threads), so fake it ourselves
|
|
|
|
* in the same way
|
|
|
|
*/
|
|
|
|
if (info->sockets == 0) {
|
|
|
|
int nr_cpus = sexpr_int(root, "node/nr_cpus");
|
2008-01-20 15:56:49 +00:00
|
|
|
int procs = info->nodes * info->cores * info->threads;
|
|
|
|
if (procs == 0) /* Sanity check in case of Xen bugs in futures..*/
|
|
|
|
return (-1);
|
|
|
|
info->sockets = nr_cpus / procs;
|
|
|
|
/* Should already be fine, but for further sanity make
|
2007-12-17 23:04:33 +00:00
|
|
|
* sure we have at least one socket
|
|
|
|
*/
|
|
|
|
if (info->sockets == 0)
|
|
|
|
info->sockets = 1;
|
|
|
|
}
|
2006-03-29 12:46:03 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
|
2007-09-28 14:28:12 +00:00
|
|
|
/**
|
2008-02-27 04:35:08 +00:00
|
|
|
* sexpr_to_xend_topology
|
2007-09-28 14:28:12 +00:00
|
|
|
* @root: an S-Expression describing a node
|
2008-02-27 04:35:08 +00:00
|
|
|
* @caps: capability info
|
2007-09-28 14:28:12 +00:00
|
|
|
*
|
2008-02-27 04:35:08 +00:00
|
|
|
* Internal routine populating capability info with
|
|
|
|
* NUMA node mapping details
|
2007-09-28 14:28:12 +00:00
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error
|
|
|
|
*/
|
2008-02-05 19:27:37 +00:00
|
|
|
static int
|
2008-02-27 04:35:08 +00:00
|
|
|
sexpr_to_xend_topology(virConnectPtr conn,
|
|
|
|
const struct sexpr *root,
|
|
|
|
virCapsPtr caps)
|
2007-09-28 14:28:12 +00:00
|
|
|
{
|
|
|
|
const char *nodeToCpu;
|
2008-02-27 04:35:08 +00:00
|
|
|
const char *cur;
|
|
|
|
char *cpuset = NULL;
|
|
|
|
int *cpuNums = NULL;
|
|
|
|
int cell, cpu, nb_cpus;
|
|
|
|
int n = 0;
|
2007-09-28 14:28:12 +00:00
|
|
|
int numCpus;
|
|
|
|
|
|
|
|
nodeToCpu = sexpr_node(root, "node/node_to_cpu");
|
|
|
|
if (nodeToCpu == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("failed to parse topology information"));
|
2008-02-27 04:35:08 +00:00
|
|
|
return -1;
|
2007-09-28 14:28:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
numCpus = sexpr_int(root, "node/nr_cpus");
|
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC_N(cpuset, numCpus) < 0)
|
2008-02-27 04:35:08 +00:00
|
|
|
goto memory_error;
|
2008-05-29 19:20:22 +00:00
|
|
|
if (VIR_ALLOC_N(cpuNums, numCpus) < 0)
|
2008-02-27 04:35:08 +00:00
|
|
|
goto memory_error;
|
|
|
|
|
|
|
|
cur = nodeToCpu;
|
|
|
|
while (*cur != 0) {
|
|
|
|
/*
|
|
|
|
* Find the next NUMA cell described in the xend output
|
|
|
|
*/
|
|
|
|
cur = strstr(cur, "node");
|
|
|
|
if (cur == NULL)
|
|
|
|
break;
|
|
|
|
cur += 4;
|
|
|
|
cell = virParseNumber(&cur);
|
|
|
|
if (cell < 0)
|
|
|
|
goto parse_error;
|
|
|
|
virSkipSpaces(&cur);
|
|
|
|
if (*cur != ':')
|
|
|
|
goto parse_error;
|
|
|
|
cur++;
|
|
|
|
virSkipSpaces(&cur);
|
2008-05-15 14:21:34 +00:00
|
|
|
if (STRPREFIX(cur, "no cpus")) {
|
2008-02-27 04:35:08 +00:00
|
|
|
nb_cpus = 0;
|
|
|
|
for (cpu = 0; cpu < numCpus; cpu++)
|
|
|
|
cpuset[cpu] = 0;
|
|
|
|
} else {
|
2008-07-25 13:17:27 +00:00
|
|
|
nb_cpus = virDomainCpuSetParse(conn, &cur, 'n', cpuset, numCpus);
|
2008-02-27 04:35:08 +00:00
|
|
|
if (nb_cpus < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (n = 0, cpu = 0; cpu < numCpus; cpu++)
|
|
|
|
if (cpuset[cpu] == 1)
|
|
|
|
cpuNums[n++] = cpu;
|
|
|
|
|
|
|
|
if (virCapabilitiesAddHostNUMACell(caps,
|
|
|
|
cell,
|
|
|
|
nb_cpus,
|
|
|
|
cpuNums) < 0)
|
|
|
|
goto memory_error;
|
|
|
|
}
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(cpuNums);
|
|
|
|
VIR_FREE(cpuset);
|
2007-09-28 14:28:12 +00:00
|
|
|
return (0);
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
parse_error:
|
|
|
|
virXendError(conn, VIR_ERR_XEN_CALL, _("topology syntax error"));
|
|
|
|
error:
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(cpuNums);
|
|
|
|
VIR_FREE(cpuset);
|
2007-09-28 14:28:12 +00:00
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
return (-1);
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
memory_error:
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(cpuNums);
|
|
|
|
VIR_FREE(cpuset);
|
2008-02-27 04:35:08 +00:00
|
|
|
virXendError(conn, VIR_ERR_NO_MEMORY, _("allocate buffer"));
|
2007-09-28 14:28:12 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2006-03-23 15:42:10 +00:00
|
|
|
/**
|
|
|
|
* sexpr_to_domain:
|
|
|
|
* @conn: an existing virtual connection block
|
|
|
|
* @root: an S-Expression describing a domain
|
|
|
|
*
|
|
|
|
* Internal routine returning the associated virDomainPtr for this domain
|
|
|
|
*
|
|
|
|
* Returns the domain pointer or NULL in case of error.
|
|
|
|
*/
|
|
|
|
static virDomainPtr
|
Adjust sexpr-related interfaces to be const-correct.
* src/sexpr.c (sexpr_cons, append, sexpr_append, sexpr2string)
(sexpr_lookup_key, sexpr_lookup, sexpr_node, sexpr_fmt_node):
Add "const" attribute where appropriate.
* src/xend_internal.c (sexpr_int, sexpr_float, sexpr_u64)
(sexpr_uuid, sexpr_to_xend_domain_info, sexpr_to_xend_node_info)
(sexpr_to_xend_topology_xml, sexpr_to_domain): Likewise.
* src/sexpr.h: Adjust prototypes.
2008-01-21 14:22:15 +00:00
|
|
|
sexpr_to_domain(virConnectPtr conn, const struct sexpr *root)
|
2006-03-23 15:42:10 +00:00
|
|
|
{
|
2006-04-09 13:11:22 +00:00
|
|
|
virDomainPtr ret = NULL;
|
2007-08-09 20:19:12 +00:00
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN];
|
2006-03-23 15:42:10 +00:00
|
|
|
const char *name;
|
2006-12-14 01:56:14 +00:00
|
|
|
const char *tmp;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-03-23 15:42:10 +00:00
|
|
|
|
|
|
|
if ((conn == NULL) || (root == NULL))
|
|
|
|
return(NULL);
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2007-08-09 20:19:12 +00:00
|
|
|
if (sexpr_uuid(uuid, root, "domain/uuid") < 0)
|
2006-04-09 13:11:22 +00:00
|
|
|
goto error;
|
|
|
|
name = sexpr_node(root, "domain/name");
|
|
|
|
if (name == NULL)
|
|
|
|
goto error;
|
|
|
|
|
2007-08-09 20:19:12 +00:00
|
|
|
ret = virGetDomain(conn, name, uuid);
|
2007-07-06 15:02:09 +00:00
|
|
|
if (ret == NULL) return NULL;
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
tmp = sexpr_node(root, "domain/domid");
|
|
|
|
/* New 3.0.4 XenD will not report a domid for inactive domains,
|
|
|
|
* so only error out for old XenD
|
|
|
|
*/
|
2007-04-04 14:19:49 +00:00
|
|
|
if (!tmp && priv->xendConfigVersion < 3)
|
2006-03-23 15:42:10 +00:00
|
|
|
goto error;
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
if (tmp)
|
2007-01-22 16:25:27 +00:00
|
|
|
ret->id = sexpr_int(root, "domain/domid");
|
2006-12-14 01:56:14 +00:00
|
|
|
else
|
2007-01-22 16:25:27 +00:00
|
|
|
ret->id = -1; /* An inactive domain */
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2006-03-23 15:42:10 +00:00
|
|
|
return (ret);
|
2006-04-09 13:11:22 +00:00
|
|
|
|
2006-03-23 15:42:10 +00:00
|
|
|
error:
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
2006-09-21 15:24:37 +00:00
|
|
|
_("failed to parse Xend domain information"));
|
2006-04-09 13:11:22 +00:00
|
|
|
if (ret != NULL)
|
2008-01-21 16:29:10 +00:00
|
|
|
virUnrefDomain(ret);
|
2006-03-23 15:42:10 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2006-07-20 13:59:23 +00:00
|
|
|
#endif /* !PROXY */
|
2006-03-22 13:44:01 +00:00
|
|
|
|
|
|
|
/*****************************************************************
|
|
|
|
******
|
|
|
|
******
|
|
|
|
******
|
|
|
|
******
|
|
|
|
Refactored
|
|
|
|
******
|
|
|
|
******
|
|
|
|
******
|
|
|
|
******
|
|
|
|
*****************************************************************/
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2006-03-22 13:44:01 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonOpen:
|
|
|
|
* @conn: an existing virtual connection block
|
|
|
|
* @name: optional argument to select a connection type
|
|
|
|
* @flags: combination of virDrvOpenFlag(s)
|
|
|
|
*
|
|
|
|
* Creates a localhost Xen Daemon connection
|
|
|
|
* Note: this doesn't try to check if the connection actually works
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error.
|
|
|
|
*/
|
|
|
|
int
|
2007-12-05 18:28:05 +00:00
|
|
|
xenDaemonOpen(virConnectPtr conn,
|
|
|
|
xmlURIPtr uri,
|
|
|
|
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
|
2007-04-30 17:30:11 +00:00
|
|
|
int flags ATTRIBUTE_UNUSED)
|
2006-03-22 13:44:01 +00:00
|
|
|
{
|
|
|
|
int ret;
|
2007-11-14 11:40:57 +00:00
|
|
|
|
|
|
|
/* Switch on the scheme, which we expect to be NULL (file),
|
|
|
|
* "http" or "xen".
|
2007-04-04 14:19:49 +00:00
|
|
|
*/
|
2007-11-14 11:40:57 +00:00
|
|
|
if (uri->scheme == NULL) {
|
|
|
|
/* It should be a file access */
|
|
|
|
if (uri->path == NULL) {
|
|
|
|
virXendError(NULL, VIR_ERR_NO_CONNECT, __FUNCTION__);
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
ret = xenDaemonOpen_unix(conn, uri->path);
|
|
|
|
if (ret < 0)
|
|
|
|
goto failed;
|
|
|
|
|
|
|
|
ret = xend_detect_config_version(conn);
|
|
|
|
if (ret == -1)
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
else if (STRCASEEQ (uri->scheme, "xen")) {
|
2006-07-06 09:29:34 +00:00
|
|
|
/*
|
2007-04-04 14:19:49 +00:00
|
|
|
* try first to open the unix socket
|
|
|
|
*/
|
|
|
|
ret = xenDaemonOpen_unix(conn, "/var/lib/xend/xend-socket");
|
|
|
|
if (ret < 0)
|
|
|
|
goto try_http;
|
2007-04-13 00:43:57 +00:00
|
|
|
ret = xend_detect_config_version(conn);
|
|
|
|
if (ret != -1)
|
2007-04-04 14:19:49 +00:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
try_http:
|
|
|
|
/*
|
|
|
|
* try though http on port 8000
|
|
|
|
*/
|
|
|
|
ret = xenDaemonOpen_tcp(conn, "localhost", 8000);
|
|
|
|
if (ret < 0)
|
|
|
|
goto failed;
|
2007-04-13 00:43:57 +00:00
|
|
|
ret = xend_detect_config_version(conn);
|
|
|
|
if (ret == -1)
|
2007-04-04 14:19:49 +00:00
|
|
|
goto failed;
|
2007-11-14 11:40:57 +00:00
|
|
|
} else if (STRCASEEQ (uri->scheme, "http")) {
|
|
|
|
ret = xenDaemonOpen_tcp(conn, uri->server, uri->port);
|
|
|
|
if (ret < 0)
|
2007-04-04 14:19:49 +00:00
|
|
|
goto failed;
|
2007-11-14 11:40:57 +00:00
|
|
|
ret = xend_detect_config_version(conn);
|
|
|
|
if (ret == -1)
|
2007-04-04 14:19:49 +00:00
|
|
|
goto failed;
|
2007-11-14 11:40:57 +00:00
|
|
|
} else {
|
|
|
|
virXendError(NULL, VIR_ERR_NO_CONNECT, __FUNCTION__);
|
|
|
|
goto failed;
|
2006-06-12 22:21:04 +00:00
|
|
|
}
|
2006-03-22 13:44:01 +00:00
|
|
|
|
2007-04-13 00:43:57 +00:00
|
|
|
done:
|
2006-03-22 13:44:01 +00:00
|
|
|
return(ret);
|
2007-04-04 14:19:49 +00:00
|
|
|
|
2006-07-06 09:29:34 +00:00
|
|
|
failed:
|
|
|
|
return(-1);
|
2006-03-22 13:44:01 +00:00
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonClose:
|
|
|
|
* @conn: an existing virtual connection block
|
|
|
|
*
|
|
|
|
* This method should be called when a connection to xend instance
|
|
|
|
* initialized with xenDaemonOpen is no longer needed
|
|
|
|
* to free the associated resources.
|
|
|
|
*
|
2007-04-04 14:19:49 +00:00
|
|
|
* Returns 0 in case of success, -1 in case of error
|
2006-03-22 13:44:01 +00:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonClose(virConnectPtr conn ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2007-04-04 14:19:49 +00:00
|
|
|
return 0;
|
2006-03-22 13:44:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDomainSuspend:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
*
|
|
|
|
* Pause the domain, the domain is not scheduled anymore though its resources
|
|
|
|
* are preserved. Use xenDaemonDomainResume() to resume execution.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainSuspend(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-03-22 13:44:01 +00:00
|
|
|
return xend_op(domain->conn, domain->name, "op", "pause", NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDomainResume:
|
|
|
|
* @xend: pointer to the Xem Daemon block
|
|
|
|
* @name: name for the domain
|
|
|
|
*
|
|
|
|
* Resume the domain after xenDaemonDomainSuspend() has been called
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainResume(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-03-22 13:44:01 +00:00
|
|
|
return xend_op(domain->conn, domain->name, "op", "unpause", NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDomainShutdown:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
*
|
|
|
|
* Shutdown the domain, the OS is requested to properly shutdown
|
|
|
|
* and the domain may ignore it. It will return immediately
|
|
|
|
* after queuing the request.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainShutdown(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-03-22 13:44:01 +00:00
|
|
|
return xend_op(domain->conn, domain->name, "op", "shutdown", "reason", "halt", NULL);
|
|
|
|
}
|
|
|
|
|
2006-04-03 13:46:43 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainReboot:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @flags: extra flags for the reboot operation, not used yet
|
|
|
|
*
|
|
|
|
* Reboot the domain, the OS is requested to properly shutdown
|
|
|
|
* and restart but the domain may ignore it. It will return immediately
|
|
|
|
* after queuing the request.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-04-03 13:46:43 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-04-03 13:46:43 +00:00
|
|
|
return xend_op(domain->conn, domain->name, "op", "shutdown", "reason", "reboot", NULL);
|
|
|
|
}
|
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainDestroy:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
*
|
|
|
|
* Abruptly halt the domain, the OS is not properly shutdown and the
|
|
|
|
* resources allocated for the domain are immediately freed, mounted
|
|
|
|
* filesystems will be marked as uncleanly shutdown.
|
|
|
|
* After calling this function, the domain's status will change to
|
|
|
|
* dying and will go away completely once all of the resources have been
|
|
|
|
* unmapped (usually from the backend devices).
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainDestroy(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-03-22 13:44:01 +00:00
|
|
|
return xend_op(domain->conn, domain->name, "op", "destroy", NULL);
|
|
|
|
}
|
|
|
|
|
2007-04-13 00:43:57 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainGetOSType:
|
|
|
|
* @domain: a domain object
|
|
|
|
*
|
|
|
|
* Get the type of domain operation system.
|
|
|
|
*
|
|
|
|
* Returns the new string or NULL in case of error, the string must be
|
|
|
|
* freed by the caller.
|
|
|
|
*/
|
|
|
|
static char *
|
|
|
|
xenDaemonDomainGetOSType(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
char *type;
|
|
|
|
struct sexpr *root;
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2007-04-13 00:43:57 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
|
|
|
return(NULL);
|
|
|
|
|
|
|
|
/* can we ask for a subset ? worth it ? */
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL)
|
|
|
|
return(NULL);
|
|
|
|
|
|
|
|
if (sexpr_lookup(root, "domain/image/hvm")) {
|
|
|
|
type = strdup("hvm");
|
|
|
|
} else {
|
|
|
|
type = strdup("linux");
|
|
|
|
}
|
|
|
|
|
|
|
|
sexpr_free(root);
|
|
|
|
|
|
|
|
return(type);
|
|
|
|
}
|
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainSave:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @filename: path for the output file
|
|
|
|
*
|
|
|
|
* This method will suspend a domain and save its memory contents to
|
|
|
|
* a file on disk. Use xenDaemonDomainRestore() to restore a domain after
|
|
|
|
* saving.
|
|
|
|
* Note that for remote Xen Daemon the file path will be interpreted in
|
|
|
|
* the remote host.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainSave(virDomainPtr domain, const char *filename)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
|
2007-04-24 13:44:16 +00:00
|
|
|
(filename == NULL) || (domain->id < 0)) {
|
2006-03-22 13:44:01 +00:00
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2007-04-24 13:44:16 +00:00
|
|
|
|
|
|
|
/* We can't save the state of Domain-0, that would mean stopping it too */
|
|
|
|
if (domain->id == 0) {
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2007-04-24 13:44:16 +00:00
|
|
|
}
|
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
return xend_op(domain->conn, domain->name, "op", "save", "file", filename, NULL);
|
|
|
|
}
|
|
|
|
|
2006-11-22 17:48:29 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainCoreDump:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @filename: path for the output file
|
|
|
|
* @flags: extra flags, currently unused
|
|
|
|
*
|
|
|
|
* This method will dump the core of a domain on a given file for analysis.
|
|
|
|
* Note that for remote Xen Daemon the file path will be interpreted in
|
|
|
|
* the remote host.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
|
|
|
|
int flags ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
|
|
|
|
(filename == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-11-22 17:48:29 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-22 17:48:29 +00:00
|
|
|
return(-1);
|
|
|
|
return xend_op(domain->conn, domain->name, "op", "dump", "file", filename,
|
|
|
|
"live", "1", "crash", "0", NULL);
|
|
|
|
}
|
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainRestore:
|
|
|
|
* @conn: pointer to the Xem Daemon block
|
|
|
|
* @filename: path for the output file
|
|
|
|
*
|
|
|
|
* This method will restore a domain saved to disk by xenDaemonDomainSave().
|
|
|
|
* Note that for remote Xen Daemon the file path will be interpreted in
|
|
|
|
* the remote host.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 (with errno) in case of error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainRestore(virConnectPtr conn, const char *filename)
|
|
|
|
{
|
|
|
|
if ((conn == NULL) || (filename == NULL)) {
|
|
|
|
/* this should be caught at the interface but ... */
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return xend_op(conn, "", "op", "restore", "file", filename, NULL);
|
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* !PROXY */
|
2006-03-22 13:44:01 +00:00
|
|
|
|
2006-03-23 15:42:10 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainGetMaxMemory:
|
|
|
|
* @domain: pointer to the domain block
|
|
|
|
*
|
|
|
|
* Ask the Xen Daemon for the maximum memory allowed for a domain
|
|
|
|
*
|
|
|
|
* Returns the memory size in kilobytes or 0 in case of error.
|
|
|
|
*/
|
|
|
|
unsigned long
|
|
|
|
xenDaemonDomainGetMaxMemory(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
unsigned long ret = 0;
|
|
|
|
struct sexpr *root;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-03-23 15:42:10 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-23 15:42:10 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-03-23 15:42:10 +00:00
|
|
|
|
|
|
|
/* can we ask for a subset ? worth it ? */
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL)
|
|
|
|
return(0);
|
|
|
|
|
|
|
|
ret = (unsigned long) sexpr_u64(root, "domain/memory") << 10;
|
|
|
|
sexpr_free(root);
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#ifndef PROXY
|
2006-03-22 13:44:01 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainSetMaxMemory:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @memory: The maximum memory in kilobytes
|
|
|
|
*
|
|
|
|
* This method will set the maximum amount of memory that can be allocated to
|
|
|
|
* a domain. Please note that a domain is able to allocate up to this amount
|
2006-04-13 17:18:49 +00:00
|
|
|
* on its own.
|
2006-03-22 13:44:01 +00:00
|
|
|
*
|
|
|
|
* Returns 0 for success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
|
|
|
|
{
|
|
|
|
char buf[1024];
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-03-22 13:44:01 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
snprintf(buf, sizeof(buf), "%lu", memory >> 10);
|
|
|
|
return xend_op(domain->conn, domain->name, "op", "maxmem_set", "memory",
|
|
|
|
buf, NULL);
|
|
|
|
}
|
|
|
|
|
2006-04-13 17:18:49 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainSetMemory:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @memory: The target memory in kilobytes
|
|
|
|
*
|
|
|
|
* This method will set a target memory allocation for a given domain and
|
|
|
|
* request that the guest meet this target. The guest may or may not actually
|
|
|
|
* achieve this target. When this function returns, it does not signify that
|
|
|
|
* the domain has actually reached that target.
|
|
|
|
*
|
|
|
|
* Memory for a domain can only be allocated up to the maximum memory setting.
|
|
|
|
* There is no safe guard for allocations that are too small so be careful
|
|
|
|
* when using this function to reduce a domain's memory usage.
|
|
|
|
*
|
|
|
|
* Returns 0 for success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory)
|
|
|
|
{
|
|
|
|
char buf[1024];
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-04-13 17:18:49 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-04-13 17:18:49 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
|
|
|
|
2006-04-13 17:18:49 +00:00
|
|
|
snprintf(buf, sizeof(buf), "%lu", memory >> 10);
|
|
|
|
return xend_op(domain->conn, domain->name, "op", "mem_target_set",
|
|
|
|
"target", buf, NULL);
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefPtr
|
|
|
|
xenDaemonDomainFetch(virConnectPtr conn,
|
|
|
|
int domid,
|
|
|
|
const char *name,
|
|
|
|
const char *cpus)
|
2006-12-14 01:56:14 +00:00
|
|
|
{
|
|
|
|
struct sexpr *root;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 10:49:33 +00:00
|
|
|
virDomainDefPtr def;
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (name)
|
|
|
|
root = sexpr_get(conn, "/xend/domain/%s?detail=1", name);
|
|
|
|
else
|
|
|
|
root = sexpr_get(conn, "/xend/domain/%d?detail=1", domid);
|
2007-06-21 15:49:09 +00:00
|
|
|
if (root == NULL) {
|
|
|
|
virXendError (conn, VIR_ERR_XEN_CALL,
|
2008-07-25 13:17:27 +00:00
|
|
|
_("xenDaemonDomainFetch failed to"
|
2008-02-04 19:31:30 +00:00
|
|
|
" find this domain"));
|
2006-09-12 01:16:22 +00:00
|
|
|
return (NULL);
|
2007-06-21 15:49:09 +00:00
|
|
|
}
|
2006-09-12 01:16:22 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(def = xenDaemonParseSxpr(conn,
|
|
|
|
root,
|
|
|
|
priv->xendConfigVersion,
|
2008-07-25 10:49:33 +00:00
|
|
|
cpus)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
cleanup:
|
2006-08-09 15:21:16 +00:00
|
|
|
sexpr_free(root);
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
return (def);
|
2006-08-09 15:21:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2006-03-22 13:44:01 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainDumpXML:
|
2006-02-20 17:22:16 +00:00
|
|
|
* @domain: a domain object
|
2007-10-31 09:39:13 +00:00
|
|
|
* @flags: potential dump flags
|
|
|
|
* @cpus: list of cpu the domain is pinned to.
|
2006-02-20 17:22:16 +00:00
|
|
|
*
|
2006-02-20 23:08:47 +00:00
|
|
|
* Provide an XML description of the domain.
|
2006-02-20 17:22:16 +00:00
|
|
|
*
|
|
|
|
* Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error.
|
|
|
|
* the caller must free() the returned value.
|
|
|
|
*/
|
|
|
|
char *
|
2007-10-31 09:39:13 +00:00
|
|
|
xenDaemonDomainDumpXML(virDomainPtr domain, int flags, const char *cpus)
|
2006-03-15 12:13:25 +00:00
|
|
|
{
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefPtr def;
|
|
|
|
char *xml;
|
2007-04-04 14:19:49 +00:00
|
|
|
|
2006-03-22 13:44:01 +00:00
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-22 13:44:01 +00:00
|
|
|
return(NULL);
|
2006-02-27 19:56:23 +00:00
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
2007-06-21 15:49:09 +00:00
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3) {
|
2008-04-10 16:54:54 +00:00
|
|
|
// fall-through to the next driver to handle
|
2006-11-15 21:03:34 +00:00
|
|
|
return(NULL);
|
2007-06-21 15:49:09 +00:00
|
|
|
}
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(def = xenDaemonDomainFetch(domain->conn,
|
|
|
|
domain->id,
|
|
|
|
domain->name,
|
|
|
|
cpus)))
|
|
|
|
return(NULL);
|
|
|
|
|
|
|
|
xml = virDomainDefFormat(domain->conn, def, flags);
|
|
|
|
|
|
|
|
virDomainDefFree(def);
|
|
|
|
|
|
|
|
return xml;
|
2006-02-20 17:22:16 +00:00
|
|
|
}
|
2006-07-20 13:59:23 +00:00
|
|
|
#endif /* !PROXY */
|
2006-03-22 13:44:01 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDomainGetInfo:
|
|
|
|
* @domain: a domain object
|
|
|
|
* @info: pointer to a virDomainInfo structure allocated by the user
|
|
|
|
*
|
|
|
|
* This method looks up information about a domain and update the
|
|
|
|
* information block provided.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
|
|
|
|
{
|
|
|
|
struct sexpr *root;
|
|
|
|
int ret;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-03-22 13:44:01 +00:00
|
|
|
|
2006-03-23 15:42:10 +00:00
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) ||
|
|
|
|
(info == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-03-23 15:42:10 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-03-22 13:44:01 +00:00
|
|
|
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL)
|
|
|
|
return (-1);
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
ret = sexpr_to_xend_domain_info(domain, root, info);
|
2006-03-22 13:44:01 +00:00
|
|
|
sexpr_free(root);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2006-03-23 15:42:10 +00:00
|
|
|
/**
|
Fri Jul 6 16:08:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c, src/proxy_internal.h,
src.xen_internal.c, src/xen_internal.h,
src/xen_unified.c, src/xen_unified.h,
src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: The interface
between xen_unified.c and its underlying driver now uses
a custom structure (struct xenUnifiedDriver) instead
of reusing virDriver.
* src/xen_unified.c: virDomainLookup* functions in Xen
now throw VIR_ERR_NO_DOMAIN if the domain does not exist.
* src/xs_internal.c: Fix indentation.
2007-07-06 15:11:22 +00:00
|
|
|
* xenDaemonLookupByName:
|
2006-03-23 15:42:10 +00:00
|
|
|
* @conn: A xend instance
|
|
|
|
* @name: The name of the domain
|
|
|
|
*
|
|
|
|
* This method looks up information about a domain and returns
|
|
|
|
* it in the form of a struct xend_domain. This should be
|
|
|
|
* free()'d when no longer needed.
|
|
|
|
*
|
|
|
|
* Returns domain info on success; NULL (with errno) on error
|
|
|
|
*/
|
|
|
|
virDomainPtr
|
Fri Jul 6 16:08:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c, src/proxy_internal.h,
src.xen_internal.c, src/xen_internal.h,
src/xen_unified.c, src/xen_unified.h,
src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: The interface
between xen_unified.c and its underlying driver now uses
a custom structure (struct xenUnifiedDriver) instead
of reusing virDriver.
* src/xen_unified.c: virDomainLookup* functions in Xen
now throw VIR_ERR_NO_DOMAIN if the domain does not exist.
* src/xs_internal.c: Fix indentation.
2007-07-06 15:11:22 +00:00
|
|
|
xenDaemonLookupByName(virConnectPtr conn, const char *domname)
|
2006-03-23 15:42:10 +00:00
|
|
|
{
|
|
|
|
struct sexpr *root;
|
|
|
|
virDomainPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((conn == NULL) || (domname == NULL)) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2006-12-14 01:56:14 +00:00
|
|
|
return(NULL);
|
2006-03-23 15:42:10 +00:00
|
|
|
}
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2006-03-23 15:42:10 +00:00
|
|
|
root = sexpr_get(conn, "/xend/domain/%s?detail=1", domname);
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = sexpr_to_domain(conn, root);
|
|
|
|
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
|
|
|
return(ret);
|
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|
2006-03-23 15:42:10 +00:00
|
|
|
|
2006-03-29 12:46:03 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonNodeGetInfo:
|
|
|
|
* @conn: pointer to the Xen Daemon block
|
|
|
|
* @info: pointer to a virNodeInfo structure allocated by the user
|
2008-02-05 19:27:37 +00:00
|
|
|
*
|
2006-03-29 12:46:03 +00:00
|
|
|
* Extract hardware information about the node.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
2006-07-03 11:12:12 +00:00
|
|
|
int
|
2006-03-29 12:46:03 +00:00
|
|
|
xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) {
|
|
|
|
int ret = -1;
|
|
|
|
struct sexpr *root;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (info == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
root = sexpr_get(conn, "/xend/node/");
|
|
|
|
if (root == NULL)
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
ret = sexpr_to_xend_node_info(root, info);
|
|
|
|
sexpr_free(root);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
2007-09-28 14:28:12 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonNodeGetTopology:
|
|
|
|
* @conn: pointer to the Xen Daemon block
|
2008-02-27 04:35:08 +00:00
|
|
|
* @caps: capabilities info
|
2007-09-28 14:28:12 +00:00
|
|
|
*
|
|
|
|
* This method retrieves a node's topology information.
|
|
|
|
*
|
|
|
|
* Returns -1 in case of error, 0 otherwise.
|
|
|
|
*/
|
|
|
|
int
|
2008-02-27 04:35:08 +00:00
|
|
|
xenDaemonNodeGetTopology(virConnectPtr conn,
|
|
|
|
virCapsPtr caps) {
|
2007-09-28 14:28:12 +00:00
|
|
|
int ret = -1;
|
|
|
|
struct sexpr *root;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
if (caps == NULL) {
|
2007-09-28 14:28:12 +00:00
|
|
|
virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (-1);
|
2008-02-27 04:35:08 +00:00
|
|
|
}
|
2007-09-28 14:28:12 +00:00
|
|
|
|
|
|
|
root = sexpr_get(conn, "/xend/node/");
|
|
|
|
if (root == NULL) {
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
2008-02-27 04:35:08 +00:00
|
|
|
ret = sexpr_to_xend_topology(conn, root, caps);
|
2007-09-28 14:28:12 +00:00
|
|
|
sexpr_free(root);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
2006-03-29 12:46:03 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonGetVersion:
|
|
|
|
* @conn: pointer to the Xen Daemon block
|
|
|
|
* @hvVer: return value for the version of the running hypervisor (OUT)
|
|
|
|
*
|
|
|
|
* Get the version level of the Hypervisor running.
|
|
|
|
*
|
|
|
|
* Returns -1 in case of error, 0 otherwise. if the version can't be
|
|
|
|
* extracted by lack of capacities returns 0 and @hvVer is 0, otherwise
|
|
|
|
* @hvVer value is major * 1,000,000 + minor * 1,000 + release
|
|
|
|
*/
|
2006-06-29 14:44:37 +00:00
|
|
|
int
|
2006-03-29 12:46:03 +00:00
|
|
|
xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
|
|
|
|
{
|
2006-09-21 09:15:33 +00:00
|
|
|
struct sexpr *root;
|
2007-06-19 09:12:55 +00:00
|
|
|
int major, minor;
|
2006-09-21 09:15:33 +00:00
|
|
|
unsigned long version;
|
2008-02-05 19:27:37 +00:00
|
|
|
|
2006-03-29 12:46:03 +00:00
|
|
|
if (!VIR_IS_CONNECT(conn)) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (hvVer == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
2006-09-21 09:15:33 +00:00
|
|
|
root = sexpr_get(conn, "/xend/node/");
|
|
|
|
if (root == NULL)
|
2008-04-10 16:54:54 +00:00
|
|
|
return(-1);
|
2006-09-21 09:15:33 +00:00
|
|
|
|
|
|
|
major = sexpr_int(root, "node/xen_major");
|
|
|
|
minor = sexpr_int(root, "node/xen_minor");
|
|
|
|
sexpr_free(root);
|
2007-06-19 09:12:55 +00:00
|
|
|
version = major * 1000000 + minor * 1000;
|
2006-03-29 12:46:03 +00:00
|
|
|
*hvVer = version;
|
|
|
|
return(0);
|
|
|
|
}
|
2006-06-14 15:44:14 +00:00
|
|
|
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2006-06-14 15:44:14 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonListDomains:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @ids: array to collect the list of IDs of active domains
|
|
|
|
* @maxids: size of @ids
|
|
|
|
*
|
|
|
|
* Collect the list of active domains, and store their ID in @maxids
|
|
|
|
* TODO: this is quite expensive at the moment since there isn't one
|
|
|
|
* xend RPC providing both name and id for all domains.
|
|
|
|
*
|
|
|
|
* Returns the number of domain found or -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids)
|
|
|
|
{
|
|
|
|
struct sexpr *root = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
struct sexpr *_for_i, *node;
|
|
|
|
long id;
|
|
|
|
|
2008-06-19 14:39:49 +00:00
|
|
|
if (maxids == 0)
|
|
|
|
return(0);
|
|
|
|
|
|
|
|
if ((ids == NULL) || (maxids < 0))
|
2006-06-14 15:44:14 +00:00
|
|
|
goto error;
|
|
|
|
root = sexpr_get(conn, "/xend/domain");
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2007-09-29 18:16:26 +00:00
|
|
|
for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS;
|
|
|
|
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
|
2006-06-14 15:44:14 +00:00
|
|
|
if (node->kind != SEXPR_VALUE)
|
|
|
|
continue;
|
2007-09-29 18:16:26 +00:00
|
|
|
id = xenDaemonDomainLookupByName_ids(conn, node->u.value, NULL);
|
2006-06-14 15:44:14 +00:00
|
|
|
if (id >= 0)
|
2006-12-07 18:23:19 +00:00
|
|
|
ids[ret++] = (int) id;
|
|
|
|
if (ret >= maxids)
|
|
|
|
break;
|
2006-06-14 15:44:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
2008-05-29 19:20:22 +00:00
|
|
|
sexpr_free(root);
|
2006-06-14 15:44:14 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonNumOfDomains:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
*
|
|
|
|
* Provides the number of active domains.
|
|
|
|
*
|
|
|
|
* Returns the number of domain found or -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonNumOfDomains(virConnectPtr conn)
|
|
|
|
{
|
|
|
|
struct sexpr *root = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
struct sexpr *_for_i, *node;
|
|
|
|
|
|
|
|
root = sexpr_get(conn, "/xend/domain");
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2007-09-29 18:16:26 +00:00
|
|
|
for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS;
|
|
|
|
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
|
2006-06-14 15:44:14 +00:00
|
|
|
if (node->kind != SEXPR_VALUE)
|
|
|
|
continue;
|
2008-04-10 16:54:54 +00:00
|
|
|
ret++;
|
2006-06-14 15:44:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
2008-05-29 19:20:22 +00:00
|
|
|
sexpr_free(root);
|
2006-06-14 15:44:14 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|
2006-06-15 14:50:48 +00:00
|
|
|
|
2006-07-20 13:59:23 +00:00
|
|
|
#ifndef PROXY
|
2006-06-15 14:50:48 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonLookupByID:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @id: the domain ID number
|
|
|
|
*
|
|
|
|
* Try to find a domain based on the hypervisor ID number
|
|
|
|
*
|
|
|
|
* Returns a new domain object or NULL in case of failure
|
|
|
|
*/
|
Fri Jul 6 16:08:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c, src/proxy_internal.h,
src.xen_internal.c, src/xen_internal.h,
src/xen_unified.c, src/xen_unified.h,
src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: The interface
between xen_unified.c and its underlying driver now uses
a custom structure (struct xenUnifiedDriver) instead
of reusing virDriver.
* src/xen_unified.c: virDomainLookup* functions in Xen
now throw VIR_ERR_NO_DOMAIN if the domain does not exist.
* src/xs_internal.c: Fix indentation.
2007-07-06 15:11:22 +00:00
|
|
|
virDomainPtr
|
2006-06-15 14:50:48 +00:00
|
|
|
xenDaemonLookupByID(virConnectPtr conn, int id) {
|
|
|
|
char *name = NULL;
|
Mon Jan 23 14:36:18 IST 2007 Mark McLoughlin <markmc@redhat.com>
* include/libvirt/libvirt.h.in: add VIR_UUID_BUFLEN and
VIR_UUID_STRING_BUFLEN
* libvirt/proxy/libvirt_proxy.c, libvirt/src/hash.c,
libvirt/src/internal.h, libvirt/src/libvirt.c,
libvirt/src/proxy_internal.c, libvirt/src/test.c,
libvirt/src/virsh.c, libvirt/src/xend_internal.c,
libvirt/src/xm_internal.c, libvirt/src/xml.c,
libvirt/python/libvir.c: use them
2007-01-23 14:39:45 +00:00
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN];
|
2006-06-15 14:50:48 +00:00
|
|
|
virDomainPtr ret;
|
|
|
|
|
2006-07-07 18:58:35 +00:00
|
|
|
if (xenDaemonDomainLookupByID(conn, id, &name, uuid) < 0) {
|
2006-06-15 14:50:48 +00:00
|
|
|
goto error;
|
2006-07-07 18:58:35 +00:00
|
|
|
}
|
2006-06-15 14:50:48 +00:00
|
|
|
|
|
|
|
ret = virGetDomain(conn, name, uuid);
|
2007-07-06 15:02:09 +00:00
|
|
|
if (ret == NULL) return NULL;
|
|
|
|
|
2007-01-22 16:25:27 +00:00
|
|
|
ret->id = id;
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(name);
|
2006-06-15 14:50:48 +00:00
|
|
|
return (ret);
|
|
|
|
|
2006-07-07 18:58:35 +00:00
|
|
|
error:
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(name);
|
2006-06-15 14:50:48 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2006-08-04 10:41:05 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainSetVcpus:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @nvcpus: the new number of virtual CPUs for this domain
|
|
|
|
*
|
|
|
|
* Dynamically change the number of virtual CPUs used by the domain.
|
|
|
|
*
|
|
|
|
* Returns 0 for success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int
|
2006-08-08 22:22:55 +00:00
|
|
|
xenDaemonDomainSetVcpus(virDomainPtr domain, unsigned int vcpus)
|
2006-08-04 10:41:05 +00:00
|
|
|
{
|
Mon Jan 23 14:36:18 IST 2007 Mark McLoughlin <markmc@redhat.com>
* include/libvirt/libvirt.h.in: add VIR_UUID_BUFLEN and
VIR_UUID_STRING_BUFLEN
* libvirt/proxy/libvirt_proxy.c, libvirt/src/hash.c,
libvirt/src/internal.h, libvirt/src/libvirt.c,
libvirt/src/proxy_internal.c, libvirt/src/test.c,
libvirt/src/virsh.c, libvirt/src/xend_internal.c,
libvirt/src/xm_internal.c, libvirt/src/xml.c,
libvirt/python/libvir.c: use them
2007-01-23 14:39:45 +00:00
|
|
|
char buf[VIR_UUID_BUFLEN];
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-08-04 10:41:05 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|
|
|
|
|| (vcpus < 1)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-08-04 10:41:05 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
|
|
|
|
2006-08-04 10:41:05 +00:00
|
|
|
snprintf(buf, sizeof(buf), "%d", vcpus);
|
|
|
|
return(xend_op(domain->conn, domain->name, "op", "set_vcpus", "vcpus",
|
|
|
|
buf, NULL));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDomainPinCpu:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @vcpu: virtual CPU number
|
|
|
|
* @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes)
|
|
|
|
* @maplen: length of cpumap in bytes
|
2008-02-05 19:27:37 +00:00
|
|
|
*
|
2006-08-04 10:41:05 +00:00
|
|
|
* Dynamically change the real CPUs which can be allocated to a virtual CPU.
|
|
|
|
*
|
|
|
|
* Returns 0 for success; -1 (with errno) on error
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
|
|
|
|
unsigned char *cpumap, int maplen)
|
|
|
|
{
|
Mon Jan 23 14:36:18 IST 2007 Mark McLoughlin <markmc@redhat.com>
* include/libvirt/libvirt.h.in: add VIR_UUID_BUFLEN and
VIR_UUID_STRING_BUFLEN
* libvirt/proxy/libvirt_proxy.c, libvirt/src/hash.c,
libvirt/src/internal.h, libvirt/src/libvirt.c,
libvirt/src/proxy_internal.c, libvirt/src/test.c,
libvirt/src/virsh.c, libvirt/src/xend_internal.c,
libvirt/src/xm_internal.c, libvirt/src/xml.c,
libvirt/python/libvir.c: use them
2007-01-23 14:39:45 +00:00
|
|
|
char buf[VIR_UUID_BUFLEN], mapstr[sizeof(cpumap_t) * 64] = "[";
|
2006-08-04 10:41:05 +00:00
|
|
|
int i, j;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|
|
|
|
|| (cpumap == NULL) || (maplen < 1) || (maplen > (int)sizeof(cpumap_t))) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-08-04 10:41:05 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
2006-08-04 10:41:05 +00:00
|
|
|
|
|
|
|
/* from bit map, build character string of mapped CPU numbers */
|
|
|
|
for (i = 0; i < maplen; i++) for (j = 0; j < 8; j++)
|
|
|
|
if (cpumap[i] & (1 << j)) {
|
2007-03-23 16:15:07 +00:00
|
|
|
snprintf(buf, sizeof(buf), "%d,", (8 * i) + j);
|
2006-08-04 10:41:05 +00:00
|
|
|
strcat(mapstr, buf);
|
|
|
|
}
|
|
|
|
mapstr[strlen(mapstr) - 1] = ']';
|
|
|
|
snprintf(buf, sizeof(buf), "%d", vcpu);
|
|
|
|
return(xend_op(domain->conn, domain->name, "op", "pincpu", "vcpu", buf,
|
|
|
|
"cpumap", mapstr, NULL));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virDomainGetVcpus:
|
|
|
|
* @domain: pointer to domain object, or NULL for Domain0
|
|
|
|
* @info: pointer to an array of virVcpuInfo structures (OUT)
|
|
|
|
* @maxinfo: number of structures in info array
|
|
|
|
* @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit bytes) (OUT)
|
2008-04-04 07:58:29 +00:00
|
|
|
* If cpumaps is NULL, then no cpumap information is returned by the API.
|
2006-08-04 10:41:05 +00:00
|
|
|
* It's assumed there is <maxinfo> cpumap in cpumaps array.
|
|
|
|
* The memory allocated to cpumaps must be (maxinfo * maplen) bytes
|
|
|
|
* (ie: calloc(maxinfo, maplen)).
|
|
|
|
* One cpumap inside cpumaps has the format described in virDomainPinVcpu() API.
|
|
|
|
* @maplen: number of bytes in one cpumap, from 1 up to size of CPU map in
|
|
|
|
* underlying virtualization system (Xen...).
|
2008-02-05 19:27:37 +00:00
|
|
|
*
|
2006-08-04 10:41:05 +00:00
|
|
|
* Extract information about virtual CPUs of domain, store it in info array
|
2008-04-04 07:58:29 +00:00
|
|
|
* and also in cpumaps if this pointer isn't NULL.
|
2006-08-04 10:41:05 +00:00
|
|
|
*
|
|
|
|
* Returns the number of info filled in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
|
2006-09-28 19:20:52 +00:00
|
|
|
unsigned char *cpumaps, int maplen)
|
2006-08-04 10:41:05 +00:00
|
|
|
{
|
|
|
|
struct sexpr *root, *s, *t;
|
|
|
|
virVcpuInfoPtr ipt = info;
|
|
|
|
int nbinfo = 0, oln;
|
|
|
|
unsigned char *cpumap;
|
|
|
|
int vcpu, cpu;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|
2006-09-28 19:20:52 +00:00
|
|
|
|| (info == NULL) || (maxinfo < 1)) {
|
2006-08-04 10:41:05 +00:00
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2006-09-28 19:20:52 +00:00
|
|
|
__FUNCTION__);
|
2006-08-04 10:41:05 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (cpumaps != NULL && maplen < 1) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2006-09-28 19:20:52 +00:00
|
|
|
__FUNCTION__);
|
2006-08-04 10:41:05 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
2007-01-22 16:25:27 +00:00
|
|
|
if (domain->id < 0)
|
2006-11-15 21:03:34 +00:00
|
|
|
return(-1);
|
|
|
|
|
2006-08-04 10:41:05 +00:00
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?op=vcpuinfo", domain->name);
|
|
|
|
if (root == NULL)
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
if (cpumaps != NULL)
|
2006-09-28 19:20:52 +00:00
|
|
|
memset(cpumaps, 0, maxinfo * maplen);
|
2006-08-04 10:41:05 +00:00
|
|
|
|
|
|
|
/* scan the sexprs from "(vcpu (number x)...)" and get parameter values */
|
2007-09-29 18:16:26 +00:00
|
|
|
for (s = root; s->kind == SEXPR_CONS; s = s->u.s.cdr) {
|
|
|
|
if ((s->u.s.car->kind == SEXPR_CONS) &&
|
|
|
|
(s->u.s.car->u.s.car->kind == SEXPR_VALUE) &&
|
2008-05-14 19:51:24 +00:00
|
|
|
STREQ(s->u.s.car->u.s.car->u.value, "vcpu")) {
|
2007-09-29 18:16:26 +00:00
|
|
|
t = s->u.s.car;
|
2006-09-28 19:20:52 +00:00
|
|
|
vcpu = ipt->number = sexpr_int(t, "vcpu/number");
|
|
|
|
if ((oln = sexpr_int(t, "vcpu/online")) != 0) {
|
|
|
|
if (sexpr_int(t, "vcpu/running")) ipt->state = VIR_VCPU_RUNNING;
|
|
|
|
if (sexpr_int(t, "vcpu/blocked")) ipt->state = VIR_VCPU_BLOCKED;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
ipt->state = VIR_VCPU_OFFLINE;
|
|
|
|
ipt->cpuTime = sexpr_float(t, "vcpu/cpu_time") * 1000000000;
|
|
|
|
ipt->cpu = oln ? sexpr_int(t, "vcpu/cpu") : -1;
|
|
|
|
|
|
|
|
if (cpumaps != NULL && vcpu >= 0 && vcpu < maxinfo) {
|
|
|
|
cpumap = (unsigned char *) VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
|
|
|
|
/*
|
|
|
|
* get sexpr from "(cpumap (x y z...))" and convert values
|
|
|
|
* to bitmap
|
|
|
|
*/
|
2007-09-29 18:16:26 +00:00
|
|
|
for (t = t->u.s.cdr; t->kind == SEXPR_CONS; t = t->u.s.cdr)
|
|
|
|
if ((t->u.s.car->kind == SEXPR_CONS) &&
|
|
|
|
(t->u.s.car->u.s.car->kind == SEXPR_VALUE) &&
|
2008-05-14 19:51:24 +00:00
|
|
|
STREQ(t->u.s.car->u.s.car->u.value, "cpumap") &&
|
2007-09-29 18:16:26 +00:00
|
|
|
(t->u.s.car->u.s.cdr->kind == SEXPR_CONS)) {
|
|
|
|
for (t = t->u.s.car->u.s.cdr->u.s.car; t->kind == SEXPR_CONS; t = t->u.s.cdr)
|
2007-11-12 14:00:32 +00:00
|
|
|
if (t->u.s.car->kind == SEXPR_VALUE
|
2008-02-08 09:15:16 +00:00
|
|
|
&& virStrToLong_i(t->u.s.car->u.value, NULL, 10, &cpu) == 0
|
2007-11-12 14:00:32 +00:00
|
|
|
&& cpu >= 0
|
|
|
|
&& (VIR_CPU_MAPLEN(cpu+1) <= maplen)) {
|
|
|
|
VIR_USE_CPU(cpumap, cpu);
|
2006-09-28 19:20:52 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2006-08-04 10:41:05 +00:00
|
|
|
}
|
|
|
|
|
2006-09-28 19:20:52 +00:00
|
|
|
if (++nbinfo == maxinfo) break;
|
|
|
|
ipt++;
|
|
|
|
}
|
2006-08-04 10:41:05 +00:00
|
|
|
}
|
|
|
|
sexpr_free(root);
|
|
|
|
return(nbinfo);
|
|
|
|
}
|
|
|
|
|
2006-06-15 14:50:48 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonLookupByUUID:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @uuid: the raw UUID for the domain
|
|
|
|
*
|
|
|
|
* Try to lookup a domain on xend based on its UUID.
|
|
|
|
*
|
|
|
|
* Returns a new domain object or NULL in case of failure
|
|
|
|
*/
|
Fri Jul 6 16:08:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c, src/proxy_internal.h,
src.xen_internal.c, src/xen_internal.h,
src/xen_unified.c, src/xen_unified.h,
src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: The interface
between xen_unified.c and its underlying driver now uses
a custom structure (struct xenUnifiedDriver) instead
of reusing virDriver.
* src/xen_unified.c: virDomainLookup* functions in Xen
now throw VIR_ERR_NO_DOMAIN if the domain does not exist.
* src/xs_internal.c: Fix indentation.
2007-07-06 15:11:22 +00:00
|
|
|
virDomainPtr
|
2006-06-15 14:50:48 +00:00
|
|
|
xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
|
|
|
|
{
|
|
|
|
virDomainPtr ret;
|
|
|
|
char *name = NULL;
|
|
|
|
int id = -1;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2007-03-02 20:19:08 +00:00
|
|
|
/* Old approach for xen <= 3.0.3 */
|
2007-04-04 14:19:49 +00:00
|
|
|
if (priv->xendConfigVersion < 3) {
|
2007-03-02 20:19:08 +00:00
|
|
|
char **names, **tmp;
|
|
|
|
unsigned char ident[VIR_UUID_BUFLEN];
|
|
|
|
names = xenDaemonListDomainsOld(conn);
|
|
|
|
tmp = names;
|
|
|
|
|
|
|
|
if (names == NULL) {
|
2006-06-15 14:50:48 +00:00
|
|
|
return (NULL);
|
2007-03-02 20:19:08 +00:00
|
|
|
}
|
|
|
|
while (*tmp != NULL) {
|
|
|
|
id = xenDaemonDomainLookupByName_ids(conn, *tmp, &ident[0]);
|
|
|
|
if (id >= 0) {
|
|
|
|
if (!memcmp(uuid, ident, VIR_UUID_BUFLEN)) {
|
|
|
|
name = strdup(*tmp);
|
|
|
|
break;
|
|
|
|
}
|
2006-06-15 14:50:48 +00:00
|
|
|
}
|
2007-03-02 20:19:08 +00:00
|
|
|
tmp++;
|
2006-06-15 14:50:48 +00:00
|
|
|
}
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(names);
|
2007-03-02 20:19:08 +00:00
|
|
|
} else { /* New approach for xen >= 3.0.4 */
|
|
|
|
char *domname = NULL;
|
|
|
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
|
|
|
struct sexpr *root = NULL;
|
|
|
|
|
2007-08-09 20:19:12 +00:00
|
|
|
virUUIDFormat(uuid, uuidstr);
|
2007-03-02 20:19:08 +00:00
|
|
|
root = sexpr_get(conn, "/xend/domain/%s?detail=1", uuidstr);
|
|
|
|
if (root == NULL)
|
|
|
|
return (NULL);
|
|
|
|
domname = (char*)sexpr_node(root, "domain/name");
|
|
|
|
if (sexpr_node(root, "domain/domid")) /* only active domains have domid */
|
|
|
|
id = sexpr_int(root, "domain/domid");
|
|
|
|
else
|
|
|
|
id = -1;
|
|
|
|
name = domname ? strdup(domname) : NULL;
|
|
|
|
sexpr_free(root);
|
2006-06-15 14:50:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (name == NULL)
|
2007-03-02 20:19:08 +00:00
|
|
|
return (NULL);
|
2006-06-15 14:50:48 +00:00
|
|
|
|
|
|
|
ret = virGetDomain(conn, name, uuid);
|
2007-07-06 15:02:09 +00:00
|
|
|
if (ret == NULL) return NULL;
|
|
|
|
|
2007-01-22 16:25:27 +00:00
|
|
|
ret->id = id;
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(name);
|
2006-06-15 14:50:48 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
2006-06-16 12:36:40 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonCreateLinux:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @xmlDesc: an XML description of the domain
|
|
|
|
* @flags: an optional set of virDomainFlags
|
|
|
|
*
|
|
|
|
* Launch a new Linux guest domain, based on an XML description similar
|
|
|
|
* to the one returned by virDomainGetXMLDesc()
|
2008-03-17 10:27:31 +00:00
|
|
|
* This function may requires privileged access to the hypervisor.
|
2008-02-05 19:27:37 +00:00
|
|
|
*
|
2006-06-16 12:36:40 +00:00
|
|
|
* Returns a new domain object or NULL in case of failure
|
|
|
|
*/
|
|
|
|
static virDomainPtr
|
|
|
|
xenDaemonCreateLinux(virConnectPtr conn, const char *xmlDesc,
|
|
|
|
unsigned int flags ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
char *sexpr;
|
2007-02-22 19:09:29 +00:00
|
|
|
virDomainPtr dom = NULL;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefPtr def;
|
2006-06-16 12:36:40 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(def = virDomainDefParseString(conn,
|
|
|
|
priv->caps,
|
|
|
|
xmlDesc)))
|
|
|
|
return (NULL);
|
2006-06-16 12:36:40 +00:00
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(sexpr = xenDaemonFormatSxpr(conn, def, priv->xendConfigVersion))) {
|
|
|
|
virXendError(conn, VIR_ERR_XML_ERROR,
|
|
|
|
"%s", _("failed to build sexpr"));
|
|
|
|
virDomainDefFree(def);
|
2006-06-16 12:36:40 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = xenDaemonDomainCreateLinux(conn, sexpr);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(sexpr);
|
2006-06-16 12:36:40 +00:00
|
|
|
if (ret != 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2007-02-22 19:09:29 +00:00
|
|
|
/* This comes before wait_for_devices, to ensure that latter
|
|
|
|
cleanup will destroy the domain upon failure */
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(dom = virDomainLookupByName(conn, def->name)))
|
2006-06-16 12:36:40 +00:00
|
|
|
goto error;
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if ((ret = xend_wait_for_devices(conn, def->name)) < 0)
|
2006-06-16 12:36:40 +00:00
|
|
|
goto error;
|
|
|
|
|
2007-02-22 19:09:29 +00:00
|
|
|
if ((ret = xenDaemonDomainResume(dom)) < 0)
|
2006-06-16 12:36:40 +00:00
|
|
|
goto error;
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefFree(def);
|
2006-06-16 12:36:40 +00:00
|
|
|
return (dom);
|
2007-02-22 19:09:29 +00:00
|
|
|
|
2006-06-16 12:36:40 +00:00
|
|
|
error:
|
2007-02-22 19:09:29 +00:00
|
|
|
/* Make sure we don't leave a still-born domain around */
|
|
|
|
if (dom != NULL) {
|
|
|
|
xenDaemonDomainDestroy(dom);
|
2008-01-21 16:29:10 +00:00
|
|
|
virUnrefDomain(dom);
|
2007-02-22 19:09:29 +00:00
|
|
|
}
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefFree(def);
|
2006-06-16 12:36:40 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
2006-11-16 18:11:28 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonAttachDevice:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @xml: pointer to XML description of device
|
2008-02-05 19:27:37 +00:00
|
|
|
*
|
2006-11-16 18:11:28 +00:00
|
|
|
* Create a virtual device attachment to backend.
|
|
|
|
* XML description is translated into S-expression.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
2007-10-15 21:38:56 +00:00
|
|
|
xenDaemonAttachDevice(virDomainPtr domain, const char *xml)
|
2006-11-16 18:11:28 +00:00
|
|
|
{
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 13:17:27 +00:00
|
|
|
char *sexpr = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
2007-09-10 11:47:17 +00:00
|
|
|
char class[8], ref[80];
|
2006-11-16 18:11:28 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2008-07-25 13:17:27 +00:00
|
|
|
return -1;
|
2006-11-16 18:11:28 +00:00
|
|
|
}
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
2007-08-16 15:38:38 +00:00
|
|
|
/*
|
|
|
|
* on older Xen without the inactive guests management
|
|
|
|
* avoid doing this on inactive guests
|
|
|
|
*/
|
|
|
|
if ((domain->id < 0) && (priv->xendConfigVersion < 3))
|
2008-07-25 13:17:27 +00:00
|
|
|
return -1;
|
2007-08-16 15:38:38 +00:00
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(def = xenDaemonDomainFetch(domain->conn,
|
|
|
|
domain->id,
|
|
|
|
domain->name,
|
|
|
|
NULL)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!(dev = virDomainDeviceDefParse(domain->conn, def, xml)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
|
|
|
switch (dev->type) {
|
|
|
|
case VIR_DOMAIN_DEVICE_DISK:
|
|
|
|
if (xenDaemonFormatSxprDisk(domain->conn,
|
|
|
|
dev->data.disk,
|
|
|
|
&buf,
|
|
|
|
STREQ(def->os.type, "hvm") ? 1 : 0,
|
2008-08-06 11:26:47 +00:00
|
|
|
priv->xendConfigVersion, 1) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto cleanup;
|
With the recent refactoring of the domain code, plus the changes with the Xend
code, a couple of bugs were introduced into the attach-disk and attach-interface
functionality. This patch fixes 3 bugs:
1) In xenDaemonAttachDevice(), there is a switch statement to determine which
of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case
statements are all missing the corresponding "break", so we always fall-through
to the default error case. This patch just adds the appropriate break statements.
2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray
"fprintf". This is now converted to a proper virXendError().
3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of
the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2).
Because of this, the attaches would fail. The patch fixes this by removing the
(device from the front, which makes attach-disk and attach-interface work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com>
2008-08-05 16:45:07 +00:00
|
|
|
break;
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
case VIR_DOMAIN_DEVICE_NET:
|
|
|
|
if (xenDaemonFormatSxprNet(domain->conn,
|
|
|
|
dev->data.net,
|
|
|
|
&buf,
|
|
|
|
STREQ(def->os.type, "hvm") ? 1 : 0,
|
2008-08-06 11:26:47 +00:00
|
|
|
priv->xendConfigVersion, 1) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto cleanup;
|
With the recent refactoring of the domain code, plus the changes with the Xend
code, a couple of bugs were introduced into the attach-disk and attach-interface
functionality. This patch fixes 3 bugs:
1) In xenDaemonAttachDevice(), there is a switch statement to determine which
of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case
statements are all missing the corresponding "break", so we always fall-through
to the default error case. This patch just adds the appropriate break statements.
2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray
"fprintf". This is now converted to a proper virXendError().
3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of
the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2).
Because of this, the attaches would fail. The patch fixes this by removing the
(device from the front, which makes attach-disk and attach-interface work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com>
2008-08-05 16:45:07 +00:00
|
|
|
break;
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
virXendError(domain->conn, VIR_ERR_NO_SUPPORT, "%s",
|
|
|
|
_("unsupported device type"));
|
|
|
|
goto cleanup;
|
2006-11-16 18:11:28 +00:00
|
|
|
}
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
sexpr = virBufferContentAndReset(&buf);
|
|
|
|
|
|
|
|
if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) {
|
2007-09-10 11:47:17 +00:00
|
|
|
/* device doesn't exist, define it */
|
|
|
|
ret = xend_op(domain->conn, domain->name, "op", "device_create",
|
2008-07-25 13:17:27 +00:00
|
|
|
"config", sexpr, NULL);
|
2008-02-05 19:27:37 +00:00
|
|
|
}
|
2007-09-10 11:47:17 +00:00
|
|
|
else {
|
|
|
|
/* device exists, attempt to modify it */
|
2008-02-05 19:27:37 +00:00
|
|
|
ret = xend_op(domain->conn, domain->name, "op", "device_configure",
|
2008-07-25 13:17:27 +00:00
|
|
|
"config", sexpr, "dev", ref, NULL);
|
2007-09-10 11:47:17 +00:00
|
|
|
}
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
cleanup:
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(sexpr);
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefFree(def);
|
|
|
|
virDomainDeviceDefFree(dev);
|
2006-11-16 18:11:28 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonDetachDevice:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @xml: pointer to XML description of device
|
2008-02-05 19:27:37 +00:00
|
|
|
*
|
2006-11-16 18:11:28 +00:00
|
|
|
* Destroy a virtual device attachment to backend.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
2007-10-15 21:38:56 +00:00
|
|
|
xenDaemonDetachDevice(virDomainPtr domain, const char *xml)
|
2006-11-16 18:11:28 +00:00
|
|
|
{
|
2008-07-25 13:17:27 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2006-11-16 18:11:28 +00:00
|
|
|
char class[8], ref[80];
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDeviceDefPtr dev = NULL;
|
|
|
|
virDomainDefPtr def = NULL;
|
|
|
|
int ret = -1;
|
2006-11-16 18:11:28 +00:00
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-11-16 18:11:28 +00:00
|
|
|
return (-1);
|
|
|
|
}
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* on older Xen without the inactive guests management
|
|
|
|
* avoid doing this on inactive guests
|
|
|
|
*/
|
|
|
|
if ((domain->id < 0) && (priv->xendConfigVersion < 3))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (!(def = xenDaemonDomainFetch(domain->conn,
|
|
|
|
domain->id,
|
|
|
|
domain->name,
|
|
|
|
NULL)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (!(dev = virDomainDeviceDefParse(domain->conn, def, xml)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref)))
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
ret = xend_op(domain->conn, domain->name, "op", "device_destroy",
|
|
|
|
"type", class, "dev", ref, "force", "0", "rm_cfg", "1", NULL);
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
virDomainDefFree(def);
|
|
|
|
virDomainDeviceDefFree(dev);
|
|
|
|
|
|
|
|
return ret;
|
2006-11-16 18:11:28 +00:00
|
|
|
}
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2008-05-09 08:17:18 +00:00
|
|
|
int
|
|
|
|
xenDaemonDomainGetAutostart(virDomainPtr domain,
|
|
|
|
int *autostart)
|
|
|
|
{
|
|
|
|
struct sexpr *root;
|
|
|
|
const char *tmp;
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* xm_internal.c (the support for defined domains from /etc/xen
|
|
|
|
* config files used by old Xen) will handle this.
|
|
|
|
*/
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
if (priv->xendConfigVersion < 3)
|
|
|
|
return(-1);
|
|
|
|
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL) {
|
|
|
|
virXendError (domain->conn, VIR_ERR_XEN_CALL,
|
|
|
|
_("xenDaemonGetAutostart failed to find this domain"));
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
*autostart = 0;
|
|
|
|
|
|
|
|
tmp = sexpr_node(root, "domain/on_xend_start");
|
|
|
|
if (tmp && STREQ(tmp, "start")) {
|
|
|
|
*autostart = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
sexpr_free(root);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
xenDaemonDomainSetAutostart(virDomainPtr domain,
|
|
|
|
int autostart)
|
|
|
|
{
|
|
|
|
struct sexpr *root, *autonode;
|
|
|
|
const char *autostr;
|
|
|
|
char buf[4096];
|
|
|
|
int ret = -1;
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INTERNAL_ERROR,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* xm_internal.c (the support for defined domains from /etc/xen
|
|
|
|
* config files used by old Xen) will handle this.
|
|
|
|
*/
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
if (priv->xendConfigVersion < 3)
|
|
|
|
return(-1);
|
|
|
|
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL) {
|
|
|
|
virXendError (domain->conn, VIR_ERR_XEN_CALL,
|
|
|
|
_("xenDaemonSetAutostart failed to find this domain"));
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
autostr = sexpr_node(root, "domain/on_xend_start");
|
|
|
|
if (autostr) {
|
|
|
|
if (!STREQ(autostr, "ignore") && !STREQ(autostr, "start")) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected value from on_xend_start"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Change the autostart value in place, then define the new sexpr
|
|
|
|
autonode = sexpr_lookup(root, "domain/on_xend_start");
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(autonode->u.s.car->u.value);
|
2008-05-09 08:17:18 +00:00
|
|
|
autonode->u.s.car->u.value = (autostart ? strdup("start")
|
|
|
|
: strdup("ignore"));
|
|
|
|
if (!(autonode->u.s.car->u.value)) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("no memory"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sexpr2string(root, buf, sizeof(buf)) == 0) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("sexpr2string failed"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (xend_op(domain->conn, "", "op", "new", "config", buf, NULL) != 0) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_XEN_CALL,
|
|
|
|
_("Failed to redefine sexpr"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("on_xend_start not present in sexpr"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
|
|
|
return ret;
|
|
|
|
}
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2007-08-21 09:31:12 +00:00
|
|
|
int
|
|
|
|
xenDaemonDomainMigratePrepare (virConnectPtr dconn,
|
|
|
|
char **cookie ATTRIBUTE_UNUSED,
|
|
|
|
int *cookielen ATTRIBUTE_UNUSED,
|
|
|
|
const char *uri_in,
|
|
|
|
char **uri_out,
|
|
|
|
unsigned long flags ATTRIBUTE_UNUSED,
|
|
|
|
const char *dname ATTRIBUTE_UNUSED,
|
|
|
|
unsigned long resource ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
char hostname [HOST_NAME_MAX+1];
|
|
|
|
|
|
|
|
/* If uri_in is NULL, get the current hostname as a best guess
|
|
|
|
* of how the source host should connect to us. Note that caller
|
|
|
|
* deallocates this string.
|
|
|
|
*/
|
|
|
|
if (uri_in == NULL) {
|
|
|
|
r = gethostname (hostname, HOST_NAME_MAX+1);
|
|
|
|
if (r == -1) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError (dconn, VIR_ERR_SYSTEM_ERROR,
|
|
|
|
_("gethostname failed: %s"), strerror (errno));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*uri_out = strdup (hostname);
|
|
|
|
if (*uri_out == NULL) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError (dconn, VIR_ERR_SYSTEM_ERROR,
|
|
|
|
_("failed to strdup hostname: %s"), strerror (errno));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
xenDaemonDomainMigratePerform (virDomainPtr domain,
|
|
|
|
const char *cookie ATTRIBUTE_UNUSED,
|
|
|
|
int cookielen ATTRIBUTE_UNUSED,
|
|
|
|
const char *uri,
|
|
|
|
unsigned long flags,
|
|
|
|
const char *dname,
|
|
|
|
unsigned long bandwidth)
|
|
|
|
{
|
|
|
|
/* Upper layers have already checked domain. */
|
|
|
|
virConnectPtr conn = domain->conn;
|
|
|
|
/* NB: Passing port=0 to xend means it ignores
|
|
|
|
* the port. However this is somewhat specific to
|
|
|
|
* the internals of the xend Python code. (XXX).
|
|
|
|
*/
|
|
|
|
char port[16] = "0";
|
|
|
|
char live[2] = "0";
|
|
|
|
int ret;
|
|
|
|
char *p, *hostname = NULL;
|
|
|
|
|
|
|
|
/* Xen doesn't support renaming domains during migration. */
|
|
|
|
if (dname) {
|
|
|
|
virXendError (conn, VIR_ERR_NO_SUPPORT,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: Xen does not support"
|
|
|
|
" renaming domains during migration"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Xen (at least up to 3.1.0) takes a resource parameter but
|
|
|
|
* ignores it.
|
|
|
|
*/
|
|
|
|
if (bandwidth) {
|
|
|
|
virXendError (conn, VIR_ERR_NO_SUPPORT,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: Xen does not support"
|
|
|
|
" bandwidth limits during migration"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check the flags. */
|
|
|
|
if ((flags & VIR_MIGRATE_LIVE)) {
|
|
|
|
strcpy (live, "1");
|
|
|
|
flags &= ~VIR_MIGRATE_LIVE;
|
|
|
|
}
|
|
|
|
if (flags != 0) {
|
|
|
|
virXendError (conn, VIR_ERR_NO_SUPPORT,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: unsupported flag"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set hostname and port.
|
|
|
|
*
|
|
|
|
* URI is non-NULL (guaranteed by caller). We expect either
|
|
|
|
* "hostname", "hostname:port" or "xenmigr://hostname[:port]/".
|
|
|
|
*/
|
|
|
|
if (strstr (uri, "//")) { /* Full URI. */
|
|
|
|
xmlURIPtr uriptr = xmlParseURI (uri);
|
|
|
|
if (!uriptr) {
|
|
|
|
virXendError (conn, VIR_ERR_INVALID_ARG,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: invalid URI"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (uriptr->scheme && STRCASENEQ (uriptr->scheme, "xenmigr")) {
|
|
|
|
virXendError (conn, VIR_ERR_INVALID_ARG,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: only xenmigr://"
|
|
|
|
" migrations are supported by Xen"));
|
2007-08-21 09:31:12 +00:00
|
|
|
xmlFreeURI (uriptr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!uriptr->server) {
|
|
|
|
virXendError (conn, VIR_ERR_INVALID_ARG,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: a hostname must be"
|
|
|
|
" specified in the URI"));
|
2007-08-21 09:31:12 +00:00
|
|
|
xmlFreeURI (uriptr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
hostname = strdup (uriptr->server);
|
|
|
|
if (!hostname) {
|
2008-02-04 19:31:30 +00:00
|
|
|
virXendError (conn, VIR_ERR_NO_MEMORY, _("strdup failed"));
|
2007-08-21 09:31:12 +00:00
|
|
|
xmlFreeURI (uriptr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (uriptr->port)
|
|
|
|
snprintf (port, sizeof port, "%d", uriptr->port);
|
|
|
|
xmlFreeURI (uriptr);
|
|
|
|
}
|
|
|
|
else if ((p = strrchr (uri, ':')) != NULL) { /* "hostname:port" */
|
|
|
|
int port_nr, n;
|
|
|
|
|
|
|
|
if (sscanf (p+1, "%d", &port_nr) != 1) {
|
|
|
|
virXendError (conn, VIR_ERR_INVALID_ARG,
|
2008-02-04 19:31:30 +00:00
|
|
|
_("xenDaemonDomainMigrate: invalid port number"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
snprintf (port, sizeof port, "%d", port_nr);
|
|
|
|
|
|
|
|
/* Get the hostname. */
|
|
|
|
n = p - uri; /* n = Length of hostname in bytes. */
|
|
|
|
hostname = strdup (uri);
|
|
|
|
if (!hostname) {
|
2008-02-04 19:31:30 +00:00
|
|
|
virXendError (conn, VIR_ERR_NO_MEMORY, _("strdup failed"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
hostname[n] = '\0';
|
|
|
|
}
|
|
|
|
else { /* "hostname" (or IP address) */
|
|
|
|
hostname = strdup (uri);
|
|
|
|
if (!hostname) {
|
2008-02-04 19:31:30 +00:00
|
|
|
virXendError (conn, VIR_ERR_NO_MEMORY, _("strdup failed"));
|
2007-08-21 09:31:12 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-19 18:36:01 +00:00
|
|
|
DEBUG("hostname = %s, port = %s", hostname, port);
|
2007-08-21 09:31:12 +00:00
|
|
|
|
|
|
|
/* Make the call. */
|
|
|
|
ret = xend_op (domain->conn, domain->name,
|
|
|
|
"op", "migrate",
|
|
|
|
"destination", hostname,
|
|
|
|
"live", live,
|
|
|
|
"port", port,
|
|
|
|
"resource", "0", /* required, xend ignores it */
|
|
|
|
NULL);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE (hostname);
|
2007-08-21 09:31:12 +00:00
|
|
|
|
2008-01-19 18:36:01 +00:00
|
|
|
DEBUG0("migration done");
|
2007-08-21 09:31:12 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) {
|
|
|
|
int ret;
|
|
|
|
char *sexpr;
|
|
|
|
char *name = NULL;
|
|
|
|
virDomainPtr dom;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefPtr def;
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) conn->privateData;
|
|
|
|
|
|
|
|
if (priv->xendConfigVersion < 3)
|
2007-01-18 18:38:09 +00:00
|
|
|
return(NULL);
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(def = virDomainDefParseString(conn, priv->caps, xmlDesc))) {
|
2008-02-04 19:31:30 +00:00
|
|
|
virXendError(conn, VIR_ERR_XML_ERROR,
|
|
|
|
_("failed to parse domain description"));
|
2006-12-14 01:56:14 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
if (!(sexpr = xenDaemonFormatSxpr(conn, def, priv->xendConfigVersion))) {
|
|
|
|
virXendError(conn, VIR_ERR_XML_ERROR,
|
|
|
|
_("failed to build sexpr"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
ret = xend_op(conn, "", "op", "new", "config", sexpr, NULL);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(sexpr);
|
2006-12-14 01:56:14 +00:00
|
|
|
if (ret != 0) {
|
With the recent refactoring of the domain code, plus the changes with the Xend
code, a couple of bugs were introduced into the attach-disk and attach-interface
functionality. This patch fixes 3 bugs:
1) In xenDaemonAttachDevice(), there is a switch statement to determine which
of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case
statements are all missing the corresponding "break", so we always fall-through
to the default error case. This patch just adds the appropriate break statements.
2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray
"fprintf". This is now converted to a proper virXendError().
3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of
the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2).
Because of this, the attaches would fail. The patch fixes this by removing the
(device from the front, which makes attach-disk and attach-interface work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com>
2008-08-05 16:45:07 +00:00
|
|
|
virXendError(conn, VIR_ERR_XEN_CALL,
|
|
|
|
_("Failed to create inactive domain %s\n"), name);
|
2006-12-14 01:56:14 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
dom = virDomainLookupByName(conn, name);
|
|
|
|
if (dom == NULL) {
|
|
|
|
goto error;
|
|
|
|
}
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefFree(def);
|
2006-12-14 01:56:14 +00:00
|
|
|
return (dom);
|
2008-07-25 13:17:27 +00:00
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
error:
|
2008-07-25 13:17:27 +00:00
|
|
|
virDomainDefFree(def);
|
2006-12-14 01:56:14 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
int xenDaemonDomainCreate(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-12-14 01:56:14 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (priv->xendConfigVersion < 3)
|
2006-12-14 01:56:14 +00:00
|
|
|
return(-1);
|
|
|
|
|
|
|
|
return xend_op(domain->conn, domain->name, "op", "start", NULL);
|
|
|
|
}
|
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
int xenDaemonDomainUndefine(virDomainPtr domain)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
2008-04-10 16:54:54 +00:00
|
|
|
__FUNCTION__);
|
2006-12-14 01:56:14 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2007-04-04 14:19:49 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (priv->xendConfigVersion < 3)
|
2006-12-14 01:56:14 +00:00
|
|
|
return(-1);
|
|
|
|
|
|
|
|
return xend_op(domain->conn, domain->name, "op", "delete", NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonNumOfDomains:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
*
|
|
|
|
* Provides the number of active domains.
|
|
|
|
*
|
|
|
|
* Returns the number of domain found or -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonNumOfDefinedDomains(virConnectPtr conn)
|
|
|
|
{
|
|
|
|
struct sexpr *root = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
struct sexpr *_for_i, *node;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2007-09-20 12:02:18 +00:00
|
|
|
/* xm_internal.c (the support for defined domains from /etc/xen
|
|
|
|
* config files used by old Xen) will handle this.
|
|
|
|
*/
|
2007-04-04 14:19:49 +00:00
|
|
|
if (priv->xendConfigVersion < 3)
|
2007-01-18 18:38:09 +00:00
|
|
|
return(-1);
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
root = sexpr_get(conn, "/xend/domain?state=halted");
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2007-09-29 18:16:26 +00:00
|
|
|
for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS;
|
|
|
|
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
|
2006-12-14 01:56:14 +00:00
|
|
|
if (node->kind != SEXPR_VALUE)
|
|
|
|
continue;
|
|
|
|
ret++;
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
2008-01-29 17:41:07 +00:00
|
|
|
sexpr_free(root);
|
2006-12-14 01:56:14 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
2008-07-25 09:51:23 +00:00
|
|
|
static int
|
|
|
|
xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) {
|
2006-12-14 01:56:14 +00:00
|
|
|
struct sexpr *root = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
struct sexpr *_for_i, *node;
|
2007-04-04 14:19:49 +00:00
|
|
|
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
|
2006-12-14 01:56:14 +00:00
|
|
|
|
2007-04-04 14:19:49 +00:00
|
|
|
if (priv->xendConfigVersion < 3)
|
2007-01-18 18:38:09 +00:00
|
|
|
return(-1);
|
|
|
|
|
2008-06-19 14:39:49 +00:00
|
|
|
if ((names == NULL) || (maxnames < 0))
|
2006-12-14 01:56:14 +00:00
|
|
|
goto error;
|
2008-06-19 14:39:49 +00:00
|
|
|
if (maxnames == 0)
|
|
|
|
return(0);
|
|
|
|
|
2006-12-14 01:56:14 +00:00
|
|
|
root = sexpr_get(conn, "/xend/domain?state=halted");
|
|
|
|
if (root == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
2007-09-29 18:16:26 +00:00
|
|
|
for (_for_i = root, node = root->u.s.car; _for_i->kind == SEXPR_CONS;
|
|
|
|
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
|
2006-12-14 01:56:14 +00:00
|
|
|
if (node->kind != SEXPR_VALUE)
|
|
|
|
continue;
|
|
|
|
|
2007-09-29 18:16:26 +00:00
|
|
|
names[ret++] = strdup(node->u.value);
|
2006-12-14 01:56:14 +00:00
|
|
|
if (ret >= maxnames)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
2008-01-29 17:41:07 +00:00
|
|
|
sexpr_free(root);
|
2006-12-14 01:56:14 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
2008-03-24 09:23:32 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonGetSchedulerType:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @nparams: give a number of scheduler parameters
|
|
|
|
*
|
|
|
|
* Get the scheduler type of Xen
|
|
|
|
*
|
|
|
|
* Returns a scheduler name (credit or sedf) which must be freed by the
|
|
|
|
* caller or NULL in case of failure
|
|
|
|
*/
|
|
|
|
static char *
|
|
|
|
xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
struct sexpr *root;
|
|
|
|
const char *ret = NULL;
|
|
|
|
char *schedulertype = NULL;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|
|
|
|
|| (nparams == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Support only xendConfigVersion >=4 */
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
if (priv->xendConfigVersion < 4) {
|
|
|
|
virXendError (domain->conn, VIR_ERR_NO_SUPPORT,
|
|
|
|
_("unsupported in xendConfigVersion < 4"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
root = sexpr_get(domain->conn, "/xend/node/");
|
|
|
|
if (root == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* get xen_scheduler from xend/node */
|
|
|
|
ret = sexpr_node(root, "node/xen_scheduler");
|
|
|
|
if (ret == NULL){
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("node information incomplete, missing scheduler name"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (STREQ (ret, "credit")) {
|
|
|
|
schedulertype = strdup("credit");
|
|
|
|
if (schedulertype == NULL){
|
|
|
|
virXendError(domain->conn, VIR_ERR_SYSTEM_ERROR, _("strdup failed"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
*nparams = XEN_SCHED_CRED_NPARAM;
|
|
|
|
} else if (STREQ (ret, "sedf")) {
|
|
|
|
schedulertype = strdup("sedf");
|
|
|
|
if (schedulertype == NULL){
|
|
|
|
virXendError(domain->conn, VIR_ERR_SYSTEM_ERROR, _("strdup failed"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
*nparams = XEN_SCHED_SEDF_NPARAM;
|
|
|
|
} else {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, _("Unknown scheduler"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
|
|
|
return schedulertype;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *str_weight = "weight";
|
|
|
|
static const char *str_cap = "cap";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonGetSchedulerParameters:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @params: pointer to scheduler parameters
|
|
|
|
* This memory area must be allocated by the caller
|
|
|
|
* @nparams: a number of scheduler parameters which should be same as a
|
|
|
|
* given number from xenDaemonGetSchedulerType()
|
|
|
|
*
|
|
|
|
* Get the scheduler parameters
|
|
|
|
*
|
|
|
|
* Returns 0 or -1 in case of failure
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonGetSchedulerParameters(virDomainPtr domain,
|
|
|
|
virSchedParameterPtr params, int *nparams)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
struct sexpr *root;
|
|
|
|
char *sched_type = NULL;
|
|
|
|
int sched_nparam = 0;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|
|
|
|
|| (params == NULL) || (nparams == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Support only xendConfigVersion >=4 */
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
if (priv->xendConfigVersion < 4) {
|
|
|
|
virXendError (domain->conn, VIR_ERR_NO_SUPPORT,
|
|
|
|
_("unsupported in xendConfigVersion < 4"));
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* look up the information by domain name */
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL)
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
/* get the scheduler type */
|
|
|
|
sched_type = xenDaemonGetSchedulerType(domain, &sched_nparam);
|
|
|
|
if (sched_type == NULL) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to get a scheduler name"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (sched_nparam){
|
|
|
|
case XEN_SCHED_SEDF_NPARAM:
|
|
|
|
/* TODO: Implement for Xen/SEDF */
|
|
|
|
TODO
|
|
|
|
goto error;
|
|
|
|
case XEN_SCHED_CRED_NPARAM:
|
|
|
|
/* get cpu_weight/cpu_cap from xend/domain */
|
|
|
|
if (sexpr_node(root, "domain/cpu_weight") == NULL) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing cpu_weight"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (sexpr_node(root, "domain/cpu_cap") == NULL) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing cpu_cap"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
strncpy (params[0].field, str_weight, VIR_DOMAIN_SCHED_FIELD_LENGTH);
|
|
|
|
params[0].field[VIR_DOMAIN_SCHED_FIELD_LENGTH-1] = '\0';
|
|
|
|
params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT;
|
|
|
|
params[0].value.ui = sexpr_int(root, "domain/cpu_weight");
|
|
|
|
|
|
|
|
strncpy (params[1].field, str_cap, VIR_DOMAIN_SCHED_FIELD_LENGTH);
|
|
|
|
params[1].field[VIR_DOMAIN_SCHED_FIELD_LENGTH-1] = '\0';
|
|
|
|
params[1].type = VIR_DOMAIN_SCHED_FIELD_UINT;
|
|
|
|
params[1].value.ui = sexpr_int(root, "domain/cpu_cap");
|
|
|
|
*nparams = XEN_SCHED_CRED_NPARAM;
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, _("Unknown scheduler"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(sched_type);
|
2008-03-24 09:23:32 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonSetSchedulerParameters:
|
|
|
|
* @domain: pointer to the Domain block
|
|
|
|
* @params: pointer to scheduler parameters
|
|
|
|
* @nparams: a number of scheduler setting parameters
|
|
|
|
*
|
|
|
|
* Set the scheduler parameters
|
|
|
|
*
|
|
|
|
* Returns 0 or -1 in case of failure
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonSetSchedulerParameters(virDomainPtr domain,
|
|
|
|
virSchedParameterPtr params, int nparams)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv;
|
|
|
|
struct sexpr *root;
|
|
|
|
char *sched_type = NULL;
|
|
|
|
int i;
|
|
|
|
int sched_nparam = 0;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)
|
|
|
|
|| (params == NULL)) {
|
|
|
|
virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG,
|
|
|
|
__FUNCTION__);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Support only xendConfigVersion >=4 and active domains */
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
if (priv->xendConfigVersion < 4) {
|
|
|
|
virXendError (domain->conn, VIR_ERR_NO_SUPPORT,
|
|
|
|
_("unsupported in xendConfigVersion < 4"));
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* look up the information by domain name */
|
|
|
|
root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name);
|
|
|
|
if (root == NULL)
|
|
|
|
return (-1);
|
|
|
|
|
|
|
|
/* get the scheduler type */
|
|
|
|
sched_type = xenDaemonGetSchedulerType(domain, &sched_nparam);
|
|
|
|
if (sched_type == NULL) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to get a scheduler name"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (sched_nparam){
|
|
|
|
case XEN_SCHED_SEDF_NPARAM:
|
|
|
|
/* TODO: Implement for Xen/SEDF */
|
|
|
|
TODO
|
|
|
|
goto error;
|
|
|
|
case XEN_SCHED_CRED_NPARAM: {
|
|
|
|
char buf_weight[VIR_UUID_BUFLEN];
|
|
|
|
char buf_cap[VIR_UUID_BUFLEN];
|
|
|
|
const char *weight = NULL;
|
|
|
|
const char *cap = NULL;
|
|
|
|
|
|
|
|
/* get the scheduler parameters */
|
|
|
|
memset(&buf_weight, 0, VIR_UUID_BUFLEN);
|
|
|
|
memset(&buf_cap, 0, VIR_UUID_BUFLEN);
|
|
|
|
for (i = 0; i < nparams; i++) {
|
|
|
|
if (STREQ (params[i].field, str_weight) &&
|
|
|
|
params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) {
|
|
|
|
snprintf(buf_weight, sizeof(buf_weight), "%u", params[i].value.ui);
|
|
|
|
} else if (STREQ (params[i].field, str_cap) &&
|
|
|
|
params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) {
|
|
|
|
snprintf(buf_cap, sizeof(buf_cap), "%u", params[i].value.ui);
|
|
|
|
} else {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if not get the scheduler parameter, set the current setting */
|
|
|
|
if (strlen(buf_weight) == 0) {
|
|
|
|
weight = sexpr_node(root, "domain/cpu_weight");
|
|
|
|
if (weight == NULL) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing cpu_weight"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
snprintf(buf_weight, sizeof(buf_weight), "%s", weight);
|
|
|
|
}
|
|
|
|
if (strlen(buf_cap) == 0) {
|
|
|
|
cap = sexpr_node(root, "domain/cpu_cap");
|
|
|
|
if (cap == NULL) {
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("domain information incomplete, missing cpu_cap"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
snprintf(buf_cap, sizeof(buf_cap), "%s", cap);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = xend_op(domain->conn, domain->name, "op",
|
|
|
|
"domain_sched_credit_set", "weight", buf_weight,
|
|
|
|
"cap", buf_cap, NULL);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, _("Unknown scheduler"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
sexpr_free(root);
|
2008-05-29 19:20:22 +00:00
|
|
|
VIR_FREE(sched_type);
|
2008-03-24 09:23:32 +00:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
/**
|
|
|
|
* xenDaemonDomainBlockPeek:
|
|
|
|
* @dom: domain object
|
|
|
|
* @path: path to the file or device
|
|
|
|
* @offset: offset
|
|
|
|
* @size: size
|
|
|
|
* @buffer: return buffer
|
|
|
|
*
|
|
|
|
* Returns 0 if successful, -1 if error, -2 if declined.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path,
|
|
|
|
unsigned long long offset, size_t size,
|
|
|
|
void *buffer)
|
|
|
|
{
|
|
|
|
xenUnifiedPrivatePtr priv;
|
2008-07-25 10:49:33 +00:00
|
|
|
struct sexpr *root = NULL;
|
|
|
|
int fd = -1, ret = -1;
|
|
|
|
int found = 0;
|
|
|
|
virDomainDefPtr def;
|
|
|
|
virDomainDiskDefPtr disk;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
|
|
|
priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
|
|
|
|
|
|
|
|
if (domain->id < 0 && priv->xendConfigVersion < 3)
|
|
|
|
return -2; /* Decline, allow XM to handle it. */
|
|
|
|
|
|
|
|
/* Security check: The path must correspond to a block device. */
|
|
|
|
if (domain->id > 0)
|
|
|
|
root = sexpr_get (domain->conn, "/xend/domain/%d?detail=1",
|
|
|
|
domain->id);
|
|
|
|
else if (domain->id < 0)
|
|
|
|
root = sexpr_get (domain->conn, "/xend/domain/%s?detail=1",
|
|
|
|
domain->name);
|
|
|
|
else {
|
|
|
|
/* This call always fails for dom0. */
|
|
|
|
virXendError (domain->conn, VIR_ERR_NO_SUPPORT,
|
|
|
|
_("domainBlockPeek is not supported for dom0"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!root) {
|
|
|
|
virXendError (domain->conn, VIR_ERR_XEN_CALL, __FUNCTION__);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
if (!(def = xenDaemonParseSxpr(domain->conn, root, priv->xendConfigVersion, NULL)))
|
|
|
|
goto cleanup;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
|
2008-07-25 10:49:33 +00:00
|
|
|
disk = def->disks;
|
|
|
|
while (disk) {
|
|
|
|
if (disk->src &&
|
|
|
|
STREQ(disk->src, path)) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
disk = disk->next;
|
|
|
|
}
|
|
|
|
if (!found) {
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
virXendError (domain->conn, VIR_ERR_INVALID_ARG,
|
2008-06-09 12:16:03 +00:00
|
|
|
_("%s: invalid path"), path);
|
2008-07-25 10:49:33 +00:00
|
|
|
goto cleanup;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The path is correct, now try to open it and get its size. */
|
|
|
|
fd = open (path, O_RDONLY);
|
2008-06-05 21:12:26 +00:00
|
|
|
if (fd == -1) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError (domain->conn, VIR_ERR_SYSTEM_ERROR,
|
|
|
|
_("failed to open for reading: %s: %s"),
|
|
|
|
path, strerror (errno));
|
2008-07-25 10:49:33 +00:00
|
|
|
goto cleanup;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Seek and read. */
|
|
|
|
/* NB. Because we configure with AC_SYS_LARGEFILE, off_t should
|
|
|
|
* be 64 bits on all platforms.
|
|
|
|
*/
|
|
|
|
if (lseek (fd, offset, SEEK_SET) == (off_t) -1 ||
|
|
|
|
saferead (fd, buffer, size) == (ssize_t) -1) {
|
2008-06-09 12:16:03 +00:00
|
|
|
virXendError (domain->conn, VIR_ERR_SYSTEM_ERROR,
|
|
|
|
_("failed to lseek or read from file: %s: %s"),
|
|
|
|
path, strerror (errno));
|
2008-07-25 10:49:33 +00:00
|
|
|
goto cleanup;
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
2008-07-25 10:49:33 +00:00
|
|
|
cleanup:
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
if (fd >= 0) close (fd);
|
2008-07-25 10:49:33 +00:00
|
|
|
sexpr_free(root);
|
|
|
|
virDomainDefFree(def);
|
virDomainBlockPeek call
* configure.in: Document AC_SYS_LARGEFILE.
* docs/hvsupport.html.in: Document HV support for virDomainBlockPeek.
* include/libvirt/libvirt.h.in, src/driver.h, src/libvirt.c,
src/libvirt_sym.version: Add virDomainBlockPeek infrastructure.
* src/qemu_driver.c, src/test.c: Null versions of this call.
* src/xen_unified.c, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h: Xen implementation.
* tests/sexpr2xmldata/sexpr2xml-curmem.xml,
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml: XML output
has been reordered slightly in the Xen driver, but should be
functionally the same.
2008-06-05 13:17:45 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-07-25 09:51:23 +00:00
|
|
|
struct xenUnifiedDriver xenDaemonDriver = {
|
|
|
|
xenDaemonOpen, /* open */
|
|
|
|
xenDaemonClose, /* close */
|
|
|
|
xenDaemonGetVersion, /* version */
|
|
|
|
NULL, /* hostname */
|
|
|
|
NULL, /* URI */
|
|
|
|
xenDaemonNodeGetInfo, /* nodeGetInfo */
|
|
|
|
NULL, /* getCapabilities */
|
|
|
|
xenDaemonListDomains, /* listDomains */
|
|
|
|
xenDaemonNumOfDomains, /* numOfDomains */
|
|
|
|
xenDaemonCreateLinux, /* domainCreateLinux */
|
|
|
|
xenDaemonDomainSuspend, /* domainSuspend */
|
|
|
|
xenDaemonDomainResume, /* domainResume */
|
|
|
|
xenDaemonDomainShutdown, /* domainShutdown */
|
|
|
|
xenDaemonDomainReboot, /* domainReboot */
|
|
|
|
xenDaemonDomainDestroy, /* domainDestroy */
|
|
|
|
xenDaemonDomainGetOSType, /* domainGetOSType */
|
|
|
|
xenDaemonDomainGetMaxMemory, /* domainGetMaxMemory */
|
|
|
|
xenDaemonDomainSetMaxMemory, /* domainSetMaxMemory */
|
|
|
|
xenDaemonDomainSetMemory, /* domainMaxMemory */
|
|
|
|
xenDaemonDomainGetInfo, /* domainGetInfo */
|
|
|
|
xenDaemonDomainSave, /* domainSave */
|
|
|
|
xenDaemonDomainRestore, /* domainRestore */
|
|
|
|
xenDaemonDomainCoreDump, /* domainCoreDump */
|
|
|
|
xenDaemonDomainSetVcpus, /* domainSetVcpus */
|
|
|
|
xenDaemonDomainPinVcpu, /* domainPinVcpu */
|
|
|
|
xenDaemonDomainGetVcpus, /* domainGetVcpus */
|
|
|
|
NULL, /* domainGetMaxVcpus */
|
|
|
|
xenDaemonListDefinedDomains, /* listDefinedDomains */
|
|
|
|
xenDaemonNumOfDefinedDomains,/* numOfDefinedDomains */
|
|
|
|
xenDaemonDomainCreate, /* domainCreate */
|
|
|
|
xenDaemonDomainDefineXML, /* domainDefineXML */
|
|
|
|
xenDaemonDomainUndefine, /* domainUndefine */
|
|
|
|
xenDaemonAttachDevice, /* domainAttachDevice */
|
|
|
|
xenDaemonDetachDevice, /* domainDetachDevice */
|
|
|
|
xenDaemonDomainGetAutostart, /* domainGetAutostart */
|
|
|
|
xenDaemonDomainSetAutostart, /* domainSetAutostart */
|
|
|
|
xenDaemonGetSchedulerType, /* domainGetSchedulerType */
|
|
|
|
xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */
|
|
|
|
xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */
|
|
|
|
};
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
/************************************************************************
|
|
|
|
* *
|
|
|
|
* Converter functions to go from the XML tree to an S-Expr for Xen *
|
|
|
|
* *
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virtDomainParseXMLGraphicsDescVFB:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @node: node containing graphics description
|
|
|
|
* @buf: a buffer for the result S-Expr
|
|
|
|
*
|
|
|
|
* Parse the graphics part of the XML description and add it to the S-Expr
|
|
|
|
* in buf. This is a temporary interface as the S-Expr interface will be
|
|
|
|
* replaced by XML-RPC in the future. However the XML format should stay
|
|
|
|
* valid over time.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprGraphicsNew(virConnectPtr conn,
|
|
|
|
virDomainGraphicsDefPtr def,
|
|
|
|
virBufferPtr buf)
|
|
|
|
{
|
|
|
|
if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL &&
|
|
|
|
def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected graphics type %d"),
|
|
|
|
def->type);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
virBufferAddLit(buf, "(device (vkbd))");
|
|
|
|
virBufferAddLit(buf, "(device (vfb ");
|
|
|
|
|
|
|
|
if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
|
|
|
|
virBufferAddLit(buf, "(type sdl)");
|
|
|
|
if (def->data.sdl.display)
|
|
|
|
virBufferVSprintf(buf, "(display '%s')", def->data.sdl.display);
|
|
|
|
if (def->data.sdl.xauth)
|
|
|
|
virBufferVSprintf(buf, "(xauthority '%s')", def->data.sdl.xauth);
|
|
|
|
} else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
|
|
|
|
virBufferAddLit(buf, "(type vnc)");
|
|
|
|
if (def->data.vnc.autoport) {
|
|
|
|
virBufferAddLit(buf, "(vncunused 1)");
|
|
|
|
} else {
|
|
|
|
virBufferAddLit(buf, "(vncunused 0)");
|
|
|
|
virBufferVSprintf(buf, "(vncdisplay %d)", def->data.vnc.port-5900);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->data.vnc.listenAddr)
|
|
|
|
virBufferVSprintf(buf, "(vnclisten '%s')", def->data.vnc.listenAddr);
|
|
|
|
if (def->data.vnc.passwd)
|
|
|
|
virBufferVSprintf(buf, "(vncpasswd '%s')", def->data.vnc.passwd);
|
|
|
|
if (def->data.vnc.keymap)
|
|
|
|
virBufferVSprintf(buf, "(keymap '%s')", def->data.vnc.keymap);
|
|
|
|
}
|
|
|
|
|
|
|
|
virBufferAddLit(buf, "))");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprGraphicsOld(virConnectPtr conn,
|
|
|
|
virDomainGraphicsDefPtr def,
|
|
|
|
virBufferPtr buf,
|
|
|
|
int xendConfigVersion)
|
|
|
|
{
|
|
|
|
if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL &&
|
|
|
|
def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected graphics type %d"),
|
|
|
|
def->type);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
|
|
|
|
virBufferAddLit(buf, "(sdl 1)");
|
|
|
|
if (def->data.sdl.display)
|
|
|
|
virBufferVSprintf(buf, "(display '%s')", def->data.sdl.display);
|
|
|
|
if (def->data.sdl.xauth)
|
|
|
|
virBufferVSprintf(buf, "(xauthority '%s')", def->data.sdl.xauth);
|
|
|
|
} else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
|
|
|
|
virBufferAddLit(buf, "(vnc 1)");
|
|
|
|
if (xendConfigVersion >= 2) {
|
|
|
|
if (def->data.vnc.autoport) {
|
|
|
|
virBufferAddLit(buf, "(vncunused 1)");
|
|
|
|
} else {
|
|
|
|
virBufferAddLit(buf, "(vncunused 0)");
|
|
|
|
virBufferVSprintf(buf, "(vncdisplay %d)", def->data.vnc.port-5900);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->data.vnc.listenAddr)
|
|
|
|
virBufferVSprintf(buf, "(vnclisten '%s')", def->data.vnc.listenAddr);
|
|
|
|
if (def->data.vnc.passwd)
|
|
|
|
virBufferVSprintf(buf, "(vncpasswd '%s')", def->data.vnc.passwd);
|
|
|
|
if (def->data.vnc.keymap)
|
|
|
|
virBufferVSprintf(buf, "(keymap '%s')", def->data.vnc.keymap);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
int
|
2008-07-25 13:17:27 +00:00
|
|
|
xenDaemonFormatSxprChr(virConnectPtr conn,
|
|
|
|
virDomainChrDefPtr def,
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferPtr buf)
|
2008-07-25 13:17:27 +00:00
|
|
|
{
|
|
|
|
const char *type = virDomainChrTypeToString(def->type);
|
|
|
|
|
|
|
|
if (!type) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected chr device type"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (def->type) {
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_NULL:
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_STDIO:
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_VC:
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_PTY:
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(buf, "%s", type);
|
2008-07-25 13:17:27 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_FILE:
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_PIPE:
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(buf, "%s:%s", type, def->data.file.path);
|
2008-07-25 13:17:27 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_DEV:
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(buf, "%s", def->data.file.path);
|
2008-07-25 13:17:27 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_TCP:
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(buf, "%s:%s:%s%s",
|
2008-07-25 13:17:27 +00:00
|
|
|
(def->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW ?
|
|
|
|
"tcp" : "telnet"),
|
|
|
|
(def->data.tcp.host ? def->data.tcp.host : ""),
|
|
|
|
(def->data.tcp.service ? def->data.tcp.service : ""),
|
|
|
|
(def->data.tcp.listen ? ",listen" : ""));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_UDP:
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(buf, "%s:%s:%s@%s:%s", type,
|
2008-07-25 13:17:27 +00:00
|
|
|
(def->data.udp.connectHost ? def->data.udp.connectHost : ""),
|
|
|
|
(def->data.udp.connectService ? def->data.udp.connectService : ""),
|
|
|
|
(def->data.udp.bindHost ? def->data.udp.bindHost : ""),
|
|
|
|
(def->data.udp.bindService ? def->data.udp.bindService : ""));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_CHR_TYPE_UNIX:
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferVSprintf(buf, "%s:%s%s", type,
|
2008-07-25 13:17:27 +00:00
|
|
|
def->data.nix.path,
|
|
|
|
def->data.nix.listen ? ",listen" : "");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virDomainParseXMLDiskDesc:
|
|
|
|
* @node: node containing disk description
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @buf: a buffer for the result S-Expr
|
|
|
|
* @xendConfigVersion: xend configuration file format
|
|
|
|
*
|
|
|
|
* Parse the one disk in the XML description and add it to the S-Expr in buf
|
|
|
|
* This is a temporary interface as the S-Expr interface
|
|
|
|
* will be replaced by XML-RPC in the future. However the XML format should
|
|
|
|
* stay valid over time.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|
|
|
virDomainDiskDefPtr def,
|
|
|
|
virBufferPtr buf,
|
|
|
|
int hvm,
|
2008-08-06 11:26:47 +00:00
|
|
|
int xendConfigVersion,
|
|
|
|
int isAttach)
|
2008-07-25 13:17:27 +00:00
|
|
|
{
|
|
|
|
/* Xend (all versions) put the floppy device config
|
|
|
|
* under the hvm (image (os)) block
|
|
|
|
*/
|
|
|
|
if (hvm &&
|
|
|
|
def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Xend <= 3.0.2 doesn't include cdrom config here */
|
|
|
|
if (hvm &&
|
|
|
|
def->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
|
|
|
|
xendConfigVersion == 1)
|
|
|
|
return 0;
|
|
|
|
|
2008-08-06 11:26:47 +00:00
|
|
|
if (!isAttach)
|
|
|
|
virBufferAddLit(buf, "(device ");
|
|
|
|
|
2008-07-25 13:17:27 +00:00
|
|
|
/* Normally disks are in a (device (vbd ...)) block
|
|
|
|
* but blktap disks ended up in a differently named
|
|
|
|
* (device (tap ....)) block.... */
|
|
|
|
if (def->driverName &&
|
|
|
|
STREQ(def->driverName, "tap")) {
|
|
|
|
virBufferAddLit(buf, "(tap ");
|
|
|
|
} else {
|
|
|
|
virBufferAddLit(buf, "(vbd ");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hvm) {
|
|
|
|
/* Xend <= 3.0.2 wants a ioemu: prefix on devices for HVM */
|
|
|
|
if (xendConfigVersion == 1)
|
|
|
|
virBufferVSprintf(buf, "(dev 'ioemu:%s')", def->dst);
|
|
|
|
else /* But newer does not */
|
|
|
|
virBufferVSprintf(buf, "(dev '%s:%s')", def->dst,
|
|
|
|
def->device == VIR_DOMAIN_DISK_DEVICE_CDROM ?
|
|
|
|
"cdrom" : "disk");
|
|
|
|
} else {
|
|
|
|
virBufferVSprintf(buf, "(dev '%s')", def->dst);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->src) {
|
|
|
|
if (def->driverName) {
|
|
|
|
if (STREQ(def->driverName, "tap")) {
|
|
|
|
virBufferVSprintf(buf, "(uname '%s:%s:%s')",
|
|
|
|
def->driverName,
|
|
|
|
def->driverType ? def->driverType : "aio",
|
|
|
|
def->src);
|
|
|
|
} else {
|
|
|
|
virBufferVSprintf(buf, "(uname '%s:%s')",
|
|
|
|
def->driverName,
|
|
|
|
def->src);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (def->type == VIR_DOMAIN_DISK_TYPE_FILE) {
|
|
|
|
virBufferVSprintf(buf, "(uname 'file:%s')", def->src);
|
|
|
|
} else {
|
|
|
|
if (def->src[0] == '/')
|
|
|
|
virBufferVSprintf(buf, "(uname 'phy:%s')", def->src);
|
|
|
|
else
|
|
|
|
virBufferVSprintf(buf, "(uname 'phy:/dev/%s')", def->src);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->readonly)
|
|
|
|
virBufferAddLit(buf, "(mode 'r')");
|
|
|
|
else if (def->shared)
|
|
|
|
virBufferAddLit(buf, "(mode 'w!')");
|
|
|
|
else
|
|
|
|
virBufferAddLit(buf, "(mode 'w')");
|
|
|
|
|
2008-08-06 11:26:47 +00:00
|
|
|
if (!isAttach)
|
|
|
|
virBufferAddLit(buf, ")");
|
|
|
|
|
With the recent refactoring of the domain code, plus the changes with the Xend
code, a couple of bugs were introduced into the attach-disk and attach-interface
functionality. This patch fixes 3 bugs:
1) In xenDaemonAttachDevice(), there is a switch statement to determine which
of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case
statements are all missing the corresponding "break", so we always fall-through
to the default error case. This patch just adds the appropriate break statements.
2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray
"fprintf". This is now converted to a proper virXendError().
3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of
the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2).
Because of this, the attaches would fail. The patch fixes this by removing the
(device from the front, which makes attach-disk and attach-interface work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com>
2008-08-05 16:45:07 +00:00
|
|
|
virBufferAddLit(buf, ")");
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonFormatSxprNet
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @node: node containing the interface description
|
|
|
|
* @buf: a buffer for the result S-Expr
|
|
|
|
* @xendConfigVersion: xend configuration file format
|
|
|
|
*
|
|
|
|
* Parse the one interface the XML description and add it to the S-Expr in buf
|
|
|
|
* This is a temporary interface as the S-Expr interface
|
|
|
|
* will be replaced by XML-RPC in the future. However the XML format should
|
|
|
|
* stay valid over time.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprNet(virConnectPtr conn,
|
|
|
|
virDomainNetDefPtr def,
|
|
|
|
virBufferPtr buf,
|
|
|
|
int hvm,
|
2008-08-06 11:26:47 +00:00
|
|
|
int xendConfigVersion,
|
|
|
|
int isAttach)
|
2008-07-25 13:17:27 +00:00
|
|
|
{
|
|
|
|
if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE &&
|
|
|
|
def->type != VIR_DOMAIN_NET_TYPE_NETWORK &&
|
|
|
|
def->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unsupported network type %d"), def->type);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-08-06 11:26:47 +00:00
|
|
|
if (!isAttach)
|
|
|
|
virBufferAddLit(buf, "(device ");
|
|
|
|
|
With the recent refactoring of the domain code, plus the changes with the Xend
code, a couple of bugs were introduced into the attach-disk and attach-interface
functionality. This patch fixes 3 bugs:
1) In xenDaemonAttachDevice(), there is a switch statement to determine which
of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case
statements are all missing the corresponding "break", so we always fall-through
to the default error case. This patch just adds the appropriate break statements.
2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray
"fprintf". This is now converted to a proper virXendError().
3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of
the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2).
Because of this, the attaches would fail. The patch fixes this by removing the
(device from the front, which makes attach-disk and attach-interface work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com>
2008-08-05 16:45:07 +00:00
|
|
|
virBufferAddLit(buf, "(vif ");
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
virBufferVSprintf(buf,
|
|
|
|
"(mac '%02x:%02x:%02x:%02x:%02x:%02x')",
|
|
|
|
def->mac[0], def->mac[1], def->mac[2],
|
|
|
|
def->mac[3], def->mac[4], def->mac[5]);
|
|
|
|
|
|
|
|
switch (def->type) {
|
|
|
|
case VIR_DOMAIN_NET_TYPE_BRIDGE:
|
|
|
|
virBufferVSprintf(buf, "(bridge '%s')", def->data.bridge.brname);
|
|
|
|
virBufferAddLit(buf, "(script 'vif-bridge')");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_NET_TYPE_NETWORK:
|
|
|
|
{
|
|
|
|
virNetworkPtr network =
|
|
|
|
virNetworkLookupByName(conn, def->data.network.name);
|
|
|
|
char *bridge;
|
|
|
|
|
|
|
|
if (!network) {
|
|
|
|
virXendError(conn, VIR_ERR_NO_SOURCE, "%s",
|
|
|
|
def->data.network.name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
bridge = virNetworkGetBridgeName(network);
|
|
|
|
virNetworkFree(network);
|
|
|
|
if (!bridge) {
|
|
|
|
virXendError(conn, VIR_ERR_NO_SOURCE, "%s",
|
|
|
|
def->data.network.name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
virBufferVSprintf(buf, "(bridge '%s')", bridge);
|
|
|
|
virBufferAddLit(buf, "(script 'vif-bridge')");
|
|
|
|
VIR_FREE(bridge);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case VIR_DOMAIN_NET_TYPE_ETHERNET:
|
|
|
|
if (def->data.ethernet.script)
|
|
|
|
virBufferVSprintf(buf, "(script '%s')", def->data.ethernet.script);
|
|
|
|
if (def->data.ethernet.ipaddr != NULL)
|
|
|
|
virBufferVSprintf(buf, "(ip '%s')", def->data.ethernet.ipaddr);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->ifname != NULL &&
|
|
|
|
!STRPREFIX(def->ifname, "vif"))
|
|
|
|
virBufferVSprintf(buf, "(vifname '%s')", def->ifname);
|
|
|
|
|
|
|
|
if (def->model != NULL)
|
|
|
|
virBufferVSprintf(buf, "(model '%s')", def->model);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* apparently (type ioemu) breaks paravirt drivers on HVM so skip this
|
|
|
|
* from Xen 3.1.0
|
|
|
|
*/
|
|
|
|
if ((hvm) && (xendConfigVersion < 4))
|
|
|
|
virBufferAddLit(buf, "(type ioemu)");
|
|
|
|
|
2008-08-06 11:26:47 +00:00
|
|
|
if (!isAttach)
|
|
|
|
virBufferAddLit(buf, ")");
|
|
|
|
|
With the recent refactoring of the domain code, plus the changes with the Xend
code, a couple of bugs were introduced into the attach-disk and attach-interface
functionality. This patch fixes 3 bugs:
1) In xenDaemonAttachDevice(), there is a switch statement to determine which
of the xenDaemonFormatSxpr{Disk,Net} functions to call. Unfortunately, the case
statements are all missing the corresponding "break", so we always fall-through
to the default error case. This patch just adds the appropriate break statements.
2) (minor) In xenDaemonDomainDefineXML (that's a mouthful!), there is a stray
"fprintf". This is now converted to a proper virXendError().
3) xenDaemonFormatSxpr{Disk,Net} were adding an extra (device to the front of
the sexpr expressions that xend did not expect (this is Xend on RHEL 5.2).
Because of this, the attaches would fail. The patch fixes this by removing the
(device from the front, which makes attach-disk and attach-interface work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com>
2008-08-05 16:45:07 +00:00
|
|
|
virBufferAddLit(buf, ")");
|
2008-07-25 13:17:27 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
int
|
2008-07-25 13:17:27 +00:00
|
|
|
xenDaemonFormatSxprSound(virConnectPtr conn,
|
|
|
|
virDomainSoundDefPtr sound,
|
|
|
|
virBufferPtr buf)
|
|
|
|
{
|
|
|
|
const char *str;
|
|
|
|
virDomainSoundDefPtr prev = NULL;
|
|
|
|
|
|
|
|
while (sound) {
|
|
|
|
if (!(str = virDomainSoundModelTypeToString(sound->model))) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected sound model %d"), sound->model);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
virBufferVSprintf(buf, "%s%s", prev ? "," : "", str);
|
|
|
|
prev = sound;
|
|
|
|
sound = sound->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
xenDaemonFormatSxprInput(virConnectPtr conn,
|
|
|
|
virDomainInputDefPtr input,
|
|
|
|
virBufferPtr buf)
|
|
|
|
{
|
|
|
|
if (input->bus != VIR_DOMAIN_INPUT_BUS_USB)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (input->type != VIR_DOMAIN_INPUT_TYPE_MOUSE &&
|
|
|
|
input->type != VIR_DOMAIN_INPUT_TYPE_TABLET) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected input type %d"), input->type);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
virBufferVSprintf(buf, "(usbdevice %s)",
|
|
|
|
input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ?
|
|
|
|
"mouse" : "tablet");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* xenDaemonFormatSxpr:
|
|
|
|
* @conn: pointer to the hypervisor connection
|
|
|
|
* @def: domain config definition
|
|
|
|
* @xendConfigVersion: xend configuration file format
|
|
|
|
*
|
|
|
|
* Generate an SEXPR representing the domain configuration.
|
|
|
|
*
|
|
|
|
* Returns the 0 terminatedi S-Expr string or NULL in case of error.
|
|
|
|
* the caller must free() the returned value.
|
|
|
|
*/
|
|
|
|
char *
|
|
|
|
xenDaemonFormatSxpr(virConnectPtr conn,
|
|
|
|
virDomainDefPtr def,
|
|
|
|
int xendConfigVersion)
|
|
|
|
{
|
|
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
|
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
|
|
|
const char *tmp;
|
|
|
|
int hvm = 0, i;
|
|
|
|
virDomainNetDefPtr net;
|
|
|
|
virDomainDiskDefPtr disk;
|
|
|
|
virDomainInputDefPtr input;
|
|
|
|
|
|
|
|
virBufferAddLit(&buf, "(vm ");
|
|
|
|
virBufferVSprintf(&buf, "(name '%s')", def->name);
|
|
|
|
virBufferVSprintf(&buf, "(memory %lu)(maxmem %lu)",
|
|
|
|
def->memory/1024, def->maxmem/1024);
|
|
|
|
virBufferVSprintf(&buf, "(vcpus %lu)", def->vcpus);
|
|
|
|
|
|
|
|
if (def->cpumask) {
|
|
|
|
char *ranges = virDomainCpuSetFormat(conn, def->cpumask, def->cpumasklen);
|
|
|
|
if (ranges == NULL)
|
|
|
|
goto error;
|
|
|
|
virBufferVSprintf(&buf, "(cpus '%s')", ranges);
|
|
|
|
VIR_FREE(ranges);
|
|
|
|
}
|
|
|
|
|
|
|
|
virUUIDFormat(def->uuid, uuidstr);
|
|
|
|
virBufferVSprintf(&buf, "(uuid '%s')", uuidstr);
|
|
|
|
|
|
|
|
if (def->os.bootloader) {
|
|
|
|
if (def->os.bootloader[0])
|
|
|
|
virBufferVSprintf(&buf, "(bootloader '%s')", def->os.bootloader);
|
|
|
|
else
|
|
|
|
virBufferAddLit(&buf, "(bootloader)");
|
|
|
|
|
|
|
|
if (def->os.bootloaderArgs)
|
|
|
|
virBufferVSprintf(&buf, "(bootloader_args '%s')", def->os.bootloaderArgs);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(tmp = virDomainLifecycleTypeToString(def->onPoweroff))) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected lifecycle value %d"), def->onPoweroff);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
virBufferVSprintf(&buf, "(on_poweroff '%s')", tmp);
|
|
|
|
|
|
|
|
if (!(tmp = virDomainLifecycleTypeToString(def->onReboot))) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected lifecycle value %d"), def->onReboot);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
virBufferVSprintf(&buf, "(on_reboot '%s')", tmp);
|
|
|
|
|
|
|
|
if (!(tmp = virDomainLifecycleTypeToString(def->onCrash))) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("unexpected lifecycle value %d"), def->onCrash);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
virBufferVSprintf(&buf, "(on_crash '%s')", tmp);
|
|
|
|
|
|
|
|
if (!def->os.bootloader) {
|
|
|
|
if (STREQ(def->os.type, "hvm"))
|
|
|
|
hvm = 1;
|
|
|
|
|
|
|
|
if (hvm)
|
|
|
|
virBufferAddLit(&buf, "(image (hvm ");
|
|
|
|
else
|
|
|
|
virBufferAddLit(&buf, "(image (linux ");
|
|
|
|
|
|
|
|
if (hvm &&
|
|
|
|
def->os.loader == NULL) {
|
|
|
|
virXendError(conn, VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"%s",_("no HVM domain loader"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->os.kernel)
|
|
|
|
virBufferVSprintf(&buf, "(kernel '%s')", def->os.kernel);
|
|
|
|
if (def->os.initrd)
|
|
|
|
virBufferVSprintf(&buf, "(ramdisk '%s')", def->os.initrd);
|
|
|
|
if (def->os.root)
|
|
|
|
virBufferVSprintf(&buf, "(root '%s')", def->os.root);
|
|
|
|
if (def->os.cmdline)
|
|
|
|
virBufferVSprintf(&buf, "(args '%s')", def->os.cmdline);
|
|
|
|
|
|
|
|
if (hvm) {
|
|
|
|
char bootorder[VIR_DOMAIN_BOOT_LAST+1];
|
|
|
|
if (def->os.kernel)
|
|
|
|
virBufferVSprintf(&buf, "(loader '%s')", def->os.loader);
|
|
|
|
else
|
|
|
|
virBufferVSprintf(&buf, "(kernel '%s')", def->os.loader);
|
|
|
|
|
|
|
|
virBufferVSprintf(&buf, "(vcpus %lu)", def->vcpus);
|
|
|
|
|
|
|
|
for (i = 0 ; i < def->os.nBootDevs ; i++) {
|
|
|
|
switch (def->os.bootDevs[i]) {
|
|
|
|
case VIR_DOMAIN_BOOT_FLOPPY:
|
|
|
|
bootorder[i] = 'a';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
case VIR_DOMAIN_BOOT_DISK:
|
|
|
|
bootorder[i] = 'c';
|
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_BOOT_CDROM:
|
|
|
|
bootorder[i] = 'd';
|
|
|
|
break;
|
|
|
|
case VIR_DOMAIN_BOOT_NET:
|
|
|
|
bootorder[i] = 'n';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (def->os.nBootDevs == 0) {
|
|
|
|
bootorder[0] = 'c';
|
|
|
|
bootorder[1] = '\0';
|
|
|
|
} else {
|
|
|
|
bootorder[def->os.nBootDevs] = '\0';
|
|
|
|
}
|
|
|
|
virBufferVSprintf(&buf, "(boot %s)", bootorder);
|
|
|
|
|
|
|
|
/* get the cdrom device file */
|
|
|
|
/* Only XenD <= 3.0.2 wants cdrom config here */
|
|
|
|
if (xendConfigVersion == 1) {
|
|
|
|
disk = def->disks;
|
|
|
|
while (disk) {
|
|
|
|
if (disk->type == VIR_DOMAIN_DISK_DEVICE_CDROM &&
|
|
|
|
STREQ(disk->dst, "hdc") &&
|
|
|
|
disk->src) {
|
|
|
|
virBufferVSprintf(&buf, "(cdrom '%s')",
|
|
|
|
disk->src);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
disk = disk->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))
|
|
|
|
virBufferAddLit(&buf, "(acpi 1)");
|
|
|
|
if (def->features & (1 << VIR_DOMAIN_FEATURE_APIC))
|
|
|
|
virBufferAddLit(&buf, "(apic 1)");
|
|
|
|
if (def->features & (1 << VIR_DOMAIN_FEATURE_PAE))
|
|
|
|
virBufferAddLit(&buf, "(pae 1)");
|
|
|
|
|
|
|
|
virBufferAddLit(&buf, "(usb 1)");
|
|
|
|
|
|
|
|
input = def->inputs;
|
|
|
|
while (input) {
|
|
|
|
if (xenDaemonFormatSxprInput(conn, input, &buf) < 0)
|
|
|
|
goto error;
|
|
|
|
input = input->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->parallels) {
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, "(parallel ");
|
|
|
|
if (xenDaemonFormatSxprChr(conn, def->parallels, &buf) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto error;
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, ")");
|
2008-07-25 13:17:27 +00:00
|
|
|
} else {
|
|
|
|
virBufferAddLit(&buf, "(parallel none)");
|
|
|
|
}
|
|
|
|
if (def->serials) {
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, "(serial ");
|
|
|
|
if (xenDaemonFormatSxprChr(conn, def->serials, &buf) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto error;
|
2008-07-25 14:10:49 +00:00
|
|
|
virBufferAddLit(&buf, ")");
|
2008-07-25 13:17:27 +00:00
|
|
|
} else {
|
|
|
|
virBufferAddLit(&buf, "(serial none)");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (def->localtime)
|
|
|
|
virBufferAddLit(&buf, "(localtime 1)");
|
|
|
|
|
2008-07-25 14:10:49 +00:00
|
|
|
if (def->sounds) {
|
|
|
|
virBufferAddLit(&buf, "(soundhw '");
|
|
|
|
if (xenDaemonFormatSxprSound(conn, def->sounds, &buf) < 0)
|
|
|
|
goto error;
|
|
|
|
virBufferAddLit(&buf, "')");
|
|
|
|
}
|
2008-07-25 13:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* get the device emulation model */
|
|
|
|
if (def->emulator && (hvm || xendConfigVersion >= 3))
|
|
|
|
virBufferVSprintf(&buf, "(device_model '%s')", def->emulator);
|
|
|
|
|
|
|
|
|
|
|
|
/* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */
|
|
|
|
if ((!hvm && xendConfigVersion < 3) ||
|
|
|
|
(hvm && xendConfigVersion < 4)) {
|
|
|
|
if (def->graphics &&
|
|
|
|
xenDaemonFormatSxprGraphicsOld(conn, def->graphics, &buf, xendConfigVersion) < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
virBufferAddLit(&buf, "))");
|
|
|
|
}
|
|
|
|
|
|
|
|
disk = def->disks;
|
|
|
|
while (disk) {
|
2008-08-06 11:26:47 +00:00
|
|
|
if (xenDaemonFormatSxprDisk(conn, disk, &buf, hvm, xendConfigVersion, 0) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto error;
|
|
|
|
disk = disk->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
net = def->nets;
|
|
|
|
while (net) {
|
2008-08-06 11:26:47 +00:00
|
|
|
if (xenDaemonFormatSxprNet(conn, net, &buf, hvm, xendConfigVersion, 0) < 0)
|
2008-07-25 13:17:27 +00:00
|
|
|
goto error;
|
|
|
|
net = net->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* New style PV graphics config xen >= 3.0.4,
|
|
|
|
* or HVM graphics config xen >= 3.0.5 */
|
|
|
|
if ((xendConfigVersion >= 3 && !hvm) ||
|
|
|
|
(xendConfigVersion >= 4 && hvm)) {
|
|
|
|
if (def->graphics &&
|
|
|
|
xenDaemonFormatSxprGraphicsNew(conn, def->graphics, &buf) < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
virBufferAddLit(&buf, ")"); /* closes (vm */
|
|
|
|
|
|
|
|
return virBufferContentAndReset(&buf);
|
|
|
|
|
|
|
|
error:
|
|
|
|
tmp = virBufferContentAndReset(&buf);
|
|
|
|
VIR_FREE(tmp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virDomainXMLDevID:
|
|
|
|
* @domain: pointer to domain object
|
|
|
|
* @dev: pointer to device config object
|
|
|
|
* @class: Xen device class "vbd" or "vif" (OUT)
|
|
|
|
* @ref: Xen device reference (OUT)
|
|
|
|
*
|
|
|
|
* Set class according to XML root, and:
|
|
|
|
* - if disk, copy in ref the target name from description
|
|
|
|
* - if network, get MAC address from description, scan XenStore and
|
|
|
|
* copy in ref the corresponding vif number.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success, -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virDomainXMLDevID(virDomainPtr domain,
|
|
|
|
virDomainDeviceDefPtr dev,
|
|
|
|
char *class,
|
|
|
|
char *ref,
|
|
|
|
int ref_len)
|
|
|
|
{
|
|
|
|
char *xref;
|
|
|
|
|
|
|
|
if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
|
|
|
|
strcpy(class, "vbd");
|
|
|
|
if (dev->data.disk->dst == NULL)
|
|
|
|
return -1;
|
|
|
|
xref = xenStoreDomainGetDiskID(domain->conn, domain->id,
|
|
|
|
dev->data.disk->dst);
|
|
|
|
if (xref == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
strncpy(ref, xref, ref_len);
|
|
|
|
free(xref);
|
|
|
|
ref[ref_len - 1] = '\0';
|
|
|
|
} else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
|
|
|
|
char mac[30];
|
|
|
|
virDomainNetDefPtr def = dev->data.net;
|
|
|
|
snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
|
|
|
|
def->mac[0], def->mac[1], def->mac[2],
|
|
|
|
def->mac[3], def->mac[4], def->mac[5]);
|
|
|
|
|
|
|
|
strcpy(class, "vif");
|
|
|
|
|
|
|
|
xref = xenStoreDomainGetNetworkID(domain->conn, domain->id,
|
|
|
|
mac);
|
|
|
|
if (xref == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
strncpy(ref, xref, ref_len);
|
|
|
|
free(xref);
|
|
|
|
ref[ref_len - 1] = '\0';
|
|
|
|
} else {
|
|
|
|
virXendError(NULL, VIR_ERR_NO_SUPPORT,
|
|
|
|
_("hotplug of device type not supported"));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-09 15:21:16 +00:00
|
|
|
#endif /* ! PROXY */
|