- Devel - libvirt List Archives

[libvirt] [PATCH] * POTFILES.in: update: remove src/lxc_conf.c; Add src/bridge.c.
by Jim Meyering 27 Jan '09

27 Jan '09

"make syntax-check" broke. Here's the fix: >From 5bfc2955253b173e13659104890448d427c5e716 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 27 Jan 2009 16:27:07 +0100 Subject: [PATCH] * POTFILES.in: update: remove src/lxc_conf.c; Add src/bridge.c. --- po/POTFILES.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 49b72e7..401043a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,13 +1,13 @@ gnulib/lib/gai_strerror.c qemud/qemud.c qemud/remote.c +src/bridge.c src/conf.c src/console.c src/datatypes.c src/domain_conf.c src/iptables.c src/libvirt.c -src/lxc_conf.c src/lxc_container.c src/lxc_controller.c src/lxc_driver.c -- 1.6.1.1.363.g2a3bd

2 1

[libvirt] about libvirt-qpid on libvirt.org
by Atsushi SAKAI 27 Jan '09

27 Jan '09

Hi, I have a question about libvirt-qpid. The libvirt-qpid is working for QPID broker? If so, it should be added in "livirt is" section of following pages. http://libvirt.org/ How do you think? (If agreed, I add it.) Thanks Atsushi SAKAI

2 3

[libvirt] [PATCH] fix errors in virReportSystemErrorFull
by Jim Meyering 27 Jan '09

27 Jan '09

While looking at removing most of the remaining uses of strerror, I spotted problems in virReportSystemErrorFull. 1) it would leak "combined" 2) that allocated, written-into buffer wasn't even used So, since we'd rather avoid having to allocate at all in the error-reporting path (esp for OOM errors), I've made it automatic. >From 8550ec841b4e19049abc4b5e4a2f8a81d1824055 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 26 Jan 2009 14:59:35 +0100 Subject: [PATCH] fix errors in virReportSystemErrorFull * src/virterror.c (virReportSystemErrorFull): Don't leak "combined". In fact, don't even attempt allocation. Do include the result of formatted print in final diagnostic. --- src/virterror.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/virterror.c b/src/virterror.c index 0c66781..cfde1dc 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -1019,7 +1019,7 @@ void virReportSystemErrorFull(virConnectPtr conn, char systemError[1024]; char *theerrnostr; const char *virerr; - char *combined = NULL; + char combined[2048]; #ifdef HAVE_STRERROR_R #ifdef __USE_GNU @@ -1047,10 +1047,15 @@ void virReportSystemErrorFull(virConnectPtr conn, errorMessage[0] = '\0'; } - if (virAsprintf(&combined, "%s: %s", errorMessage, theerrnostr) < 0) - combined = theerrnostr; /* OOM, so lets just pass the strerror info as best effort */ + char *err_str; + int n = snprintf(combined, sizeof combined, "%s: %s", + errorMessage, theerrnostr); + err_str = (0 < n && n < sizeof(combined) + ? combined + /* use the strerror info as best effort */ + : theerrnostr); - virerr = virErrorMsg(VIR_ERR_SYSTEM_ERROR, (errorMessage[0] ? errorMessage : NULL)); + virerr = virErrorMsg(VIR_ERR_SYSTEM_ERROR, (err_str[0] ? err_str : NULL)); virRaiseError(conn, NULL, NULL, domcode, VIR_ERR_SYSTEM_ERROR, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } -- 1.6.1.1.347.g3f81d

2 4

[libvirt] [PATCH] kvm/virtio: Set IFF_VNET_HDR when setting up tap fds
by Mark McLoughlin 27 Jan '09

27 Jan '09

IFF_VNET_HDR is a tun/tap flag that allows you to send and receive large (i.e. GSO) packets and packets with partial checksums. Setting the flag means that every packet is proceeded by the same header which virtio uses to communicate GSO/csum metadata. By enabling this flag on the tap fds we create, we greatly increase the achievable throughput with virtio_net. However, we need to be careful to only set the flag when a) QEMU has support for this ABI and b) the value of the flag is queryable using the TUNGETIFF ioctl. It's nearly five months since kvm-74 - the first KVM release with this feature - was released. Up until now, we've not added libvirt support because there is no clean way to detect support for this in QEMU at runtime. A brief attempt to add a "info capabilities" monitor command to QEMU floundered. Perfect is the enemy of good enough. Probing the KVM version will suffice for now. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- src/bridge.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/bridge.h | 1 + src/qemu_conf.c | 33 +++++++++++++++++++------- src/qemu_conf.h | 1 + 4 files changed, 93 insertions(+), 9 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 30afa6d..9c4ca74 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -47,6 +47,7 @@ #include "internal.h" #include "memory.h" #include "util.h" +#include "logging.h" #define MAX_BRIDGE_ID 256 @@ -403,10 +404,67 @@ static int brSetInterfaceMtu(brControl *ctl, } /** + * brProbeVnetHdr: + * @tapfd: a tun/tap file descriptor + * + * Check whether it is safe to enable the IFF_VNET_HDR flag on the + * tap interface. + * + * Setting IFF_VNET_HDR enables QEMU's virtio_net driver to allow + * guests to pass larger (GSO) packets, with partial checksums, to + * the host. This greatly increases the achievable throughput. + * + * It is only useful to enable this when we're setting up a virtio + * interface. And it is only *safe* to enable it when we know for + * sure that a) qemu has support for IFF_VNET_HDR and b) the running + * kernel implements the TUNGETIFF ioctl(), which qemu needs to query + * the supplied tapfd. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int +brProbeVnetHdr(int tapfd) +{ +#if defined(IFF_VNET_HDR) && defined(TUNGETFEATURES) && defined(TUNGETIFF) + unsigned int features; + struct ifreq dummy; + + if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) { + VIR_INFO0(_("Not enabling IFF_VNET_HDR; " + "TUNGETFEATURES ioctl() not implemented")); + return 0; + } + + if (!(features & IFF_VNET_HDR)) { + VIR_INFO0(_("Not enabling IFF_VNET_HDR; " + "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR")); + return 0; + } + + /* The kernel will always return -1 at this point. + * If TUNGETIFF is not implemented then errno == EBADFD. + */ + if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) { + VIR_INFO0(_("Not enabling IFF_VNET_HDR; " + "TUNGETIFF ioctl() not implemented")); + return 0; + } + + VIR_INFO0(_("Enabling IFF_VNET_HDR")); + + return 1; +#else + VIR_INFO0(_("Not enabling IFF_VNET_HDR; disabled at build time")); + return 0; +#endif +} + +/** * brAddTap: * @ctl: bridge control pointer * @bridge: the bridge name * @ifname: the interface name (or name template) + * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device * * This function creates a new tap device on a bridge. @ifname can be either @@ -420,6 +478,7 @@ int brAddTap(brControl *ctl, const char *bridge, char **ifname, + int vnet_hdr, int *tapfd) { int id, subst, fd; @@ -435,6 +494,9 @@ brAddTap(brControl *ctl, if ((fd = open("/dev/net/tun", O_RDWR)) < 0) return errno; + if (vnet_hdr) + vnet_hdr = brProbeVnetHdr(fd); + do { struct ifreq try; int len; @@ -443,6 +505,11 @@ brAddTap(brControl *ctl, try.ifr_flags = IFF_TAP|IFF_NO_PI; +#ifdef IFF_VNET_HDR + if (vnet_hdr) + try.ifr_flags |= IFF_VNET_HDR; +#endif + if (subst) { len = snprintf(try.ifr_name, BR_IFNAME_MAXLEN, *ifname, id); if (len >= BR_IFNAME_MAXLEN) { diff --git a/src/bridge.h b/src/bridge.h index 2172b92..2491123 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -63,6 +63,7 @@ int brDeleteInterface (brControl *ctl, int brAddTap (brControl *ctl, const char *bridge, char **ifname, + int vnet_hdr, int *tapfd); int brSetInterfaceUp (brControl *ctl, diff --git a/src/qemu_conf.c b/src/qemu_conf.c index ee5cf62..bd5d414 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -353,7 +353,7 @@ int qemudExtractVersionInfo(const char *qemu, int newstdout = -1; int ret = -1, status; unsigned int major, minor, micro; - unsigned int version; + unsigned int version, kvm_version; unsigned int flags = 0; if (retflags) @@ -371,10 +371,13 @@ int qemudExtractVersionInfo(const char *qemu, if (len < 0) goto cleanup2; - if (sscanf(help, "QEMU PC emulator version %u.%u.%u", - &major, &minor, &micro) != 3) { + if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)", + &major, &minor, &micro, &kvm_version) != 4) + kvm_version = 0; + + if (!kvm_version && sscanf(help, "QEMU PC emulator version %u.%u.%u", + &major, &minor, &micro) != 3) goto cleanup2; - } version = (major * 1000 * 1000) + (minor * 1000) + micro; @@ -394,6 +397,8 @@ int qemudExtractVersionInfo(const char *qemu, flags |= QEMUD_CMD_FLAG_DRIVE_BOOT; if (version >= 9000) flags |= QEMUD_CMD_FLAG_VNC_COLON; + if (kvm_version >= 74) + flags |= QEMUD_CMD_FLAG_VNET_HDR; if (retversion) *retversion = version; @@ -404,6 +409,8 @@ int qemudExtractVersionInfo(const char *qemu, qemudDebug("Version %d %d %d Cooked version: %d, with flags ? %d", major, minor, micro, version, flags); + if (kvm_version) + qemudDebug("KVM version %d detected", kvm_version); cleanup2: VIR_FREE(help); @@ -467,7 +474,8 @@ qemudNetworkIfaceConnect(virConnectPtr conn, int **tapfds, int *ntapfds, virDomainNetDefPtr net, - int vlan) + int vlan, + int vnet_hdr) { char *brname; char tapfdstr[4+3+32+7]; @@ -517,7 +525,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, } if ((err = brAddTap(driver->brctl, brname, - &net->ifname, &tapfd))) { + &net->ifname, vnet_hdr, &tapfd))) { if (errno == ENOTSUP) { /* In this particular case, give a better diagnostic. */ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -1029,9 +1037,16 @@ int qemudBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: { - char *tap = qemudNetworkIfaceConnect(conn, driver, - tapfds, ntapfds, - net, vlan); + char *tap; + int vnet_hdr = 0; + + if (qemuCmdFlags & QEMUD_CMD_FLAG_VNET_HDR && + net->model && STREQ(net->model, "virtio")) + vnet_hdr = 1; + + tap = qemudNetworkIfaceConnect(conn, driver, + tapfds, ntapfds, + net, vlan, vnet_hdr); if (tap == NULL) goto error; ADD_ARG(tap); diff --git a/src/qemu_conf.h b/src/qemu_conf.h index db2491c..65b08ac 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -48,6 +48,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_NAME = (1 << 5), QEMUD_CMD_FLAG_UUID = (1 << 6), QEMUD_CMD_FLAG_DOMID = (1 << 7), /* Xenner only */ + QEMUD_CMD_FLAG_VNET_HDR = (1 << 8), }; /* Main driver state */ -- 1.6.0.6

3 4

[libvirt] [PATCH] mark a few diagnostics for translation
by Jim Meyering 27 Jan '09

27 Jan '09

Avoid compile-time warnings: >From 4597152e0c4a1e4a5ee85156496a8625b5cc4f42 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 26 Jan 2009 14:54:21 +0100 Subject: [PATCH 2/3] mark a few diagnostics for translation * src/proxy_internal.c (xenProxyCommand): Mark a diagnostic. * src/xen_unified.c (xenUnifiedOpen, xenUnifiedAddDomainInfo): Likewise. --- src/proxy_internal.c | 6 ++---- src/xen_unified.c | 11 +++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/proxy_internal.c b/src/proxy_internal.c index 4d8be3a..d1255ae 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006, 2008 Red Hat, Inc. + * Copyright (C) 2006, 2008, 2009 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -455,7 +455,7 @@ retry: */ if ((res == NULL) || (res->version != PROXY_PROTO_VERSION) || (res->len < sizeof(virProxyPacket))) { - virProxyError(conn, VIR_ERR_INTERNAL_ERROR, + virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Communication error with proxy: malformed packet\n")); goto error; } @@ -1058,5 +1058,3 @@ xenProxyDomainGetOSType(virDomainPtr domain) return(ostype); } - - diff --git a/src/xen_unified.c b/src/xen_unified.c index 1a0f007..240b8f5 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -261,19 +261,21 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) /* Allocate per-connection private data. */ if (VIR_ALLOC(priv) < 0) { - xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating private data")); + xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, + "%s", _("allocating private data")); return VIR_DRV_OPEN_ERROR; } if (virMutexInit(&priv->lock) < 0) { xenUnifiedError (NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot initialise mutex")); + "%s", _("cannot initialise mutex")); VIR_FREE(priv); return VIR_DRV_OPEN_ERROR; } /* Allocate callback list */ if (VIR_ALLOC(cbList) < 0) { - xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating callback list")); + xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, + "%s", _("allocating callback list")); virMutexDestroy(&priv->lock); VIR_FREE(priv); return VIR_DRV_OPEN_ERROR; @@ -1564,7 +1566,8 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list, list->count++; return 0; memory_error: - xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating domain info")); + xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, + "%s", _("allocating domain info")); if (info) VIR_FREE(info->name); VIR_FREE(info); -- 1.6.1.1.347.g3f81d

2 3

[libvirt] [ANNOUNCE] New release virtinst 0.400.1
by Cole Robinson 26 Jan '09

26 Jan '09

I'm happy to announce a new virtinst release, version 0.4.1. The release can be downloaded from: http://virt-manager.org/download.html The direct download link is: http://virt-manager.org/download/sources/virtinst/virtinst-0.400.1.tar.gz This release includes: - Add virt-image -> vmx support to virt-convert, replacing virt-pack (Joey Boggs) - Add disk checksum support to virt-image (Joey Boggs) - Enhanced URL install support: Debian Xen paravirt, Ubuntu kernel and boot.iso, Mandriva kernel, and Solaris Xen Paravirt (Guido Gunther, John Levon, Cole Robinson) - Expanded test suite - Numerous bug fixes, cleanups, and minor improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [ANNOUNCE] New release virt-manager 0.6.1
by Cole Robinson 26 Jan '09

26 Jan '09

I'm happy to announce a new virt-manager release, version 0.6.1. The release can be downloaded from: http://virt-manager.org/download.html The direct download link is: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.6.1.ta… This release includes: - VM disk and network stats reporting (Guido Gunther) - VM Migration support (Shigeki Sakamoto) - Support for adding sound devices to an existing VM - Enumerate host devices attached to an existing VM - Allow specifying a device model when adding a network device to an existing VM - Combine the serial console view with the VM Details window - Allow connection to multiple VM serial consoles - Bug fixes and many minor improvements. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH] [VULN] proxy: Avoid use of uninitialized memory
by Anonymous 26 Jan '09

26 Jan '09

diff -urp libvirt-0.5.1/proxy/libvirt_proxy.c libvirt-dev/proxy/libvirt_proxy.c --- libvirt-0.5.1/proxy/libvirt_proxy.c 2008-11-20 08:58:43.000000000 +0100 +++ libvirt-dev/proxy/libvirt_proxy.c 2009-01-25 12:51:33.000000000 +0100 @@ -385,7 +385,8 @@ retry: fprintf(stderr, "read %d bytes from client %d on socket %d\n", ret, nr, pollInfos[nr].fd); - if ((req->version != PROXY_PROTO_VERSION) || + if ((ret != sizeof(virProxyPacket)) || + (req->version != PROXY_PROTO_VERSION) || (req->len < sizeof(virProxyPacket)) || (req->len > sizeof(virProxyFullPacket))) goto comm_error;

1 0

[libvirt] [PATCH] Fix virsh sched-credit for xend
by john.levon＠sun.com 26 Jan '09

26 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232675291 28800 # Node ID 415bfd87e0ecd7751ed6df372e82da0e3991d617 # Parent 68e14fe50dfa88a4694bc4c7a68d2f73f41c6171 Fix virsh sched-credit for xend Need to pass domain in the xend op for shut-down domains. (This also requires xend fixes, but this patch doesn't make things worse.) Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4665,7 +4665,7 @@ xenDaemonSetSchedulerParameters(virDomai ret = xend_op(domain->conn, domain->name, "op", "domain_sched_credit_set", "weight", buf_weight, - "cap", buf_cap, NULL); + "cap", buf_cap, "dom", domain->name, NULL); break; } default:

4 9

[libvirt] [PATCH] * src/virterror.c (virErrorMsg): Correct indentation.
by Jim Meyering 26 Jan '09

26 Jan '09

Just correct bogus indentation. >From dca64d37d946f73275fc5e8300e8cd29f34afd06 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 26 Jan 2009 14:44:22 +0100 Subject: [PATCH] * src/virterror.c (virErrorMsg): Correct indentation. --- src/virterror.c | 84 +++++++++++++++++++++++++++--------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/virterror.c b/src/virterror.c index 9732eb4..0c66781 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -902,66 +902,66 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("Network not found: %s"); break; - case VIR_ERR_INVALID_MAC: + case VIR_ERR_INVALID_MAC: if (info == NULL) errmsg = _("invalid MAC address"); else errmsg = _("invalid MAC address: %s"); break; - case VIR_ERR_AUTH_FAILED: + case VIR_ERR_AUTH_FAILED: if (info == NULL) errmsg = _("authentication failed"); else errmsg = _("authentication failed: %s"); break; case VIR_ERR_NO_STORAGE_POOL: - if (info == NULL) - errmsg = _("Storage pool not found"); - else - errmsg = _("Storage pool not found: %s"); - break; + if (info == NULL) + errmsg = _("Storage pool not found"); + else + errmsg = _("Storage pool not found: %s"); + break; case VIR_ERR_NO_STORAGE_VOL: - if (info == NULL) - errmsg = _("Storage volume not found"); - else - errmsg = _("Storage volume not found: %s"); - break; + if (info == NULL) + errmsg = _("Storage volume not found"); + else + errmsg = _("Storage volume not found: %s"); + break; case VIR_ERR_INVALID_STORAGE_POOL: - if (info == NULL) - errmsg = _("invalid storage pool pointer in"); - else - errmsg = _("invalid storage pool pointer in %s"); - break; + if (info == NULL) + errmsg = _("invalid storage pool pointer in"); + else + errmsg = _("invalid storage pool pointer in %s"); + break; case VIR_ERR_INVALID_STORAGE_VOL: - if (info == NULL) - errmsg = _("invalid storage volume pointer in"); - else - errmsg = _("invalid storage volume pointer in %s"); - break; + if (info == NULL) + errmsg = _("invalid storage volume pointer in"); + else + errmsg = _("invalid storage volume pointer in %s"); + break; case VIR_WAR_NO_STORAGE: - if (info == NULL) - errmsg = _("Failed to find a storage driver"); - else - errmsg = _("Failed to find a storage driver: %s"); - break; + if (info == NULL) + errmsg = _("Failed to find a storage driver"); + else + errmsg = _("Failed to find a storage driver: %s"); + break; case VIR_WAR_NO_NODE: - if (info == NULL) - errmsg = _("Failed to find a node driver"); - else - errmsg = _("Failed to find a node driver: %s"); - break; + if (info == NULL) + errmsg = _("Failed to find a node driver"); + else + errmsg = _("Failed to find a node driver: %s"); + break; case VIR_ERR_INVALID_NODE_DEVICE: - if (info == NULL) - errmsg = _("invalid node device pointer"); - else - errmsg = _("invalid node device pointer in %s"); - break; + if (info == NULL) + errmsg = _("invalid node device pointer"); + else + errmsg = _("invalid node device pointer in %s"); + break; case VIR_ERR_NO_NODE_DEVICE: - if (info == NULL) - errmsg = _("Node device not found"); - else - errmsg = _("Node device not found: %s"); - break; + if (info == NULL) + errmsg = _("Node device not found"); + else + errmsg = _("Node device not found: %s"); + break; } return (errmsg); } -- 1.6.1.1.347.g3f81d

2 1

[libvirt] [PATCH] xm_internal.c: fix locking bug: s/Unlock/Lock/
by Jim Meyering 26 Jan '09

26 Jan '09

Merge error? I'll commit this in an hour or so. >From e660e3353b468cb219208a1aba9f8eca456467dd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 22 Jan 2009 20:08:55 +0100 Subject: [PATCH] xm_internal.c: fix locking bug: s/Unlock/Lock/ * src/xm_internal.c (xenXMDomainDefineXML): Release lock, (don't try to acquire it) upon failure, just before returning. --- src/xm_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 31f56b7..b420e80 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2357,7 +2357,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { if (!(def = virDomainDefParseString(conn, priv->caps, xml, VIR_DOMAIN_XML_INACTIVE))) { - xenUnifiedLock(priv); + xenUnifiedUnlock(priv); return (NULL); } -- 1.6.1.399.g0d272

3 5

[libvirt] [PATCH] Quieten virsh schedinfo for shutoff domain
by john.levon＠sun.com 26 Jan '09

26 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232675291 28800 # Node ID 3ef027308b88b47b2f3ca721bf88f2e606d8e3bc # Parent 903a29e99c80a35ce7f4754a3bcc3ab34bf32d8a Quieten virsh schedinfo for shutoff domain Quietly return failure for a shutoff domain in the sched params driver routines. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -1069,11 +1069,17 @@ xenHypervisorGetSchedulerType(virDomainP } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { + if (priv->handle < 0) { virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + "priv->handle invalid", 0); return NULL; } + + /* + * If it's not running, we can't help. + */ + if (domain->id < 0) + return NULL; /* * Support only dom_interface_version >=5 @@ -1144,11 +1150,17 @@ xenHypervisorGetSchedulerParameters(virD } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { + if (priv->handle < 0) { virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + "priv->handle invalid", 0); return -1; } + + /* + * If it's not running, we can't help. + */ + if (domain->id < 0) + return -1; /* * Support only dom_interface_version >=5 @@ -1242,11 +1254,17 @@ xenHypervisorSetSchedulerParameters(virD } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { + if (priv->handle < 0) { virXenErrorFunc (domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + "priv->handle invalid", 0); return -1; } + + /* + * If it's not running, we can't help. + */ + if (domain->id < 0) + return -1; /* * Support only dom_interface_version >=5

3 2

[libvirt] [PATCH] gnulib/tests: allow test-getaddrinfo to pass when offline
by Mark McLoughlin 26 Jan '09

26 Jan '09

Sometimes - yes, even in the latter part of the first decade of the twenty first century - one doesn't have access to the Internet while one is hacking. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- gnulib/tests/test-getaddrinfo.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/gnulib/tests/test-getaddrinfo.c b/gnulib/tests/test-getaddrinfo.c index a887cb1..246021a 100644 --- a/gnulib/tests/test-getaddrinfo.c +++ b/gnulib/tests/test-getaddrinfo.c @@ -64,6 +64,11 @@ int simple (char *host, char *service) if (res != 0) { + /* EAI_AGAIN is returned if no network is available. Don't fail + the test merely because someone is down the country on their + in-law's farm. */ + if (res == EAI_AGAIN) + return 0; /* IRIX reports EAI_NONAME for "https". Don't fail the test merely because of this. */ if (res == EAI_NONAME) -- 1.6.0.6

3 2

[libvirt] libvirt-0.5.1: problems connecting qemu:///system
by Nikola Ciprich 26 Jan '09

26 Jan '09

Hello, After upgrading to libvirt-0.5.1, I'm unable to connect to it. virsh (as well as my own python code) always ends up with: virsh -c qemu:///system libvir: error : could not connect to qemu:///system error: failed to connect to the hypervisor I'm using 0.5.1 libvirt compiled with qemu support, on latest CentOS 5 I have auth_unix_ro = "none" auth_unix_rw = "none" in config file. When I run libvirtd -f /etc/libvirt/libvirtd.conf -v -l and try to connect, I get: EVENT: Poll got 1 event EVENT: Dispatch 1 6 1 0x1efa5d0 EVENT: Add handle 12 13 0x40b9a0 0x1efa5d0 EVENT: Calculate expiry of 0 timers EVENT: Timeout at 0 due in -1 ms EVENT: Poll on 6 handles 0x1f358d0 timeout -1 EVENT: Poll got 1 event EVENT: Dispatch 5 12 1 0x1efa5d0 EVENT: Remove handle 5 EVENT: mark delete 5 12 EVENT: Add handle 12 13 0x40b9a0 0x1efa5d0 EVENT: Remove handle 6 EVENT: mark delete 6 12 EVENT: Add handle 12 14 0x40b9a0 0x1efa5d0 EVENT: Calculate expiry of 0 timers EVENT: Timeout at 0 due in -1 ms EVENT: Poll on 6 handles 0x1f358d0 timeout -1 EVENT: Poll got 1 event EVENT: Dispatch 7 12 4 0x1efa5d0 EVENT: Remove handle 7 EVENT: mark delete 5 12 EVENT: Add handle 12 13 0x40b9a0 0x1efa5d0 EVENT: Calculate expiry of 0 timers EVENT: Timeout at 0 due in -1 ms EVENT: Poll on 6 handles 0x1f358d0 timeout -1 EVENT: Poll got 1 event EVENT: Dispatch 8 12 1 0x1efa5d0 EVENT: Remove handle 8 EVENT: mark delete 5 12 EVENT: Add handle 12 13 0x40b9a0 0x1efa5d0 libvir: error : could not connect to qemu:///system EVENT: Remove handle 9 EVENT: mark delete 6 12 EVENT: Add handle 12 14 0x40b9a0 0x1efa5d0 EVENT: Calculate expiry of 0 timers EVENT: Timeout at 0 due in -1 ms EVENT: Poll on 6 handles 0x1f358d0 timeout -1 EVENT: Poll got 1 event EVENT: Dispatch 10 12 4 0x1efa5d0 EVENT: Remove handle 10 EVENT: mark delete 5 12 EVENT: Add handle 12 13 0x40b9a0 0x1efa5d0 EVENT: Calculate expiry of 0 timers EVENT: Timeout at 0 due in -1 ms EVENT: Poll on 6 handles 0x1f358d0 timeout -1 EVENT: Poll got 1 event EVENT: Dispatch 11 12 17 0x1efa5d0 EVENT: Remove handle 11 EVENT: mark delete 5 12 EVENT: Calculate expiry of 0 timers EVENT: Timeout at 0 due in -1 ms EVENT: Poll on 5 handles 0x1f3aa20 timeout -1 Could somebody give me a hint on what I'm doing wrong? Thanks a lot in advance! with best regards nik -- ------------------------------------- Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

2 1

[libvirt] [PATCH] qemud: don't dereference NULL on failed virGetUserDirectory
by Jim Meyering 26 Jan '09

26 Jan '09

I spotted this while merging my unix_sock_dir changes: >From 04373207bc838c31bd07596df3c676476e73c983 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 23 Jan 2009 13:59:28 +0100 Subject: [PATCH] qemud: don't dereference NULL on failed virGetUserDirectory * qemud/qemud.c (qemudInitPaths): Check for OOM. --- qemud/qemud.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 55f31d5..84034f3 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -719,6 +719,10 @@ static int qemudInitPaths(struct qemud_server *server, goto snprintf_error; } else { char *userdir = virGetUserDirectory(NULL, uid); + if (userdir == NULL) { + /* give no diagnostic here; virGetUserDirectory reports OOM */ + return -1; + } if (snprintf(sockname, maxlen, "@%s/.libvirt/libvirt-sock", userdir) >= maxlen) { VIR_FREE(userdir); -- 1.6.1.354.gd9e51

3 3

[libvirt] [Patch][RFC] Example policy files (3/3)
by Syunsuke HAYASHI 26 Jan '09

26 Jan '09

The policy checker employs two files. Role_definition.xml defines what and how VMs a role is allowed to operate. User_definition.xml defines what roles are available to a user. Operations are currently represented by numbers. They are defined in src/xr_internal.h in libvirt part, though it is hardly readable.

1 0

[libvirt] [Patch][RFC] Access control library (2/3)
by Syunsuke HAYASHI 26 Jan '09

26 Jan '09

Policy checker and loader. Some of the variables, functions, macros, and files have "xen" in their names but they are never dedicated to Xen. Sorry for confusion. It is just because our most important target was Xen in the early stage. diff -r a4c4b2407117 -r d864c312eae4 domname_list.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/domname_list.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,119 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <stdlib.h> +#include <string.h> +#include "role_list.h" +#include "domname_list.h" +#include "xr_log.h" + +static void +init_domname(domname *dn) +{ + strcpy(dn->value, "\n"); + dn->next = NULL; +} + +domname* +new_domname(void) +{ + domname *dn; + + DMSG(FUNC, "start\n"); + + dn = (domname *) malloc(sizeof(struct _domname)); + if (!dn) { + EMSG("out of memory for domname\n"); + return NULL; + } + DMSG(FUNC, "allocate domname: %p\n", dn); + + dn->value = (char *) malloc(XR_MAX_LENGTH_OF_DOMNAME * sizeof(char)); + if (!dn->value) { + free(dn); + EMSG("out of memory for value of domname\n"); + return NULL; + } + DMSG(FUNC, "allocate value of domname: %p\n", dn->value); + + init_domname(dn); + return dn; +} + +static void +free_domname(domname *dn) +{ + DMSG(FUNC, "start\n"); + + if (!dn) + return; + + if (dn->value) { + DMSG(FUNC, "free value of domname: %p\n", dn->value); + free(dn->value); + } + + DMSG(FUNC, "free domname: %p\n", dn); + free(dn); +} + +void +free_domname_list(role *r) +{ + domname *dn = r->managementVMList; + domname *dn_next = NULL; + + DMSG(FUNC, "start\n"); + + while (dn) { + dn_next = dn; + free_domname(dn); + dn = dn_next; + } +} + +void +append_domname(role *r, domname *dn) +{ + DMSG(FUNC, "start\n"); + + dn->next = r->managementVMList; + r->managementVMList = dn; + + r->domname_c++; +} + +void +show_domname_list(role *r) +{ + domname *dn = r->managementVMList; + + while (dn) { + DMSG(" domname : %p\n", dn); + DMSG(" value : %s\n", dn->value); + DMSG(" next : %p\n", dn->next); + dn = dn->next; + } +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 domname_list.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/domname_list.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,42 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __DOMNAME_LIST_H__ +#define __DOMNAME_LIST_H__ +#define XR_MAX_LENGTH_OF_DOMNAME 100 + +typedef struct _domname domname; +struct _domname { + char *value; + struct _domname *next; +}; +struct _role; + +domname *new_domname(void); +void free_domname_list(struct _role *r); +void append_domname(struct _role *r, domname *dn); +void show_domname_list(struct _role *r); + +#endif /* __DOMNAME_LIST_H */ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 opeid_list.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/opeid_list.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,105 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <stdlib.h> +#include "role_list.h" +#include "opeid_list.h" +#include "xr_log.h" + +static void +init_opeid_data(opeid_data *op) +{ + op->value = 0; + op->next = NULL; +} + +opeid_data* +new_opeid_data(void) +{ + opeid_data *op; + + DMSG(FUNC, "start\n"); + + op = (opeid_data *) malloc(sizeof(struct _opeid_data)); + if (!op) { + EMSG("out of memory for opeid_data"); + return NULL; + } + DMSG(FUNC, "allocate opeid_data: %p\n", op); + + init_opeid_data(op); + return op; +} + +static void +free_opeid_data(opeid_data *op) +{ + DMSG(FUNC, "start\n"); + + if (!op) + return; + + DMSG(FUNC, "free opeid_data: %p\n", op); + free(op); +} + +void +free_opeid_data_list(role *r) +{ + opeid_data *op = r->acceptOperationList; + opeid_data *op_next; + + DMSG(FUNC, "start\n"); + + while (op) { + op_next = op->next; + free_opeid_data(op); + op = op_next; + } +} + +void +append_opeid_data(role *r, opeid_data *op) +{ + DMSG(FUNC, "start\n"); + + op->next = r->acceptOperationList; + r->acceptOperationList = op; + + r->opeid_c++; +} + +void +show_opeid_data_list(role *r) +{ + opeid_data *op = r->acceptOperationList; + + while (op) { + DMSG(" opeid_data : %p\n", op); + DMSG(" value : %d\n", op->value); + DMSG(" next : %p\n", op->next); + op = op->next; + } +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 opeid_list.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/opeid_list.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,41 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __OPEID_LIST_H__ +#define __OPEID_LIST_H__ + +typedef struct _opeid_data opeid_data; +struct _opeid_data { + int value; + struct _opeid_data *next; +}; +struct _role; + +opeid_data *new_opeid_data(void); +void free_opeid_data_list(struct _role *r); +void append_opeid_data(struct _role *r, opeid_data *op); +void show_opeid_data_list(struct _role *r); + +#endif /* __OPEID_LIST_H */ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 python/xen/lowlevel/xr/xr.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python/xen/lowlevel/xr/xr.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,99 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <Python.h> +#include "xenrbac.h" + +#define PKG "xen.lowlevel.xr" +static PyObject *xr_error_obj; + +static PyObject* +pyxr_error_to_exception(int result) +{ + PyObject *pyerr; + + if (result == XR_ACCEPT){ + Py_DECREF(xr_error_obj); + return NULL; + } + + pyerr = Py_BuildValue("s",strerror(result)); + PyErr_SetObject(xr_error_obj,pyerr); + Py_DECREF(pyerr); + + return NULL; +} + +static PyObject* +pyxr_judge(PyObject* self, PyObject* args) +{ + int result = XR_ACCEPT; + static char formats[] = "zizi"; + PyObject *username, *opeid, *domainname, *all_flag; + + if (!PyArg_ParseTuple(args, formats, + &username, &opeid, &domainname, &all_flag)) + goto error; + + if ((result = xr_judge( (char *)username , (int)opeid, + (char *)domainname, (int)all_flag))) + goto error; + + return Py_BuildValue("i",result); + + error: + + return pyxr_error_to_exception(result); + +} + +static PyMethodDef xr_funcs[] = { + {"xr_judge", + (PyCFunction)pyxr_judge, + METH_VARARGS, + "xr_judge() does the access judgement.\n" + "user name [str]\n" + "operation number [int]\n" + "domain name [str]\n" + "all flag [int]\n" + "Returns [int]:judged result. \n"}, + + {NULL, NULL, 0, NULL} +}; + +void +initxr(void) +{ + PyObject *m; + + if (!(m = Py_InitModule("xr",xr_funcs))) + return; + + xr_error_obj = PyErr_NewException(PKG".Libxenrbac_Error", + PyExc_RuntimeError, NULL); + Py_INCREF(xr_error_obj); + PyModule_AddObject(m,"Libxenrbac_Error",xr_error_obj); + +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 rolePolicyDefinition.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rolePolicyDefinition.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,506 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <string.h> +#include <errno.h> +#include <libxml/parser.h> +#include <libxml/tree.h> +#include <libxml/xpath.h> +#include "userinfo.h" +#include "role_list.h" +#include "rolePolicyDefinition.h" +#include "xr.h" +#include "xr_log.h" + +static xmlNodePtr getXPathNode(const char *xpath, xmlXPathContextPtr ctxt); +static int searchRole(userInfo *ui, xmlNodePtr node); +static int searchPolicyID(role *r, xmlNodePtr node); +static int searchManageVM(role *r, xmlNodePtr node); +static int searchVM(role *r, xmlNodePtr node); +static int makeStructDomname(role *r, xmlChar *attr); +static int searchControlOperation(role *r, xmlNodePtr node); +static int searchAccept(role *r, xmlNodePtr node); +static int searchOperation(role *r, xmlNodePtr node); +static int makeStructOpeid(role *r, int opeid); + +#define EMSG_XML(_a...) \ + do { \ + EMSG("%s parsing failed. (%s)\n", ROLE_POLICY_FILENAME, _a); \ + } while (0) + +int +readRolePolicyDefinition(userInfo *ui) +{ + xmlDoc *doc = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr r_node = NULL; + + int rc = 0; + char fileName[strlen(XENRBAC_POLICY_PATHNAME) + strlen(ROLE_POLICY_FILENAME) + 1]; + + strcpy(fileName, XENRBAC_POLICY_PATHNAME); + strcat(fileName, ROLE_POLICY_FILENAME); + + doc = xmlReadFile(fileName, NULL, XML_PARSE_NOBLANKS); + if (!doc) { + EMSG("%s reading or parsing failed(%m)\n", + ROLE_POLICY_FILENAME); + rc = errno; + goto error; + } + + ctxt = xmlXPathNewContext(doc); + if (!ctxt) { + EMSG_XML("ctxt is NULL"); + rc = EINVAL; + goto error; + } + + r_node = getXPathNode("/RolePolicyDefinition/RoleDefinition/Role", ctxt); + if (!r_node) { + EMSG_XML("/RolePolicyDefinition/RoleDefinition/Role is not defined"); + rc = EINVAL; + goto error; + } + + if (!(rc = searchRole(ui, r_node))) + goto cleanup; + +error: + DMSG(FUNC, "error in readRolePolicyDefinition\n"); + +cleanup: + DMSG(FUNC, "cleanup in readRolePolicyDefinition\n"); + //free the document + /* + *Free the global variables that may + *have been allocated by the parser. + */ + xmlCleanupParser(); + + if (ctxt) + xmlXPathFreeContext(ctxt); + if (doc) + xmlFreeDoc(doc); + + return rc; +} + +static xmlNodePtr +getXPathNode(const char *xpath, xmlXPathContextPtr ctxt) +{ + xmlXPathObjectPtr obj = NULL; + xmlNodePtr ret = NULL; + + if ((ctxt == NULL) || (xpath == NULL)) + return NULL; + + obj = xmlXPathEval(BAD_CAST xpath, ctxt); + if ((obj == NULL) || + (obj->type != XPATH_NODESET) || + (obj->nodesetval == NULL) || + (obj->nodesetval->nodeNr <= 0) || + (obj->nodesetval->nodeTab == NULL)) { + xmlXPathFreeObject(obj); + return NULL; + } + + ret = obj->nodesetval->nodeTab[0]; + xmlXPathFreeObject(obj); + + return ret; +} + +static int +searchRole(userInfo *ui, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + int rc; + size_t len; + role *r; + + DMSG("%S(%d) %S\n",__func__,__LINE__,"searchRole start\n"); + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "Role", sizeof("Role"))) + continue; + + attr = xmlGetProp(c_node, "name"); + if (!attr) { + EMSG_XML("name in /RolePolicyDefinition/Role is not defined"); + return EINVAL; + } + + len = strlen(attr); + if (len >= XR_MAX_LENGTH_OF_ROLENAME) { + EMSG_XML("name in /RolePolicyDefinition/Role is long"); + xmlFree(attr); + return EINVAL; + } + + for (r = ui->roleList; r; r = r->next) { + if (strcmp(r->roleName, (char *) attr)) + continue; + + if (r->parsed_Role) { + EMSG_XML("multiple roles with same name are defined"); + xmlFree(attr); + return EINVAL; + } + + if ((rc = searchPolicyID(r, c_node->children))) { + xmlFree(attr); + return rc; + } + + if ((rc = searchManageVM(r, c_node->children))) { + xmlFree(attr); + return rc; + } + + if ((rc = searchControlOperation(r, c_node->children))) { + xmlFree(attr); + return rc; + + r->parsed_Role = 1; + + break; + } + } + + xmlFree(attr); + } + + return 0; +} + +static int +searchPolicyID(role *r, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + size_t len; + int rc; + + DMSG("%S(%d) %S\n",__func__,__LINE__,"searchPolidyID start\n"); + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "PolicyID", sizeof("PolicyID"))) + continue; + + if (r->parsed_PolicyID) { + EMSG_XML("multiple /RolePolicyDefinition/Role/PolicyID is defined for the role"); + return EINVAL; + } + + attr = xmlGetProp(c_node, "id"); + + if (!attr) { + EMSG_XML("type in /RolePolicyDefinition/Role/PolicyID is not defined"); + return EINVAL; + } + + len = strlen(attr); + if (len >= XR_MAX_LENGTH_OF_PolicyID) { + EMSG_XML("name in /RolePolicyDefinition/PolidyID is long"); + xmlFree(attr); + return EINVAL; + } + r->parsed_PolicyID = 1; + + strcpy(r->policyID, (char *) attr); + + xmlFree(attr); + } + + return 0; +} + +static int +searchManageVM(role *r, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + int rc; + + DMSG("%S(%d) %S\n",__func__,__LINE__,"searchManagerVM start\n"); + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "ManageVM", sizeof("ManageVM"))) + continue; + + if (r->parsed_ManageVM) { + EMSG_XML("multiple /RolePolicyDefinition/Role/ManageVMs are defined for the role"); + return EINVAL; + } + + attr = xmlGetProp(c_node, "type"); + + if (!attr) { + EMSG_XML("type in /RolePolicyDefinition/Role/ManageVM is not defined"); + return EINVAL; + } + + if (!strncmp(attr, "individual", sizeof("individual"))) { + + r->managementVMType = XR_VMTYPE_INDIVIDUAL; + + if ((rc = searchVM(r, c_node->children))) { + xmlFree(attr); + return rc; + } + + } else if (!strncmp(attr, "whole", sizeof("whole"))) { + + r->managementVMType = XR_VMTYPE_WHOLE; + + } else { + + EMSG_XML("type in /RolePolicyDefinition/Role/ManageVM is wrong"); + xmlFree(attr); + return EINVAL; + } + + r->parsed_ManageVM = 1; + + xmlFree(attr); + } + + return 0; +} + +static int +searchVM(role *r, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + int rc; + size_t len; + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "VM", sizeof("VM"))) + continue; + + attr = xmlGetProp(c_node, "name"); + if (!attr) { + EMSG_XML("name in /RolePolicyDefinition/Role/ManageVM/VM is not defined"); + return EINVAL; + } + + len = strlen(attr); + if (len >= XR_MAX_LENGTH_OF_DOMNAME) { + EMSG_XML("name in /RolePolicyDefinition/Role/ManageVM/VM is long"); + xmlFree(attr); + return EINVAL; + } + + if ((rc = makeStructDomname(r, attr))) { + xmlFree(attr); + return rc; + } + + xmlFree(attr); + } + + return 0; +} + +static int +makeStructDomname(role *r, xmlChar *attr) +{ + domname *dn; + + DMSG(FUNC, "management domain name = %s\n", attr); + + for (dn = r->managementVMList; dn; dn = dn->next) { + if (!strcmp(dn->value, (char *) attr)) { + EMSG_XML("same domain name is defined for the role"); + return EINVAL; + } + } + + if (r->domname_c >= XR_NR_DOMNAME_LISTS) { + EMSG_XML("too many /RolePolicyDefinition/Role/ManageVM/VM"); + return EINVAL; + } + + if (!(dn = new_domname())) + return ENOMEM; + + strcpy(dn->value, (char *) attr); + append_domname(r, dn); + + return 0; +} + +static int +searchControlOperation(role *r, xmlNodePtr node) +{ + xmlNodePtr c_node; + + int rc; + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "ControlOperation", sizeof("ControlOperation"))) + continue; + + if (r->parsed_ControlOpe) { + EMSG_XML("multiple /RolePolicyDefinition/Role/ControlOperations are defined for the role"); + return EINVAL; + } + + if ((rc = searchAccept(r, c_node->children))) + return rc; + + r->parsed_ControlOpe = 1; + } + + return 0; +} + +static int +searchAccept(role* r, xmlNodePtr node) +{ + xmlNodePtr c_node; + + int rc; + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "Accept", sizeof("Accept"))) + continue; + + if (r->parsed_Accept) { + EMSG_XML("multiple /RolePolicyDefinition/Role/ControlOperation/Accepts are defined for the role"); + return EINVAL; + } + + if ((rc = searchOperation(r, c_node->children))) + return rc; + + r->parsed_Accept = 1; + } + + return 0; +} + +static int +searchOperation(role* r, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + int rc; + long int long_id; + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "operation", sizeof("operation"))) + continue; + + attr = xmlGetProp(c_node, "id"); + if (!attr) { + EMSG_XML("id in /RolePolicyDefinition/Role/ControlOperation/Accept/operation is not defined"); + return EINVAL; + } + + errno = 0; + long_id = strtol((char *) attr, NULL, 10); + if (errno) { + EMSG_XML("id in /RolePolicyDefinition/Role/ControlOperation/Accept/operation is invalid"); + xmlFree(attr); + return errno; + } + + if (long_id < 0 || + long_id > XR_MAX_OPEID) { + EMSG_XML("id in /RolePolicyDefinition/Role/ControlOperation/Accept/operation is invalid"); + xmlFree(attr); + return errno; + } + + if ((rc = makeStructOpeid(r, (int) long_id))) { + xmlFree(attr); + return rc; + } + + xmlFree(attr); + } + + return 0; +} + +static int +makeStructOpeid(role *r, int opeid) +{ + opeid_data *opd; + + DMSG(FUNC, "id = %d\n", opeid); + /* + for (opd = r->acceptOperationList; opd; opd = opd->next) { + if (opd->value == opeid) { + EMSG_XML("same operation id is defined for the role"); + return EINVAL; + } + } + */ + + if (r->opeid_c >= XR_NR_OPEID_LISTS) { + EMSG_XML("too many /RolePolicyDefinition/Role/ControlOperation/Accept/operation"); + return EINVAL; + } + + if (!(opd = new_opeid_data())) + return ENOMEM; + + opd->value = opeid; + append_opeid_data(r, opd); + + return 0; +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 rolePolicyDefinition.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rolePolicyDefinition.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,27 @@ +/* + Copyright (C) 200 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __ROLE_POLICY_DEFINITION_H__ +#define __ROLE_POLICY_DEFINITION_H__ + +#include "userinfo.h" + +int readRolePolicyDefinition(userInfo *ui); + +#endif /*__ROLE_POLICY_DEFINITION_H__ */ diff -r a4c4b2407117 -r d864c312eae4 role_list.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/role_list.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,152 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +* +/ +#include <stdlib.h> +#include <string.h> +#include "userinfo.h" +#include "role_list.h" +#include "xr_log.h" + +static void +init_role(role *r) +{ + strcpy(r->roleName, ""); + r->managementVMType = XR_VMTYPE_UNKNOWN; + r->acceptOperationList = NULL; + r->opeid_c = 0; + strcpy(r->policyID, ""); + r->managementVMList = NULL; + r->domname_c = 0; + r->next = NULL; + r->parsed_Role = 0; + r->parsed_PolicyID = 0; + r->parsed_ManageVM = 0; + r->parsed_ControlOpe = 0; + r->parsed_Accept = 0; +} + +role* +new_role(void) +{ + role *r; + + DMSG(FUNC, "start\n"); + + r = (role *) malloc(sizeof(struct _role)); + if (!r) { + EMSG("out of memory for role\n"); + return NULL; + } + DMSG(FUNC, "allocate role: %p\n", r); + + r->roleName = (char *) malloc(XR_MAX_LENGTH_OF_ROLENAME * sizeof(char)); + if (!r->roleName) { + free(r); + EMSG("out of memory for roleName\n"); + return NULL; + } + DMSG(FUNC, "allocate roleName: %p\n", r->roleName); + + r->policyID = (char *) malloc(XR_MAX_LENGTH_OF_PolicyID * sizeof(char)); + if (!r->policyID) { + free(r); + EMSG("out of memory for policyID\n"); + return NULL; + } + DMSG(FUNC, "allocate policyID: %p\n", r->policyID); + + init_role(r); + return r; +} + +static void +free_role(role *r) +{ + DMSG(FUNC, "start\n"); + + if (!r) + return; + + if (r->roleName) { + DMSG(FUNC, "free roleName: %p\n", r->roleName); + free(r->roleName); + } + if (r->policyID) { + DMSG(FUNC, "free policyID: %p\n", r->policyID); + free(r->policyID); + } + if (r->acceptOperationList) + free_opeid_data_list(r); + if (r->managementVMList) + free_domname_list(r); + + DMSG(FUNC, "free role: %p\n", r); + free(r); +} + +void +free_role_list(userInfo *ui) +{ + role *r = ui->roleList; + role *r_next; + + DMSG(FUNC, "start\n"); + + while (r) { + r_next = r->next; + free_role(r); + r = r_next; + } +} + +void +append_role(userInfo *ui, role *r) +{ + DMSG(FUNC, "start\n"); + + r->next = ui->roleList; + ui->roleList = r; + + ui->role_c++; +} + +void +show_role_list(userInfo *ui) +{ + role *r = ui->roleList; + + while (r) { + DMSG(" role : %p\n", r); + DMSG(" roleName : %s\n", r->roleName); + DMSG(" policyID : %s\n", r->policyID); + DMSG(" managementVMType : %d\n", r->managementVMType); + DMSG(" next : %p\n", r->next); + DMSG(" opeid_c : %d\n", r->opeid_c); + show_opeid_data_list(r); + DMSG(" domname_c : %d\n", r->domname_c); + show_domname_list(r); + r = r->next; + } +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 role_list.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/role_list.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,68 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + + +#ifndef __ROLE_LIST_H__ +#define __ROLE_LIST_H__ + +#include "opeid_list.h" +#include "domname_list.h" + +#define XR_NR_DOMNAME_LISTS 1000 +#define XR_NR_OPEID_LISTS 1000 + +#define XR_MAX_LENGTH_OF_ROLENAME 100 +#define XR_MAX_LENGTH_OF_PolicyID 37 + +enum manageVMType { + XR_VMTYPE_UNKNOWN = 0, + XR_VMTYPE_WHOLE = 1, + XR_VMTYPE_INDIVIDUAL = 2 +}; + +typedef struct _role role; +struct _role { + char *roleName; + char *policyID; + enum manageVMType managementVMType; + opeid_data *acceptOperationList; + int opeid_c; + domname *managementVMList; + int domname_c; + struct _role *next; + int parsed_Role; + int parsed_PolicyID; + int parsed_ManageVM; + int parsed_ControlOpe; + int parsed_Accept; +}; +struct _userInfo; + +role *new_role(void); +void free_role_list(struct _userInfo *ui); +void append_role(struct _userInfo *ui, role *r); +void show_role_list(struct _userInfo *ui); + +#endif /* __ROLE_LIST_H */ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 rsyslog.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rsyslog.conf Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,47 @@ +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! + +*.info;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg * + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + +################################################# +# For Xen-RBAC 2008/06/27 +################################################# +$umask 0000 +$CreateDirs on +$RepeatedMsgReduction off + +$template templateXenRBAC,"%msg%\n" +$template fileNameXenRBAC, "/var/log/xen-audit/audit-xen-rbac.log" + +$DirOwner root +$DirGroup log-admin +$DirCreateMode 0750 + +$FileOwner root +$FileGroup log-admin +$FileCreateMode 0640 + +:syslogtag,isequal,"xenrbac" +auth.info ?fileNameXenRBAC;templateXenRBAC diff -r a4c4b2407117 -r d864c312eae4 userConfiguration.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/userConfiguration.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,248 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <string.h> +#include <errno.h> +#include <libxml/parser.h> +#include <libxml/tree.h> +#include <libxml/xpath.h> +#include "userinfo.h" +#include "role_list.h" +#include "xr.h" +#include "xr_log.h" + +static int searchUser(userInfo *ui, xmlNodePtr node); +static int searchUserRole(userInfo *ui, xmlNodePtr node); +static int makeStructRole(userInfo *ui, xmlChar *attr); +static xmlNodePtr getXPathNode(const char *xpath, xmlXPathContextPtr ctxt); + +#define EMSG_XML(_a...) \ + do { \ + EMSG("%s parsing failed. (%s)\n", USER_CONFIG_FILENAME, _a); \ + } while (0) + +int +readUserConfiguration(userInfo *ui) +{ + xmlDoc *doc = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr node = NULL; + + int rc = 0; + char fileName[strlen(XENRBAC_POLICY_PATHNAME) + strlen(USER_CONFIG_FILENAME) + 1]; + + strcpy(fileName, XENRBAC_POLICY_PATHNAME); + strcat(fileName, USER_CONFIG_FILENAME); + + doc = xmlReadFile(fileName, NULL, XML_PARSE_NOBLANKS); + if (!doc) { + EMSG("%s reading or parsing failed (%m)\n", + USER_CONFIG_FILENAME); + rc = errno; + goto error; + } + + ctxt = xmlXPathNewContext(doc); + if (!ctxt) { + EMSG_XML("ctxt is NULL"); + rc = EINVAL; + goto error; + } + + node = getXPathNode("/UserConfiguration/User", ctxt); + if (!node) { + EMSG_XML("/UserConfiguration/User is not defined"); + rc = EINVAL; + goto error; + } + + if (!(rc = searchUser(ui, node))) + goto cleanup; + +error: + DMSG(FUNC, "error in readUserConfiguration\n"); + +cleanup: + DMSG(FUNC, "cleanup in readUserConfiguration\n"); + //free the document + /* + *Free the global variables that may + *have been allocated by the parser. + */ + xmlCleanupParser(); + + if (ctxt) + xmlXPathFreeContext(ctxt); + if (doc) + xmlFreeDoc(doc); + + return rc; +} + +static xmlNodePtr +getXPathNode(const char *xpath, xmlXPathContextPtr ctxt) +{ + xmlXPathObjectPtr obj = NULL; + xmlNodePtr ret = NULL; + + if ((ctxt == NULL) || (xpath == NULL)) + return NULL; + + obj = xmlXPathEval(BAD_CAST xpath, ctxt); + if ((obj == NULL) || + (obj->type != XPATH_NODESET) || + (obj->nodesetval == NULL) || + (obj->nodesetval->nodeNr <= 0) || + (obj->nodesetval->nodeTab == NULL)) { + xmlXPathFreeObject(obj); + return NULL; + } + + ret = obj->nodesetval->nodeTab[0]; + xmlXPathFreeObject(obj); + + return ret; +} + +static int +searchUser(userInfo *ui, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + int rc; + size_t len; + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "User", sizeof("User"))) + continue; + + attr = xmlGetProp(c_node, "name"); + if (!attr) { + EMSG_XML("name in /UserConfiguration/User is not defined"); + return EINVAL; + } + + len = strlen((char *) attr); + if (len >= XR_MAX_LENGTH_OF_USERNAME) { + EMSG_XML("name in /UserConfiguration/User is long"); + xmlFree(attr); + return EINVAL; + } + + if (strncmp((char *) attr, ui->userName, XR_MAX_LENGTH_OF_USERNAME)) { + xmlFree(attr); + continue; + } + + if (ui->parsed_User) { + EMSG("multiple /UserConfiguration/Users are defined for the user"); + xmlFree(attr); + return EINVAL; + } + + if ((rc = searchUserRole(ui, c_node->children))) { + xmlFree(attr); + return rc; + } + + ui->parsed_User = 1; + + xmlFree(attr); + } + + return 0; +} + +static int +searchUserRole(userInfo *ui, xmlNodePtr node) +{ + xmlNodePtr c_node; + xmlChar *attr; + + int rc; + size_t len; + + for (c_node = node; c_node; c_node = c_node->next) { + if (c_node->type != XML_ELEMENT_NODE) + continue; + + if (strncmp(c_node->name, "UserRole", sizeof("UserRole"))) + continue; + + attr = xmlGetProp(c_node, "role"); + if (!attr) { + EMSG_XML("role in /UserConfiguration/User/UserRole is not defined"); + return EINVAL; + } + + len = strlen((char *) attr); + if (len >= XR_MAX_LENGTH_OF_ROLENAME) { + EMSG_XML("role in /UserConfiguration/User/UserRole is long"); + xmlFree(attr); + return EINVAL; + } + + if ((rc = makeStructRole(ui, attr))) { + xmlFree(attr); + return rc; + } + + xmlFree(attr); + } + + return 0; +} + +static int +makeStructRole(userInfo *ui, xmlChar *attr) +{ + role *r; + + DMSG(FUNC, "role = %s\n", (char *) attr); + + for (r = ui->roleList; r; r = r->next) { + if (!strcmp(r->roleName, (char *) attr)) { + EMSG_XML("same role is defined for the user"); + return EINVAL; + } + } + + if (ui->role_c >= XR_NR_ROLE_LISTS) { + EMSG_XML("too many /UserConfiguration/User/UserRole for the user"); + return EINVAL; + } + + if (!(r = new_role())) + return ENOMEM; + + strcpy(r->roleName, (char *) attr); + append_role(ui, r); + + return 0; +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 userConfiguration.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/userConfiguration.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,33 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __USER_CONFIGULATION_H_ +#define __USER_CONFIGULATION_H_ + +#include "userinfo.h" + +int readUserConfiguration(userInfo *userInfo); + +#endif +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 userinfo.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/userinfo.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,79 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <stdlib.h> +#include <string.h> +#include "userinfo.h" +#include "xr_log.h" + +static void +init_UserInfo(userInfo* ui) +{ + strcpy(ui->userName, "\n"); + ui->roleList = NULL; + ui->role_c = 0; + ui->parsed_User = 0; +} + +userInfo* +new_UserInfo(void) +{ + userInfo *ui; + + DMSG(FUNC, "start\n"); + + ui = (userInfo *) malloc(sizeof(struct _userInfo)); + if (!ui) { + EMSG("out of memory for userInfo\n"); + return NULL; + } + DMSG(FUNC, "allocate userInfo: %p\n", ui); + + init_UserInfo(ui); + return ui; +} + +void +free_UserInfo(userInfo *ui) +{ + DMSG(FUNC, "start\n"); + + if (!ui) { + if (!ui->roleList) + free_role_list(ui); + + DMSG(FUNC, "free userInfo: %p\n", ui); + free(ui); + } +} + +void +show_UserInfo(userInfo *ui) +{ + DMSG("userInfo : %p", ui); + DMSG(" user : %s", ui->userName); + DMSG(" role_c : %d", ui->role_c); + show_role_list(ui); +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 userinfo.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/userinfo.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,46 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __USERINFO_H__ +#define __USERINFO_H__ + +#include "role_list.h" + +#define XR_MAX_LENGTH_OF_USERNAME 32 +#define XR_NR_ROLE_LISTS 1000 + +typedef struct _userInfo userInfo; +struct _userInfo { + char userName[XR_MAX_LENGTH_OF_USERNAME]; + struct _role *roleList; + int role_c; + int parsed_User; +}; + +userInfo *new_UserInfo(void); +void free_UserInfo(userInfo *ui); +void show_UserInfo(userInfo *ui); + +#endif /*__USERINFO_H__*/ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 xenrbac.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xenrbac.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,325 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <time.h> +#include <errno.h> +#include "userinfo.h" +#include "role_list.h" +#include "domname_list.h" +#include "opeid_list.h" +#include "rolePolicyDefinition.h" +#include "userConfiguration.h" +#include "xenrbac.h" +#include "xr.h" +#include "xr_log.h" + +static void +getTime(char *outstr, int size){ + + time_t t; + struct tm *tmp; + char *format = "%FT%T%z"; + + t = time(NULL); + tmp = localtime(&t); + if (tmp == NULL) { + perror("localtime\n"); + outstr = NULL; } + + if (strftime(outstr, size, format, tmp) == 0) { + fprintf(stderr, "strftime returned 0\n"); + outstr = NULL; } +} + +static void +outputlog(char *user, char *arguments, char *judgedMsg, char *policyID, char *message){ + + char time[40]; + char *host = getenv("HOSTNAME"); + char *compo = "xen-rbac"; + char *action = "Execute"; + + if (!host) + host = ""; + getTime(time, sizeof(time)); + + if (!message) { + AUDITMSG("\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"\n", + time, + user, + host, + arguments, + action, + judgedMsg, + policyID, + compo + ); + } else { + AUDITMSG("\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"\n", + time, + user, + host, + arguments, + action, + judgedMsg, + policyID, + compo, + message + ); + + } +} + +static int +searchOperationID(int opeid, role *r) +{ + opeid_data *opd; + + for (opd = r->acceptOperationList; opd; opd = opd->next) { + if (opd->value == opeid) + return XR_ACCEPT; + } + + return XR_DENY; +} + +static int +searchManagementVM(char *domainname, role *r) +{ + domname *dn = NULL; + + for (dn = r->managementVMList; dn; dn = dn->next) + if (domainname && + !strcmp(dn->value, domainname)) + return XR_ACCEPT; + + return XR_DENY; +} + +int +check_args_username(char *un) +{ + size_t len_un; + + if (!un) { + EMSG("username is NULL\n"); + return EINVAL; + } + + len_un = strlen(un); + if (len_un == 0) { + EMSG("username is none\n"); + return EINVAL; + } + if (len_un >= XR_MAX_LENGTH_OF_USERNAME) { + EMSG("username is long\n"); + return EINVAL; + } + + return 0; +} + +int +check_args_opeid(int op) +{ + if (op < XR_MIN_OPEID) { + EMSG("opeid is out of range\n"); + return EINVAL; + } + + return 0; +} + +int +check_args_domainname(char *dn) +{ + size_t len_dn; + + if (!dn) + return 0; + + len_dn = strlen(dn); + /* + if (len_dn == 0) { + EMSG("domainname is none\n"); + return EINVAL; + }*/ + if (len_dn >= XR_MAX_LENGTH_OF_DOMNAME) { + EMSG("domainname is long\n"); + return EINVAL; + } + + return 0; +} + +int +check_args_flag_all(int f) +{ + if (f != XR_ALL && + f != XR_ANY) { + EMSG("flag_all is invalid\n"); + return EINVAL; + } + + return 0; +} + +int +check_args(char *username, int opeid, char *domainname, int flag_all) +{ + int rc; + + if ((rc = check_args_username(username))) + return rc; + if ((rc = check_args_opeid(opeid))) + return rc; + if ((rc = check_args_domainname(domainname))) + return rc; + if ((rc = check_args_flag_all(flag_all))) + return rc; + + return 0; +} + +int +xr_judge(char *username, int opeid, char *domainname, int flag_all) +{ + int rc = XR_ACCEPT; + + userInfo *ui = NULL; + role *r = NULL; + char arg[100]; + char message[100]; + + init_xenrbac_log(); + + if ((rc = check_args(username, opeid, domainname, flag_all))) + goto error; + + if (domainname) + sprintf(arg, "OperationID:%d;Flag:%d;VMName:%s", opeid, flag_all, domainname); + else + sprintf(arg, "OperationID:%d;Flag:%d;VMName:%s", opeid, flag_all, ""); + + if (!(ui = new_UserInfo())) { + rc = ENOMEM; + goto error; + } + strncpy(ui->userName, username, XR_MAX_LENGTH_OF_USERNAME); + + if ((rc = readUserConfiguration(ui))) + goto error; + show_UserInfo(ui); + + if ((rc = readRolePolicyDefinition(ui))) + goto error; + show_UserInfo(ui); + + //When user don't have role + if (!(r = ui->roleList)) { + outputlog(username, arg, "deny", "", "role is none"); + goto access_deny; + } + + if (flag_all) { + for (r = ui->roleList; r ; r = r->next) { + if (r->managementVMType != XR_VMTYPE_WHOLE) { + sprintf(message, "ManagementVMType:whole is not found in role"); + outputlog(username, arg, "deny", r->policyID, message); + continue; + } + if (searchOperationID(opeid, r) == XR_ACCEPT) { + goto access_accept; + } else { + sprintf(message, "OperationID:%d is not found in role", opeid); + outputlog(username, arg, "deny", r->policyID, message); + } + } + + goto access_deny; + } + + for (r = ui->roleList; r ; r = r->next) { + if (r->managementVMType == XR_VMTYPE_INDIVIDUAL) { + if(searchManagementVM(domainname, r) == XR_DENY) { + sprintf(message, "ManagementVM:%s is not found in role", domainname); + outputlog(username, arg, "deny", r->policyID, message); + continue; + } + if (searchOperationID(opeid, r) == XR_ACCEPT) { + goto access_accept; + } else { + sprintf(message, "OperationID:%d is not found in role", opeid); + outputlog(username, arg, "deny", r->policyID, message); + continue; + } + } else if (r->managementVMType == XR_VMTYPE_WHOLE) { + if (searchOperationID(opeid, r) == XR_ACCEPT) { + goto access_accept; + } else { + sprintf(message, "OperationID:%d is not found in role", opeid); + outputlog(username, arg, "deny", r->policyID, message); + continue; + } + } + } + + goto access_deny; + +error: + DMSG("error error_no = %d\n", rc); + + if (rc == XR_ACCEPT) { + EMSG("return code is not set"); + rc = XR_DENY; + } + goto cleanup; + +access_deny: + DMSG("judged result is DENY\n"); + + rc = XR_DENY; + goto cleanup; + +access_accept: + DMSG("judged result is ACCEPT\n"); + outputlog(username, arg, "allow", r->policyID, NULL); + + rc = XR_ACCEPT; + goto cleanup; + +cleanup: + DMSG("%s(%d) : %s", __func__, __LINE__, "cleannup\n"); + + if (ui) + free_UserInfo(ui); + + end_xenrbac_log(); + + return rc; +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 xenrbac.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xenrbac.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,39 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __XENRBAC_H__ +#define __XENRBAC_H__ + +#include <errno.h> + +int xr_judge(char *username, int opeid, char *domainname, int flag_all); + +#define XR_ANY 0 +#define XR_ALL 1 + +#define XR_ACCEPT 0 +#define XR_DENY EPERM + +#endif /*__XENRBAC_H__*/ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 xr.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xr.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,39 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __XR_H__ +#define __XR_H__ + +#define XENRBAC_POLICY_PATHNAME "/etc/xen/role/" +#define USER_CONFIG_FILENAME "user_define.xml" +#define ROLE_POLICY_FILENAME "role_define.xml" + +#define XR_OPEID_COMMAND_INVALID -1 +#define XR_OPEID_COMMAND_XM 0 +#define XR_MIN_OPEID -1 +#define XR_MAX_OPEID 83 +#define XR_NR_OPEIDS 84 + +#endif /*__XR_H__*/ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 xr_log.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xr_log.c Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,48 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#include <stdlib.h> +#include <syslog.h> +#include "xr.h" +#include "xr_log.h" + +int XENRBAC_DEBUG = 0; + +void +init_xenrbac_log(void) +{ + openlog("xenrbac", LOG_PID, LOG_AUTHPRIV); + + if (getenv("XENRBAC_DEBUG")) { + XENRBAC_DEBUG = 1; + DMSG("start with debug mode\n"); + } +} + +void +end_xenrbac_log(void) +{ + closelog(); +} +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r a4c4b2407117 -r d864c312eae4 xr_log.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xr_log.h Fri Jan 23 04:39:58 2009 +0900 @@ -0,0 +1,60 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __XR_LOG_H__ +#define __XR_LOG_H__ + +#include <syslog.h> + +extern int XENRBAC_DEBUG; + +void init_xenrbac_log(void); +void end_xenrbac_log(void); + +#define FUNC "%s: ", __func__ +#define LINE "%s: ", __LINE__ + +#define AUDITMSG(_a...) \ + do { \ + syslog(LOG_AUTH|LOG_INFO, _a); \ + } while (0) + +#define EMSG(_a...) \ + do { \ + syslog(LOG_AUTHPRIV|LOG_ERR, _a); \ + } while (0) + +#define IMSG(_a...) \ + do { \ + syslog(LOG_AUTHPRIV|LOG_INFO, _a); \ + } while (0) + +#define DMSG(_a...) \ + do { \ + if (XENRBAC_DEBUG) \ + syslog(LOG_AUTHPRIV|LOG_INFO, _a); \ + } while (0) + +#endif /*__XR_LOG_H__*/ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */

1 0

[libvirt] [Patch][RFC] Embedding hooks in libvirt (1/3)
by Syunsuke HAYASHI 26 Jan '09

26 Jan '09

This should be applied to libvirt-0.4.0. It is a bit old one, sorry, but this patch is just hooking around. So I think I can merge it to latest libvirt with a little effort. Please note that uid is essential for access control and the uid is available only in a local machine. For this reason, our access control takes effect only in a local machine by virsh. This means that remotely connecting to libvirtd is currently out of scope. diff -r d5dbadfb6161 -r 62d2ebb8d23b configure --- a/configure Wed Apr 02 13:13:06 2008 +0900 +++ b/configure Tue Jan 27 03:13:46 2009 +0900 @@ -35181,7 +35181,12 @@ sysconfdir='/etc' fi - +# Check whether --with-rbac was given. +if test "${with_rbac+set}" = set; then + withval=$with_rbac; +else + with_rbac=no +fi # Check whether --with-xen was given. if test "${with_xen+set}" = set; then @@ -39753,6 +39758,9 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' DEFS=-DHAVE_CONFIG_H +if test "$with_rbac" = "yes" ; then + DEFS="$DEFS -DRBAC" +fi ac_libobjs= ac_ltlibobjs= @@ -41743,6 +41751,9 @@ { echo "$as_me:$LINENO: polkit: no" >&5 echo "$as_me: polkit: no" >&6;} fi +{ echo "$as_me:$LINENO: RBAC: $with_rbac" >&5 +echo "$as_me: RBAC: $with_rbac" >&6;} + { echo "$as_me:$LINENO: " >&5 echo "$as_me: " >&6;} { echo "$as_me:$LINENO: Miscellaneous" >&5 diff -r d5dbadfb6161 -r 62d2ebb8d23b include/libvirt/libvirt.h --- a/include/libvirt/libvirt.h Wed Apr 02 13:13:06 2008 +0900 +++ b/include/libvirt/libvirt.h Tue Jan 27 03:13:46 2009 +0900 @@ -514,6 +514,11 @@ char * virDomainGetXMLDesc (virDomainPtr domain, int flags); +#ifdef RBAC +char * virDomainGetXMLDesc_XRBAC (int op_id, + virDomainPtr domain, + int flags); +#endif int virDomainBlockStats (virDomainPtr dom, const char *path, virDomainBlockStatsPtr stats, @@ -697,6 +702,11 @@ char **const names, int maxnames); +#ifdef RBAC +int virConnectListNetworks_QEMUD (virConnectPtr conn, + char **const names, + int maxnames); +#endif /* * List inactive networks */ @@ -705,6 +715,11 @@ char **const names, int maxnames); +#ifdef RBAC +int virConnectListDefinedNetworks_QEMUD (virConnectPtr conn, + char **const names, + int maxnames); +#endif /* * Lookup network by name or uuid */ @@ -721,26 +736,43 @@ virNetworkPtr virNetworkCreateXML (virConnectPtr conn, const char *xmlDesc); +#ifdef RBAC +virNetworkPtr virNetworkCreateXML_QEMUD (virConnectPtr conn, + const char *xmlDesc); +#endif /* * Define inactive persistent network */ virNetworkPtr virNetworkDefineXML (virConnectPtr conn, const char *xmlDesc); +#ifdef RBAC +virNetworkPtr virNetworkDefineXML_QEMUD (virConnectPtr conn, + const char *xml); +#endif /* * Delete persistent network */ int virNetworkUndefine (virNetworkPtr network); +#ifdef RBAC +int virNetworkUndefine_QEMUD (virNetworkPtr network); +#endif /* * Activate persistent network */ int virNetworkCreate (virNetworkPtr network); +#ifdef RBAC +int virNetworkCreate_QEMUD (virNetworkPtr network); +#endif /* * Network destroy/free */ int virNetworkDestroy (virNetworkPtr network); +#ifdef RBAC +int virNetworkDestroy_QEMUD (virNetworkPtr network); +#endif int virNetworkFree (virNetworkPtr network); /* @@ -753,12 +785,20 @@ char *buf); char * virNetworkGetXMLDesc (virNetworkPtr network, int flags); +#ifdef RBAC +char * virNetworkGetXMLDesc_QEMUD (virNetworkPtr network, + int flags); +#endif char * virNetworkGetBridgeName (virNetworkPtr network); int virNetworkGetAutostart (virNetworkPtr network, int *autostart); int virNetworkSetAutostart (virNetworkPtr network, int autostart); +#ifdef RBAC +int virNetworkSetAutostart_QEMUD (virNetworkPtr network, + int autostart); +#endif #ifdef __cplusplus } diff -r d5dbadfb6161 -r 62d2ebb8d23b include/libvirt/libvirt.h.in --- a/include/libvirt/libvirt.h.in Wed Apr 02 13:13:06 2008 +0900 +++ b/include/libvirt/libvirt.h.in Tue Jan 27 03:13:46 2009 +0900 @@ -514,6 +514,11 @@ char * virDomainGetXMLDesc (virDomainPtr domain, int flags); +#ifdef RBAC +char * virDomainGetXMLDesc_XRBAC (int op_id, + virDomainPtr domain, + int flags); +#endif int virDomainBlockStats (virDomainPtr dom, const char *path, virDomainBlockStatsPtr stats, @@ -697,6 +702,11 @@ char **const names, int maxnames); +#ifdef RBAC +int virConnectListNetworks_QEMUD (virConnectPtr conn, + char **const names, + int maxnames); +#endif /* * List inactive networks */ @@ -705,6 +715,11 @@ char **const names, int maxnames); +#ifdef RBAC +int virConnectListDefinedNetworks_QEMUD (virConnectPtr conn, + char **const names, + int maxnames); +#endif /* * Lookup network by name or uuid */ @@ -721,26 +736,43 @@ virNetworkPtr virNetworkCreateXML (virConnectPtr conn, const char *xmlDesc); +#ifdef RBAC +virNetworkPtr virNetworkCreateXML_QEMUD (virConnectPtr conn, + const char *xmlDesc); +#endif /* * Define inactive persistent network */ virNetworkPtr virNetworkDefineXML (virConnectPtr conn, const char *xmlDesc); +#ifdef RBAC +virNetworkPtr virNetworkDefineXML_QEMUD (virConnectPtr conn, + const char *xml); +#endif /* * Delete persistent network */ int virNetworkUndefine (virNetworkPtr network); +#ifdef RBAC +int virNetworkUndefine_QEMUD (virNetworkPtr network); +#endif /* * Activate persistent network */ int virNetworkCreate (virNetworkPtr network); +#ifdef RBAC +int virNetworkCreate_QEMUD (virNetworkPtr network); +#endif /* * Network destroy/free */ int virNetworkDestroy (virNetworkPtr network); +#ifdef RBAC +int virNetworkDestroy_QEMUD (virNetworkPtr network); +#endif int virNetworkFree (virNetworkPtr network); /* @@ -753,12 +785,20 @@ char *buf); char * virNetworkGetXMLDesc (virNetworkPtr network, int flags); +#ifdef RBAC +char * virNetworkGetXMLDesc_QEMUD (virNetworkPtr network, + int flags); +#endif char * virNetworkGetBridgeName (virNetworkPtr network); int virNetworkGetAutostart (virNetworkPtr network, int *autostart); int virNetworkSetAutostart (virNetworkPtr network, int autostart); +#ifdef RBAC +int virNetworkSetAutostart_QEMUD (virNetworkPtr network, + int autostart); +#endif #ifdef __cplusplus } diff -r d5dbadfb6161 -r 62d2ebb8d23b include/libvirt/virterror.h --- a/include/libvirt/virterror.h Wed Apr 02 13:13:06 2008 +0900 +++ b/include/libvirt/virterror.h Tue Jan 27 03:13:46 2009 +0900 @@ -54,6 +54,9 @@ VIR_FROM_OPENVZ, /* Error from OpenVZ driver */ VIR_FROM_XENXM, /* Error at Xen XM layer */ VIR_FROM_STATS_LINUX, /* Error in the Linux Stats code */ +#ifdef RBAC + VIR_FROM_XENRBAC, /* Error form Xen RBAC */ +#endif } virErrorDomain; @@ -132,6 +135,9 @@ VIR_ERR_NO_NETWORK, /* network not found */ VIR_ERR_INVALID_MAC, /* invalid MAC adress */ VIR_ERR_AUTH_FAILED, /* authentication failed */ +#ifdef RBAC + VIR_ERR_PERMISSION, /* operation not permitted */ +#endif } virErrorNumber; /** diff -r d5dbadfb6161 -r 62d2ebb8d23b libvirt.pc --- a/libvirt.pc Wed Apr 02 13:13:06 2008 +0900 +++ b/libvirt.pc Tue Jan 27 03:13:46 2009 +0900 @@ -1,4 +1,4 @@ -prefix=/usr +prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include diff -r d5dbadfb6161 -r 62d2ebb8d23b libvirt.spec --- a/libvirt.spec Wed Apr 02 13:13:06 2008 +0900 +++ b/libvirt.spec Tue Jan 27 03:13:46 2009 +0900 @@ -1,17 +1,14 @@ # -*- rpm-spec -*- -%if "%{fedora}" >= "8" -%define with_polkit 1 -%define with_proxy no -%else +# For Xen RBAC 20080910 %define with_polkit 0 %define with_proxy yes -%endif +%define with_rbac yes Summary: Library providing a simple API virtualization Name: libvirt Version: 0.4.0 -Release: 1 +Release: 1%{?dist} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -35,6 +32,7 @@ Requires: PolicyKit >= 0.6 %endif BuildRequires: xen-devel +BuildRequires: libxenrbac >= 2.0.0 BuildRequires: libxml2-devel BuildRequires: readline-devel BuildRequires: ncurses-devel @@ -85,7 +83,8 @@ %configure --with-init-script=redhat \ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ --with-remote-file=%{_localstatedir}/run/libvirtd.pid \ - --with-xen-proxy=%{with_proxy} + --with-xen-proxy=%{with_proxy} \ + --with-rbac=%{with_rbac} make %install diff -r d5dbadfb6161 -r 62d2ebb8d23b libvirt.spec.in --- a/libvirt.spec.in Wed Apr 02 13:13:06 2008 +0900 +++ b/libvirt.spec.in Tue Jan 27 03:13:46 2009 +0900 @@ -1,17 +1,14 @@ # -*- rpm-spec -*- -%if "%{fedora}" >= "8" -%define with_polkit 1 -%define with_proxy no -%else +# For Xen RBAC 20080910 %define with_polkit 0 %define with_proxy yes -%endif +%define with_rbac yes Summary: Library providing a simple API virtualization Name: libvirt Version: @VERSION@ -Release: 1 +Release: 1%{?dist} License: LGPL Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -35,6 +32,7 @@ Requires: PolicyKit >= 0.6 %endif BuildRequires: xen-devel +BuildRequires: libxenrbac >= 2.0.0 BuildRequires: libxml2-devel BuildRequires: readline-devel BuildRequires: ncurses-devel @@ -85,7 +83,8 @@ %configure --with-init-script=redhat \ --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \ --with-remote-file=%{_localstatedir}/run/libvirtd.pid \ - --with-xen-proxy=%{with_proxy} + --with-xen-proxy=%{with_proxy} \ + --with-rbac=%{with_rbac} make %install diff -r d5dbadfb6161 -r 62d2ebb8d23b proxy/libvirt_proxy.c --- a/proxy/libvirt_proxy.c Wed Apr 02 13:13:06 2008 +0900 +++ b/proxy/libvirt_proxy.c Tue Jan 27 03:13:46 2009 +0900 @@ -363,6 +363,9 @@ virProxyPacketPtr req = (virProxyPacketPtr) &request; int ret; char *xml, *ostype; +#ifdef RBAC + char *sched_type; +#endif /* RBAC */ retry: ret = read(pollInfos[nr].fd, req, sizeof(virProxyPacket)); @@ -662,6 +665,28 @@ free(ostype); } break; +#ifdef RBAC + case VIR_PROXY_GET_SCHEDTYPE: + if (req->len != sizeof(virProxyPacket)) + goto comm_error; + sched_type = xenHypervisorGetSchedType(conn, &request.extra.arg[0]); + if (!sched_type) { + req->data.arg = -1; + req->len = sizeof (virProxyPacket); + } else { + int type_len = strlen(sched_type); + if (type_len > (int) sizeof (request.extra.str)) { + req->data.arg = -2; + req->len = sizeof (virProxyPacket); + } else { + req->data.arg = 0; + memmove (&request.extra.str[4], sched_type, type_len); + req->len = sizeof (virProxyPacket) + sizeof(int) + type_len; + } + free (sched_type); + } + break; +#endif /* RBAC */ default: goto comm_error; } diff -r d5dbadfb6161 -r 62d2ebb8d23b qemud/qemud.c --- a/qemud/qemud.c Wed Apr 02 13:13:06 2008 +0900 +++ b/qemud/qemud.c Tue Jan 27 03:13:46 2009 +0900 @@ -73,7 +73,11 @@ static char *tcp_port = (char *) LIBVIRTD_TCP_PORT; static gid_t unix_sock_gid = 0; /* Only root by default */ +#ifdef RBAC +static int unix_sock_rw_mask = 0777; /* Allow world */ +#else static int unix_sock_rw_mask = 0700; /* Allow user only */ +#endif static int unix_sock_ro_mask = 0777; /* Allow world */ #if HAVE_POLKIT diff -r d5dbadfb6161 -r 62d2ebb8d23b qemud/remote.c --- a/qemud/remote.c Wed Apr 02 13:13:06 2008 +0900 +++ b/qemud/remote.c Tue Jan 27 03:13:46 2009 +0900 @@ -1705,9 +1705,15 @@ /* Allocate return buffer. */ ret->names.names_val = calloc (args->maxnames, sizeof (*(ret->names.names_val))); +#ifdef RBAC + ret->names.names_len = + virConnectListDefinedNetworks_QEMUD (client->conn, + ret->names.names_val, args->maxnames); +#else ret->names.names_len = virConnectListDefinedNetworks (client->conn, ret->names.names_val, args->maxnames); +#endif if (ret->names.names_len == -1) return -1; return 0; @@ -1756,9 +1762,15 @@ /* Allocate return buffer. */ ret->names.names_val = calloc (args->maxnames, sizeof (*(ret->names.names_val))); +#ifdef RBAC + ret->names.names_len = + virConnectListNetworks_QEMUD (client->conn, + ret->names.names_val, args->maxnames); +#else ret->names.names_len = virConnectListNetworks (client->conn, ret->names.names_val, args->maxnames); +#endif if (ret->names.names_len == -1) return -1; return 0; @@ -1780,10 +1792,17 @@ return -2; } +#ifdef RBAC + if (virNetworkCreate_QEMUD (net) == -1) { + virNetworkFree(net); + return -1; + } +#else if (virNetworkCreate (net) == -1) { virNetworkFree(net); return -1; } +#endif virNetworkFree(net); return 0; } @@ -1798,7 +1817,11 @@ virNetworkPtr net; CHECK_CONN(client); +#ifdef RBAC + net = virNetworkCreateXML_QEMUD (client->conn, args->xml); +#else net = virNetworkCreateXML (client->conn, args->xml); +#endif if (net == NULL) return -1; make_nonnull_network (&ret->net, net); @@ -1816,7 +1839,11 @@ virNetworkPtr net; CHECK_CONN(client); +#ifdef RBAC + net = virNetworkDefineXML_QEMUD (client->conn, args->xml); +#else net = virNetworkDefineXML (client->conn, args->xml); +#endif if (net == NULL) return -1; make_nonnull_network (&ret->net, net); @@ -1840,10 +1867,17 @@ return -2; } +#ifdef RBAC + if (virNetworkDestroy_QEMUD (net) == -1) { + virNetworkFree(net); + return -1; + } +#else if (virNetworkDestroy (net) == -1) { virNetworkFree(net); return -1; } +#endif virNetworkFree(net); return 0; } @@ -1865,7 +1899,11 @@ } /* remoteDispatchClientRequest will free this. */ +#ifdef RBAC + ret->xml = virNetworkGetXMLDesc_QEMUD (net, args->flags); +#else ret->xml = virNetworkGetXMLDesc (net, args->flags); +#endif if (!ret->xml) { virNetworkFree(net); return -1; @@ -1976,10 +2014,17 @@ return -2; } +#ifdef RBAC + if (virNetworkSetAutostart_QEMUD (net, args->autostart) == -1) { + virNetworkFree(net); + return -1; + } +#else if (virNetworkSetAutostart (net, args->autostart) == -1) { virNetworkFree(net); return -1; } +#endif virNetworkFree(net); return 0; } @@ -2000,10 +2045,17 @@ return -2; } +#ifdef RBAC + if (virNetworkUndefine_QEMUD (net) == -1) { + virNetworkFree(net); + return -1; + } +#else if (virNetworkUndefine (net) == -1) { virNetworkFree(net); return -1; } +#endif virNetworkFree(net); return 0; } diff -r d5dbadfb6161 -r 62d2ebb8d23b src/Makefile.in --- a/src/Makefile.in Wed Apr 02 13:13:06 2008 +0900 +++ b/src/Makefile.in Tue Jan 27 03:13:46 2009 +0900 @@ -122,7 +122,8 @@ libvirt_la-iptables.lo libvirt_la-uuid.lo \ libvirt_la-qemu_driver.lo libvirt_la-qemu_conf.lo \ libvirt_la-openvz_conf.lo libvirt_la-openvz_driver.lo \ - libvirt_la-nodeinfo.lo libvirt_la-util.lo + libvirt_la-nodeinfo.lo libvirt_la-util.lo \ + libvirt_la-xenrbac_libvirt.lo am__objects_2 = libvirt_la-remote_protocol.lo am_libvirt_la_OBJECTS = $(am__objects_1) $(am__objects_2) libvirt_la_OBJECTS = $(am_libvirt_la_OBJECTS) @@ -359,6 +360,7 @@ LIBVIRT_VERSION_NUMBER = @LIBVIRT_VERSION_NUMBER@ LIBXML_CFLAGS = @LIBXML_CFLAGS@ LIBXML_LIBS = @LIBXML_LIBS@ +LIBXENRBAC = -lxenrbac LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -569,7 +571,8 @@ openvz_conf.c openvz_conf.h \ openvz_driver.c openvz_driver.h \ nodeinfo.h nodeinfo.c \ - util.c util.h + util.c util.h \ + xenrbac_libvirt.c xenrbac_libvirt.h SERVER_SOURCES = \ ../qemud/remote_protocol.c ../qemud/remote_protocol.h @@ -652,7 +655,7 @@ rm -f "$${dir}/so_locations"; \ done libvirt.la: $(libvirt_la_OBJECTS) $(libvirt_la_DEPENDENCIES) - $(libvirt_la_LINK) -rpath $(libdir) $(libvirt_la_OBJECTS) $(libvirt_la_LIBADD) $(LIBS) + $(libvirt_la_LINK) -rpath $(libdir) $(libvirt_la_OBJECTS) $(libvirt_la_LIBADD) $(LIBS) $(LIBXENRBAC) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -683,7 +686,7 @@ done virsh$(EXEEXT): $(virsh_OBJECTS) $(virsh_DEPENDENCIES) @rm -f virsh$(EXEEXT) - $(virsh_LINK) $(virsh_OBJECTS) $(virsh_LDADD) $(LIBS) + $(virsh_LINK) $(virsh_OBJECTS) $(virsh_LDADD) $(LIBS) $(LIBXENRBAC) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -719,6 +722,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_la-xm_internal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_la-xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_la-xs_internal.Plo@am__quote@ +#RBAC +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_la-xenrbac_libvirt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virsh-console.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virsh-virsh.Po@am__quote@ @@ -813,6 +818,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_la_CFLAGS) $(CFLAGS) -c -o libvirt_la-xs_internal.lo `test -f 'xs_internal.c' || echo '$(srcdir)/'`xs_internal.c +libvirt_la-xenrbac_libvirt.lo: xenrbac_libvirt.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_la_CFLAGS) $(CFLAGS) -MT libvirt_la-xenrbac_libvirt.lo -MD -MP -MF $(DEPDIR)/libvirt_la-xenrbac_libvirt.Tpo -c -o libvirt_la-xenrbac_libvirt.lo `test -f 'xenrbac_libvirt.c' || echo '$(srcdir)/'`xenrbac_libvirt.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirt_la-xenrbac_libvirt.Tpo $(DEPDIR)/libvirt_la-xenrbac_libvirt.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xenrbac_libvirt.c' object='libvirt_la-xenrbac_libvirt.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_la_CFLAGS) $(CFLAGS) -c -o libvirt_la-xenrbac_libvirt.lo `test -f 'xenrbac_libvirt.c' || echo '$(srcdir)/'`xenrbac_libvirt.c + libvirt_la-xend_internal.lo: xend_internal.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_la_CFLAGS) $(CFLAGS) -MT libvirt_la-xend_internal.lo -MD -MP -MF $(DEPDIR)/libvirt_la-xend_internal.Tpo -c -o libvirt_la-xend_internal.lo `test -f 'xend_internal.c' || echo '$(srcdir)/'`xend_internal.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libvirt_la-xend_internal.Tpo $(DEPDIR)/libvirt_la-xend_internal.Plo @@ -1181,7 +1193,7 @@ # target to ease building test programs # tst: tst.c - $(CC) $(CFLAGS) $(INCLUDES) -I../include -o tst tst.c .libs/libvirt.a $(LIBXML_LIBS) $(VIRSH_LIBS) $(GNUTLS_LIBS) $(LIBS) + $(CC) $(CFLAGS) $(INCLUDES) -I../include -o tst tst.c .libs/libvirt.a $(LIBXML_LIBS) $(VIRSH_LIBS) $(GNUTLS_LIBS) $(LIBS) $(LIBXENRBAC) cov: clean-cov $(COVERAGE_FILES) diff -r d5dbadfb6161 -r 62d2ebb8d23b src/libvirt.c --- a/src/libvirt.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/libvirt.c Tue Jan 27 03:13:46 2009 +0900 @@ -40,6 +40,9 @@ #ifdef WITH_OPENVZ #include "openvz_driver.h" #endif +#ifdef RBAC +#include "xenrbac_libvirt.h" +#endif /* * TODO: @@ -481,6 +484,11 @@ if (libVer == NULL) return (-1); + +#ifdef RBAC + if(xenRBACdomain( XR_VERSION, NULL, NULL) == -1) + return (-1); +#endif *libVer = LIBVIR_VERSION_NUMBER; if (typeVer != NULL) { @@ -815,6 +823,10 @@ return NULL; } +#ifdef RBAC + if(xenRBACdomain( XR_HOSTNAME, NULL, conn) == -1) + return NULL; +#endif if (conn->driver->getHostname) return conn->driver->getHostname (conn); @@ -849,6 +861,10 @@ return NULL; } +#ifdef RBAC + if(xenRBACdomain( XR_HYPERVISER_URI, NULL, conn) == -1) + return NULL; +#endif /* Drivers may override getURI, but if they don't then * we provide a default implementation. */ @@ -917,6 +933,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_LIST_VM, NULL, conn) == -1) + return (-1); +#endif if (conn->driver->listDomains) return conn->driver->listDomains (conn, ids, maxids); @@ -1006,6 +1026,10 @@ return (NULL); } +#ifdef RBAC + if(xenRBACxml(XR_CREATE_VM, xmlDesc, conn) == -1) + return (NULL); +#endif if (conn->driver->domainCreateLinux) return conn->driver->domainCreateLinux (conn, xmlDesc, flags); @@ -1189,6 +1213,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_DESTROY_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainDestroy) return conn->driver->domainDestroy (domain); @@ -1248,6 +1276,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_PAUSE_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainSuspend) return conn->driver->domainSuspend (domain); @@ -1282,6 +1314,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_PAUSE_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainResume) return conn->driver->domainResume (domain); @@ -1322,6 +1358,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_SAVE_VM, NULL, conn) == -1) + return (-1); +#endif /* * We must absolutize the file path as the save is done out of process * TODO: check for URI when libxml2 is linked in. @@ -1377,6 +1417,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_SAVE_VM, NULL, conn) == -1) + return (-1); +#endif /* * We must absolutize the file path as the restore is done out of process * TODO: check for URI when libxml2 is linked in. @@ -1436,6 +1480,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_DUMP_VM, domain->name, conn) == -1) + return (-1); +#endif /* * We must absolutize the file path as the save is done out of process * TODO: check for URI when libxml2 is linked in. @@ -1493,6 +1541,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_SHUTDOWN_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainShutdown) return conn->driver->domainShutdown (domain); @@ -1528,6 +1580,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_REBOOT_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainReboot) return conn->driver->domainReboot (domain, flags); @@ -1661,6 +1717,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_LIST_VM, domain->name, conn) == -1) + return (NULL); +#endif if (conn->driver->domainGetOSType) return conn->driver->domainGetOSType (domain); @@ -1734,6 +1794,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_SET_MEM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainSetMaxMemory) return conn->driver->domainSetMaxMemory (domain, memory); @@ -1778,6 +1842,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_SET_MEM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainSetMemory) return conn->driver->domainSetMemory (domain, memory); @@ -1926,6 +1994,11 @@ return NULL; } conn = domain->conn; /* Source connection. */ + +#ifdef RBAC + if(xenRBACdomain( XR_MIGRATE_VM, domain->name, conn) == -1) + return NULL; +#endif if (!VIR_IS_CONNECT (dconn)) { virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__); return NULL; @@ -2150,6 +2223,10 @@ return 0; } +#ifdef RBAC + if(xenRBACdomain( XR_AVAILABLE_MEM, NULL, conn) == -1) + return 0; +#endif if (conn->driver->getFreeMemory) return conn->driver->getFreeMemory (conn); @@ -2179,6 +2256,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_GET_SCHEDULER, domain->name, conn) == -1) + return NULL; +#endif if (conn->driver->domainGetSchedulerType){ schedtype = conn->driver->domainGetSchedulerType (domain, nparams); return schedtype; @@ -2216,6 +2297,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_GET_SCHEDULER, domain->name, conn) == -1) + return -1; +#endif if (conn->driver->domainGetSchedulerParameters) return conn->driver->domainGetSchedulerParameters (domain, params, nparams); @@ -2248,6 +2333,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_SET_SCHEDULER, domain->name, conn) == -1) + return -1; +#endif if (conn->driver->domainSetSchedulerParameters) return conn->driver->domainSetSchedulerParameters (domain, params, nparams); @@ -2297,6 +2386,10 @@ } conn = dom->conn; +#ifdef RBAC + if(xenRBACdomain( XR_LOAD_VM, dom->name, conn) == -1) + return -1; +#endif if (conn->driver->domainBlockStats) { if (conn->driver->domainBlockStats (dom, path, &stats2) == -1) return -1; @@ -2349,6 +2442,10 @@ } conn = dom->conn; +#ifdef RBAC + if(xenRBACdomain( XR_LOAD_VM, dom->name, conn) == -1) + return -1; +#endif if (conn->driver->domainInterfaceStats) { if (conn->driver->domainInterfaceStats (dom, path, &stats2) == -1) return -1; @@ -2396,6 +2493,10 @@ return (NULL); } +#ifdef RBAC + if(xenRBACxml(XR_DEFINE_VM, xml, conn) == -1) + return (NULL); +#endif if (conn->driver->domainDefineXML) return conn->driver->domainDefineXML (conn, xml); @@ -2426,6 +2527,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_UNDEFINE_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainUndefine) return conn->driver->domainUndefine (domain); @@ -2483,6 +2588,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_LIST_VM, NULL, conn) == -1) + return (-1); +#endif if (conn->driver->listDefinedDomains) return conn->driver->listDefinedDomains (conn, names, maxnames); @@ -2518,6 +2627,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_START_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainCreate) return conn->driver->domainCreate (domain); @@ -2585,6 +2698,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_AUTOSTART_VM, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainSetAutostart) return conn->driver->domainSetAutostart (domain, autostart); @@ -2630,6 +2747,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_SET_VCPU, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainSetVcpus) return conn->driver->domainSetVcpus (domain, nvcpus); @@ -2682,6 +2803,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_SET_VCPU, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainPinVcpu) return conn->driver->domainPinVcpu (domain, vcpu, cpumap, maplen); @@ -2736,6 +2861,10 @@ conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_GET_VCPU, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainGetVcpus) return conn->driver->domainGetVcpus (domain, info, maxinfo, cpumaps, maplen); @@ -2802,6 +2931,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_ATTACH_DEVICE, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainAttachDevice) return conn->driver->domainAttachDevice (domain, xml); @@ -2834,6 +2967,10 @@ } conn = domain->conn; +#ifdef RBAC + if(xenRBACdomain( XR_DETACH_DEVICE, domain->name, conn) == -1) + return (-1); +#endif if (conn->driver->domainDetachDevice) return conn->driver->domainDetachDevice (domain, xml); @@ -2876,6 +3013,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_AVAILABLE_MEM, NULL, conn) == -1) + return (-1); +#endif if (conn->driver->nodeGetCellsFreeMemory) return conn->driver->nodeGetCellsFreeMemory (conn, freeMems, startCell, maxCells); @@ -2959,6 +3100,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_LIST_VNET, NULL, conn) == -1) + return (-1); +#endif if (conn->networkDriver && conn->networkDriver->listNetworks) return conn->networkDriver->listNetworks (conn, names, maxnames); @@ -3017,6 +3162,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_LIST_VNET, NULL, conn) == -1) + return (-1); +#endif if (conn->networkDriver && conn->networkDriver->listDefinedNetworks) return conn->networkDriver->listDefinedNetworks (conn, names, maxnames); @@ -3166,6 +3315,10 @@ return (NULL); } +#ifdef RBAC + if(xenRBACdomain( XR_CREATE_VNET, NULL, conn) == -1) + return (NULL); +#endif if (conn->networkDriver && conn->networkDriver->networkCreateXML) return conn->networkDriver->networkCreateXML (conn, xmlDesc); @@ -3200,6 +3353,10 @@ return (NULL); } +#ifdef RBAC + if(xenRBACdomain( XR_DEFINE_VNET, NULL, conn) == -1) + return (NULL); +#endif if (conn->networkDriver && conn->networkDriver->networkDefineXML) return conn->networkDriver->networkDefineXML (conn, xml); @@ -3230,6 +3387,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_DEFINE_VNET, NULL, conn) == -1) + return (-1); +#endif if (conn->networkDriver && conn->networkDriver->networkUndefine) return conn->networkDriver->networkUndefine (network); @@ -3266,6 +3427,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_CREATE_VNET, NULL, conn) == -1) + return (-1); +#endif if (conn->networkDriver && conn->networkDriver->networkCreate) return conn->networkDriver->networkCreate (network); @@ -3302,6 +3467,10 @@ return (-1); } +#ifdef RBAC + if(xenRBACdomain( XR_DESTROY_VNET, NULL, conn) == -1) + return (-1); +#endif if (conn->networkDriver && conn->networkDriver->networkDestroy) return conn->networkDriver->networkDestroy (network); @@ -3441,6 +3610,10 @@ conn = network->conn; +#ifdef RBAC + if(xenRBACdomain( XR_DETAIL_VNET, NULL, conn) == -1) + return (NULL); +#endif if (conn->networkDriver && conn->networkDriver->networkDumpXML) return conn->networkDriver->networkDumpXML (network, flags); @@ -3538,6 +3711,10 @@ conn = network->conn; +#ifdef RBAC + if(xenRBACdomain( XR_AUTOSTART_VNET, NULL, conn) == -1) + return (-1); +#endif if (conn->networkDriver && conn->networkDriver->networkSetAutostart) return conn->networkDriver->networkSetAutostart (network, autostart); @@ -3545,6 +3722,340 @@ return -1; } +#ifdef RBAC +/** + * virDomainGetXMLDesc_XRBAC: + * @op_id: a access ID + * @domain: a domain object + * @flags: an OR'ed set of virDomainXMLFlags + * + * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. + * the caller must free() the returned value. + */ +char * +virDomainGetXMLDesc_XRBAC(int op_id, virDomainPtr domain, int flags) +{ + /* parameter Check */ + if( domain == NULL ) { + virLibConnError( domain->conn, VIR_ERR_INTERNAL_ERROR, "domain name"); + return NULL; + } + if( (domain->name == NULL) || (strlen(domain->name) == 0) ){ + virLibConnError( domain->conn, VIR_ERR_INTERNAL_ERROR, "domain name"); + return NULL; + } + + if(xenRBACdomain( op_id, domain->name, domain->conn) == -1) + return NULL; + + return virDomainGetXMLDesc(domain, flags); +} + +/** + * virConnectListNetworks_QEMUD: + * @conn: pointer to the hypervisor connection + * @names: array to collect the list of names of active networks + * @maxnames: size of @names + * + * Collect the list of active networks, and store their names in @names + * + * Returns the number of networks found or -1 in case of error + */ +int +virConnectListNetworks_QEMUD(virConnectPtr conn, char **const names, int maxnames) +{ + DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + + if ((names == NULL) || (maxnames < 0)) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->listNetworks) + return conn->networkDriver->listNetworks (conn, names, maxnames); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -1; +} + +/** + * virConnectListDefinedNetworks_QEMUD: + * @conn: pointer to the hypervisor connection + * @names: pointer to an array to store the names + * @maxnames: size of the array + * + * list the inactive networks, stores the pointers to the names in @names + * + * Returns the number of names provided in the array or -1 in case of error + */ +int +virConnectListDefinedNetworks_QEMUD(virConnectPtr conn, char **const names, + int maxnames) +{ + DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + + if ((names == NULL) || (maxnames < 0)) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->listDefinedNetworks) + return conn->networkDriver->listDefinedNetworks (conn, + names, maxnames); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -1; +} + +/** + * virNetworkCreateXML_QEMUD: + * @conn: pointer to the hypervisor connection + * @xmlDesc: an XML description of the network + * + * Create and start a new virtual network, based on an XML description + * similar to the one returned by virNetworkGetXMLDesc() + * + * Returns a new network object or NULL in case of failure + */ +virNetworkPtr +virNetworkCreateXML_QEMUD(virConnectPtr conn, const char *xmlDesc) +{ + DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (xmlDesc == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (NULL); + } + + if (conn->networkDriver && conn->networkDriver->networkCreateXML) + return conn->networkDriver->networkCreateXML (conn, xmlDesc); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return NULL; +} + +/** + * virNetworkDefineXML_QEMUD: + * @conn: pointer to the hypervisor connection + * @xml: the XML description for the network, preferably in UTF-8 + * + * Define a network, but does not create it + * + * Returns NULL in case of error, a pointer to the network otherwise + */ +virNetworkPtr +virNetworkDefineXML_QEMUD(virConnectPtr conn, const char *xml) +{ + DEBUG("conn=%p, xml=%s", conn, xml); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (NULL); + } + if (xml == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + if (conn->networkDriver && conn->networkDriver->networkDefineXML) + return conn->networkDriver->networkDefineXML (conn, xml); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return NULL; +} + +/** + * virNetworkUndefine_QEMUD: + * @network: pointer to a defined network + * + * Undefine a network but does not stop it if it is running + * + * Returns 0 in case of success, -1 in case of error + */ +int +virNetworkUndefine_QEMUD(virNetworkPtr network) { + virConnectPtr conn; + DEBUG("network=%p", network); + + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->networkUndefine) + return conn->networkDriver->networkUndefine (network); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -1; +} + +/** + * virNetworkCreate_QEMUD: + * @network: pointer to a defined network + * + * Create and start a defined network. If the call succeed the network + * moves from the defined to the running networks pools. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virNetworkCreate_QEMUD(virNetworkPtr network) +{ + virConnectPtr conn; + DEBUG("network=%p", network); + + if (network == NULL) { + TODO + return (-1); + } + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->networkCreate) + return conn->networkDriver->networkCreate (network); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -1; +} + +/** + * virNetworkDestroy_QEMUD: + * @network: a network object + * + * Destroy the network object. The running instance is shutdown if not down + * already and all resources used by it are given back to the hypervisor. + * The data structure is freed and should not be used thereafter if the + * call does not return an error. + * This function may requires priviledged access + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virNetworkDestroy_QEMUD(virNetworkPtr network) +{ + virConnectPtr conn; + DEBUG("network=%p", network); + + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + + if (conn->networkDriver && conn->networkDriver->networkDestroy) + return conn->networkDriver->networkDestroy (network); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -1; +} + +/** + * virNetworkGetXMLDesc_QEMUD: + * @network: a network object + * @flags: and OR'ed set of extraction flags, not used yet + * + * Provide an XML description of the network. The description may be reused + * later to relaunch the network with virNetworkCreateXML(). + * + * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. + * the caller must free() the returned value. + */ +char * +virNetworkGetXMLDesc_QEMUD(virNetworkPtr network, int flags) +{ + virConnectPtr conn; + DEBUG("network=%p, flags=%d", network, flags); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (NULL); + } + if (flags != 0) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + conn = network->conn; + + if (conn->networkDriver && conn->networkDriver->networkDumpXML) + return conn->networkDriver->networkDumpXML (network, flags); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return NULL; +} + +/** + * virNetworkSetAutostart_QEMUD: + * @network: a network object + * @autostart: whether the network should be automatically started 0 or 1 + * + * Configure the network to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkSetAutostart_QEMUD(virNetworkPtr network, + int autostart) +{ + virConnectPtr conn; + DEBUG("network=%p, autostart=%d", network, autostart); + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(NULL, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + + conn = network->conn; + + if (conn->networkDriver && conn->networkDriver->networkSetAutostart) + return conn->networkDriver->networkSetAutostart (network, autostart); + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + return -1; +} +#endif + + /* * vim: set tabstop=4: * vim: set shiftwidth=4: diff -r d5dbadfb6161 -r 62d2ebb8d23b src/libvirt_sym.version --- a/src/libvirt_sym.version Wed Apr 02 13:13:06 2008 +0900 +++ b/src/libvirt_sym.version Tue Jan 27 03:13:46 2009 +0900 @@ -28,6 +28,7 @@ virDomainGetName; virDomainGetOSType; virDomainGetXMLDesc; + virDomainGetXMLDesc_XRBAC; virDomainLookupByID; virDomainLookupByName; virDomainLookupByUUID; @@ -99,6 +100,15 @@ virNetworkGetBridgeName; virNetworkGetAutostart; virNetworkSetAutostart; + virConnectListNetworks_QEMUD; + virConnectListDefinedNetworks_QEMUD; + virNetworkCreateXML_QEMUD; + virNetworkDefineXML_QEMUD; + virNetworkUndefine_QEMUD; + virNetworkCreate_QEMUD; + virNetworkDestroy_QEMUD; + virNetworkGetXMLDesc_QEMUD; + virNetworkSetAutostart_QEMUD; /* Symbols with __ are private only for use by the libvirtd daemon. diff -r d5dbadfb6161 -r 62d2ebb8d23b src/proxy_internal.c --- a/src/proxy_internal.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/proxy_internal.c Tue Jan 27 03:13:46 2009 +0900 @@ -42,6 +42,9 @@ static unsigned long xenProxyDomainGetMaxMemory(virDomainPtr domain); static int xenProxyDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info); static char *xenProxyDomainGetOSType(virDomainPtr domain); +#ifdef RBAC +static char *xenProxyGetSchedulerType(virDomainPtr domain, int *nparams); +#endif struct xenUnifiedDriver xenProxyDriver = { xenProxyOpen, /* open */ @@ -80,7 +83,11 @@ NULL, /* domainDetachDevice */ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ +#ifdef RBAC + xenProxyGetSchedulerType, /* domainGetInfo */ +#else NULL, /* domainGetSchedulerType */ +#endif NULL, /* domainGetSchedulerParameters */ NULL, /* domainSetSchedulerParameters */ }; @@ -533,9 +540,11 @@ int ret; int fd; xenUnifiedPrivatePtr priv; - + +#ifndef RBAC if (!(flags & VIR_CONNECT_RO)) return(-1); +#endif priv = (xenUnifiedPrivatePtr) conn->privateData; priv->proxy = -1; @@ -1113,6 +1122,54 @@ return(ostype); } +#ifdef RBAC +static char * +xenProxyGetSchedulerType(virDomainPtr domain, int *nparams) +{ + virProxyPacket req; + virProxyFullPacket ans; + int ret, type_len; + char *sched_type; + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + if (domain == NULL) + virProxyError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + else + virProxyError(domain->conn, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return NULL; + } + if (domain->id < 0) + return NULL; + + memset(&req, 0, sizeof(req)); + req.command = VIR_PROXY_GET_SCHEDTYPE; + req.len = sizeof(req); + ret = xenProxyCommand(domain->conn, &req, &ans, 0); + if (ret < 0) { + xenProxyClose(domain->conn); + return NULL; + } + if (ans.data.arg == -1) + return NULL; + if (ans.len <= sizeof(virProxyPacket)) { + virProxyError(domain->conn, VIR_ERR_OPERATION_FAILED, __FUNCTION__); + return NULL; + } + + type_len = ans.len - sizeof (virProxyPacket) - sizeof(int); + sched_type = malloc (type_len + 1); + if (!sched_type) { + virProxyError (domain->conn, VIR_ERR_NO_MEMORY, __FUNCTION__); + return NULL; + } + + *nparams = ans.extra.arg[0]; + memmove (sched_type, &ans.extra.str[4], type_len); + sched_type[type_len] = '\0'; + + return sched_type; +} +#endif #endif /* WITH_XEN */ /* diff -r d5dbadfb6161 -r 62d2ebb8d23b src/proxy_internal.h --- a/src/proxy_internal.h Wed Apr 02 13:13:06 2008 +0900 +++ b/src/proxy_internal.h Tue Jan 27 03:13:46 2009 +0900 @@ -37,7 +37,12 @@ VIR_PROXY_DOMAIN_INFO = 9, VIR_PROXY_DOMAIN_XML = 10, VIR_PROXY_DOMAIN_OSTYPE = 11, +#ifdef RBAC + VIR_PROXY_GET_CAPABILITIES = 12, + VIR_PROXY_GET_SCHEDTYPE = 13 +#else VIR_PROXY_GET_CAPABILITIES = 12 +#endif } virProxyCommand; /* diff -r d5dbadfb6161 -r 62d2ebb8d23b src/remote_internal.c --- a/src/remote_internal.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/remote_internal.c Tue Jan 27 03:13:46 2009 +0900 @@ -677,7 +677,7 @@ cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET); cmd_argv[j++] = 0; assert (j == nr_args); - for (j = 0; j < nr_args; j++) + for (j = 0; j < (nr_args-1); j++) if (cmd_argv[j] == NULL) { error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM)); goto failed; diff -r d5dbadfb6161 -r 62d2ebb8d23b src/virsh.c --- a/src/virsh.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/virsh.c Tue Jan 27 03:13:46 2009 +0900 @@ -49,6 +49,10 @@ #include "internal.h" #include "console.h" +#ifdef RBAC +#include "xenrbac_libvirt.h" +#endif + static char *progname; #ifndef TRUE @@ -1066,12 +1070,13 @@ if (!(dom = vshCommandOptDomainBy(ctl, cmd, "name", NULL, VSH_BYNAME))) return FALSE; +#ifndef RBAC if (virDomainGetID(dom) != (unsigned int)-1) { vshError(ctl, FALSE, _("Domain is already active")); virDomainFree(dom); return FALSE; } - +#endif if (virDomainCreate(dom) == 0) { vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); @@ -1549,6 +1554,25 @@ if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) return FALSE; +#ifdef RBAC + if ((str = virDomainGetOSType(dom))) { + id = virDomainGetID(dom); + if (id == ((unsigned int)-1)) + vshPrint(ctl, "%-15s %s\n", _("Id:"), "-"); + else + vshPrint(ctl, "%-15s %d\n", _("Id:"), id); + vshPrint(ctl, "%-15s %s\n", _("Name:"), virDomainGetName(dom)); + + if (virDomainGetUUIDString(dom, &uuid[0])==0) + vshPrint(ctl, "%-15s %s\n", _("UUID:"), uuid); + + vshPrint(ctl, "%-15s %s\n", _("OS Type:"), str); + free(str); + } else { + virDomainFree(dom); + return FALSE; + } +#else id = virDomainGetID(dom); if (id == ((unsigned int)-1)) vshPrint(ctl, "%-15s %s\n", _("Id:"), "-"); @@ -1563,6 +1587,7 @@ vshPrint(ctl, "%-15s %s\n", _("OS Type:"), str); free(str); } +#endif if (virDomainGetInfo(dom, &info) == 0) { vshPrint(ctl, "%-15s %s\n", _("State:"), @@ -2116,7 +2141,11 @@ if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) return FALSE; +#ifdef RBAC + dump = virDomainGetXMLDesc_XRBAC(XR_DETAIL_VM, dom, 0); +#else dump = virDomainGetXMLDesc(dom, 0); +#endif if (dump != NULL) { printf("%s", dump); free(dump); @@ -2555,7 +2584,6 @@ } if (maxactive) { activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); - if ((maxactive = virConnectListNetworks(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, FALSE, _("Failed to list active networks")); @@ -2576,7 +2604,6 @@ } if (maxinactive) { inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); - if ((maxinactive = virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, FALSE, _("Failed to list inactive networks")); if (activeNames) @@ -2824,6 +2851,13 @@ return FALSE; } +#ifdef RBAC + ret = virGetVersion(&libVersion, hvType, &apiVersion); + if (ret < 0) { + vshError(ctl, FALSE, _("failed to get the library version")); + return FALSE; + } + includeVersion = LIBVIR_VERSION_NUMBER; major = includeVersion / 1000000; includeVersion %= 1000000; @@ -2831,12 +2865,22 @@ rel = includeVersion % 1000; vshPrint(ctl, _("Compiled against library: libvir %d.%d.%d\n"), major, minor, rel); +#else + includeVersion = LIBVIR_VERSION_NUMBER; + major = includeVersion / 1000000; + includeVersion %= 1000000; + minor = includeVersion / 1000; + rel = includeVersion % 1000; + vshPrint(ctl, _("Compiled against library: libvir %d.%d.%d\n"), + major, minor, rel); ret = virGetVersion(&libVersion, hvType, &apiVersion); if (ret < 0) { vshError(ctl, FALSE, _("failed to get the library version")); return FALSE; } +#endif + major = libVersion / 1000000; libVersion %= 1000000; minor = libVersion / 1000; @@ -2961,7 +3005,11 @@ if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) return FALSE; +#ifdef RBAC + doc = virDomainGetXMLDesc_XRBAC(XR_DETAIL_VM, dom, 0); +#else doc = virDomainGetXMLDesc(dom, 0); +#endif if (!doc) goto cleanup; @@ -3038,7 +3086,11 @@ if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", NULL))) return FALSE; +#ifdef RBAC + doc = virDomainGetXMLDesc_XRBAC(XR_DETAIL_VM, dom, 0); +#else doc = virDomainGetXMLDesc(dom, 0); +#endif if (!doc) goto cleanup; @@ -4532,12 +4584,15 @@ /* set up the library error handler */ virSetErrorFunc(NULL, virshErrorHandler); +#ifdef RBAC +#else #ifndef __MINGW32__ /* Force a non-root, Xen connection to readonly */ if ((ctl->name == NULL || !strcasecmp(ctl->name, "xen")) && ctl->uid != 0) ctl->readonly = 1; #endif +#endif /* RBAC */ ctl->conn = virConnectOpenAuth(ctl->name, virConnectAuthPtrDefault, diff -r d5dbadfb6161 -r 62d2ebb8d23b src/virterror.c --- a/src/virterror.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/virterror.c Tue Jan 27 03:13:46 2009 +0900 @@ -300,6 +300,11 @@ case VIR_FROM_STATS_LINUX: dom = "Linux Stats "; break; +#ifdef RBAC + case VIR_FROM_XENRBAC: + dom = "Xen RBAC "; + break; +#endif } if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) { @@ -679,6 +684,14 @@ else errmsg = _("authentication failed: %s"); break; +#ifdef RBAC + case VIR_ERR_PERMISSION: + if (info == NULL) + errmsg = _("operation not permitted"); + else + errmsg = _("operation not permitted: %s"); + break; +#endif } return (errmsg); } diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xen_internal.c --- a/src/xen_internal.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/xen_internal.c Tue Jan 27 03:13:46 2009 +0900 @@ -741,7 +741,6 @@ errmsg, info, NULL, value, 0, errmsg, info, value); } -#ifndef PROXY /** * virXenErrorFunc: @@ -779,7 +778,6 @@ } } -#endif /* PROXY */ /** * virXenPerror: @@ -1069,7 +1067,6 @@ } -#ifndef PROXY /** * xenHypervisorGetSchedulerType: * @domain: pointer to the Xen Hypervisor block @@ -1082,19 +1079,35 @@ char * xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) { + if ((domain == NULL) || (domain->conn == NULL)) { + virXenErrorFunc(NULL, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "domain is NULL", 0); + return NULL; + } + if (domain->id < 0) { + virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "domain->id invalid", 0); + return NULL; + } + return(xenHypervisorGetSchedType(domain->conn, nparams)); +} + +char * +xenHypervisorGetSchedType(virConnectPtr conn, int *nparams) +{ char *schedulertype = NULL; xenUnifiedPrivatePtr priv; - if ((domain == NULL) || (domain->conn == NULL)) { + if (conn == NULL) { virXenErrorFunc(NULL, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "domain or conn is NULL", 0); + "conn is NULL", 0); return NULL; } - priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->handle < 0 || domain->id < 0) { - virXenErrorFunc(domain->conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, - "priv->handle or domain->id invalid", 0); + priv = (xenUnifiedPrivatePtr) conn->privateData; + if (priv->handle < 0) { + virXenErrorFunc(conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, + "priv->handle invalid", 0); return NULL; } @@ -1104,8 +1117,8 @@ * TODO: check on Xen 3.0.3 */ if (dom_interface_version < 5) { - virXenErrorFunc(domain->conn, VIR_ERR_NO_XEN, __FUNCTION__, - "unsupported in dom interface < 5", 0); + virXenErrorFunc(conn, VIR_ERR_NO_XEN, __FUNCTION__, + "unsupported in dom interface < 5", 0); return NULL; } @@ -1138,6 +1151,7 @@ return schedulertype; } +#ifndef PROXY static const char *str_weight = "weight"; static const char *str_cap = "cap"; diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xen_internal.h --- a/src/xen_internal.h Wed Apr 02 13:13:06 2008 +0900 +++ b/src/xen_internal.h Tue Jan 27 03:13:46 2009 +0900 @@ -76,8 +76,10 @@ int maplen); int xenHypervisorGetVcpuMax (virDomainPtr domain); -char * xenHypervisorGetSchedulerType (virDomainPtr domain, - int *nparams); +char * xenHypervisorGetSchedulerType (virDomainPtr domain, + int *nparams); +char * xenHypervisorGetSchedType (virConnectPtr conn, + int *nparams); int xenHypervisorGetSchedulerParameters (virDomainPtr domain, virSchedParameterPtr params, diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xen_unified.c --- a/src/xen_unified.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/xen_unified.c Tue Jan 27 03:13:46 2009 +0900 @@ -40,6 +40,9 @@ #include "xm_internal.h" #include "xml.h" +#ifdef RBAC +#include <xen/xen.h> +#endif static int xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info); static int @@ -266,6 +269,11 @@ priv->xendConfigVersion > 2) continue; +#ifdef RBAC + /* Ignore proxy for non-root */ + if (i == XEN_UNIFIED_HYPERVISOR_OFFSET && getuid() != 0) + continue; +#endif /* Ignore proxy for root */ if (i == XEN_UNIFIED_PROXY_OFFSET && getuid() == 0) continue; @@ -282,10 +290,15 @@ #endif } +#ifdef RBAC + if (!priv->opened[i] && + (!(conn->flags & VIR_CONNECT_RO) || getuid() == 0 || i == XEN_UNIFIED_PROXY_OFFSET)) { +#else /* If as root, then all drivers must succeed. If non-root, then only proxy must succeed */ if (!priv->opened[i] && (getuid() == 0 || i == XEN_UNIFIED_PROXY_OFFSET)) { +#endif for (j = 0; j < i; ++j) if (priv->opened[j]) drivers[j]->close (conn); free (priv); @@ -381,6 +394,9 @@ static int xenUnifiedGetMaxVcpus (virConnectPtr conn, const char *type) { +#ifdef RBAC + return MAX_VIRT_CPUS; +#else GET_PRIVATE(conn); if (type && STRCASENEQ (type, "Xen")) { @@ -394,6 +410,7 @@ xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } +#endif } static int @@ -889,6 +906,9 @@ static int xenUnifiedDomainGetMaxVcpus (virDomainPtr dom) { +#ifdef RBAC + return MAX_VIRT_CPUS; +#else GET_PRIVATE(dom->conn); int i, ret; @@ -899,6 +919,7 @@ } return -1; +#endif } static char * diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xend_internal.c --- a/src/xend_internal.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/xend_internal.c Tue Jan 27 03:13:46 2009 +0900 @@ -62,6 +62,12 @@ static int xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename, int flags); #endif /* PROXY */ +#ifdef RBAC +static int xenDaemonGetSchedulerParameters(virDomainPtr domain, + virSchedParameterPtr params, int *nparams); +static int xenDaemonSetSchedulerParameters(virDomainPtr domain, + virSchedParameterPtr params, int nparams); +#endif /* RBAC */ #ifndef PROXY struct xenUnifiedDriver xenDaemonDriver = { @@ -102,8 +108,13 @@ NULL, /* domainGetAutostart */ NULL, /* domainSetAutostart */ NULL, /* domainGetSchedulerType */ +#ifdef RBAC + xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */ + xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */ +#else NULL, /* domainGetSchedulerParameters */ NULL, /* domainSetSchedulerParameters */ +#endif }; /** @@ -235,7 +246,11 @@ * is rather normal, this should fallback to the proxy (or * remote) mechanism. */ +#ifdef RBAC + if (getuid() == 0) { +#else if ((getuid() == 0) || (xend->flags & VIR_CONNECT_RO)) { +#endif virXendError(xend, VIR_ERR_INTERNAL_ERROR, "failed to connect to xend"); } @@ -3591,6 +3606,109 @@ return(ret); } + +#ifdef RBAC +static const char *str_weight = "weight"; +static const char *str_cap = "cap"; + +static int +xenDaemonGetSchedulerParameters(virDomainPtr domain, + virSchedParameterPtr params, int *nparams) +{ + xenUnifiedPrivatePtr priv; + struct sexpr *root; + int weight, cap; + + if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { + virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, + __FUNCTION__); + return (-1); + } + + priv = (xenUnifiedPrivatePtr) domain->conn->privateData; + if (domain->id < 0 && priv->xendConfigVersion < 3) + return (-1); + + root = sexpr_get(domain->conn, "/xend/domain/%d?detail=1", domain->id); + if (root == NULL) + return (-1); + + weight = sexpr_int(root, "domain/cpu_weight"); + cap = sexpr_int(root, "domain/cpu_cap"); + + strncpy (params[0].field, str_weight, VIR_DOMAIN_SCHED_FIELD_LENGTH); + params[0].type = VIR_DOMAIN_SCHED_FIELD_INT; + params[0].value.i = weight; + + strncpy (params[1].field, str_cap, VIR_DOMAIN_SCHED_FIELD_LENGTH); + params[1].type = VIR_DOMAIN_SCHED_FIELD_INT; + params[1].value.i = cap; + + return (0); +} + +static int +xenDaemonSetSchedulerParameters(virDomainPtr domain, + virSchedParameterPtr params, int nparams) +{ + int i; + int weight_set = 0; + int cap_set = 0; + char buf_weight[VIR_UUID_BUFLEN]; + char buf_cap[VIR_UUID_BUFLEN]; + xenUnifiedPrivatePtr priv; + int weight, cap; + struct sexpr *root; + + if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL) + || (nparams == 0) || (params == NULL)) { + virXendError((domain ? domain->conn : NULL), VIR_ERR_INVALID_ARG, + __FUNCTION__); + return (-1); + } + + priv = (xenUnifiedPrivatePtr) domain->conn->privateData; + + if (domain->id < 0 && priv->xendConfigVersion < 3) + return(-1); + + /* search specified parameter */ + 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), "%d", params[i].value.ui); + weight_set = 1; + } else if (STREQ (params[i].field, str_cap) && + params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { + snprintf(buf_cap, sizeof(buf_cap), "%d", params[i].value.ui); + cap_set = 1; + } else { + virXendError((domain ? domain->conn : NULL), + VIR_ERR_INVALID_ARG, __FUNCTION__); + return(-1); + } + } + + /* get the current setting from xend */ + root = sexpr_get(domain->conn, "/xend/domain/%d?detail=1", domain->id); + weight = sexpr_int(root, "domain/cpu_weight"); + cap = sexpr_int(root, "domain/cpu_cap"); + + + /* if not specified parameter, set the current value */ + if (weight_set != 1) + snprintf(buf_weight, sizeof(buf_weight), "%d", weight); + if (cap_set != 1) + snprintf(buf_cap, sizeof(buf_weight), "%d", cap); + + /* xend operation */ + return(xend_op(domain->conn, domain->name, "op", "domain_sched_credit_set", + "weight", buf_weight, "cap", buf_cap, NULL)); +} +#endif /* RBAC */ + #endif /* ! PROXY */ #endif /* WITH_XEN */ diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xenrbac.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xenrbac.h Tue Jan 27 03:13:46 2009 +0900 @@ -0,0 +1,39 @@ +/* + Copyright (C) 2008 Fujitsu Limited. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ + +#ifndef __XENRBAC_H__ +#define __XENRBAC_H__ + +#include <errno.h> + +int xr_judge(char *username, int opeid, char *domainname, int flag_all); + +#define XR_ANY 0 +#define XR_ALL 1 + +#define XR_ACCEPT 0 +#define XR_DENY EPERM + +#endif /*__XENRBAC_H__*/ +/* + * Local variables: + * c-indent-level: 8 + * c-basic-offset: 8 + * End: + */ diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xenrbac_libvirt.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xenrbac_libvirt.c Tue Jan 27 03:13:46 2009 +0900 @@ -0,0 +1,162 @@ +/* + * xr_internal.c: access to Xen RBAC + * + * Copyright (C) 2008 FUJITSU Limited. + * + * See COPYING.LIB for the License of this software + * + */ + +#include "libvirt/libvirt.h" +#include "libvirt/virterror.h" +#include "internal.h" + +#include <stdio.h> +#include <errno.h> +#include <sys/types.h> +#include <pwd.h> +#include <unistd.h> + +#include <libxml/parser.h> +#include <libxml/xpath.h> +#include <libxml/uri.h> + +#include "xenrbac_libvirt.h" +#include "xenrbac.h" + + +/** + * xenRBACError: + * @error: the error number + * @info: extra information string + * + * Handle an error at the connection level + */ +static void +xenRBACError(virConnectPtr conn, virErrorNumber error, const char *info) +{ + const char *errmsg; + + if (error == VIR_ERR_OK) + return; + + errmsg = __virErrorMsg(error, info); + __virRaiseError(conn, NULL, NULL, VIR_FROM_XENRBAC, error, VIR_ERR_ERROR, + errmsg, info, NULL, 0, 0, errmsg, info); +} + +int +xenRBACdomain(int op_id, char *domname, virConnectPtr conn) +{ + struct passwd *pw = NULL; + int ret=0; + char msg_buff[256]; + + memset((char *)msg_buff, (char)NULL, 256); + + /* parameter Check */ + if( op_id <= 0 ) { + snprintf(msg_buff, 256, "unknown access ID ID = %d", op_id); + xenRBACError( conn, VIR_ERR_INTERNAL_ERROR, msg_buff); + return -1; + } + + if( (domname != NULL) && (strlen(domname) == 0) ){ + xenRBACError( conn, VIR_ERR_INTERNAL_ERROR, "domain name"); + return -1; + } + /* Get username */ + if( !(pw = getpwuid( getuid())) ){ + if(errno == 0) + xenRBACError( conn, VIR_ERR_SYSTEM_ERROR, NULL); + else + xenRBACError( conn, VIR_ERR_SYSTEM_ERROR, strerror(errno)); + return -1; + } + + ret = xr_judge( pw->pw_name, op_id, domname, XR_ANY); + if ( ret != 0 ){ + switch(ret) { + case EPERM: + xenRBACError( conn, VIR_ERR_PERMISSION, NULL); + return -1; + + case EINVAL: + xenRBACError( conn, VIR_ERR_INTERNAL_ERROR, NULL); + return -1; + + case ENOMEM: + xenRBACError( conn, VIR_ERR_NO_MEMORY, NULL); + return -1; + + case ENOENT: + case EACCES: + xenRBACError( conn, VIR_ERR_OPEN_FAILED, NULL); + return -1; + + default: + xenRBACError( conn, VIR_ERR_INTERNAL_ERROR, NULL); + return -1; + + } //switch_end + } + + return 0; +} + +int +xenRBACxml( int op_id, const char *xmlDesc, virConnectPtr conn) +{ + + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + int ret = 0; + + /* parameter Check */ + if( xmlDesc == NULL ){ + xenRBACError( conn, VIR_ERR_INTERNAL_ERROR, "xmlDesc"); + return -1; + } + + xml = xmlReadDoc((const xmlChar *) xmlDesc, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xml) { + xenRBACError( conn, VIR_ERR_XML_ERROR, NULL); + ret = -1; + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (!ctxt) { + xenRBACError( conn, VIR_ERR_XML_ERROR, NULL); + ret = -1; + goto cleanup; + } + + obj = xmlXPathEval(BAD_CAST "string(/domain/name)" , ctxt); + if (!obj) { + xenRBACError( conn, VIR_ERR_XML_ERROR, NULL); + ret = -1; + goto cleanup; + } + if ( (obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0) ) { + ret = xenRBACdomain( op_id, (char *)obj->stringval, conn); + } else { + xenRBACError( conn, VIR_ERR_XML_ERROR, NULL); + ret = -1; + goto cleanup; + } + + cleanup: + if (obj) + xmlXPathFreeObject(obj); + if (ctxt) + xmlXPathFreeContext(ctxt); + if (xml) + xmlFreeDoc(xml); + + return ret; +} + diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xenrbac_libvirt.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xenrbac_libvirt.h Tue Jan 27 03:13:46 2009 +0900 @@ -0,0 +1,68 @@ +/* + * xenrbac_libvirt.h: internal API for access to Xen RBAC + * + * Copyright (C) 2008 FUJITSU Limited. + * + * See COPYING.LIB for the License of this software + * + */ + + +#ifndef __VIR_XR_JUDGE_H__ +#define __VIR_XR_JUDGE_H__ + +int xenRBACdomain(int op_id, char *domainname, virConnectPtr conn); +int xenRBACxml(int op_id, const char *xmlDesc, virConnectPtr conn); + +#ifdef RBAC +/* ACCESS LIST */ +#define XR_CREATE_VM 1 +#define XR_START_VM 2 +#define XR_DESTROY_VM 3 +#define XR_SHUTDOWN_VM 4 +#define XR_PAUSE_VM 5 +#define XR_SUSPEND_VM 6 +#define XR_SAVE_VM 7 +#define XR_DEFINE_VM 8 +#define XR_MIGRATE_VM 9 +#define XR_REBOOT_VM 10 +#define XR_DUMP_VM 11 +#define XR_RENAME_VM 12 +#define XR_SYSREQ_VM 13 +#define XR_AUTOSTART_VM 14 +#define XR_UNDEFINE_VM 15 /* Step2 2008.8.13 */ +#define XR_LIST_VM 16 +#define XR_DETAIL_VM 17 +#define XR_LOAD_VM 18 +#define XR_UPTIME_VM 19 +#define XR_XEND_LOG 20 +#define XR_XEND_MSG 21 +#define XR_HOSTNAME 22 +#define XR_AVAILABLE_MEM 23 + +#define XR_SET_VCPU 30 +#define XR_GET_VCPU 31 +#define XR_SET_SCHEDULER 32 +#define XR_GET_SCHEDULER 33 +#define XR_SET_MEM 34 +#define XR_ATTACH_DEVICE 35 /* Step2 2008.8.13 */ +#define XR_LIST_VBD 36 +#define XR_LIST_VNIF 37 +#define XR_LIST_VTPM 38 +#define XR_CREATE_VNET 40 +#define XR_LIST_VNET 41 +#define XR_DETAIL_VNET 42 +#define XR_AUTOSTART_VNET 43 +#define XR_DEFINE_VNET 44 +#define XR_DETACH_DEVICE 45 /* Step2 2008.8.13 */ +#define XR_CHANGE_DEVICE 46 /* Step2 2008.8.13 */ +#define XR_DESTROY_VNET 47 /* Step2 2008.8.13 */ + +#define XR_HYPERVISER_URI 61 +#define XR_VERSION 62 +#define XR_SEND_TRIGGER 63 +#define XR_SEND_DEBUG_KEY 64 +#endif + +#endif /* __VIR_XR_JUDGE_H__ */ + diff -r d5dbadfb6161 -r 62d2ebb8d23b src/xs_internal.c --- a/src/xs_internal.c Wed Apr 02 13:13:06 2008 +0900 +++ b/src/xs_internal.c Tue Jan 27 03:13:46 2009 +0900 @@ -336,7 +336,11 @@ #ifdef PROXY priv->xshandle = xs_daemon_open_readonly(); #else +#ifdef RBAC + if ((getuid != 0) || (flags & VIR_CONNECT_RO)) +#else if (flags & VIR_CONNECT_RO) +#endif priv->xshandle = xs_daemon_open_readonly(); else priv->xshandle = xs_daemon_open(); @@ -348,7 +352,11 @@ * is rather normal, this should fallback to the proxy (or * remote) mechanism. */ +#ifdef RBAC + if (!(flags & VIR_CONNECT_RO)) { +#else if (getuid() == 0) { +#endif virXenStoreError(NULL, VIR_ERR_NO_XEN, _("failed to connect to Xen Store")); } diff -r d5dbadfb6161 -r 62d2ebb8d23b tests/Makefile.in --- a/tests/Makefile.in Wed Apr 02 13:13:06 2008 +0900 +++ b/tests/Makefile.in Tue Jan 27 03:13:46 2009 +0900 @@ -387,6 +387,7 @@ LIBXML_CFLAGS = @LIBXML_CFLAGS@ LIBXML_LIBS = @LIBXML_LIBS@ LN_S = @LN_S@ +LIBXENRBAC = -lxenrbac LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -693,37 +694,37 @@ done conftest$(EXEEXT): $(conftest_OBJECTS) $(conftest_DEPENDENCIES) @rm -f conftest$(EXEEXT) - $(LINK) $(conftest_OBJECTS) $(conftest_LDADD) $(LIBS) + $(LINK) $(conftest_OBJECTS) $(conftest_LDADD) $(LIBS) $(LIBXENRBAC) nodeinfotest$(EXEEXT): $(nodeinfotest_OBJECTS) $(nodeinfotest_DEPENDENCIES) @rm -f nodeinfotest$(EXEEXT) - $(LINK) $(nodeinfotest_OBJECTS) $(nodeinfotest_LDADD) $(LIBS) + $(LINK) $(nodeinfotest_OBJECTS) $(nodeinfotest_LDADD) $(LIBS) $(LIBXENRBAC) qemuxml2argvtest$(EXEEXT): $(qemuxml2argvtest_OBJECTS) $(qemuxml2argvtest_DEPENDENCIES) @rm -f qemuxml2argvtest$(EXEEXT) - $(LINK) $(qemuxml2argvtest_OBJECTS) $(qemuxml2argvtest_LDADD) $(LIBS) + $(LINK) $(qemuxml2argvtest_OBJECTS) $(qemuxml2argvtest_LDADD) $(LIBS) $(LIBXENRBAC) qemuxml2xmltest$(EXEEXT): $(qemuxml2xmltest_OBJECTS) $(qemuxml2xmltest_DEPENDENCIES) @rm -f qemuxml2xmltest$(EXEEXT) - $(LINK) $(qemuxml2xmltest_OBJECTS) $(qemuxml2xmltest_LDADD) $(LIBS) + $(LINK) $(qemuxml2xmltest_OBJECTS) $(qemuxml2xmltest_LDADD) $(LIBS) $(LIBXENRBAC) reconnect$(EXEEXT): $(reconnect_OBJECTS) $(reconnect_DEPENDENCIES) @rm -f reconnect$(EXEEXT) - $(LINK) $(reconnect_OBJECTS) $(reconnect_LDADD) $(LIBS) + $(LINK) $(reconnect_OBJECTS) $(reconnect_LDADD) $(LIBS) $(LIBXENRBAC) sexpr2xmltest$(EXEEXT): $(sexpr2xmltest_OBJECTS) $(sexpr2xmltest_DEPENDENCIES) @rm -f sexpr2xmltest$(EXEEXT) - $(LINK) $(sexpr2xmltest_OBJECTS) $(sexpr2xmltest_LDADD) $(LIBS) + $(LINK) $(sexpr2xmltest_OBJECTS) $(sexpr2xmltest_LDADD) $(LIBS) $(LIBXENRBAC) virshtest$(EXEEXT): $(virshtest_OBJECTS) $(virshtest_DEPENDENCIES) @rm -f virshtest$(EXEEXT) - $(LINK) $(virshtest_OBJECTS) $(virshtest_LDADD) $(LIBS) + $(LINK) $(virshtest_OBJECTS) $(virshtest_LDADD) $(LIBS) $(LIBXENRBAC) xencapstest$(EXEEXT): $(xencapstest_OBJECTS) $(xencapstest_DEPENDENCIES) @rm -f xencapstest$(EXEEXT) - $(LINK) $(xencapstest_OBJECTS) $(xencapstest_LDADD) $(LIBS) + $(LINK) $(xencapstest_OBJECTS) $(xencapstest_LDADD) $(LIBS) $(LIBXENRBAC) xmconfigtest$(EXEEXT): $(xmconfigtest_OBJECTS) $(xmconfigtest_DEPENDENCIES) @rm -f xmconfigtest$(EXEEXT) - $(LINK) $(xmconfigtest_OBJECTS) $(xmconfigtest_LDADD) $(LIBS) + $(LINK) $(xmconfigtest_OBJECTS) $(xmconfigtest_LDADD) $(LIBS) $(LIBXENRBAC) xml2sexprtest$(EXEEXT): $(xml2sexprtest_OBJECTS) $(xml2sexprtest_DEPENDENCIES) @rm -f xml2sexprtest$(EXEEXT) - $(LINK) $(xml2sexprtest_OBJECTS) $(xml2sexprtest_LDADD) $(LIBS) + $(LINK) $(xml2sexprtest_OBJECTS) $(xml2sexprtest_LDADD) $(LIBS) $(LIBXENRBAC) xmlrpctest$(EXEEXT): $(xmlrpctest_OBJECTS) $(xmlrpctest_DEPENDENCIES) @rm -f xmlrpctest$(EXEEXT) - $(LINK) $(xmlrpctest_OBJECTS) $(xmlrpctest_LDADD) $(LIBS) + $(LINK) $(xmlrpctest_OBJECTS) $(xmlrpctest_LDADD) $(LIBS) $(LIBXENRBAC) mostlyclean-compile: -rm -f *.$(OBJEXT)

1 0

[libvirt] docs/examples/*.res
by John Levon 24 Jan '09

24 Jan '09

What are these files supposed to be? Dan V's 2105:ed8c8b0ec3c5 changeset backed out my change: install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \ - $(srcdir)/*.xsl $(DESTDIR)$(HTML_DIR) + $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) They don't exist in the repository, so $(srcdir) can't be right, but nor can I see any rules to generate them in the objdir... regards john

2 3

[libvirt] [PATCH] xend driver: handle new-format sched-credit options
by john.levon＠sun.com 23 Jan '09

23 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232675291 28800 # Node ID ad7f82da983cc0ba07f7f4e94a2f23a4edc3be57 # Parent 3ef027308b88b47b2f3ca721bf88f2e606d8e3bc xend driver: handle new-format sched-credit options Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4634,9 +4634,15 @@ xenDaemonSetSchedulerParameters(virDomai 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_weight) && + params[i].type == VIR_DOMAIN_SCHED_FIELD_LLONG) { + snprintf(buf_weight, sizeof(buf_weight), "%lld", params[i].value.l); } 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 if (STREQ (params[i].field, str_cap) && + params[i].type == VIR_DOMAIN_SCHED_FIELD_LLONG) { + snprintf(buf_cap, sizeof(buf_cap), "%lld", params[i].value.l); } else { virXendError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error;

3 2

[libvirt] FYI, .*ignore and gnulib updates
by Jim Meyering 23 Jan '09

23 Jan '09

I'll push these shortly: The updates to .m4 files from gnulib are required to avoid new warnings (about a subtle problem) from the very latest version of autoconf, built from yesterday's upstream sources. >From fe911bb6a39f88dd25dce5edea1f9e03d156cd86 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 23 Jan 2009 11:14:17 +0100 Subject: [PATCH 1/2] correct and tighten up .*ignore files * .cvsignore: Don't ignore *.orig or *.rej. They're not build products. Don't ignore the entire m4 directory. * Makefile.maint (sync-vcs-ignore-files): Correct quoting. Use sed rather than a for loop. Search only version-controled files (for reproducibility) * gnulib/lib/netinet/.cvsignore: Append missing newline-at-EOF, so that the use of sed doesn't mistakenly concatenate lines. * gnulib/lib/sys/.cvsignore: Likewise. * m4/.cvsignore: Ignore acinclude.m4 and aclocal.m4, not *.m4. * .hgignore: Regenerate. * all .gitignore files: Regenerate. --- .cvsignore | 3 - .gitignore | 3 - .hgignore | 485 ++++++++++++++++++++--------------------- Makefile.maint | 12 +- gnulib/lib/.cvsignore | 12 +- gnulib/lib/.gitignore | 12 +- gnulib/lib/netinet/.cvsignore | 2 +- gnulib/lib/netinet/.gitignore | 2 +- gnulib/lib/sys/.cvsignore | 2 +- gnulib/lib/sys/.gitignore | 2 +- m4/.cvsignore | 3 +- m4/.gitignore | 3 +- 12 files changed, 267 insertions(+), 274 deletions(-) diff --git a/.cvsignore b/.cvsignore index ecb8bf0..1b36694 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1,5 @@ *.a *.o -*.orig -*.rej *~ .git ABOUT-NLS @@ -27,7 +25,6 @@ libvirt.pc libvirt.spec ltconfig ltmain.sh -m4 mingw32-libvirt.spec mkinstalldirs results.log diff --git a/.gitignore b/.gitignore index ecb8bf0..1b36694 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ *.a *.o -*.orig -*.rej *~ .git ABOUT-NLS @@ -27,7 +25,6 @@ libvirt.pc libvirt.spec ltconfig ltmain.sh -m4 mingw32-libvirt.spec mkinstalldirs results.log diff --git a/.hgignore b/.hgignore index 728e7e7..5fe04cd 100644 --- a/.hgignore +++ b/.hgignore @@ -1,245 +1,242 @@ syntax: glob -./proxy/Makefile -./proxy/Makefile.in -./proxy/.deps -./proxy/.libs -./proxy/libvirt_proxy -./build-aux/compile -./build-aux/config.guess -./build-aux/config.rpath -./build-aux/config.sub -./build-aux/depcomp -./build-aux/install-sh -./build-aux/ltmain.sh -./build-aux/missing -./build-aux/mkinstalldirs -./build-aux/mktempd -./qemud/*.gcda -./qemud/*.gcno -./qemud/*.la -./qemud/*.lo -./qemud/.deps -./qemud/.libs -./qemud/Makefile -./qemud/Makefile.in -./qemud/libvirt_qemud -./qemud/libvirtd -./qemud/libvirtd.init -./qemud/libvirtd.logrotate -./m4/acinclude.m4 -./m4/aclocal.m4 -./m4/Makefile -./m4/Makefile.in -./docs/devhelp/Makefile -./docs/devhelp/Makefile.in -./docs/devhelp/libvirt.devhelp -./docs/examples/.memdump -./docs/examples/Makefile.in -./docs/examples/Makefile -./docs/examples/.deps -./docs/examples/.libs -./docs/examples/info1 -./docs/examples/suspend -./docs/examples/python/Makefile -./docs/examples/python/Makefile.in -./docs/Makefile -./docs/Makefile.in -./docs/.memdump -./docs/apibuild.pyc -./po/stamp-po -./po/remove-potcdate.sin -./po/quot.sed -./po/insert-header.sin -./po/*.gmo -./po/en(a)quot.header -./po/en(a)boldquot.header -./po/boldquot.sed -./po/Rules-quot -./po/POTFILES -./po/Makevars.template -./po/Makefile.in.in -./po/Makefile.in -./po/Makefile -./po/remove-potcdate.sed -./gnulib/lib/arpa/inet.h -./gnulib/lib/sys/select.h -./gnulib/lib/sys/socket.h -./gnulib/lib/sys/stat.h -./gnulib/lib/sys/time.h -./gnulib/lib/alloca.h -./gnulib/lib/arpa_inet.h -./gnulib/lib/.deps -./gnulib/lib/errno.h -./gnulib/lib/float.h -./gnulib/lib/*.la -./gnulib/lib/.libs -./gnulib/lib/*.lo -./gnulib/lib/Makefile -./gnulib/lib/Makefile.in -./gnulib/lib/netdb.h -./gnulib/lib/netinet_in.h -./gnulib/lib/poll.h -./gnulib/lib/stdbool.h -./gnulib/lib/stdint.h -./gnulib/lib/stdio.h -./gnulib/lib/stdlib.h -./gnulib/lib/string.h -./gnulib/lib/sys_ioctl.h -./gnulib/lib/sys_select.h -./gnulib/lib/sys_socket.h -./gnulib/lib/sys_stat.h -./gnulib/lib/sys_time.h -./gnulib/lib/time.h -./gnulib/lib/unistd.h -./gnulib/lib/wchar.h -./gnulib/lib/netinet/in.h -./gnulib/tests/.deps -./gnulib/tests/.libs -./gnulib/tests/Makefile -./gnulib/tests/Makefile.in -./gnulib/tests/sys -./gnulib/tests/test-EOVERFLOW -./gnulib/tests/test-alloca-opt -./gnulib/tests/test-arpa_inet -./gnulib/tests/test-c-ctype -./gnulib/tests/test-errno -./gnulib/tests/test-fseeko -./gnulib/tests/test-getaddrinfo -./gnulib/tests/test-getdelim -./gnulib/tests/test-gethostname -./gnulib/tests/test-getline -./gnulib/tests/test-gettimeofday -./gnulib/tests/test-lseek -./gnulib/tests/test-lstat -./gnulib/tests/test-netdb -./gnulib/tests/test-netinet_in -./gnulib/tests/test-perror -./gnulib/tests/test-poll -./gnulib/tests/test-random_r -./gnulib/tests/test-snprintf -./gnulib/tests/test-sockets -./gnulib/tests/test-stdbool -./gnulib/tests/test-stdint -./gnulib/tests/test-stdio -./gnulib/tests/test-stdlib -./gnulib/tests/test-strerror -./gnulib/tests/test-string -./gnulib/tests/test-sys_select -./gnulib/tests/test-sys_socket -./gnulib/tests/test-sys_stat -./gnulib/tests/test-sys_time -./gnulib/tests/test-unistd -./gnulib/tests/test-vasnprintf -./gnulib/tests/test-vasprintf -./gnulib/tests/test-wchar -./gnulib/tests/test-time -./examples/domain-events/events-c/Makefile -./examples/domain-events/events-c/Makefile.in -./examples/domain-events/events-c/*.exe -./examples/domain-events/events-c/.deps -./examples/domain-events/events-c/.libs -./examples/domain-events/events-c/event-test -./src/Makefile -./src/Makefile.in -./src/.deps -./src/.libs -./src/*.lo -./src/*.loT -./src/*.la -./src/virsh -./src/*.exe -./src/*.gcda -./src/*.gcno -./src/*.gcov -./src/*.cov -./src/libvirt_parthelper -./src/libvirt_lxc -./src/virsh-net-edit.c -./src/virsh-pool-edit.c -./src/libvirt.syms -./*.a -./*.o -./ChangeLog.orig -./ChangeLog.rej -./*~ -./.git -./ABOUT-NLS -./COPYING -./INSTALL -./Makefile -./Makefile.in -./aclocal.m4 -./autom4te.cache -./config.cache -./config.guess -./config.h -./config.h.in -./config.log -./config.rpath -./config.status -./config.sub -./configure -./coverage -./libtool -./libvirt-*.tar.gz -./libvirt.pc -./libvirt.spec -./ltconfig -./ltmain.sh -./m4 -./mingw32-libvirt.spec -./mkinstalldirs -./results.log -./stamp-h -./stamp-h.in -./stamp-h1 -./update.log -./python/Makefile -./python/Makefile.in -./python/.deps -./python/.libs -./python/*.lo -./python/*.la -./python/*.loT -./python/libvirt.py -./python/libvirt-export.c -./python/libvirtclass.txt -./python/libvirt-py.[ch] -./python/libvirtclass.py -./python/gen_prog -./python/*.pyc -./python/tests/Makefile -./python/tests/Makefile.in -./tests/xml2sexprdata/Makefile -./tests/xml2sexprdata/Makefile.in -./tests/sexpr2xmldata/Makefile -./tests/sexpr2xmldata/Makefile.in -./tests/confdata/Makefile -./tests/confdata/Makefile.in -./tests/xmconfigdata/Makefile -./tests/xmconfigdata/Makefile.in -./tests/Makefile -./tests/Makefile.in -./tests/.deps -./tests/.libs -./tests/sexpr2xmltest -./tests/xml2sexprtest -./tests/virshtest -./tests/conftest -./tests/reconnect -./tests/xmconfigtest -./tests/xencapstest -./tests/qemuxml2xmltest -./tests/qemuxml2argvtest -./tests/nodeinfotest -./tests/statstest -./tests/qparamtest -./tests/*.gcda -./tests/*.gcno -./tests/*.exe -./tests/xencapsdata/Makefile -./tests/xencapsdata/Makefile.in -./include/libvirt/Makefile -./include/libvirt/Makefile.in -./include/Makefile -./include/Makefile.in +*.a +*.o +*~ +.git +ABOUT-NLS +COPYING +INSTALL +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +build-aux/compile +build-aux/config.guess +build-aux/config.rpath +build-aux/config.sub +build-aux/depcomp +build-aux/install-sh +build-aux/ltmain.sh +build-aux/missing +build-aux/mkinstalldirs +build-aux/mktempd +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.status +config.sub +configure +coverage +docs/.memdump +docs/Makefile +docs/Makefile.in +docs/apibuild.pyc +docs/devhelp/Makefile +docs/devhelp/Makefile.in +docs/devhelp/libvirt.devhelp +docs/examples/.deps +docs/examples/.libs +docs/examples/.memdump +docs/examples/Makefile +docs/examples/Makefile.in +docs/examples/info1 +docs/examples/python/Makefile +docs/examples/python/Makefile.in +docs/examples/suspend +examples/domain-events/events-c/*.exe +examples/domain-events/events-c/.deps +examples/domain-events/events-c/.libs +examples/domain-events/events-c/Makefile +examples/domain-events/events-c/Makefile.in +examples/domain-events/events-c/event-test +gnulib/lib/*.la +gnulib/lib/*.lo +gnulib/lib/.deps +gnulib/lib/.libs +gnulib/lib/Makefile +gnulib/lib/Makefile.in +gnulib/lib/alloca.h +gnulib/lib/arpa/inet.h +gnulib/lib/arpa_inet.h +gnulib/lib/errno.h +gnulib/lib/float.h +gnulib/lib/netdb.h +gnulib/lib/netinet/in.h +gnulib/lib/netinet_in.h +gnulib/lib/poll.h +gnulib/lib/stdbool.h +gnulib/lib/stdint.h +gnulib/lib/stdio.h +gnulib/lib/stdlib.h +gnulib/lib/string.h +gnulib/lib/sys/select.h +gnulib/lib/sys/socket.h +gnulib/lib/sys/stat.h +gnulib/lib/sys/time.h +gnulib/lib/sys_ioctl.h +gnulib/lib/sys_select.h +gnulib/lib/sys_socket.h +gnulib/lib/sys_stat.h +gnulib/lib/sys_time.h +gnulib/lib/time.h +gnulib/lib/unistd.h +gnulib/lib/wchar.h +gnulib/tests/.deps +gnulib/tests/.libs +gnulib/tests/Makefile +gnulib/tests/Makefile.in +gnulib/tests/sys +gnulib/tests/test-EOVERFLOW +gnulib/tests/test-alloca-opt +gnulib/tests/test-arpa_inet +gnulib/tests/test-c-ctype +gnulib/tests/test-errno +gnulib/tests/test-fseeko +gnulib/tests/test-getaddrinfo +gnulib/tests/test-getdelim +gnulib/tests/test-gethostname +gnulib/tests/test-getline +gnulib/tests/test-gettimeofday +gnulib/tests/test-lseek +gnulib/tests/test-lstat +gnulib/tests/test-netdb +gnulib/tests/test-netinet_in +gnulib/tests/test-perror +gnulib/tests/test-poll +gnulib/tests/test-random_r +gnulib/tests/test-snprintf +gnulib/tests/test-sockets +gnulib/tests/test-stdbool +gnulib/tests/test-stdint +gnulib/tests/test-stdio +gnulib/tests/test-stdlib +gnulib/tests/test-strerror +gnulib/tests/test-string +gnulib/tests/test-sys_select +gnulib/tests/test-sys_socket +gnulib/tests/test-sys_stat +gnulib/tests/test-sys_time +gnulib/tests/test-time +gnulib/tests/test-unistd +gnulib/tests/test-vasnprintf +gnulib/tests/test-vasprintf +gnulib/tests/test-wchar +include/Makefile +include/Makefile.in +include/libvirt/Makefile +include/libvirt/Makefile.in +libtool +libvirt-*.tar.gz +libvirt.pc +libvirt.spec +ltconfig +ltmain.sh +m4/Makefile +m4/Makefile.in +m4/acinclude.m4 +m4/aclocal.m4 +mingw32-libvirt.spec +mkinstalldirs +po/*.gmo +po/Makefile +po/Makefile.in +po/Makefile.in.in +po/Makevars.template +po/POTFILES +po/Rules-quot +po/boldquot.sed +po/en(a)boldquot.header +po/en(a)quot.header +po/insert-header.sin +po/quot.sed +po/remove-potcdate.sed +po/remove-potcdate.sin +po/stamp-po +proxy/.deps +proxy/.libs +proxy/Makefile +proxy/Makefile.in +proxy/libvirt_proxy +python/*.la +python/*.lo +python/*.loT +python/*.pyc +python/.deps +python/.libs +python/Makefile +python/Makefile.in +python/gen_prog +python/libvirt-export.c +python/libvirt-py.[ch] +python/libvirt.py +python/libvirtclass.py +python/libvirtclass.txt +python/tests/Makefile +python/tests/Makefile.in +qemud/*.gcda +qemud/*.gcno +qemud/*.la +qemud/*.lo +qemud/.deps +qemud/.libs +qemud/Makefile +qemud/Makefile.in +qemud/libvirt_qemud +qemud/libvirtd +qemud/libvirtd.init +qemud/libvirtd.logrotate +results.log +src/*.cov +src/*.exe +src/*.gcda +src/*.gcno +src/*.gcov +src/*.la +src/*.lo +src/*.loT +src/.deps +src/.libs +src/Makefile +src/Makefile.in +src/libvirt.syms +src/libvirt_lxc +src/libvirt_parthelper +src/virsh +src/virsh-net-edit.c +src/virsh-pool-edit.c +stamp-h +stamp-h.in +stamp-h1 +tests/*.exe +tests/*.gcda +tests/*.gcno +tests/.deps +tests/.libs +tests/Makefile +tests/Makefile.in +tests/confdata/Makefile +tests/confdata/Makefile.in +tests/conftest +tests/nodeinfotest +tests/qemuxml2argvtest +tests/qemuxml2xmltest +tests/qparamtest +tests/reconnect +tests/sexpr2xmldata/Makefile +tests/sexpr2xmldata/Makefile.in +tests/sexpr2xmltest +tests/statstest +tests/virshtest +tests/xencapsdata/Makefile +tests/xencapsdata/Makefile.in +tests/xencapstest +tests/xmconfigdata/Makefile +tests/xmconfigdata/Makefile.in +tests/xmconfigtest +tests/xml2sexprdata/Makefile +tests/xml2sexprdata/Makefile.in +tests/xml2sexprtest +update.log diff --git a/Makefile.maint b/Makefile.maint index 43675f6..84309cf 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -718,9 +718,9 @@ sync-vcs-ignore-files: perl $(c2g) rm -f $(c2g) echo "syntax: glob" > .hgignore - for ignore in `find $(srcdir) -name .gitignore`; do \ - dir=`dirname $$ignore`; \ - for rule in `cat $$ignore`; do \ - echo "$$dir/$$rule" >> .hgignore; \ - done ; \ - done + ( for ignore in $$($(VC_LIST) \ + | grep -E '(^|/)\.gitignore$$'); do \ + dir=$$(dirname "$$ignore"); \ + test "$$dir" = . && pfx= || pfx=$$dir/; \ + sed "s!^!$$pfx!" "$$ignore"; \ + done ) | sort -u >> .hgignore diff --git a/gnulib/lib/.cvsignore b/gnulib/lib/.cvsignore index ba817ae..9d6b35f 100644 --- a/gnulib/lib/.cvsignore +++ b/gnulib/lib/.cvsignore @@ -1,13 +1,13 @@ -alloca.h -arpa_inet.h -.deps -errno.h -float.h *.la -.libs *.lo +.deps +.libs Makefile Makefile.in +alloca.h +arpa_inet.h +errno.h +float.h netdb.h netinet_in.h poll.h diff --git a/gnulib/lib/.gitignore b/gnulib/lib/.gitignore index ba817ae..9d6b35f 100644 --- a/gnulib/lib/.gitignore +++ b/gnulib/lib/.gitignore @@ -1,13 +1,13 @@ -alloca.h -arpa_inet.h -.deps -errno.h -float.h *.la -.libs *.lo +.deps +.libs Makefile Makefile.in +alloca.h +arpa_inet.h +errno.h +float.h netdb.h netinet_in.h poll.h diff --git a/gnulib/lib/netinet/.cvsignore b/gnulib/lib/netinet/.cvsignore index 95f1a2e..00fea9e 100644 --- a/gnulib/lib/netinet/.cvsignore +++ b/gnulib/lib/netinet/.cvsignore @@ -1 +1 @@ -in.h \ No newline at end of file +in.h diff --git a/gnulib/lib/netinet/.gitignore b/gnulib/lib/netinet/.gitignore index 95f1a2e..00fea9e 100644 --- a/gnulib/lib/netinet/.gitignore +++ b/gnulib/lib/netinet/.gitignore @@ -1 +1 @@ -in.h \ No newline at end of file +in.h diff --git a/gnulib/lib/sys/.cvsignore b/gnulib/lib/sys/.cvsignore index f6e392f..62c8ffb 100644 --- a/gnulib/lib/sys/.cvsignore +++ b/gnulib/lib/sys/.cvsignore @@ -1,4 +1,4 @@ select.h socket.h stat.h -time.h \ No newline at end of file +time.h diff --git a/gnulib/lib/sys/.gitignore b/gnulib/lib/sys/.gitignore index f6e392f..62c8ffb 100644 --- a/gnulib/lib/sys/.gitignore +++ b/gnulib/lib/sys/.gitignore @@ -1,4 +1,4 @@ select.h socket.h stat.h -time.h \ No newline at end of file +time.h diff --git a/m4/.cvsignore b/m4/.cvsignore index 0063d7a..09797f0 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -1,3 +1,4 @@ -*.m4 Makefile Makefile.in +acinclude.m4 +aclocal.m4 diff --git a/m4/.gitignore b/m4/.gitignore index 0063d7a..09797f0 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1,3 +1,4 @@ -*.m4 Makefile Makefile.in +acinclude.m4 +aclocal.m4 -- 1.6.1.399.g0d272 >From e718a0203a74f370cca32250708e5765d6f03b8e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 23 Jan 2009 11:55:59 +0100 Subject: [PATCH 2/2] m4: update from gnulib to avoid warnings from cutting-edge autoconf * gnulib/m4/errno_h.m4 * gnulib/m4/gnulib-comp.m4 * gnulib/m4/multiarch.m4 --- gnulib/m4/errno_h.m4 | 12 +++--------- gnulib/m4/gnulib-comp.m4 | 5 ++--- gnulib/m4/multiarch.m4 | 16 ++++------------ 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/gnulib/m4/errno_h.m4 b/gnulib/m4/errno_h.m4 index 0682d1a..4d77672 100644 --- a/gnulib/m4/errno_h.m4 +++ b/gnulib/m4/errno_h.m4 @@ -1,17 +1,11 @@ -# errno_h.m4 serial 3 +# errno_h.m4 serial 4 dnl Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_ERRNO_H], -[ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_HEADER_ERRNO_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_ERRNO_H_BODY], +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [ AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [ diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index e8747d8..3879843 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -25,7 +25,6 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_LIBOBJS$])dnl a variable m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable AC_REQUIRE([AC_PROG_RANLIB]) - AC_REQUIRE([AC_GNU_SOURCE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_FUNC_FSEEKO]) ]) @@ -57,7 +56,7 @@ AC_SUBST([LTALLOCA]) AC_LIBOBJ([connect]) fi gl_SYS_SOCKET_MODULE_INDICATOR([connect]) - gl_HEADER_ERRNO_H + AC_REQUIRE([gl_HEADER_ERRNO_H]) gl_FUNC_FCLOSE gl_STDIO_MODULE_INDICATOR([fclose]) gl_FLOAT_H @@ -97,7 +96,7 @@ AC_SUBST([LTALLOCA]) gl_STDLIB_MODULE_INDICATOR([malloc-posix]) gl_FUNC_MKSTEMP gl_STDLIB_MODULE_INDICATOR([mkstemp]) - gl_MULTIARCH + AC_REQUIRE([gl_MULTIARCH]) gl_HEADER_NETDB gl_HEADER_NETINET_IN AC_PROG_MKDIR_P diff --git a/gnulib/m4/multiarch.m4 b/gnulib/m4/multiarch.m4 index 7b73e15..3948e6e 100644 --- a/gnulib/m4/multiarch.m4 +++ b/gnulib/m4/multiarch.m4 @@ -1,5 +1,5 @@ -# multiarch.m4 serial 3 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# multiarch.m4 serial 4 +dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,16 +19,8 @@ dnl with or without modifications, as long as this notice is preserved. # Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the # beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. -AC_DEFUN([gl_MULTIARCH], -[ - dnl This AC_REQUIRE is not necessary in theory. It works around a bug in - dnl autoconf <= 2.63: AC_REQUIRE invocations inside AC_REQUIREd macros are - dnl being handled better than AC_REQUIRE invocations inside normally invoked - dnl macros. - AC_REQUIRE([gl_MULTIARCH_BODY]) -]) - -AC_DEFUN([gl_MULTIARCH_BODY], +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_MULTIARCH], [ dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. gl_cv_c_multiarch=no -- 1.6.1.399.g0d272

1 0

[libvirt] [PATCH] Fix recursive lock in xenstore driver
by john.levon＠sun.com 23 Jan '09

23 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232675291 28800 # Node ID 903a29e99c80a35ce7f4754a3bcc3ab34bf32d8a # Parent b83af161640c69b1de279547b270b8acb101152e Fix recursive lock in xenstore driver The watch handlers take the driver lock, so must use an internalized version of xenStoreListDomains(). Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -565,6 +565,46 @@ xenStoreNumOfDomains(virConnectPtr conn) } /** + * xenStoreDoListDomains: + * @conn: pointer to the hypervisor connection + * @ids: array to collect the list of IDs of active domains + * @maxids: size of @ids + * + * Internal API: collect the list of active domains, and store + * their ID in @maxids. The driver lock must be held. + * + * Returns the number of domain found or -1 in case of error + */ +int +xenStoreDoListDomains(xenUnifiedPrivatePtr priv, int *ids, int maxids) +{ + char **idlist = NULL, *endptr; + unsigned int num, i; + int ret = -1; + long id; + + if (priv->xshandle == NULL) + goto out; + + idlist = xs_directory (priv->xshandle, 0, "/local/domain", &num); + if (idlist == NULL) + goto out; + + for (ret = 0, i = 0; (i < num) && (ret < maxids); i++) { + id = strtol(idlist[i], &endptr, 10); + if ((endptr == idlist[i]) || (*endptr != 0)) + goto out; + ids[ret++] = (int) id; + } + + free(idlist); + +out: + VIR_FREE (idlist); + return ret; +} + +/** * xenStoreListDomains: * @conn: pointer to the hypervisor connection * @ids: array to collect the list of IDs of active domains @@ -577,11 +617,8 @@ int int xenStoreListDomains(virConnectPtr conn, int *ids, int maxids) { - char **idlist = NULL, *endptr; - unsigned int num, i; + xenUnifiedPrivatePtr priv; int ret; - long id; - xenUnifiedPrivatePtr priv; if ((conn == NULL) || (ids == NULL)) { virXenStoreError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); @@ -591,32 +628,10 @@ xenStoreListDomains(virConnectPtr conn, priv = (xenUnifiedPrivatePtr) conn->privateData; xenUnifiedLock(priv); - if (priv->xshandle == NULL) - goto error; - - idlist = xs_directory (priv->xshandle, 0, "/local/domain", &num); - if (idlist == NULL) - goto error; - - for (ret = 0, i = 0; (i < num) && (ret < maxids); i++) { - id = strtol(idlist[i], &endptr, 10); - if ((endptr == idlist[i]) || (*endptr != 0)) { - ret = -1; - break; - } -#if 0 - if (virConnectCheckStoreID(conn, (int) id) < 0) - continue; -#endif - ids[ret++] = (int) id; - } - free(idlist); + ret = xenStoreDoListDomains(priv, ids, maxids); xenUnifiedUnlock(priv); + return(ret); - -error: - xenUnifiedUnlock(priv); - return -1; } /** @@ -1260,7 +1275,7 @@ retry: "%s", _("failed to allocate domids")); return -1; } - nread = xenStoreListDomains(conn, new_domids, new_domain_cnt); + nread = xenStoreDoListDomains(priv, new_domids, new_domain_cnt); if (nread != new_domain_cnt) { // mismatch. retry this read VIR_FREE(new_domids); @@ -1342,7 +1357,7 @@ retry: "%s", _("failed to allocate domids")); return -1; } - nread = xenStoreListDomains(conn, new_domids, new_domain_cnt); + nread = xenStoreDoListDomains(priv, new_domids, new_domain_cnt); if (nread != new_domain_cnt) { // mismatch. retry this read VIR_FREE(new_domids);

2 1

[libvirt] [PATCH] Parse ipaddr for bridge network types
by john.levon＠sun.com 22 Jan '09

22 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232562942 28800 # Node ID 14b7020610538fbaf0cd5db5e713abe5769de2af # Parent e0b0295722ecf4645983e3a9a090e0aaabc40da7 Parse ipaddr for bridge network types As well as supporting round-tripping of the IP address, this fixes a leak if ipaddr was specified in the Xen domain config. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -289,6 +289,7 @@ void virDomainNetDefFree(virDomainNetDef case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); VIR_FREE(def->data.bridge.script); + VIR_FREE(def->data.bridge.ipaddr); break; } @@ -887,7 +888,8 @@ virDomainNetDefParseXML(virConnectPtr co address = virXMLPropString(cur, "address"); port = virXMLPropString(cur, "port"); } else if ((address == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET) && + (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || + def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && (xmlStrEqual(cur->name, BAD_CAST "ip"))) { address = virXMLPropString(cur, "address"); } else if ((ifname == NULL) && @@ -953,6 +955,10 @@ virDomainNetDefParseXML(virConnectPtr co if (script != NULL) { def->data.bridge.script = script; script = NULL; + } + if (address != NULL) { + def->data.bridge.ipaddr = address; + address = NULL; } break; @@ -2889,6 +2895,9 @@ virDomainNetDefFormat(virConnectPtr conn case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.ipaddr) + virBufferVSprintf(buf, " <ip address='%s'/>\n", + def->data.bridge.ipaddr); if (def->data.bridge.script) virBufferEscapeString(buf, " <script path='%s'/>\n", def->data.bridge.script); diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -155,6 +155,7 @@ struct _virDomainNetDef { struct { char *brname; char *script; + char *ipaddr; } bridge; } data; char *ifname; diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1756,10 +1756,18 @@ xenDaemonParseSxprNets(virConnectPtr con net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && !(net->data.bridge.script = strdup(tmp2))) goto no_memory; + tmp = sexpr_node(node, "device/vif/ip"); + if (tmp && + !(net->data.bridge.ipaddr = strdup(tmp))) + goto no_memory; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; if (tmp2 && !(net->data.ethernet.script = strdup(tmp2))) + goto no_memory; + tmp = sexpr_node(node, "device/vif/ip"); + if (tmp && + !(net->data.ethernet.ipaddr = strdup(tmp))) goto no_memory; } @@ -1793,11 +1801,6 @@ xenDaemonParseSxprNets(virConnectPtr con 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 (model && !(net->model = strdup(model))) @@ -5104,6 +5107,8 @@ xenDaemonFormatSxprNet(virConnectPtr con script = def->data.bridge.script; virBufferVSprintf(buf, "(script '%s')", script); + if (def->data.bridge.ipaddr != NULL) + virBufferVSprintf(buf, "(ip '%s')", def->data.bridge.ipaddr); break; case VIR_DOMAIN_NET_TYPE_NETWORK: diff --git a/src/xm_internal.c b/src/xm_internal.c --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1071,6 +1071,9 @@ xenXMDomainConfigParse(virConnectPtr con if (script[0] && !(net->data.bridge.script = strdup(script))) goto no_memory; + if (ip[0] && + !(net->data.bridge.ipaddr = strdup(ip))) + goto no_memory; } else { if (script[0] && !(net->data.ethernet.script = strdup(script))) @@ -1832,6 +1835,8 @@ static int xenXMDomainConfigFormatNet(vi switch (net->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferVSprintf(&buf, ",bridge=%s", net->data.bridge.brname); + if (net->data.bridge.ipaddr) + virBufferVSprintf(&buf, ",ip=%s", net->data.bridge.ipaddr); break; case VIR_DOMAIN_NET_TYPE_ETHERNET: diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr new file mode 100644 --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr @@ -0,0 +1,2 @@ +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(ip '192.0.2.1'))) + diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml new file mode 100644 --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml @@ -0,0 +1,34 @@ +<domain type='xen' id='6'> + <name>pvtest</name> + <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> + <memory>430080</memory> + <currentMemory>430080</currentMemory> + <vcpu>2</vcpu> + <os> + <type>linux</type> + <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel> + <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> + <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… </cmdline> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/root/some.img'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:11:22:33:44:55'/> + <source bridge='xenbr2'/> + <ip address='192.0.2.1'/> + <script path='vif-bridge'/> + <target dev='vif6.0'/> + </interface> + <console type='pty'> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -117,6 +117,7 @@ mymain(int argc, char **argv) DO_TEST("net-routed", "net-routed", 2); DO_TEST("net-bridged", "net-bridged", 2); DO_TEST("net-e1000", "net-e1000", 2); + DO_TEST("bridge-ipaddr", "bridge-ipaddr", 3); DO_TEST("no-source-cdrom", "no-source-cdrom", 2); DO_TEST("fv-utc", "fv-utc", 1); diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr new file mode 100644 --- /dev/null +++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr @@ -0,0 +1,1 @@ +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(ip '192.0.2.1')))) \ No newline at end of file diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml new file mode 100644 --- /dev/null +++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml @@ -0,0 +1,30 @@ +<domain type='xen' id='15'> + <name>pvtest</name> + <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid> + <os> + <type>linux</type> + <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel> + <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> + <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… </cmdline> + </os> + <memory>430080</memory> + <vcpu>2</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='/root/some.img'/> + <target dev='xvda'/> + </disk> + <interface type="bridge"> + <mac address="00:11:22:33:44:55"/> + <source bridge="xenbr2"/> + <ip address="192.0.2.1"/> + <script path="vif-bridge"/> + <target dev="vif4.0"/> + </interface> + <console tty='/dev/pts/4'/> + </devices> +</domain> + diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -126,6 +126,7 @@ mymain(int argc, char **argv) DO_TEST("net-routed", "net-routed", "pvtest", 2); DO_TEST("net-bridged", "net-bridged", "pvtest", 2); DO_TEST("net-e1000", "net-e1000", "pvtest", 2); + DO_TEST("bridge-ipaddr", "bridge-ipaddr", "pvtest", 2); DO_TEST("no-source-cdrom", "no-source-cdrom", "test", 2); DO_TEST("fv-utc", "fv-utc", "fvtest", 1);

4 4

[libvirt] Probs connecting QEMU hypervisor with URL ?
by Daniel Schwager 22 Jan '09

22 Jan '09

Hi, i tried to use virt-viewer to connect to a remote machine running libvirt & kvm-qemu at FC9 - but it failed. So, I run virsh without the URL directly on FC9, it works (e.g. virsh list). If I use a connection URL, it failed. Did I miss something ? regards Danny [root@xxx03 ~]# virsh list Id Name State ---------------------------------- oot@xxx03 ~]# virsh -c qemu+tls://localhost list libvir: Remote error : Certificate's owner does not match the hostname (localhost) libvir: Remote error : unable to connect to 'localhost': Invalid argument error: failed to connect to the hypervisor [root@xxx03 ~]# virsh -c qemu+tls://xxx03.domainname.com list libvir: error : could not connect to qemu:// error: failed to connect to the hypervisor *** Port is available: [root@ xxx03 ~]# netstat -nl | grep 16514 tcp 0 0 0.0.0.0:16514 0.0.0.0:* LISTEN *** Also, a ssh does not work: [root@xxx03 ~]# virsh -c qemu+ssh://xxx03.domainname.com list root(a)xxx03.domainname.com password: libvir: error : could not connect to qemu:// error: failed to connect to the hypervisor ** Connecting directly works: [root@ xxx03 ~]# virsh -c qemu:///system list Id Name State ---------------------------------- ** but not with the remote name like [root@ xxx03 ~]# virsh -c qemu://xxx03.domainname.com /system list libvir: error : could not connect to qemu://xxx03.domainname.com /system error: failed to connect to the hypervisor

2 4

[libvirt] [PATCH] Remove non-existent symbol from linker script
by john.levon＠sun.com 22 Jan '09

22 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232574142 28800 # Node ID 0a35ce4ac7e0cf83df188dea0fc37818b4c39d48 # Parent fc06d88e4140cebc9d0b7795019c0c2741c3f8a9 Remove non-existent symbol from linker script Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -205,7 +205,6 @@ virNetworkObjListFree; virNetworkObjListFree; virNetworkDefParseNode; virNetworkRemoveInactive; -virNetworkSaveConfigXML; virNetworkSaveConfig; virNetworkObjLock; virNetworkObjUnlock;

4 4

[libvirt] [PATCH] Add a rule for generating .hgignore
by john.levon＠sun.com 22 Jan '09

22 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232576262 28800 # Node ID c58822f94b2b5e87a363128a4bd36ec2846054fe # Parent c109dd0801246b82aed8d5f9b1fa4196432868d0 Add a rule for generating .hgignore Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/Makefile.maint b/Makefile.maint --- a/Makefile.maint +++ b/Makefile.maint @@ -717,3 +717,5 @@ sync-vcs-ignore-files: mv $(c2g)-t $(c2g) perl $(c2g) rm -f $(c2g) + find $(srcdir) -name .gitignore | xargs cat \ + | sort -u | sed 's+\*+.*+' >.hgignore

4 5

[libvirt] PATCH: Add RNG schemas for capabilities, storage and node device XML
by Daniel P. Berrange 22 Jan '09

22 Jan '09

We currently only have RNG schemas for the domain XML and network XML. This patch adds more RNG schemas covering the host capabilities XML, the storage pool and storage volume XML and node device XML In addition it sets up the makefile to install all these schemas into /usr/share/libvirt/schemas/, instead if just randomly stuffing them into RPM %docs section Finally, test cases and example XML files are added to check correctness of the schemas and XML a/docs/libvirt.rng | 1111 ---------- a/docs/network.rng | 69 b/docs/schemas/Makefile.am | 12 b/docs/schemas/capability.rng | 287 ++ b/docs/schemas/domain.rng | 1111 ++++++++++ b/docs/schemas/network.rng | 69 b/docs/schemas/nodedev.rng | 360 +++ b/docs/schemas/storagepool.rng | 371 +++ b/docs/schemas/storagevol.rng | 187 + b/tests/capabilityschemadata/caps-qemu-kvm.xml | 111 b/tests/capabilityschemadata/caps-test.xml | 71 b/tests/capabilityschematest | 34 b/tests/networkschematest | 33 b/tests/nodedevschemadata/DVD_GCC_4247N.xml | 17 b/tests/nodedevschemadata/computer.xml | 18 b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 11 b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 11 b/tests/nodedevschemadata/pci_1002_71c4.xml | 14 b/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml | 9 b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml | 9 b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml | 13 b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml | 9 b/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml | 14 b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml | 12 b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml | 12 b/tests/nodedevschematest | 33 b/tests/storagepoolschemadata/pool-dir.xml | 17 b/tests/storagepoolschemadata/pool-disk.xml | 22 b/tests/storagepoolschemadata/pool-fs.xml | 20 b/tests/storagepoolschemadata/pool-iscsi.xml | 10 b/tests/storagepoolschemadata/pool-logical.xml | 19 b/tests/storagepoolschemadata/pool-netfs.xml | 21 b/tests/storagepoolschematest | 33 b/tests/storagevolschemadata/vol-logical.xml | 21 b/tests/storagevolschemadata/vol-partition.xml | 21 b/tests/storagevolschemadata/vol-qcow2.xml | 28 b/tests/storagevolschematest | 33 configure.in | 1 docs/Makefile.am | 8 libvirt.spec.in | 11 mingw32-libvirt.spec.in | 9 tests/Makefile.am | 20 tests/domainschematest | 3 43 files changed, 3115 insertions(+), 1190 deletions(-) Daniel diff -r 8eb4d4028b98 configure.in --- a/configure.in Wed Jan 21 15:47:23 2009 +0000 +++ b/configure.in Wed Jan 21 16:28:43 2009 +0000 @@ -1272,6 +1272,7 @@ cp -f COPYING.LIB COPYING AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ docs/examples/python/Makefile \ + docs/schemas/Makefile \ gnulib/lib/Makefile \ gnulib/tests/Makefile \ libvirt.pc libvirt.spec mingw32-libvirt.spec \ diff -r 8eb4d4028b98 docs/Makefile.am --- a/docs/Makefile.am Wed Jan 21 15:47:23 2009 +0000 +++ b/docs/Makefile.am Wed Jan 21 16:28:43 2009 +0000 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS= . examples devhelp +SUBDIRS= schemas examples devhelp # The directory containing the source code (if it contains documentation). DOC_SOURCE_DIR=../src @@ -52,10 +52,6 @@ xml = \ testnetpriv.xml \ testnode.xml -rng = \ - libvirt.rng \ - network.rng - fig = \ libvirt-net-logical.fig \ libvirt-net-physical.fig @@ -64,7 +60,7 @@ EXTRA_DIST= \ libvirt-api.xml libvirt-refs.xml apibuild.py \ site.xsl newapi.xsl news.xsl page.xsl ChangeLog.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ - $(xml) $(rng) $(fig) $(png) \ + $(xml) $(fig) $(png) \ virsh.pod ChangeLog.awk all: web $(top_builddir)/NEWS $(man_MANS) diff -r 8eb4d4028b98 docs/libvirt.rng --- a/docs/libvirt.rng Wed Jan 21 15:47:23 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1111 +0,0 @@ -<?xml version="1.0" ?> -<grammar xmlns="http://relaxng.org/ns/structure/1.0" - datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> -  - <start> - <ref name='domain'/> - </start> - -  - <define name='domain'> - <element name="domain"> - <ref name='hvs'/> - <ref name='ids'/> - <interleave> - <ref name='os'/> - <ref name='clock'/> - <ref name='resources'/> - <ref name='features'/> - <ref name='termination'/> - <optional> - <ref name='devices'/> - </optional> - </interleave> - </element> - </define> - - <define name='hvs'> - <attribute name='type'> - <choice> - <value>xen</value> - <value>kvm</value> - <value>kqemu</value> - <value>qemu</value> - <value>lxc</value> - <value>openvz</value> - <value>test</value> - </choice> - </attribute> - </define> - - <define name='os'> - <choice> - <ref name='osxen'/> - <ref name='oshvm'/> - <ref name='osexe'/> - </choice> - </define> - - <define name='osxen'> - <choice> - <group> - <optional> - <ref name='bootloader'/> - </optional> - <element name='os'> - <ref name='ostypexen'/> - <ref name='osbootkernel'/> - </element> - </group> - <group> - <ref name='bootloader'/> - <optional> - <element name='os'> - <ref name='ostypexen'/> - <optional> - <ref name='osbootkernel'/> - </optional> - </element> - </optional> - </group> - </choice> - </define> - - - <define name='oshvm'> - <element name='os'> - <ref name='ostypehvm'/> - <interleave> - <optional> - <element name='loader'> - <ref name='absFilePath'/> - </element> - </optional> - <choice> - <ref name='osbootkernel'/> - <ref name='osbootdev'/> - </choice> - </interleave> - </element> - </define> - - - <define name='ostypexen'> - <element name='type'> - <optional> - <attribute name='arch'> - <choice> - <value>i686</value> - <value>x86_64</value> - <value>ia64</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name='machine'> - <choice> - <value>xenpv</value> - <value>xenner</value> - </choice> - </attribute> - </optional> - <choice> - <value>xen</value> - <value>linux</value> - </choice> - </element> - </define> - - <define name='ostypehvm'> - <element name='type'> - <optional> - <choice> - <ref name='hvmx86'/> - <ref name='hvmmips'/> - <ref name='hvmsparc'/> - <ref name='hvmppc'/> - </choice> - </optional> - <value>hvm</value> - </element> - </define> - - <define name='hvmx86'> - <group> - <attribute name='arch'> - <choice> - <value>i686</value> - <value>x86_64</value> - </choice> - </attribute> - <attribute name='machine'> - <choice> - <value>xenfv</value> - <value>pc</value> - <value>isapc</value> - </choice> - </attribute> - </group> - </define> - - <define name='hvmmips'> - <group> - <attribute name='arch'> - <value>mips</value> - </attribute> - <attribute name='machine'> - <value>mips</value> - </attribute> - </group> - </define> - - <define name='hvmsparc'> - <group> - <attribute name='arch'> - <value>sparc</value> - </attribute> - <attribute name='machine'> - <value>sun4m</value> - </attribute> - </group> - </define> - - <define name='hvmppc'> - <group> - <attribute name='arch'> - <value>ppc</value> - </attribute> - <attribute name='machine'> - <choice> - <value>g3bw</value> - <value>mac99</value> - <value>prep</value> - </choice> - </attribute> - </group> - </define> - - - <define name='osexe'> - <element name='os'> - <element name='type'> - <value>exe</value> - </element> - <interleave> - <optional> - <element name='init'> - <ref name='absFilePath'/> - </element> - </optional> - </interleave> - </element> - </define> - - - -  - <define name='ids'> - <optional> - <attribute name='id'> - <ref name='unsignedInt'/> - </attribute> - </optional> - <interleave> - <element name="name"> - <ref name='domainName'/> - </element> - <optional> - <element name="uuid"> - <ref name='UUID'/> - </element> - </optional> - </interleave> - </define> - -  - - <define name='resources'> - <interleave> - <element name='memory'> - <ref name='memoryKB'/> - </element> - <optional> - <element name='currentMemory'> - <ref name='memoryKB'/> - </element> - </optional> - <optional> - <element name='vcpu'> - <optional> - <attribute name='cpuset' /> - </optional> - <ref name='countCPU'/> - </element> - </optional> - </interleave> - </define> - - <define name='clock'> - <optional> - <element name='clock'> - <attribute name='offset'> - <choice> - <value>localtime</value> - <value>utc</value> - </choice> - </attribute> - <empty/> - </element> - </optional> - </define> - -  - <define name='bootloader'> - <interleave> - <element name='bootloader'> - <choice> - <ref name='absFilePath'/> - <empty/> - </choice> - </element> - <optional> - <element name='bootloader_args'> - <text/> - </element> - </optional> - </interleave> - </define> - - <define name='osbootkernel'> - <interleave> - <element name='kernel'> - <ref name='absFilePath'/> - </element> - <optional> - <element name='initrd'> - <ref name='absFilePath'/> - </element> - </optional> - <optional> - <element name='root'> - <ref name='devicePath'/> - </element> - </optional> - <optional> - <element name='cmdline'> - <text/> - </element> - </optional> - </interleave> - </define> - - <define name='osbootdev'> - <element name='boot'> - <attribute name='dev'> - <choice> - <value>hd</value> - <value>fd</value> - <value>cdrom</value> - <value>network</value> - </choice> - </attribute> - <empty/> - </element> - </define> - - - <define name='diskspec'> - <optional> - <ref name='driver'/> - </optional> - <ref name='target'/> - <optional> - <element name='readonly'> - <empty/> - </element> - </optional> - <optional> - <element name='shareable'> - <empty/> - </element> - </optional> - </define> - -  - <define name='disk'> - <element name='disk'> - <optional> - <attribute name='device'> - <choice> - <value>floppy</value> - <value>disk</value> - <value>cdrom</value> - </choice> - </attribute> - </optional> - <choice> - <group> - <attribute name='type'> - <value>file</value> - </attribute> - <interleave> - <optional> - <element name='source'> - <attribute name='file'> - <ref name='absFilePath'/> - </attribute> - <empty/> - </element> - </optional> - <ref name='diskspec'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>block</value> - </attribute> - <interleave> - <optional> - <element name='source'> - <attribute name='dev'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> - </optional> - <ref name='diskspec'/> - </interleave> - </group> - <ref name='diskspec'/> - </choice> - </element> - </define> - - <define name='target'> - <element name='target'> - <attribute name='dev'> - <ref name='deviceName'/> - </attribute> - <optional> - <attribute name='bus'> - <choice> - <value>ide</value> - <value>virtio</value> - <value>fdc</value> - <value>xen</value> - <value>usb</value> - </choice> - </attribute> - </optional> - </element> - </define> - -  - <define name='driver'> - <element name='driver'> - <attribute name='name'> - <ref name='genericName'/> - </attribute> - <optional> - <attribute name='type'> - <ref name='genericName'/> - </attribute> - </optional> - <empty/> - </element> - </define> - - <define name='filesystem'> - <element name='filesystem'> - <choice> - <group> - <attribute name='type'> - <value>file</value> - </attribute> - <interleave> - <element name='source'> - <attribute name='file'> - <ref name='absFilePath'/> - </attribute> - <empty/> - </element> - <ref name='filesystemtgt'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>block</value> - </attribute> - <interleave> - <element name='source'> - <attribute name='dev'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> - <ref name='filesystemtgt'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>mount</value> - </attribute> - <interleave> - <element name='source'> - <attribute name='dir'> - <ref name='absFilePath'/> - </attribute> - <empty/> - </element> - <ref name='filesystemtgt'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>template</value> - </attribute> - <interleave> - <element name='source'> - <attribute name='name'> - <ref name='genericName'/> - </attribute> - <empty/> - </element> - <ref name='filesystemtgt'/> - </interleave> - </group> - </choice> - </element> - </define> - - <define name='filesystemtgt'> - <element name='target'> - <attribute name='dir'> - <ref name='absDirPath'/> - </attribute> - <empty/> - </element> - </define> - -  - <define name='interface'> - <element name='interface'> - <choice> - <group> - <attribute name='type'> - <value>bridge</value> - </attribute> - <interleave> - <optional> - <element name='source'> - <attribute name='bridge'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> - </optional> - <ref name='interface-options'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>ethernet</value> - </attribute> - <interleave> - <optional> - <element name='source'> - <attribute name='dev'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> - </optional> - <ref name='interface-options'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>network</value> - </attribute> - <interleave> - <element name='source'> - <attribute name='network'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> - <ref name='interface-options'/> - </interleave> - </group> - <group> - <attribute name='type'> - <value>user</value> - </attribute> - <interleave> - <ref name='interface-options'/> - </interleave> - </group> - </choice> - </element> - </define> - -  - <define name='interface-options'> - <interleave> - <optional> - <element name='target'> - <attribute name='dev'> - <ref name='deviceName'/> - </attribute> - <empty/> - </element> - </optional> - <optional> - <element name='mac'> - <attribute name='address'> - <ref name='addrMAC'/> - </attribute> - <empty/> - </element> - </optional> - <optional> - <element name='ip'> - <attribute name='address'> - <ref name='addrIP'/> - </attribute> - <empty/> - </element> - </optional> - <optional> - <element name='script'> - <attribute name='path'> - <ref name='filePath'/> - </attribute> - <empty/> - </element> - </optional> - <optional> - <element name='model'> - <attribute name='type' /> - <empty/> - </element> - </optional> - </interleave> - </define> - -  - <define name='emulator'> - <element name='emulator'> - <ref name='absFilePath'/> - </element> - </define> - -  - <define name='graphic'> - <element name='graphics'> - <choice> - <group> - <attribute name='type'> - <value>sdl</value> - </attribute> - <optional> - <attribute name='display'> - <text/> - </attribute> - </optional> - <optional> - <attribute name='xauth'> - <text/> - </attribute> - </optional> - <optional> - <attribute name='fullscreen'> - <choice> - <value>yes</value> - <value>no</value> - </choice> - </attribute> - </optional> - </group> - <group> - <attribute name='type'> - <value>vnc</value> - </attribute> - <optional> - <attribute name='port'> - <ref name='PortNumber'/> - </attribute> - </optional> - <optional> - <attribute name='autoport'> - <choice> - <value>yes</value> - <value>no</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name='listen'> - <ref name='addrIP'/> - </attribute> - </optional> - <optional> - <attribute name='passwd'> - <text/> - </attribute> - </optional> - <optional> - <attribute name='keymap'> - <text/> - </attribute> - </optional> - </group> - </choice> - </element> - </define> - -  - <define name='termination'> - <interleave> - <optional> - <element name='on_reboot'> - <ref name='offOptions'/> - </element> - </optional> - <optional> - <element name='on_poweroff'> - <ref name='offOptions'/> - </element> - </optional> - <optional> - <element name='on_crash'> - <ref name='offOptions'/> - </element> - </optional> - </interleave> - </define> - -  - <define name='offOptions'> - <choice> - <value>destroy</value> - <value>restart</value> - <value>preserve</value> - <value>rename-restart</value> - </choice> - </define> - -  - <define name='qemucdev'> - <attribute name='type'> - <choice> - <value>dev</value> - <value>file</value> - <value>pipe</value> - <value>unix</value> - <value>tcp</value> - <value>udp</value> - <value>null</value> - <value>stdio</value> - <value>vc</value> - <value>pty</value> - </choice> - </attribute> - - <interleave> - <optional> - <oneOrMore> - <element name='source'> - <optional> - <attribute name='mode' /> - </optional> - <optional> - <attribute name='path' /> - </optional> - <optional> - <attribute name='host' /> - </optional> - <optional> - <attribute name='service' /> - </optional> - <optional> - <attribute name='wiremode' /> - </optional> - </element> - </oneOrMore> - </optional> - <optional> - <element name='protocol'> - <optional> - <attribute name='type' /> - </optional> - </element> - </optional> - <optional> - <element name='target'> - <optional> - <attribute name='port' /> - </optional> - </element> - </optional> - </interleave> - </define> - -  - <define name='console'> - <element name='console'> - <choice> - <group> - <optional> - <attribute name='tty'> - <ref name='devicePath'/> - </attribute> - </optional> - <empty/> - </group> - <ref name='qemucdev' /> - </choice> - </element> - </define> - - <define name='sound'> - <element name='sound'> - <attribute name='model'> - <choice> - <value>sb16</value> - <value>es1370</value> - <value>pcspk</value> - </choice> - </attribute> - </element> - </define> - - <define name='parallel'> - <element name='parallel'> - <ref name='qemucdev' /> - </element> - </define> - - <define name='serial'> - <element name='serial'> - <ref name='qemucdev' /> - </element> - </define> - - <define name='input'> - <element name='input'> - <attribute name='type'> - <choice> - <value>tablet</value> - <value>mouse</value> - </choice> - </attribute> - <optional> - <attribute name='bus'> - <choice> - <value>ps2</value> - <value>usb</value> - <value>xen</value> - </choice> - </attribute> - </optional> - </element> - </define> - - <define name='hostdev'> - <element name='hostdev'> - <optional> - <attribute name='mode'> - <choice> - <value>subsystem</value> - <value>capabilities</value> - </choice> - </attribute> - <attribute name='type'> - <choice> - <value>usb</value> - <value>pci</value> - </choice> - </attribute> - </optional> - <group> - <element name='source'> - <choice> - <ref name="usbproduct"/> - <ref name="usbaddress"/> - <ref name="pciaddress"/> - </choice> - </element> - </group> - </element> - </define> - - <define name="usbproduct"> - <element name="vendor"> - <attribute name="id"> - <ref name="usbId"/> - </attribute> - </element> - <element name="product"> - <attribute name="id"> - <ref name="usbId"/> - </attribute> - </element> - </define> - - <define name="usbaddress"> - <element name="address"> - <attribute name="bus"> - <ref name="usbAddr"/> - </attribute> - <attribute name="device"> - <ref name="usbAddr"/> - </attribute> - </element> - </define> - - <define name="pciaddress"> - <element name="address"> - <optional> - <attribute name="domain"> - <ref name="pciDomain"/> - </attribute> - </optional> - <attribute name="bus"> - <ref name="pciBus"/> - </attribute> - <attribute name="slot"> - <ref name="pciSlot"/> - </attribute> - <attribute name="function"> - <ref name="pciFunc"/> - </attribute> - </element> - </define> -  - <define name='devices'> - <element name='devices'> - <interleave> - <optional> - <ref name='emulator'/> - </optional> - <zeroOrMore> - <choice> - <ref name='graphic'/> - <ref name='disk'/> - <ref name='filesystem'/> - <ref name='interface'/> - <ref name='console'/> - <ref name='sound'/> - <ref name='parallel'/> - <ref name='serial'/> - <ref name='input'/> - <ref name='hostdev'/> - </choice> - </zeroOrMore> - </interleave> - </element> - </define> - -  - <define name='features'> - <optional> - <element name="features"> - <interleave> - <optional> - <element name="pae"> - <empty/> - </element> - </optional> - <optional> - <element name="apic"> - <empty/> - </element> - </optional> - <optional> - <element name="acpi"> - <empty/> - </element> - </optional> - </interleave> - </element> - </optional> - </define> - -  - <define name='unsignedInt'> - <data type='unsignedInt'> - <param name="pattern">[0-9]+</param> - </data> - </define> - <define name='countCPU'> - <data type='unsignedShort'> - <param name="pattern">[0-9]+</param> - <param name="minInclusive">1</param> - </data> - </define> - <define name='PortNumber'> - <data type='short'> - <param name="minInclusive">-1</param> - </data> - </define> - <define name='memoryKB'> - <data type='unsignedInt'> - <param name="pattern">[0-9]+</param> - <param name="minInclusive">4000</param> - </data> - </define> - <define name='domainName'> - <data type='string'> - <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param> - </data> - </define> - <define name='genericName'> - <data type='string'> - <param name="pattern">[a-zA-Z0-9_\+\-]+</param> - </data> - </define> - <define name='UUID'> - <choice> - <data type='string'> - <param name="pattern">[a-fA-F0-9]{32}</param> - </data> - <data type='string'> - <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> - </data> - </choice> - </define> - <define name='filePath'> - <data type='string'> - <param name="pattern">[a-zA-Z0-9_\.\+\-&/%]+</param> - </data> - </define> - <define name='absFilePath'> - <data type='string'> - <param name="pattern">/[a-zA-Z0-9_\.\+\-&/%]+</param> - </data> - </define> - <define name='absDirPath'> - <data type='string'> - <param name="pattern">/[a-zA-Z0-9_\.\+\-&/%]*</param> - </data> - </define> - <define name='devicePath'> - <data type='string'> - <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> - </data> - </define> - <define name='deviceName'> - <data type='string'> - <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> - </data> - </define> - <define name='addrMAC'> - <data type='string'> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - <define name='addrIP'> - <data type='string'> - <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> - </data> - </define> - <define name='usbId'> - <data type='string'> - <param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param> - </data> - </define> - <define name='usbAddr'> - <data type='string'> - <param name="pattern">(0x)?[0-9a-fA-F]{1,3}</param> - </data> - </define> - <define name='pciDomain'> - <data type='string'> - <param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param> - </data> - </define> - <define name='pciBus'> - <data type='string'> - <param name="pattern">(0x)?[0-9a-fA-F]{1,2}</param> - </data> - </define> - <define name='pciSlot'> - <data type='string'> - <param name="pattern">(0x)?[0-1]?[0-9a-fA-F]</param> - </data> - </define> - <define name='pciFunc'> - <data type='string'> - <param name="pattern">(0x)?[0-7]</param> - </data> - </define> -</grammar> diff -r 8eb4d4028b98 docs/network.rng --- a/docs/network.rng Wed Jan 21 15:47:23 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ - -<element name="network" xmlns="http://relaxng.org/ns/structure/1.0" - datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> -  - <element name="name"><text/></element> - <optional> - <element name="uuid"><text/></element> - </optional> - <optional> -  - <element name="bridge"> - <optional> - <attribute name="name"><text/></attribute> - </optional> - <optional> - <attribute name="stp"> - <choice> - <value>on</value> - <value>off</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="delay"><data type="integer"/></attribute> - </optional> - </element> - </optional> - <optional> -  -  - <element name="ip"> - <optional> - <attribute name="address"><text/></attribute> - </optional> - <optional> - <attribute name="netmask"><text/></attribute> - </optional> -  - <element name="dhcp"> - <zeroOrMore> - <element name="range"> - <attribute name="start"><text/></attribute> - <attribute name="end"><text/></attribute> - </element> - </zeroOrMore> - </element> - </element> - </optional> - <optional> -  - <element name="forward"> - <optional><attribute name="dev"><text/></attribute></optional> - <optional> - <attribute name="mode"> - <choice> - <value>nat</value> - <value>routed</value> - </choice> - </attribute> - </optional> - </element> - </optional> -</element> diff -r 8eb4d4028b98 docs/schemas/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/Makefile.am Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,12 @@ + + +schemadir = $(pkgdatadir)/schemas +schema_DATA = \ + domain.rng \ + network.rng \ + storagepool.rng \ + storagevol.rng \ + nodedev.rng \ + capability.rng + +EXTRA_DIST = $(schema_DATA) diff -r 8eb4d4028b98 docs/schemas/capability.rng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/capability.rng Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,287 @@ + +<grammar xmlns="http://relaxng.org/ns/structure/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> +  + <start> + <ref name='capabilities'/> + </start> + + + <define name='capabilities'> + <element name='capabilities'> + <ref name='hostcaps'/> + + <zeroOrMore> + <ref name='guestcaps'/> + </zeroOrMore> + </element> + </define> + + <define name='hostcaps'> + <element name='host'> + <element name='cpu'> + <element name='arch'> + <ref name='archnames'/> + </element> + <optional> + <ref name='cpufeatures'/> + </optional> + </element> + <optional> + <ref name='migration'/> + </optional> + <optional> + <ref name='topology'/> + </optional> + </element> + </define> + + <define name='cpufeatures'> + <element name='features'> + <optional> + <element name='pae'><empty/></element> + </optional> + <optional> + <element name='nonpae'><empty/></element> + </optional> + <optional> + <element name='vmx'><empty/></element> + </optional> + <optional> + <element name='svm'><empty/></element> + </optional> + </element> + </define> + + <define name='migration'> + <element name='migration_features'> + <optional> + <element name='live'> + <empty/> + </element> + </optional> + <optional> + <element name='uri_transports'> + <oneOrMore> + <element name='uri_transport'> + <choice> + <value>xenmigr</value> + </choice> + </element> + </oneOrMore> + </element> + </optional> + </element> + </define> + + <define name='topology'> + <element name='topology'> + <element name='cells'> + <attribute name='num'> + <ref name='uint'/> + </attribute> + <oneOrMore> + <ref name='cell'/> + </oneOrMore> + </element> + </element> + </define> + + <define name='cell'> + <element name='cell'> + <attribute name='id'> + <ref name='uint'/> + </attribute> + + <optional> + <element name='cpus'> + <attribute name='num'> + <ref name='uint'/> + </attribute> + <oneOrMore> + <ref name='cpu'/> + </oneOrMore> + </element> + </optional> + </element> + </define> + + <define name='cpu'> + <element name='cpu'> + <attribute name='id'> + <ref name='uint'/> + </attribute> + </element> + </define> + + <define name='guestcaps'> + <element name='guest'> + <ref name='ostype'/> + <ref name='arch'/> + <optional> + <ref name='features'/> + </optional> + </element> + </define> + + <define name='ostype'> + <element name='os_type'> + <choice> + <value>xen</value>  + <value>linux</value>  + <value>hvm</value>  + <value>exe</value>  + <value>uml</value>  + </choice> + </element> + </define> + + <define name='arch'> + <element name='arch'> + <attribute name='name'> + <ref name='archnames'/> + </attribute> + <ref name='wordsize'/> + <optional> + <ref name='emulator'/> + </optional> + <optional> + <ref name='loader'/> + </optional> + <zeroOrMore> + <ref name='machine'/> + </zeroOrMore> + <oneOrMore> + <ref name='domain'/> + </oneOrMore> + </element> + </define> + + <define name='emulator'> + <element name='emulator'> + <ref name='path'/> + </element> + </define> + + <define name='loader'> + <element name='loader'> + <ref name='path'/> + </element> + </define> + + <define name='wordsize'> + <element name='wordsize'> + <choice> + <value>31</value> + <value>32</value> + <value>64</value> + </choice> + </element> + </define> + + <define name='machine'> + <element name='machine'> + <text/> + </element> + </define> + + <define name='domain'> + <element name='domain'> + <attribute name='type'> + <choice> + <value>qemu</value> + <value>kqemu</value> + <value>kvm</value> + <value>xen</value> + <value>uml</value> + <value>lxc</value> + <value>openvz</value> + <value>test</value> + </choice> + </attribute> + + <optional> + <ref name='emulator'/> + </optional> + <optional> + <ref name='machine'/> + </optional> + </element> + </define> + + <define name='features'> + <element name='features'> + <optional> + <element name='pae'> + <empty/> + </element> + </optional> + <optional> + <element name='nonpae'> + <empty/> + </element> + </optional> + <optional> + <element name='ia64_be'> + <empty/> + </element> + </optional> + <optional> + <element name='acpi'> + <ref name='featuretoggle'/> + <empty/> + </element> + </optional> + <optional> + <element name='apic'> + <ref name='featuretoggle'/> + <empty/> + </element> + </optional> + </element> + </define> + + <define name='featuretoggle'> + <attribute name='toggle'> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + <attribute name='default'> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </define> + + <define name='archnames'> + <choice> + <value>i686</value> + <value>x86_64</value> + <value>ppc</value> + <value>ppc64</value> + <value>ia64</value> + <value>s390</value> + <value>mips</value> + <value>mipsel</value> + <value>sparc</value> + </choice> + </define> + + + <define name='uint'> + <data type='string'> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name='path'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> + </data> + </define> + +</grammar> + diff -r 8eb4d4028b98 docs/schemas/domain.rng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/domain.rng Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,1111 @@ +<?xml version="1.0" ?> +<grammar xmlns="http://relaxng.org/ns/structure/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> +  + <start> + <ref name='domain'/> + </start> + +  + <define name='domain'> + <element name="domain"> + <ref name='hvs'/> + <ref name='ids'/> + <interleave> + <ref name='os'/> + <ref name='clock'/> + <ref name='resources'/> + <ref name='features'/> + <ref name='termination'/> + <optional> + <ref name='devices'/> + </optional> + </interleave> + </element> + </define> + + <define name='hvs'> + <attribute name='type'> + <choice> + <value>xen</value> + <value>kvm</value> + <value>kqemu</value> + <value>qemu</value> + <value>lxc</value> + <value>openvz</value> + <value>test</value> + </choice> + </attribute> + </define> + + <define name='os'> + <choice> + <ref name='osxen'/> + <ref name='oshvm'/> + <ref name='osexe'/> + </choice> + </define> + + <define name='osxen'> + <choice> + <group> + <optional> + <ref name='bootloader'/> + </optional> + <element name='os'> + <ref name='ostypexen'/> + <ref name='osbootkernel'/> + </element> + </group> + <group> + <ref name='bootloader'/> + <optional> + <element name='os'> + <ref name='ostypexen'/> + <optional> + <ref name='osbootkernel'/> + </optional> + </element> + </optional> + </group> + </choice> + </define> + + + <define name='oshvm'> + <element name='os'> + <ref name='ostypehvm'/> + <interleave> + <optional> + <element name='loader'> + <ref name='absFilePath'/> + </element> + </optional> + <choice> + <ref name='osbootkernel'/> + <ref name='osbootdev'/> + </choice> + </interleave> + </element> + </define> + + + <define name='ostypexen'> + <element name='type'> + <optional> + <attribute name='arch'> + <choice> + <value>i686</value> + <value>x86_64</value> + <value>ia64</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name='machine'> + <choice> + <value>xenpv</value> + <value>xenner</value> + </choice> + </attribute> + </optional> + <choice> + <value>xen</value> + <value>linux</value> + </choice> + </element> + </define> + + <define name='ostypehvm'> + <element name='type'> + <optional> + <choice> + <ref name='hvmx86'/> + <ref name='hvmmips'/> + <ref name='hvmsparc'/> + <ref name='hvmppc'/> + </choice> + </optional> + <value>hvm</value> + </element> + </define> + + <define name='hvmx86'> + <group> + <attribute name='arch'> + <choice> + <value>i686</value> + <value>x86_64</value> + </choice> + </attribute> + <attribute name='machine'> + <choice> + <value>xenfv</value> + <value>pc</value> + <value>isapc</value> + </choice> + </attribute> + </group> + </define> + + <define name='hvmmips'> + <group> + <attribute name='arch'> + <value>mips</value> + </attribute> + <attribute name='machine'> + <value>mips</value> + </attribute> + </group> + </define> + + <define name='hvmsparc'> + <group> + <attribute name='arch'> + <value>sparc</value> + </attribute> + <attribute name='machine'> + <value>sun4m</value> + </attribute> + </group> + </define> + + <define name='hvmppc'> + <group> + <attribute name='arch'> + <value>ppc</value> + </attribute> + <attribute name='machine'> + <choice> + <value>g3bw</value> + <value>mac99</value> + <value>prep</value> + </choice> + </attribute> + </group> + </define> + + + <define name='osexe'> + <element name='os'> + <element name='type'> + <value>exe</value> + </element> + <interleave> + <optional> + <element name='init'> + <ref name='absFilePath'/> + </element> + </optional> + </interleave> + </element> + </define> + + + +  + <define name='ids'> + <optional> + <attribute name='id'> + <ref name='unsignedInt'/> + </attribute> + </optional> + <interleave> + <element name="name"> + <ref name='domainName'/> + </element> + <optional> + <element name="uuid"> + <ref name='UUID'/> + </element> + </optional> + </interleave> + </define> + +  + + <define name='resources'> + <interleave> + <element name='memory'> + <ref name='memoryKB'/> + </element> + <optional> + <element name='currentMemory'> + <ref name='memoryKB'/> + </element> + </optional> + <optional> + <element name='vcpu'> + <optional> + <attribute name='cpuset' /> + </optional> + <ref name='countCPU'/> + </element> + </optional> + </interleave> + </define> + + <define name='clock'> + <optional> + <element name='clock'> + <attribute name='offset'> + <choice> + <value>localtime</value> + <value>utc</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + </define> + +  + <define name='bootloader'> + <interleave> + <element name='bootloader'> + <choice> + <ref name='absFilePath'/> + <empty/> + </choice> + </element> + <optional> + <element name='bootloader_args'> + <text/> + </element> + </optional> + </interleave> + </define> + + <define name='osbootkernel'> + <interleave> + <element name='kernel'> + <ref name='absFilePath'/> + </element> + <optional> + <element name='initrd'> + <ref name='absFilePath'/> + </element> + </optional> + <optional> + <element name='root'> + <ref name='devicePath'/> + </element> + </optional> + <optional> + <element name='cmdline'> + <text/> + </element> + </optional> + </interleave> + </define> + + <define name='osbootdev'> + <element name='boot'> + <attribute name='dev'> + <choice> + <value>hd</value> + <value>fd</value> + <value>cdrom</value> + <value>network</value> + </choice> + </attribute> + <empty/> + </element> + </define> + + + <define name='diskspec'> + <optional> + <ref name='driver'/> + </optional> + <ref name='target'/> + <optional> + <element name='readonly'> + <empty/> + </element> + </optional> + <optional> + <element name='shareable'> + <empty/> + </element> + </optional> + </define> + +  + <define name='disk'> + <element name='disk'> + <optional> + <attribute name='device'> + <choice> + <value>floppy</value> + <value>disk</value> + <value>cdrom</value> + </choice> + </attribute> + </optional> + <choice> + <group> + <attribute name='type'> + <value>file</value> + </attribute> + <interleave> + <optional> + <element name='source'> + <attribute name='file'> + <ref name='absFilePath'/> + </attribute> + <empty/> + </element> + </optional> + <ref name='diskspec'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>block</value> + </attribute> + <interleave> + <optional> + <element name='source'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + </optional> + <ref name='diskspec'/> + </interleave> + </group> + <ref name='diskspec'/> + </choice> + </element> + </define> + + <define name='target'> + <element name='target'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + <optional> + <attribute name='bus'> + <choice> + <value>ide</value> + <value>virtio</value> + <value>fdc</value> + <value>xen</value> + <value>usb</value> + </choice> + </attribute> + </optional> + </element> + </define> + +  + <define name='driver'> + <element name='driver'> + <attribute name='name'> + <ref name='genericName'/> + </attribute> + <optional> + <attribute name='type'> + <ref name='genericName'/> + </attribute> + </optional> + <empty/> + </element> + </define> + + <define name='filesystem'> + <element name='filesystem'> + <choice> + <group> + <attribute name='type'> + <value>file</value> + </attribute> + <interleave> + <element name='source'> + <attribute name='file'> + <ref name='absFilePath'/> + </attribute> + <empty/> + </element> + <ref name='filesystemtgt'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>block</value> + </attribute> + <interleave> + <element name='source'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + <ref name='filesystemtgt'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>mount</value> + </attribute> + <interleave> + <element name='source'> + <attribute name='dir'> + <ref name='absFilePath'/> + </attribute> + <empty/> + </element> + <ref name='filesystemtgt'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>template</value> + </attribute> + <interleave> + <element name='source'> + <attribute name='name'> + <ref name='genericName'/> + </attribute> + <empty/> + </element> + <ref name='filesystemtgt'/> + </interleave> + </group> + </choice> + </element> + </define> + + <define name='filesystemtgt'> + <element name='target'> + <attribute name='dir'> + <ref name='absDirPath'/> + </attribute> + <empty/> + </element> + </define> + +  + <define name='interface'> + <element name='interface'> + <choice> + <group> + <attribute name='type'> + <value>bridge</value> + </attribute> + <interleave> + <optional> + <element name='source'> + <attribute name='bridge'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + </optional> + <ref name='interface-options'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>ethernet</value> + </attribute> + <interleave> + <optional> + <element name='source'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + </optional> + <ref name='interface-options'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>network</value> + </attribute> + <interleave> + <element name='source'> + <attribute name='network'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + <ref name='interface-options'/> + </interleave> + </group> + <group> + <attribute name='type'> + <value>user</value> + </attribute> + <interleave> + <ref name='interface-options'/> + </interleave> + </group> + </choice> + </element> + </define> + +  + <define name='interface-options'> + <interleave> + <optional> + <element name='target'> + <attribute name='dev'> + <ref name='deviceName'/> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name='mac'> + <attribute name='address'> + <ref name='addrMAC'/> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name='ip'> + <attribute name='address'> + <ref name='addrIP'/> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name='script'> + <attribute name='path'> + <ref name='filePath'/> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name='model'> + <attribute name='type' /> + <empty/> + </element> + </optional> + </interleave> + </define> + +  + <define name='emulator'> + <element name='emulator'> + <ref name='absFilePath'/> + </element> + </define> + +  + <define name='graphic'> + <element name='graphics'> + <choice> + <group> + <attribute name='type'> + <value>sdl</value> + </attribute> + <optional> + <attribute name='display'> + <text/> + </attribute> + </optional> + <optional> + <attribute name='xauth'> + <text/> + </attribute> + </optional> + <optional> + <attribute name='fullscreen'> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> + </group> + <group> + <attribute name='type'> + <value>vnc</value> + </attribute> + <optional> + <attribute name='port'> + <ref name='PortNumber'/> + </attribute> + </optional> + <optional> + <attribute name='autoport'> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name='listen'> + <ref name='addrIP'/> + </attribute> + </optional> + <optional> + <attribute name='passwd'> + <text/> + </attribute> + </optional> + <optional> + <attribute name='keymap'> + <text/> + </attribute> + </optional> + </group> + </choice> + </element> + </define> + +  + <define name='termination'> + <interleave> + <optional> + <element name='on_reboot'> + <ref name='offOptions'/> + </element> + </optional> + <optional> + <element name='on_poweroff'> + <ref name='offOptions'/> + </element> + </optional> + <optional> + <element name='on_crash'> + <ref name='offOptions'/> + </element> + </optional> + </interleave> + </define> + +  + <define name='offOptions'> + <choice> + <value>destroy</value> + <value>restart</value> + <value>preserve</value> + <value>rename-restart</value> + </choice> + </define> + +  + <define name='qemucdev'> + <attribute name='type'> + <choice> + <value>dev</value> + <value>file</value> + <value>pipe</value> + <value>unix</value> + <value>tcp</value> + <value>udp</value> + <value>null</value> + <value>stdio</value> + <value>vc</value> + <value>pty</value> + </choice> + </attribute> + + <interleave> + <optional> + <oneOrMore> + <element name='source'> + <optional> + <attribute name='mode' /> + </optional> + <optional> + <attribute name='path' /> + </optional> + <optional> + <attribute name='host' /> + </optional> + <optional> + <attribute name='service' /> + </optional> + <optional> + <attribute name='wiremode' /> + </optional> + </element> + </oneOrMore> + </optional> + <optional> + <element name='protocol'> + <optional> + <attribute name='type' /> + </optional> + </element> + </optional> + <optional> + <element name='target'> + <optional> + <attribute name='port' /> + </optional> + </element> + </optional> + </interleave> + </define> + +  + <define name='console'> + <element name='console'> + <choice> + <group> + <optional> + <attribute name='tty'> + <ref name='devicePath'/> + </attribute> + </optional> + <empty/> + </group> + <ref name='qemucdev' /> + </choice> + </element> + </define> + + <define name='sound'> + <element name='sound'> + <attribute name='model'> + <choice> + <value>sb16</value> + <value>es1370</value> + <value>pcspk</value> + </choice> + </attribute> + </element> + </define> + + <define name='parallel'> + <element name='parallel'> + <ref name='qemucdev' /> + </element> + </define> + + <define name='serial'> + <element name='serial'> + <ref name='qemucdev' /> + </element> + </define> + + <define name='input'> + <element name='input'> + <attribute name='type'> + <choice> + <value>tablet</value> + <value>mouse</value> + </choice> + </attribute> + <optional> + <attribute name='bus'> + <choice> + <value>ps2</value> + <value>usb</value> + <value>xen</value> + </choice> + </attribute> + </optional> + </element> + </define> + + <define name='hostdev'> + <element name='hostdev'> + <optional> + <attribute name='mode'> + <choice> + <value>subsystem</value> + <value>capabilities</value> + </choice> + </attribute> + <attribute name='type'> + <choice> + <value>usb</value> + <value>pci</value> + </choice> + </attribute> + </optional> + <group> + <element name='source'> + <choice> + <ref name="usbproduct"/> + <ref name="usbaddress"/> + <ref name="pciaddress"/> + </choice> + </element> + </group> + </element> + </define> + + <define name="usbproduct"> + <element name="vendor"> + <attribute name="id"> + <ref name="usbId"/> + </attribute> + </element> + <element name="product"> + <attribute name="id"> + <ref name="usbId"/> + </attribute> + </element> + </define> + + <define name="usbaddress"> + <element name="address"> + <attribute name="bus"> + <ref name="usbAddr"/> + </attribute> + <attribute name="device"> + <ref name="usbAddr"/> + </attribute> + </element> + </define> + + <define name="pciaddress"> + <element name="address"> + <optional> + <attribute name="domain"> + <ref name="pciDomain"/> + </attribute> + </optional> + <attribute name="bus"> + <ref name="pciBus"/> + </attribute> + <attribute name="slot"> + <ref name="pciSlot"/> + </attribute> + <attribute name="function"> + <ref name="pciFunc"/> + </attribute> + </element> + </define> +  + <define name='devices'> + <element name='devices'> + <interleave> + <optional> + <ref name='emulator'/> + </optional> + <zeroOrMore> + <choice> + <ref name='graphic'/> + <ref name='disk'/> + <ref name='filesystem'/> + <ref name='interface'/> + <ref name='console'/> + <ref name='sound'/> + <ref name='parallel'/> + <ref name='serial'/> + <ref name='input'/> + <ref name='hostdev'/> + </choice> + </zeroOrMore> + </interleave> + </element> + </define> + +  + <define name='features'> + <optional> + <element name="features"> + <interleave> + <optional> + <element name="pae"> + <empty/> + </element> + </optional> + <optional> + <element name="apic"> + <empty/> + </element> + </optional> + <optional> + <element name="acpi"> + <empty/> + </element> + </optional> + </interleave> + </element> + </optional> + </define> + +  + <define name='unsignedInt'> + <data type='unsignedInt'> + <param name="pattern">[0-9]+</param> + </data> + </define> + <define name='countCPU'> + <data type='unsignedShort'> + <param name="pattern">[0-9]+</param> + <param name="minInclusive">1</param> + </data> + </define> + <define name='PortNumber'> + <data type='short'> + <param name="minInclusive">-1</param> + </data> + </define> + <define name='memoryKB'> + <data type='unsignedInt'> + <param name="pattern">[0-9]+</param> + <param name="minInclusive">4000</param> + </data> + </define> + <define name='domainName'> + <data type='string'> + <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param> + </data> + </define> + <define name='genericName'> + <data type='string'> + <param name="pattern">[a-zA-Z0-9_\+\-]+</param> + </data> + </define> + <define name='UUID'> + <choice> + <data type='string'> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type='string'> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> + <define name='filePath'> + <data type='string'> + <param name="pattern">[a-zA-Z0-9_\.\+\-&/%]+</param> + </data> + </define> + <define name='absFilePath'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\.\+\-&/%]+</param> + </data> + </define> + <define name='absDirPath'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\.\+\-&/%]*</param> + </data> + </define> + <define name='devicePath'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> + </data> + </define> + <define name='deviceName'> + <data type='string'> + <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> + </data> + </define> + <define name='addrMAC'> + <data type='string'> + <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> + </data> + </define> + <define name='addrIP'> + <data type='string'> + <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> + </data> + </define> + <define name='usbId'> + <data type='string'> + <param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param> + </data> + </define> + <define name='usbAddr'> + <data type='string'> + <param name="pattern">(0x)?[0-9a-fA-F]{1,3}</param> + </data> + </define> + <define name='pciDomain'> + <data type='string'> + <param name="pattern">(0x)?[0-9a-fA-F]{1,4}</param> + </data> + </define> + <define name='pciBus'> + <data type='string'> + <param name="pattern">(0x)?[0-9a-fA-F]{1,2}</param> + </data> + </define> + <define name='pciSlot'> + <data type='string'> + <param name="pattern">(0x)?[0-1]?[0-9a-fA-F]</param> + </data> + </define> + <define name='pciFunc'> + <data type='string'> + <param name="pattern">(0x)?[0-7]</param> + </data> + </define> +</grammar> diff -r 8eb4d4028b98 docs/schemas/network.rng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/network.rng Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,69 @@ + +<element name="network" xmlns="http://relaxng.org/ns/structure/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> +  + <element name="name"><text/></element> + <optional> + <element name="uuid"><text/></element> + </optional> + <optional> +  + <element name="bridge"> + <optional> + <attribute name="name"><text/></attribute> + </optional> + <optional> + <attribute name="stp"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="delay"><data type="integer"/></attribute> + </optional> + </element> + </optional> + <optional> +  + <element name="forward"> + <optional><attribute name="dev"><text/></attribute></optional> + <optional> + <attribute name="mode"> + <choice> + <value>nat</value> + <value>routed</value> + </choice> + </attribute> + </optional> + </element> + </optional> + <optional> +  +  + <element name="ip"> + <optional> + <attribute name="address"><text/></attribute> + </optional> + <optional> + <attribute name="netmask"><text/></attribute> + </optional> +  + <element name="dhcp"> + <zeroOrMore> + <element name="range"> + <attribute name="start"><text/></attribute> + <attribute name="end"><text/></attribute> + </element> + </zeroOrMore> + </element> + </element> + </optional> +</element> diff -r 8eb4d4028b98 docs/schemas/nodedev.rng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/nodedev.rng Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,360 @@ + +<grammar xmlns="http://relaxng.org/ns/structure/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> +  + <start> + <ref name='device'/> + </start> + +  + <define name='device'> + <element name="device"> +  + <element name="name"><text/></element> + <optional> + <element name="parent"><text/></element> + </optional> + + <zeroOrMore> + <ref name="capability"/> + </zeroOrMore> + </element> + </define> + + <define name='capability'> + <element name="capability"> + <choice> + <ref name="capsystem"/> + <ref name="cappcidev"/> + <ref name="capusbdev"/> + <ref name="capusbinterface"/> + <ref name="capnet"/> + <ref name="capscsihost"/> + <ref name="capscsi"/> + <ref name="capstorage"/> + </choice> + </element> + </define> + + <define name='capsystem'> + <attribute name='type'> + <value>system</value> + </attribute> + + <optional> + <element name='product'><text/></element> + </optional> + + <element name='hardware'> + <optional> + <element name='vendor'><text/></element> + </optional> + <optional> + <element name='version'><text/></element> + </optional> + <optional> + <element name='serial'><text/></element> + </optional> + + <element name='uuid'> + <ref name='uuid'/> + </element> + </element> + + + <element name='firmware'> + <optional> + <element name='vendor'><text/></element> + </optional> + <optional> + <element name='version'><text/></element> + </optional> + <optional> + <element name='release_date'><text/></element> + </optional> + </element> + </define> + + <define name='cappcidev'> + <attribute name='type'> + <value>pci</value> + </attribute> + + <element name='domain'> + <ref name='uint'/> + </element> + <element name='bus'> + <ref name='uint'/> + </element> + <element name='slot'> + <ref name='uint'/> + </element> + <element name='function'> + <ref name='uint'/> + </element> + + <element name='product'> + <attribute name='id'> + <ref name='hexuint'/> + </attribute> + + <choice> + <text/> + <empty/> + </choice> + </element> + + <element name='vendor'> + <attribute name='id'> + <ref name='hexuint'/> + </attribute> + + <choice> + <text/> + <empty/> + </choice> + </element> + + </define> + + <define name='capusbdev'> + <attribute name='type'> + <value>usb_device</value> + </attribute> + + <element name='bus'> + <ref name='uint'/> + </element> + <element name='device'> + <ref name='uint'/> + </element> + + <element name='product'> + <attribute name='id'> + <ref name='hexuint'/> + </attribute> + + <choice> + <text/> + <empty/> + </choice> + </element> + + <element name='vendor'> + <attribute name='id'> + <ref name='hexuint'/> + </attribute> + + <choice> + <text/> + <empty/> + </choice> + </element> + </define> + + <define name='capusbinterface'> + <attribute name='type'> + <value>usb</value> + </attribute> + + <element name='number'> + <ref name='uint'/> + </element> + <element name='class'> + <ref name='uint'/> + </element> + <element name='subclass'> + <ref name='uint'/> + </element> + <element name='protocol'> + <ref name='uint'/> + </element> + + <optional> + <element name='description'> + <text/> + </element> + </optional> + </define> + + <define name='capnet'> + <attribute name='type'> + <value>net</value> + </attribute> + + <element name='interface'> + <text/> + </element> + <optional> + <element name='address'> + <ref name='mac'/> + </element> + </optional> + + <zeroOrMore> + <ref name='subcapnet'/> + </zeroOrMore> + </define> + + <define name='subcapnet'> + <element name='capability'> + <choice> + <ref name='subcapnet80203'/> + <ref name='subcapnet80211'/> + </choice> + </element> + </define> + + <define name='subcapnet80203'> + <attribute name='type'> + <value>80203</value> + </attribute> + </define> + + <define name='subcapnet80211'> + <attribute name='type'> + <value>80211</value> + </attribute> + </define> + + + <define name='capscsihost'> + <attribute name='type'> + <value>scsi_host</value> + </attribute> + + <element name='host'> + <ref name='uint'/> + </element> + </define> + + <define name='capscsi'> + <attribute name='type'> + <value>scsi</value> + </attribute> + + <element name='host'> + <ref name='uint'/> + </element> + <element name='bus'> + <ref name='uint'/> + </element> + <element name='target'> + <ref name='uint'/> + </element> + <element name='lun'> + <ref name='uint'/> + </element> + + <element name='type'> + <text/> + </element> + </define> + + <define name='capstorage'> + <attribute name='type'> + <value>storage</value> + </attribute> + + <element name='block'> + <ref name='path'/> + </element> + + <optional> + <element name='bus'> + <text/> + </element> + </optional> + <optional> + <element name='drive_type'> + <text/> + </element> + </optional> + <optional> + <element name='model'> + <text/> + </element> + </optional> + <optional> + <element name='vendor'> + <text/> + </element> + </optional> + + <choice> + <ref name='capstorageremoveable'/> + <ref name='capstoragefixed'/> + </choice> + + <optional> + <element name='capability'> + <attribute name='type'> + <value>hotpluggable</value> + </attribute> + </element> + </optional> + </define> + + <define name='capstorageremoveable'> + <element name='capability'> + <attribute name='type'> + <value>removable</value> + </attribute> + <element name='media_available'> + <choice> + <value>1</value> + <value>0</value> + </choice> + </element> + + <element name='media_size'> + <ref name='uint'/> + </element> + </element> + </define> + + <define name='capstoragefixed'> + <element name='size'> + <ref name='uint'/> + </element> + </define> + + <define name='uuid'> + <choice> + <data type='string'> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type='string'> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> + + <define name='uint'> + <data type='string'> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name='hexuint'> + <data type='string'> + <param name="pattern">(0x)?[0-9a-f]+</param> + </data> + </define> + + <define name='mac'> + <data type='string'> + <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> + </data> + </define> + + <define name='path'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> + </data> + </define> + +</grammar> diff -r 8eb4d4028b98 docs/schemas/storagepool.rng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/storagepool.rng Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,371 @@ + +<grammar xmlns="http://relaxng.org/ns/structure/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> +  + <start> + <ref name='pool'/> + </start> + + + <define name='pool'> + <element name='pool'> + <choice> + <ref name='pooldir'/> + <ref name='poolfs'/> + <ref name='poolnetfs'/> + <ref name='poollogical'/> + <ref name='pooldisk'/> + <ref name='pooliscsi'/> + <ref name='poolscsi'/> + </choice> + </element> + </define> + + <define name='pooldir'> + <attribute name='type'> + <value>dir</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcedir'/> + <ref name='target'/> + </define> + + <define name='poolfs'> + <attribute name='type'> + <value>fs</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcefs'/> + <ref name='target'/> + </define> + + <define name='poolnetfs'> + <attribute name='type'> + <value>netfs</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcenetfs'/> + <ref name='target'/> + </define> + + <define name='poollogical'> + <attribute name='type'> + <value>logical</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcelogical'/> + <ref name='target'/> + </define> + + <define name='pooldisk'> + <attribute name='type'> + <value>disk</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcedisk'/> + <ref name='target'/> + </define> + + <define name='pooliscsi'> + <attribute name='type'> + <value>iscsi</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourceiscsi'/> + <ref name='target'/> + </define> + + <define name='poolscsi'> + <attribute name='type'> + <value>scsi</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcescsi'/> + <ref name='target'/> + </define> + + <define name='commonmetadata'> + <element name='name'> + <ref name='name'/> + </element> + <optional> + <element name='uuid'> + <ref name='uuid'/> + </element> + </optional> + </define> + + <define name='sizing'> + <optional> + <element name='capacity'> + <ref name='uint'/> + </element> + </optional> + <optional> + <element name='allocation'> + <ref name='uint'/> + </element> + </optional> + <optional> + <element name='available'> + <ref name='uint'/> + </element> + </optional> + </define> + + <define name='permissions'> + <optional> + <element name='permissions'> + <element name='mode'> + <ref name='uint'/> + </element> + <element name='owner'> + <ref name='uint'/> + </element> + <element name='group'> + <ref name='uint'/> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </element> + </optional> + </define> + + <define name='target'> + <element name='target'> + <optional> + <element name='path'> + <ref name='path'/> + </element> + </optional> + <ref name='permissions'/> + </element> + </define> + + <define name='sourceinfohost'> + <element name='host'> + <attribute name='name'> + <text/> + </attribute> + <empty/> + </element> + </define> + + <define name='sourceinfodev'> + <element name='device'> + <attribute name='path'> + <choice> + <ref name='path'/> + <ref name='name'/> + </choice> + </attribute> + <choice> + <empty/> + <ref name='devextents'/> + </choice> + </element> + </define> + + <define name='devextents'> + <oneOrMore> + <element name='freeExtent'> + <attribute name='start'> + <ref name='uint'/> + </attribute> + <attribute name='end'> + <ref name='uint'/> + </attribute> + </element> + </oneOrMore> + </define> + + <define name='sourceinfodir'> + <element name='dir'> + <attribute name='path'> + <ref name='path'/> + </attribute> + <empty/> + </element> + </define> + + <define name='sourceinfoadapter'> + <element name='adapter'> + <attribute name='name'> + <text/> + </attribute> + <empty/> + </element> + </define> + + <define name='sourceinfoname'> + <element name='name'> + <text/> + </element> + </define> + + <define name='sourcefmtfs'> + <optional> + <element name='format'> + <attribute name='type'> + <choice> + <value>auto</value> + <value>ext2</value> + <value>ext3</value> + <value>ext4</value> + <value>ufs</value> + <value>iso9660</value> + <value>udf</value> + <value>gfs</value> + <value>gfs2</value> + <value>vfat</value> + <value>hfs+</value> + <value>xfs</value> + </choice> + </attribute> + </element> + </optional> + </define> + + + <define name='sourcefmtnetfs'> + <optional> + <element name='format'> + <attribute name='type'> + <choice> + <value>auto</value> + <value>nfs</value> + </choice> + </attribute> + </element> + </optional> + </define> + + + <define name='sourcefmtdisk'> + <optional> + <element name='format'> + <attribute name='type'> + <choice> + <value>none</value> + <value>dos</value> + <value>dvh</value> + <value>gpt</value> + <value>mac</value> + <value>bsd</value> + <value>pc98</value> + <value>sun</value> + <value>lvm2</value> + </choice> + </attribute> + </element> + </optional> + </define> + + + <define name='sourcefmtlogical'> + <optional> + <element name='format'> + <attribute name='type'> + <choice> + <value>auto</value> + <value>lvm2</value> + </choice> + </attribute> + </element> + </optional> + </define> + + + <define name='sourcedir'> + <optional> + <element name='source'> + <empty/> + </element> + </optional> + </define> + <define name='sourcefs'> + <element name='source'> + <ref name='sourceinfodev'/> + <ref name='sourcefmtfs'/> + </element> + </define> + + <define name='sourcenetfs'> + <element name='source'> + <ref name='sourceinfohost'/> + <ref name='sourceinfodir'/> + <ref name='sourcefmtnetfs'/> + </element> + </define> + + <define name='sourcelogical'> + <element name='source'> + <ref name='sourceinfoname'/> + <optional> + <ref name='sourceinfodev'/> + </optional> + <ref name='sourcefmtlogical'/> + </element> + </define> + + <define name='sourcedisk'> + <element name='source'> + <ref name='sourceinfodev'/> + <ref name='sourcefmtdisk'/> + </element> + </define> + + <define name='sourceiscsi'> + <element name='source'> + <ref name='sourceinfohost'/> + <ref name='sourceinfodev'/> + </element> + </define> + + <define name='sourcescsi'> + <element name='source'> + <ref name='sourceinfoname'/> + </element> + </define> + + + <define name='name'> + <data type='string'> + <param name="pattern">[a-zA-Z0-9_\+\-]+</param> + </data> + </define> + <define name='uuid'> + <choice> + <data type='string'> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type='string'> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> + + <define name='uint'> + <data type='string'> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name='path'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> + </data> + </define> + + +</grammar> diff -r 8eb4d4028b98 docs/schemas/storagevol.rng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/schemas/storagevol.rng Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,187 @@ + +<grammar xmlns="http://relaxng.org/ns/structure/1.0" + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> +  + <start> + <ref name='vol'/> + </start> + + + <define name='vol'> + <element name='volume'> + <element name='name'> + <ref name='name'/> + </element> + <optional> + <element name='key'> + <text/> + </element> + </optional> + <ref name='source'/> + <ref name='sizing'/> + <ref name='target'/> + <optional> + <ref name='backingStore'/> + </optional> + </element> + </define> + + <define name='sizing'> + <optional> + <element name='capacity'> + <ref name='uint'/> + </element> + </optional> + <optional> + <element name='allocation'> + <ref name='uint'/> + </element> + </optional> + </define> + + <define name='permissions'> + <optional> + <element name='permissions'> + <element name='mode'> + <ref name='uint'/> + </element> + <element name='owner'> + <ref name='uint'/> + </element> + <element name='group'> + <ref name='uint'/> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </element> + </optional> + </define> + + <define name='target'> + <element name='target'> + <optional> + <element name='path'> + <ref name='path'/> + </element> + </optional> + <ref name='format'/> + <ref name='permissions'/> + </element> + </define> + + <define name='backingStore'> + <element name='backingStore'> + <element name='path'> + <ref name='path'/> + </element> + <ref name='format'/> + <ref name='permissions'/> + </element> + </define> + + + <define name='source'> + <element name='source'> + <zeroOrMore> + <ref name='sourcedev'/> + </zeroOrMore> + </element> + </define> + + <define name='sourcedev'> + <element name='device'> + <attribute name='path'> + <ref name='path'/> + </attribute> + <choice> + <empty/> + <ref name='devextents'/> + </choice> + </element> + </define> + + <define name='devextents'> + <oneOrMore> + <element name='extent'> + <attribute name='start'> + <ref name='uint'/> + </attribute> + <attribute name='end'> + <ref name='uint'/> + </attribute> + </element> + </oneOrMore> + </define> + + <define name='formatdev'> + <choice> + <value>none</value> + <value>auto</value> + <value>ext2</value> + <value>ext3</value> + <value>ext4</value> + <value>ufs</value> + <value>iso9660</value> + <value>udf</value> + <value>gfs</value> + <value>gfs2</value> + <value>vfat</value> + <value>hfs+</value> + <value>xfs</value> + </choice> + + </define> + + + <define name='formatfile'> + <choice> + <value>raw</value> + <value>dir</value> + <value>bochs</value> + <value>cloop</value> + <value>cow</value> + <value>dmg</value> + <value>iso</value> + <value>qcow</value> + <value>qcow2</value> + <value>vmdk</value> + <value>vpc</value> + </choice> + </define> + + <define name='format'> + <optional> + <element name='format'> + <attribute name='type'> + <choice> + <ref name='formatfile'/> + <ref name='formatdev'/> + </choice> + </attribute> + </element> + </optional> + </define> + + <define name='name'> + <data type='string'> + <param name="pattern">[a-zA-Z0-9_\+\-\.]+</param> + </data> + </define> + + <define name='uint'> + <data type='string'> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name='path'> + <data type='string'> + <param name="pattern">/[a-zA-Z0-9_\+\-\./%]+</param> + </data> + </define> + + +</grammar> diff -r 8eb4d4028b98 libvirt.spec.in --- a/libvirt.spec.in Wed Jan 21 15:47:23 2009 +0000 +++ b/libvirt.spec.in Wed Jan 21 16:28:43 2009 +0000 @@ -354,6 +354,16 @@ fi %{_datadir}/libvirt/networks/default.xml %endif +%dir %{_datadir}/libvirt/ +%dir %{_datadir}/libvirt/schemas/ + +%{_datadir}/libvirt/schemas/domain.rng +%{_datadir}/libvirt/schemas/network.rng +%{_datadir}/libvirt/schemas/storagepool.rng +%{_datadir}/libvirt/schemas/storagevol.rng +%{_datadir}/libvirt/schemas/nodedev.rng +%{_datadir}/libvirt/schemas/capability.rng + %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ @@ -410,7 +420,6 @@ fi %attr(0755, root, root) %{_sbindir}/libvirtd %endif -%doc docs/*.rng %doc docs/*.xml %files devel diff -r 8eb4d4028b98 mingw32-libvirt.spec.in --- a/mingw32-libvirt.spec.in Wed Jan 21 15:47:23 2009 +0000 +++ b/mingw32-libvirt.spec.in Wed Jan 21 16:28:43 2009 +0000 @@ -80,6 +80,15 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libvirt.la %{_mingw32_libdir}/pkgconfig/libvirt.pc +%dir %{_mingw32_datadir}/libvirt/ +%dir %{_mingw32_datadir}/libvirt/schemas/ +%{_mingw32_datadir}/libvirt/schemas/domain.rng +%{_mingw32_datadir}/libvirt/schemas/network.rng +%{_mingw32_datadir}/libvirt/schemas/storagepool.rng +%{_mingw32_datadir}/libvirt/schemas/storagevol.rng +%{_mingw32_datadir}/libvirt/schemas/nodedev.rng +%{_mingw32_datadir}/libvirt/schemas/capability.rng + %{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo %dir %{_mingw32_includedir}/libvirt diff -r 8eb4d4028b98 tests/Makefile.am --- a/tests/Makefile.am Wed Jan 21 15:47:23 2009 +0000 +++ b/tests/Makefile.am Wed Jan 21 16:28:43 2009 +0000 @@ -41,8 +41,17 @@ EXTRA_DIST = \ test-lib.sh \ qemuxml2argvdata \ nodeinfodata \ + capabilityschematest \ + capabilityschemadata \ + networkschematest \ domainschematest \ - domainschemadata + domainschemadata \ + storagepoolschematest \ + storagepoolschemadata \ + storagevolschematest \ + storagevolschemadata \ + nodedevschematest \ + nodedevschemadata noinst_PROGRAMS = virshtest conftest \ nodeinfotest statstest qparamtest @@ -55,7 +64,14 @@ if WITH_QEMU noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest endif -test_scripts = domainschematest +test_scripts = \ + capabilityschematest \ + networkschematest \ + storagepoolschematest \ + storagevolschematest \ + domainschematest \ + nodedevschematest + if WITH_LIBVIRTD test_scripts += \ test_conf.sh \ diff -r 8eb4d4028b98 tests/capabilityschemadata/caps-qemu-kvm.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,111 @@ +<capabilities> + + <host> + <cpu> + <arch>i686</arch> + </cpu> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name='i686'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu</emulator> + <machine>pc</machine> + <machine>isapc</machine> + <domain type='qemu'> + </domain> + <domain type='kvm'> + <emulator>/usr/bin/qemu-kvm</emulator> + </domain> + </arch> + <features> + <pae/> + <nonpae/> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name='x86_64'> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <machine>pc</machine> + <machine>isapc</machine> + <domain type='qemu'> + </domain> + </arch> + <features> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name='mips'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-mips</emulator> + <machine>mips</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name='mipsel'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-mipsel</emulator> + <machine>mips</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name='sparc'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-sparc</emulator> + <machine>sun4m</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> + <arch name='ppc'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-ppc</emulator> + <machine>g3bw</machine> + <machine>mac99</machine> + <machine>prep</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>xen</os_type> + <arch name='i686'> + <wordsize>32</wordsize> + <emulator>/usr/bin/xenner</emulator> + <machine>xenner</machine> + <domain type='kvm'> + </domain> + </arch> + <features> + <pae/> + <nonpae/> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + +</capabilities> + + diff -r 8eb4d4028b98 tests/capabilityschemadata/caps-test.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/capabilityschemadata/caps-test.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,71 @@ +<capabilities> + + <host> + <cpu> + <arch>i686</arch> + <features> + <pae/> + <nonpae/> + </features> + </cpu> + <topology> + <cells num='2'> + <cell id='0'> + <cpus num='8'> + <cpu id='0'/> + <cpu id='2'/> + <cpu id='4'/> + <cpu id='6'/> + <cpu id='8'/> + <cpu id='10'/> + <cpu id='12'/> + <cpu id='14'/> + </cpus> + </cell> + <cell id='1'> + <cpus num='8'> + <cpu id='1'/> + <cpu id='3'/> + <cpu id='5'/> + <cpu id='7'/> + <cpu id='9'/> + <cpu id='11'/> + <cpu id='13'/> + <cpu id='15'/> + </cpus> + </cell> + </cells> + </topology> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name='i686'> + <wordsize>32</wordsize> + <emulator>/usr/bin/test-hv</emulator> + <domain type='test'> + </domain> + </arch> + <features> + <pae/> + <nonpae/> + </features> + </guest> + + <guest> + <os_type>xen</os_type> + <arch name='i686'> + <wordsize>32</wordsize> + <emulator>/usr/bin/test-hv</emulator> + <domain type='test'> + </domain> + </arch> + <features> + <pae/> + <nonpae/> + </features> + </guest> + +</capabilities> + + diff -r 8eb4d4028b98 tests/capabilityschematest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/capabilityschematest Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,34 @@ +#!/bin/sh + +test -z "$srcdir" && srcdir=`pwd` +test -z "$abs_srcdir" && abs_srcdir=`pwd` + +DOMAINDIRS="capabilityschemadata xencapsdata" + + +n=0 +f=0 +for dir in $DOMAINDIRS +do + XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 + + for xml in $XML + do + n=`expr $n + 1` + printf "%4d) %.60s " $n $(basename $(dirname $xml))"/"$(basename $xml) + result=`xmllint --relaxng $srcdir/../docs/schemas/capability.rng --noout $xml 2>&1` + ret=$? + if test $ret = 0; then + echo "OK" + else + echo "FAILED" + echo $result + f=`expr $f + 1` + fi + done +done +echo "Validated $n files, $f failed" + +ret=0 +test $f != 0 && ret=255 +exit $ret diff -r 8eb4d4028b98 tests/domainschematest --- a/tests/domainschematest Wed Jan 21 15:47:23 2009 +0000 +++ b/tests/domainschematest Wed Jan 21 16:28:43 2009 +0000 @@ -1,6 +1,7 @@ #!/bin/sh test -z "$srcdir" && srcdir=`pwd` +test -z "$abs_srcdir" && abs_srcdir=`pwd` DOMAINDIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata" @@ -14,7 +15,7 @@ do do n=`expr $n + 1` printf "%4d) %.60s " $n $(basename $(dirname $xml))"/"$(basename $xml) - result=`xmllint --relaxng $srcdir/../docs/libvirt.rng --noout $xml 2>&1` + result=`xmllint --relaxng $srcdir/../docs/schemas/domain.rng --noout $xml 2>&1` ret=$? if test $ret = 0; then echo "OK" diff -r 8eb4d4028b98 tests/networkschematest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/networkschematest Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,33 @@ +#!/bin/sh + +test -z "$srcdir" && srcdir=`pwd` +test -z "$abs_srcdir" && abs_srcdir=`pwd` + +DIRS="../qemud" + +n=0 +f=0 +for dir in $DIRS +do + XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 + + for xml in $XML + do + n=`expr $n + 1` + printf "%4d) %.60s " $n $(basename $(dirname $xml))"/"$(basename $xml) + result=`xmllint --relaxng $srcdir/../docs/schemas/network.rng --noout $xml 2>&1` + ret=$? + if test $ret = 0; then + echo "OK" + else + echo "FAILED" + echo $result + f=`expr $f + 1` + fi + done +done +echo "Validated $n files, $f failed" + +ret=0 +test $f != 0 && ret=255 +exit $ret diff -r 8eb4d4028b98 tests/nodedevschemadata/DVD_GCC_4247N.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/DVD_GCC_4247N.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,17 @@ +<device> + <name>DVD_GCC_4247N</name> + <parent>pci_8086_27df_scsi_host_scsi_device_lun0</parent> + <capability type='storage'> + <block>/dev/sr0</block> + <bus>scsi</bus> + <drive_type>cdrom</drive_type> + <model>RW/DVD GCC-4247N</model> + <vendor>HL-DT-ST</vendor> + <capability type='removable'> + <media_available>0</media_available> + <media_size>0</media_size> + </capability> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/computer.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/computer.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,18 @@ +<device> + <name>computer</name> + <capability type='system'> + <hardware> + <vendor>LENOVO</vendor> + <version>ThinkPad T60p</version> + <serial>123123</serial> + <uuid>12345678-1234-1234-9596-a088b277d677</uuid> + </hardware> + <firmware> + <vendor>LENOVO</vendor> + <version>79ETE1WW (2.21 )</version> + <release_date>02/05/2008</release_date> + </firmware> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,11 @@ +<device> + <name>net_00_13_02_b9_f9_d3</name> + <parent>pci_8086_4227</parent> + <capability type='net'> + <interface>eth0</interface> + <address>00:13:02:b9:f9:d3</address> + <capability type='80211'/> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,11 @@ +<device> + <name>net_00_15_58_2f_e9_55</name> + <parent>pci_8086_109a</parent> + <capability type='net'> + <interface>eth1</interface> + <address>00:15:58:2f:e9:55</address> + <capability type='80203'/> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/pci_1002_71c4.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/pci_1002_71c4.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,14 @@ +<device> + <name>pci_1002_71c4</name> + <parent>pci_8086_27a1</parent> + <capability type='pci'> + <domain>0</domain> + <bus>1</bus> + <slot>0</slot> + <function>0</function> + <product id='0x71c4'>M56GL [Mobility FireGL V5200]</product> + <vendor id='0x1002'>ATI Technologies Inc</vendor> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,9 @@ +<device> + <name>pci_8086_27c5_scsi_host</name> + <parent>pci_8086_27c5</parent> + <capability type='scsi_host'> + <host>0</host> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,9 @@ +<device> + <name>pci_8086_27c5_scsi_host_0</name> + <parent>pci_8086_27c5</parent> + <capability type='scsi_host'> + <host>1</host> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,13 @@ +<device> + <name>pci_8086_27c5_scsi_host_scsi_device_lun0</name> + <parent>pci_8086_27c5_scsi_host</parent> + <capability type='scsi'> + <host>0</host> + <bus>0</bus> + <target>0</target> + <lun>0</lun> + <type>disk</type> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,9 @@ +<device> + <name>pci_8086_27c5_scsi_host_scsi_host</name> + <parent>pci_8086_27c5_scsi_host</parent> + <capability type='scsi_host'> + <host>0</host> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,14 @@ +<device> + <name>storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE</name> + <parent>pci_8086_27c5_scsi_host_scsi_device_lun0</parent> + <capability type='storage'> + <block>/dev/sda</block> + <bus>scsi</bus> + <drive_type>disk</drive_type> + <model>HTS721010G9SA00</model> + <vendor>ATA</vendor> + <size>100030242816</size> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,12 @@ +<device> + <name>usb_device_1d6b_1_0000_00_1d_0</name> + <parent>pci_8086_27c8</parent> + <capability type='usb_device'> + <bus>2</bus> + <device>1</device> + <product id='0x0001'>1.1 root hub</product> + <vendor id='0x1d6b'>Linux Foundation</vendor> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,12 @@ +<device> + <name>usb_device_1d6b_1_0000_00_1d_0_if0</name> + <parent>usb_device_1d6b_1_0000_00_1d_0</parent> + <capability type='usb'> + <number>0</number> + <class>9</class> + <subclass>0</subclass> + <protocol>0</protocol> + </capability> +</device> + + diff -r 8eb4d4028b98 tests/nodedevschematest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/nodedevschematest Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,33 @@ +#!/bin/sh + +test -z "$srcdir" && srcdir=`pwd` +test -z "$abs_srcdir" && abs_srcdir=`pwd` + +DIRS="nodedevschemadata" + +n=0 +f=0 +for dir in $DIRS +do + XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 + + for xml in $XML + do + n=`expr $n + 1` + printf "%4d) %.60s " $n $(basename $(dirname $xml))"/"$(basename $xml) + result=`xmllint --relaxng $srcdir/../docs/schemas/nodedev.rng --noout $xml 2>&1` + ret=$? + if test $ret = 0; then + echo "OK" + else + echo "FAILED" + echo $result + f=`expr $f + 1` + fi + done +done +echo "Validated $n files, $f failed" + +ret=0 +test $f != 0 && ret=255 +exit $ret diff -r 8eb4d4028b98 tests/storagepoolschemadata/pool-dir.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschemadata/pool-dir.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,17 @@ +<pool type='dir'> + <name>virtimages</name> + <uuid>70a7eb15-6c34-ee9c-bf57-69e8e5ff3fb2</uuid> + <capacity>0</capacity> + <allocation>0</allocation> + <available>0</available> + <source> + </source> + <target> + <path>/var/lib/libvirt/images</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff -r 8eb4d4028b98 tests/storagepoolschemadata/pool-disk.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschemadata/pool-disk.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,22 @@ +<pool type='disk'> + <name>sda</name> + <uuid>e3509a62-1b4c-e20b-94bd-9168963f9b97</uuid> + <capacity>100027630080</capacity> + <allocation>100027597824</allocation> + <available>0</available> + <source> + <device path='/dev/sda'> + <freeExtent start='370137600' end='567544320'/> + <freeExtent start='987033600' end='1044610560'/> + </device> + <format type='dos'/> + </source> + <target> + <path>/dev</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff -r 8eb4d4028b98 tests/storagepoolschemadata/pool-fs.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschemadata/pool-fs.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,20 @@ +<pool type='fs'> + <name>images</name> + <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> + <capacity>0</capacity> + <allocation>0</allocation> + <available>0</available> + <source> + <device path='/dev/sda6'/> + <format type='ext3'/> + </source> + <target> + <path>/mnt</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> + diff -r 8eb4d4028b98 tests/storagepoolschemadata/pool-iscsi.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschemadata/pool-iscsi.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,10 @@ +<pool type='iscsi'> + <name>virtimages</name> + <source> + <host name="iscsi.example.com"/> + <device path="demo-target"/> + </source> + <target> + <path>/dev/disk/by-path</path> + </target> +</pool> diff -r 8eb4d4028b98 tests/storagepoolschemadata/pool-logical.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschemadata/pool-logical.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,19 @@ +<pool type='logical'> + <name>HostVG</name> + <uuid>1c13165a-d0f4-3aee-b447-30fb38789091</uuid> + <capacity>99891544064</capacity> + <allocation>99220455424</allocation> + <available>671088640</available> + <source> + <name>HostVG</name> + <format type='lvm2'/> + </source> + <target> + <path>/dev/HostVG</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff -r 8eb4d4028b98 tests/storagepoolschemadata/pool-netfs.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschemadata/pool-netfs.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,21 @@ +<pool type='netfs'> + <name>nfsimages</name> + <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> + <capacity>0</capacity> + <allocation>0</allocation> + <available>0</available> + <source> + <host name='localhost'/> + <dir path='/var/lib/libvirt/images'/> + <format type='nfs'/> + </source> + <target> + <path>/mnt</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> + diff -r 8eb4d4028b98 tests/storagepoolschematest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagepoolschematest Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,33 @@ +#!/bin/sh + +test -z "$srcdir" && srcdir=`pwd` +test -z "$abs_srcdir" && abs_srcdir=`pwd` + +DIRS="storagepoolschemadata" + +n=0 +f=0 +for dir in $DIRS +do + XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 + + for xml in $XML + do + n=`expr $n + 1` + printf "%4d) %.60s " $n $(basename $(dirname $xml))"/"$(basename $xml) + result=`xmllint --relaxng $srcdir/../docs/schemas/storagepool.rng --noout $xml 2>&1` + ret=$? + if test $ret = 0; then + echo "OK" + else + echo "FAILED" + echo $result + f=`expr $f + 1` + fi + done +done +echo "Validated $n files, $f failed" + +ret=0 +test $f != 0 && ret=255 +exit $ret diff -r 8eb4d4028b98 tests/storagevolschemadata/vol-logical.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagevolschemadata/vol-logical.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,21 @@ +<volume> + <name>Swap</name> + <key>r4xkCv-MQhr-WKIT-R66x-Epn2-e8hG-1Z5gY0</key> + <source> + <device path='/dev/sda2'> + <extent start='31440502784' end='33520877568'/> + </device> + </source> + <capacity>2080374784</capacity> + <allocation>2080374784</allocation> + <target> + <path>/dev/HostVG/Swap</path> + <permissions> + <mode>060660</mode> + <owner>0</owner> + <group>6</group> + <label>system_u:object_r:fixed_disk_device_t:s0</label> + </permissions> + </target> +</volume> + diff -r 8eb4d4028b98 tests/storagevolschemadata/vol-partition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagevolschemadata/vol-partition.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,21 @@ +<volume> + <name>sda1</name> + <key>/dev/sda1</key> + <source> + <device path='/dev/sda'> + <extent start='32256' end='106928640'/> + </device> + </source> + <capacity>106896384</capacity> + <allocation>106896384</allocation> + <target> + <path>/dev/sda1</path> + <format type='none'/> + <permissions> + <mode>060660</mode> + <owner>0</owner> + <group>6</group> + <label>system_u:object_r:fixed_disk_device_t:s0</label> + </permissions> + </target> +</volume> diff -r 8eb4d4028b98 tests/storagevolschemadata/vol-qcow2.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagevolschemadata/vol-qcow2.xml Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,28 @@ +<volume> + <name>OtherDemo.img</name> + <key>/var/lib/libvirt/images/OtherDemo.img</key> + <source> + </source> + <capacity>5242880000</capacity> + <allocation>294912</allocation> + <target> + <path>/var/lib/libvirt/images/OtherDemo.img</path> + <format type='qcow2'/> + <permissions> + <mode>0100644</mode> + <owner>0</owner> + <group>0</group> + <label>unconfined_u:object_r:virt_image_t:s0</label> + </permissions> + </target> + <backingStore> + <path>/var/lib/libvirt/images/BaseDemo.img</path> + <format type='raw'/> + <permissions> + <mode>0100644</mode> + <owner>0</owner> + <group>0</group> + <label>unconfined_u:object_r:virt_image_t:s0</label> + </permissions> + </backingStore> +</volume> diff -r 8eb4d4028b98 tests/storagevolschematest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/storagevolschematest Wed Jan 21 16:28:43 2009 +0000 @@ -0,0 +1,33 @@ +#!/bin/sh + +test -z "$srcdir" && srcdir=`pwd` +test -z "$abs_srcdir" && abs_srcdir=`pwd` + +DIRS="storagevolschemadata" + +n=0 +f=0 +for dir in $DIRS +do + XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 + + for xml in $XML + do + n=`expr $n + 1` + printf "%4d) %.60s " $n $(basename $(dirname $xml))"/"$(basename $xml) + result=`xmllint --relaxng $srcdir/../docs/schemas/storagevol.rng --noout $xml 2>&1` + ret=$? + if test $ret = 0; then + echo "OK" + else + echo "FAILED" + echo $result + f=`expr $f + 1` + fi + done +done +echo "Validated $n files, $f failed" + +ret=0 +test $f != 0 && ret=255 +exit $ret -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2

[libvirt] PATCH: Support setting QEMU disk driver type
by Daniel P. Berrange 22 Jan '09

22 Jan '09

The domain XML has long supported ability to set the disk driver type but we only used it in Xen so far. This patch adds support for QEMU usage. In this usage the driver name is always going to be 'qemu' since all backends are in QEMU, no alternate kernelspace / helper daemons as with Xen. The driver type will be one of the valid QEMU disk formats. eg <driver name='qemu' type='qcow2'/> The snprintf() stuff for building the disk parameter string was getting rather out of hand, so I took the opportunity to switch it over to use the virBuffer routines. src/qemu_conf.c | 49 ++++++++--- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args | 1 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml | 29 ++++++ tests/qemuxml2argvtest.c | 2 tests/qemuxml2xmltest.c | 1 5 files changed, 69 insertions(+), 13 deletions(-) Daniel diff --git a/src/qemu_conf.c b/src/qemu_conf.c --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -48,6 +48,8 @@ #include "xml.h" #include "nodeinfo.h" +#define VIR_FROM_THIS VIR_FROM_QEMU + VIR_ENUM_DECL(virDomainDiskQEMUBus) VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, "ide", @@ -862,6 +864,18 @@ int qemudBuildCommandLine(virConnectPtr ADD_ARG_LIT(vm->def->os.bootloader); } + for (i = 0 ; i < vm->def->ndisks ; i++) { + virDomainDiskDefPtr disk = vm->def->disks[i]; + + if (disk->driverName != NULL && + !STREQ(disk->driverName, "qemu")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unsupported driver name '%s' for disk '%s'"), + disk->driverName, disk->src); + goto error; + } + } + /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */ if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) { int bootCD = 0, bootFloppy = 0, bootDisk = 0; @@ -884,8 +898,8 @@ int qemudBuildCommandLine(virConnectPtr } for (i = 0 ; i < vm->def->ndisks ; i++) { - char opt[PATH_MAX]; - const char *media = NULL; + virBuffer opt = VIR_BUFFER_INITIALIZER; + char *optstr; int bootable = 0; virDomainDiskDefPtr disk = vm->def->disks[i]; int idx = virDiskNameToIndex(disk->dst); @@ -912,7 +926,6 @@ int qemudBuildCommandLine(virConnectPtr case VIR_DOMAIN_DISK_DEVICE_CDROM: bootable = bootCD; bootCD = 0; - media = "media=cdrom,"; break; case VIR_DOMAIN_DISK_DEVICE_FLOPPY: bootable = bootFloppy; @@ -924,18 +937,28 @@ int qemudBuildCommandLine(virConnectPtr break; } - snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s%s", - disk->src ? disk->src : "", bus, - media ? media : "", - idx, - bootable && - disk->device == VIR_DOMAIN_DISK_DEVICE_DISK - ? ",boot=on" : "", - disk->shared && ! disk->readonly - ? ",cache=off" : ""); + virBufferVSprintf(&opt, "file=%s", disk->src ? disk->src : ""); + virBufferVSprintf(&opt, ",if=%s", bus); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, ",media=cdrom"); + virBufferVSprintf(&opt, ",index=%d", idx); + if (bootable && + disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) + virBufferAddLit(&opt, ",boot=on"); + if (disk->shared && !disk->readonly) + virBufferAddLit(&opt, ",cache=off"); + if (disk->driverType) + virBufferVSprintf(&opt, ",fmt=%s", disk->driverType); + + if (virBufferError(&opt)) { + virReportOOMError(conn); + goto error; + } + + optstr = virBufferContentAndReset(&opt); ADD_ARG_LIT("-drive"); - ADD_ARG_LIT(opt); + ADD_ARG(optstr); } } else { for (i = 0 ; i < vm->def->ndisks ; i++) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args new file mode 100644 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args @@ -0,0 +1,1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on,fmt=qcow2 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2,fmt=raw -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml new file mode 100644 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -194,6 +194,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE | QEMUD_CMD_FLAG_DRIVE_BOOT); + DO_TEST("disk-drive-fmt-qcow", QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT); DO_TEST("disk-usb", 0); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -97,6 +97,7 @@ mymain(int argc, char **argv) DO_TEST("disk-many"); DO_TEST("disk-xenvbd"); DO_TEST("disk-usb"); + DO_TEST("disk-drive-fmt-qcow"); DO_TEST("graphics-vnc"); DO_TEST("graphics-sdl"); DO_TEST("graphics-sdl-fullscreen"); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] Re: kvm-81: save / restore does not work - missing incoming stdio feature
by Daniel Schwager 22 Jan '09

22 Jan '09

Hi Daniel, I'm also VERY interesting in save/restore my Domains to disk - is there a roadmap back to this feature - did you talk with the qemu developers ? Or should I try to contact them ? regards Danny > From: Matthias Pfafferodt <matthias.pfafferodt <at> mapfa.de> > Subject: Re: [libvirt] kvm: save / restore > > Hello Daniel, > > thnaks for your anser. Do you know the plans regarding save/restore in kvm and > libvirt? I would like to save my vm's at shutdown and restore at boot time. > At the moment this is not working and shutdown is used. Am Thursday 18 December 2008 13:42:36 schrieb Daniel P. Berrange: > On Wed, Dec 17, 2008 at 01:46:43PM +0100, Matthias Pfafferodt wrote: > > Hallo, > > > > I use kvm-81 and libvirt 0.5.1. I can save a kvm donain but if I want to > > restore it I get the following error in the log file: > > > > unknown migration protocol: stdio > > > > I tried it using only kvm and got the same error. > > > > How can I save / restore a VM to / from a file? > > The new KVM release dropped support for the '-incoming stdio' syntax > that libvirt was using so save/restore no longer works :-( > > Daniel

4 6

[libvirt] [PATCH] Support script setting for bridge-type interfaces
by john.levon＠sun.com 22 Jan '09

22 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232562793 28800 # Node ID e0b0295722ecf4645983e3a9a090e0aaabc40da7 # Parent ce10bb67bbcee1a49b900e260a65ccfb1b69588b Support script setting for bridge-type interfaces Fix back-compatibility by allowing non-default scripts in interfaces of bridge type again. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -288,6 +288,7 @@ void virDomainNetDefFree(virDomainNetDef case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); + VIR_FREE(def->data.bridge.script); break; } @@ -897,7 +898,8 @@ virDomainNetDefParseXML(virConnectPtr co VIR_FREE(ifname); } } else if ((script == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET) && + (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || + def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); } else if (xmlStrEqual (cur->name, BAD_CAST "model")) { @@ -948,6 +950,10 @@ virDomainNetDefParseXML(virConnectPtr co } def->data.bridge.brname = bridge; bridge = NULL; + if (script != NULL) { + def->data.bridge.script = script; + script = NULL; + } break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -2883,6 +2889,9 @@ virDomainNetDefFormat(virConnectPtr conn case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.script) + virBufferEscapeString(buf, " <script path='%s'/>\n", + def->data.bridge.script); break; case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -154,6 +154,7 @@ struct _virDomainNetDef { } network; struct { char *brname; + char *script; } bridge; } data; char *ifname; diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -60,6 +60,12 @@ #define XEN_SCHED_CRED_NPARAM 2 #endif /* PROXY */ + +#ifdef __sun +#define DEFAULT_VIF_SCRIPT "vif-vnic" +#else +#define DEFAULT_VIF_SCRIPT "vif-bridge" +#endif #ifdef WITH_RHEL5_API #define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 @@ -1739,15 +1745,22 @@ xenDaemonParseSxprNets(virConnectPtr con if (VIR_ALLOC(net) < 0) goto no_memory; - if ((tmp2 && strstr(tmp2, "bridge")) || tmp) { + if (tmp != NULL || (STREQ(tmp2, DEFAULT_VIF_SCRIPT))) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; /* XXX virtual network reverse resolve */ if (tmp && !(net->data.bridge.brname = strdup(tmp))) goto no_memory; + if (tmp2 && + net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && + !(net->data.bridge.script = strdup(tmp2))) + goto no_memory; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + if (tmp2 && + !(net->data.ethernet.script = strdup(tmp2))) + goto no_memory; } tmp = sexpr_node(node, "device/vif/vifname"); @@ -1784,11 +1797,6 @@ xenDaemonParseSxprNets(virConnectPtr con 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 && @@ -5069,6 +5077,8 @@ xenDaemonFormatSxprNet(virConnectPtr con int xendConfigVersion, int isAttach) { + const char *script = DEFAULT_VIF_SCRIPT; + if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && def->type != VIR_DOMAIN_NET_TYPE_NETWORK && def->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { @@ -5090,7 +5100,10 @@ xenDaemonFormatSxprNet(virConnectPtr con switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferVSprintf(buf, "(bridge '%s')", def->data.bridge.brname); - virBufferAddLit(buf, "(script 'vif-bridge')"); + if (def->data.bridge.script) + script = def->data.bridge.script; + + virBufferVSprintf(buf, "(script '%s')", script); break; case VIR_DOMAIN_NET_TYPE_NETWORK: @@ -5113,7 +5126,7 @@ xenDaemonFormatSxprNet(virConnectPtr con return -1; } virBufferVSprintf(buf, "(bridge '%s')", bridge); - virBufferAddLit(buf, "(script 'vif-bridge')"); + virBufferVSprintf(buf, "(script '%s')", script); VIR_FREE(bridge); } break; diff --git a/src/xm_internal.c b/src/xm_internal.c --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1057,14 +1057,19 @@ xenXMDomainConfigParse(virConnectPtr con net->mac[5] = rawmac[5]; } - if (bridge[0] || STREQ(script, "vif-bridge")) + if (bridge[0] || STREQ(script, "vif-bridge") || + STREQ(script, "vif-vnic")) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - else + } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + } if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (bridge[0] && !(net->data.bridge.brname = strdup(bridge))) + goto no_memory; + if (script[0] && + !(net->data.bridge.script = strdup(script))) goto no_memory; } else { if (script[0] && diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml @@ -24,6 +24,7 @@ <interface type='bridge'> <mac address='00:16:3e:1d:06:15'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif5.0'/> </interface> <console type='pty'> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml --- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml @@ -22,6 +22,7 @@ <interface type='bridge'> <mac address='00:16:3e:23:9e:eb'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif6.0'/> </interface> <console type='pty'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <parallel type='tcp'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='file'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='null'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='pipe'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='pty'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='stdio'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='tcp'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='tcp'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='udp'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif1.0'/> </interface> <serial type='unix'> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='usb'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='tablet' bus='usb'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -32,6 +32,7 @@ <interface type='bridge'> <mac address='00:16:3e:1b:b1:47'/> <source bridge='xenbr0'/> + <script path='vif-bridge'/> <target dev='vif3.0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml --- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml @@ -23,6 +23,7 @@ <interface type='bridge'> <mac address='00:11:22:33:44:55'/> <source bridge='xenbr2'/> + <script path='vif-bridge'/> <target dev='vif6.0'/> </interface> <console type='pty'> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml --- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml @@ -23,6 +23,7 @@ <interface type='bridge'> <mac address='00:11:22:33:44:55'/> <source bridge='xenbr2'/> + <script path='vif-bridge'/> <target dev='vif6.0'/> <model type='e1000'/> </interface>

2 1

[libvirt] [PATCH] Solaris least privilege support
by john.levon＠sun.com 22 Jan '09

22 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232478815 28800 # Node ID 9c7ef175f3a797ecc3ffa6b1fed5a27d1814838c # Parent ce76623e857f5bb2cf3af8414335f891fd7902b7 Solaris least privilege support On Solaris dom0, virtd runs as a privilege barrier: all libvirt connections are routed through it, and it performs the relevant privilege checks for any clients. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -84,6 +84,39 @@ #endif +#ifdef __sun +#include <ucred.h> +#include <priv.h> + +#ifndef PRIV_VIRT_MANAGE +#define PRIV_VIRT_MANAGE ((const char *)"virt_manage") +#endif + +#ifndef PRIV_XVM_CONTROL +#define PRIV_XVM_CONTROL ((const char *)"xvm_control") +#endif + +#define PU_RESETGROUPS 0x0001 /* Remove supplemental groups */ +#define PU_CLEARLIMITSET 0x0008 /* L=0 */ + +extern int __init_daemon_priv(int, uid_t, gid_t, ...); + +#define SYSTEM_UID 60 + +static gid_t unix_sock_gid = 60; /* Not used */ +static int unix_sock_rw_mask = 0666; +static int unix_sock_ro_mask = 0666; + +#else + +#define SYSTEM_UID 0 + +static gid_t unix_sock_gid = 0; /* Only root by default */ +static int unix_sock_rw_mask = 0700; /* Allow user only */ +static int unix_sock_ro_mask = 0777; /* Allow world */ + +#endif /* __sun */ + static int godaemon = 0; /* -d: Be a daemon */ static int verbose = 0; /* -v: Verbose mode */ static int timeout = -1; /* -t: Shutdown timeout */ @@ -101,10 +134,6 @@ static char *listen_addr = (char *) LIB static char *listen_addr = (char *) LIBVIRTD_LISTEN_ADDR; static char *tls_port = (char *) LIBVIRTD_TLS_PORT; static char *tcp_port = (char *) LIBVIRTD_TCP_PORT; - -static gid_t unix_sock_gid = 0; /* Only root by default */ -static int unix_sock_rw_mask = 0700; /* Allow user only */ -static int unix_sock_ro_mask = 0777; /* Allow world */ #if HAVE_POLKIT static int auth_unix_rw = REMOTE_AUTH_POLKIT; @@ -638,10 +667,11 @@ static int qemudInitPaths(struct qemud_s static int qemudInitPaths(struct qemud_server *server, char *sockname, char *roSockname, - int maxlen) { + int maxlen) +{ uid_t uid = geteuid(); - if (!uid) { + if (uid == SYSTEM_UID) { if (snprintf (sockname, maxlen, "%s/run/libvirt/libvirt-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -1110,6 +1140,29 @@ static int qemudDispatchServer(struct qe return -1; } +#ifdef __sun + { + ucred_t *ucred = NULL; + const priv_set_t *privs; + + if (getpeerucred (fd, &ucred) == -1 || + (privs = ucred_getprivset (ucred, PRIV_EFFECTIVE)) == NULL) { + if (ucred != NULL) + ucred_free (ucred); + close (fd); + return -1; + } + + if (!priv_ismember (privs, PRIV_VIRT_MANAGE)) { + ucred_free (ucred); + close (fd); + return -1; + } + + ucred_free (ucred); + } +#endif /* __sun */ + /* Disable Nagle. Unix sockets will ignore this. */ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&no_slow_start, sizeof no_slow_start); @@ -2257,6 +2310,30 @@ version (const char *argv0) { printf ("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); } + +#ifdef __sun +static int +qemudSetupPrivs (void) +{ + chown ("/var/run/libvirt", SYSTEM_UID, SYSTEM_UID); + + if (__init_daemon_priv (PU_RESETGROUPS | PU_CLEARLIMITSET, + SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { + fprintf (stderr, "additional privileges are required\n"); + return -1; + } + + if (priv_set (PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, + PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { + fprintf (stderr, "failed to set reduced privileges\n"); + return -1; + } + + return 0; +} +#else +#define qemudSetupPrivs() 0 +#endif /* Print command-line usage. */ static void @@ -2435,6 +2512,21 @@ int main(int argc, char **argv) { sig_action.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sig_action, NULL); + /* Ensure the rundir exists (on tmpfs on some systems) */ + if (geteuid () == 0) { + const char *rundir = LOCAL_STATE_DIR "/run/libvirt"; + + if (mkdir (rundir, 0755)) { + if (errno != EEXIST) { + VIR_ERROR0 (_("unable to create rundir")); + return -1; + } + } + } + + if (qemudSetupPrivs() < 0) + goto error2; + if (!(server = qemudInitialize(sigpipe[0]))) { ret = 2; goto error2; diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -885,18 +885,21 @@ remoteOpen (virConnectPtr conn, } /* - * If URI is NULL, then do a UNIX connection - * possibly auto-spawning unprivileged server - * and probe remote server for URI + * If URI is NULL, then do a UNIX connection possibly auto-spawning + * unprivileged server and probe remote server for URI. On Solaris, + * this isn't supported, but we may be privileged enough to connect + * to the UNIX socket anyway. */ if (!conn->uri) { DEBUG0("Auto-probe remote URI"); rflags |= VIR_DRV_OPEN_REMOTE_UNIX; +#ifndef __sun if (getuid() > 0) { DEBUG0("Auto-spawn user daemon instance"); rflags |= VIR_DRV_OPEN_REMOTE_USER; rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; } +#endif } priv->sock = -1; diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -26,6 +26,17 @@ #include <errno.h> #include <sys/utsname.h> +#ifdef __sun +#include <sys/systeminfo.h> + +#include <priv.h> + +#ifndef PRIV_XVM_CONTROL +#define PRIV_XVM_CONTROL ((const char *)"xvm_control") +#endif + +#endif /* __sun */ + /* required for dom0_getdomaininfo_t */ #include <xen/dom0_ops.h> #include <xen/version.h> @@ -35,10 +46,6 @@ #ifdef HAVE_XEN_SYS_PRIVCMD_H #include <xen/sys/privcmd.h> #endif -#endif - -#ifdef __sun -#include <sys/systeminfo.h> #endif /* required for shutdown flags */ @@ -3393,3 +3400,17 @@ xenHypervisorGetVcpuMax(virDomainPtr dom return maxcpu; } +/** + * xenHavePrivilege() + * + * Return true if the current process should be able to connect to Xen. + */ +int +xenHavePrivilege() +{ +#ifdef __sun + return priv_ineffect (PRIV_XVM_CONTROL); +#else + return getuid () == 0; +#endif +} diff --git a/src/xen_internal.h b/src/xen_internal.h --- a/src/xen_internal.h +++ b/src/xen_internal.h @@ -104,4 +104,6 @@ int xenHypervisorNodeGetCellsFreeMem int startCell, int maxCells); +int xenHavePrivilege(void); + #endif /* __VIR_XEN_INTERNAL_H__ */ diff --git a/src/xen_unified.c b/src/xen_unified.c --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -65,6 +65,8 @@ static struct xenUnifiedDriver *drivers[ #endif }; +static int inside_daemon; + #define xenUnifiedError(conn, code, fmt...) \ virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) @@ -195,6 +197,21 @@ done: return(res); } +#ifdef WITH_LIBVIRTD + +static int +xenInitialize (void) +{ + inside_daemon = 1; + return 0; +} + +static virStateDriver state_driver = { + .initialize = xenInitialize, +}; + +#endif + /*----- Dispatch functions. -----*/ /* These dispatch functions follow the model used historically @@ -231,6 +248,15 @@ xenUnifiedOpen (virConnectPtr conn, virC xenUnifiedPrivatePtr priv; virDomainEventCallbackListPtr cbList; +#ifdef __sun + /* + * Only the libvirtd instance can open this driver. + * Everything else falls back to the remote driver. + */ + if (!inside_daemon) + return VIR_DRV_OPEN_DECLINED; +#endif + if (conn->uri == NULL) { if (!xenUnifiedProbe()) return VIR_DRV_OPEN_DECLINED; @@ -283,8 +309,8 @@ xenUnifiedOpen (virConnectPtr conn, virC priv->proxy = -1; - /* Hypervisor is only run as root & required to succeed */ - if (getuid() == 0) { + /* Hypervisor is only run with privilege & required to succeed */ + if (xenHavePrivilege()) { DEBUG0("Trying hypervisor sub-driver"); if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { @@ -293,7 +319,7 @@ xenUnifiedOpen (virConnectPtr conn, virC } } - /* XenD is required to suceed if root. + /* XenD is required to succeed if privileged. * If it fails as non-root, then the proxy driver may take over */ DEBUG0("Trying XenD sub-driver"); @@ -318,12 +344,12 @@ xenUnifiedOpen (virConnectPtr conn, virC DEBUG0("Activated XS sub-driver"); priv->opened[XEN_UNIFIED_XS_OFFSET] = 1; } else { - if (getuid() == 0) - goto fail; /* XS is mandatory as root */ + if (xenHavePrivilege()) + goto fail; /* XS is mandatory when privileged */ } } else { - if (getuid() == 0) { - goto fail; /* XenD is mandatory as root */ + if (xenHavePrivilege()) { + goto fail; /* XenD is mandatory when privileged */ } else { #if WITH_PROXY DEBUG0("Trying proxy sub-driver"); @@ -1472,6 +1498,10 @@ xenRegister (void) (void) xenHypervisorInit (); (void) xenXMInit (); +#ifdef WITH_LIBVIRTD + if (virRegisterStateDriver (&state_driver) == -1) return -1; +#endif + return virRegisterDriver (&xenUnifiedDriver); } diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -42,7 +42,7 @@ #include "buf.h" #include "uuid.h" #include "xen_unified.h" -#include "xen_internal.h" /* for DOM0_INTERFACE_VERSION */ +#include "xen_internal.h" #include "xs_internal.h" /* To extract VNC port & Serial console TTY */ #include "memory.h" @@ -159,9 +159,10 @@ do_connect(virConnectPtr xend) s = -1; /* - * Connecting to XenD as root is mandatory, so log this error + * Connecting to XenD when privileged is mandatory, so log this + * error */ - if (getuid() == 0) { + if (xenHavePrivilege()) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, "%s", _("failed to connect to xend")); } diff --git a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -35,7 +35,7 @@ #include "uuid.h" #include "xen_unified.h" #include "xs_internal.h" -#include "xen_internal.h" /* for xenHypervisorCheckID */ +#include "xen_internal.h" #ifdef __linux__ #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" @@ -299,11 +299,11 @@ xenStoreOpen(virConnectPtr conn, if (priv->xshandle == NULL) { /* - * not being able to connect via the socket as a normal user - * is rather normal, this should fallback to the proxy (or + * not being able to connect via the socket as an unprivileged + * user is rather normal, this should fallback to the proxy (or * remote) mechanism. */ - if (getuid() == 0) { + if (xenHavePrivilege()) { virXenStoreError(NULL, VIR_ERR_NO_XEN, "%s", _("failed to connect to Xen Store")); }

2 1

[libvirt] OpenNebula driver, libvirt-0.5.1
by "Abel Míguez Rodríguez" 22 Jan '09

22 Jan '09

1 0

[libvirt] [PATCH] Add .hgignore entries
by john.levon＠sun.com 21 Jan '09

21 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232563649 28800 # Node ID 256c8a54b46909dcdd6999d55538e64ec5931e4d # Parent c109dd0801246b82aed8d5f9b1fa4196432868d0 Add .hgignore entries Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,6 +1,38 @@ -(^|/)CVS($|/) -(^|/)\.hg($|/) -(^|/)\.hgtags($|/) -^state$ -^state.old$ -^state.journal$ +.*.a +.*.o +.*.orig +.*.rej +.*~ +.git +ABOUT-NLS +COPYING +INSTALL +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.status +config.sub +configure +coverage +libtool +libvirt-.*.tar.gz +libvirt.pc +libvirt.spec +ltconfig +ltmain.sh +m4 +mingw32-libvirt.spec +mkinstalldirs +results.log +stamp-h +stamp-h.in +stamp-h1 +update.log +TAGS

3 2

[libvirt] [PATCH] Add .hgignore entries
by john.levon＠sun.com 21 Jan '09

21 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232563649 28800 # Node ID 256c8a54b46909dcdd6999d55538e64ec5931e4d # Parent c109dd0801246b82aed8d5f9b1fa4196432868d0 Add .hgignore entries Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,6 +1,38 @@ -(^|/)CVS($|/) -(^|/)\.hg($|/) -(^|/)\.hgtags($|/) -^state$ -^state.old$ -^state.journal$ +.*.a +.*.o +.*.orig +.*.rej +.*~ +.git +ABOUT-NLS +COPYING +INSTALL +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.status +config.sub +configure +coverage +libtool +libvirt-.*.tar.gz +libvirt.pc +libvirt.spec +ltconfig +ltmain.sh +m4 +mingw32-libvirt.spec +mkinstalldirs +results.log +stamp-h +stamp-h.in +stamp-h1 +update.log +TAGS

1 0

[libvirt] [PATCH] Fix remote driver crash
by john.levon＠sun.com 21 Jan '09

21 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232501231 28800 # Node ID 12e2e9f6eb99f86c2ab20f1e6a7b7a77418e66db # Parent 39479c2678f822349169112e31e6061af3289548 Fix remote driver crash Ensure ->watch is initialized so it's not used before an updateHandleImpl is registered. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -902,7 +902,9 @@ remoteOpen (virConnectPtr conn, #endif } + priv->watch = -1; priv->sock = -1; + ret = doRemoteOpen(conn, priv, auth, rflags); if (ret != VIR_DRV_OPEN_SUCCESS) { conn->privateData = NULL;

3 2

[libvirt] spec file: don't create networks/default.xml if it already exists
by Mark McLoughlin 21 Jan '09

21 Jan '09

If you un-install libvirt and re-install it, you get a warning from the post-install script: Installing : libvirt ln: creating symbolic link `/etc/libvirt/qemu/networks/autostart/default.xml': File exists See https://bugzilla.redhat.com/462011 Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e0ce497..9121c6d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -294,7 +294,7 @@ rm -fr %{buildroot} # or on the first upgrade from a non-network aware libvirt only. # We check this by looking to see if the daemon is already installed /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 -if [ $? != 0 ] +if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] then UUID=`/usr/bin/uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ -- 1.6.0.6

2 1

[libvirt] [PATCH] Fix openlog() ident usage
by john.levon＠sun.com 20 Jan '09

20 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232478815 28800 # Node ID 37a6a671e38d7f4449d3b47bc5cf06c19362bc41 # Parent 15bfba92a98744f8c554757ed608c3bf89fa38aa Fix openlog() ident usage It cannot be freed, as it's used by reference in the syslog code, at least on Solaris. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/logging.c b/src/logging.c --- a/src/logging.c +++ b/src/logging.c @@ -705,7 +705,10 @@ int virLogParseOutputs(const char *outpu return(-1); if (virLogAddOutputToSyslog(prio, name) == 0) ret++; - VIR_FREE(name); + /* + * Do *NOT* free(name) - openlog() uses this string by + * reference, instead of keeping its own copy. + */ #endif /* HAVE_SYSLOG_H */ } else if (STREQLEN(cur, "file", 4)) { cur += 4;

3 4

[libvirt] [PATCH] Set syslog logging priority based on LIBVIRT_DEBUG
by john.levon＠sun.com 20 Jan '09

20 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232478815 28800 # Node ID a9c75296e1d6e09947a231fa9864d67a543979eb # Parent 37a6a671e38d7f4449d3b47bc5cf06c19362bc41 Set syslog logging priority based on LIBVIRT_DEBUG Currently, qemud in daemonized is dropping all messages below level 3, regardless of LIBVIRT_DEBUG setting. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2151,10 +2151,15 @@ qemudSetLogging(virConfPtr conf, const c */ GET_CONF_STR (conf, filename, log_outputs); if (log_outputs == NULL) { - if (godaemon) - virLogParseOutputs("3:syslog:libvirtd"); - else + if (godaemon) { + char *tmp = NULL; + if (virAsprintf (&tmp, "%d:syslog:libvirtd", log_level) < 0) + goto free_and_fail; + virLogParseOutputs (tmp); + VIR_FREE (tmp); + } else { virLogParseOutputs("0:stderr:libvirtd"); + } } else virLogParseOutputs(log_outputs); ret = 0;

2 1

[libvirt] [PATCH] maint: update list of error function names and adapt
by Jim Meyering 20 Jan '09

20 Jan '09

I updated the list of error function names in Makefile.maint, and exposed 3 more unmarked diagnostics. Going through the old/new lists, I also found two now-unused (#define'd) "functions". I originally did this on top of Dan's patch series, but it also applies to the trunk, modulo some offset differences in xen_unified.c. >From 8124c5ae693fdad477df6b38dc5b75b4cd8f36cf Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 19 Jan 2009 09:25:02 +0100 Subject: [PATCH] maint: update list of error function names and adapt * Makefile.maint (msg_gen_function): Update list. Remove some now-unused names, add some new ones. * src/hash.c (virHashError): Remove unused definition. * src/openvz_conf.h (openvzLog): Likewise. * src/xen_unified.c: Mark newly-exposed diagnostics for translation. --- Makefile.maint | 8 ++++---- src/hash.c | 5 ----- src/openvz_conf.h | 8 -------- src/xen_unified.c | 8 ++++---- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 2ac6dd7..35eddd1 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -390,6 +390,7 @@ msg_gen_function += ERROR0 msg_gen_function += REMOTE_DEBUG msg_gen_function += ReportError msg_gen_function += VIR_FREE +msg_gen_function += VIR_INFO msg_gen_function += VIR_USE_CPU msg_gen_function += errorf msg_gen_function += lxcError @@ -401,9 +402,7 @@ msg_gen_function += qemudDispatchClientFailure msg_gen_function += qemudLog msg_gen_function += qemudReportError msg_gen_function += regerror -msg_gen_function += remoteDispatchError msg_gen_function += remoteDispatchFormatError -msg_gen_function += umlError msg_gen_function += umlLog msg_gen_function += umlReportError msg_gen_function += virConfError @@ -414,18 +413,19 @@ msg_gen_function += virLibDomainError msg_gen_function += virLog msg_gen_function += virNetworkReportError msg_gen_function += virNodeDeviceReportError +msg_gen_function += virProxyError msg_gen_function += virRaiseError msg_gen_function += virReportErrorHelper +msg_gen_function += virReportSystemError msg_gen_function += virSexprError msg_gen_function += virStorageLog msg_gen_function += virStorageReportError -msg_gen_function += virTestError msg_gen_function += virXMLError msg_gen_function += virXenInotifyError msg_gen_function += virXenStoreError msg_gen_function += virXendError -msg_gen_function += virxmlRpcError msg_gen_function += vshCloseLogFile +msg_gen_function += xenUnifiedError msg_gen_function += xenXMError # Uncomment the following and run "make syntax-check" to see diagnostics diff --git a/src/hash.c b/src/hash.c index b960640..bde3a0b 100644 --- a/src/hash.c +++ b/src/hash.c @@ -32,10 +32,6 @@ /* #define DEBUG_GROW */ -#define virHashError(conn, code, fmt...) \ - virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ - __FUNCTION__, __LINE__, fmt) - /* * A single entry in the hash table */ @@ -593,4 +589,3 @@ void *virHashSearch(virHashTablePtr table, virHashSearcher iter, const void *dat } return (NULL); } - diff --git a/src/openvz_conf.h b/src/openvz_conf.h index 1030d17..8e02056 100644 --- a/src/openvz_conf.h +++ b/src/openvz_conf.h @@ -34,14 +34,6 @@ enum { OPENVZ_WARN, OPENVZ_ERR }; -#define openvzLog(level, msg...) { if(level == OPENVZ_WARN) \ - fprintf(stderr, "\nWARNING: ");\ - else \ - fprintf(stderr, "\nERROR: ");\ - fprintf(stderr, "\n\t");\ - fprintf(stderr, msg);\ - fprintf(stderr, "\n"); } - #define openvzError(conn, code, fmt...) \ virReportErrorHelper(conn, VIR_FROM_OPENVZ, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) diff --git a/src/xen_unified.c b/src/xen_unified.c index e0a446a..66d5fc2 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -1,7 +1,7 @@ /* * xen_unified.c: Unified Xen driver. * - * Copyright (C) 2007, 2008 Red Hat, Inc. + * Copyright (C) 2007, 2008, 2009 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -235,7 +235,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) /* Allocate per-connection private data. */ if (VIR_ALLOC(priv) < 0) { - xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, "allocating private data"); + xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating private data")); return VIR_DRV_OPEN_ERROR; } if (virMutexInit(&priv->lock) < 0) { @@ -247,7 +247,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) /* Allocate callback list */ if (VIR_ALLOC(cbList) < 0) { - xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, "allocating callback list"); + xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating callback list")); virMutexDestroy(&priv->lock); VIR_FREE(priv); return VIR_DRV_OPEN_ERROR; @@ -1533,7 +1533,7 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list, list->count++; return 0; memory_error: - xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, "allocating domain info"); + xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating domain info")); if (info) VIR_FREE(info->name); VIR_FREE(info); -- 1.6.1.258.g7ff14

2 2

[libvirt] Tiny additional RHEL patch
by Daniel Veillard 20 Jan '09

20 Jan '09

Small addition to the spec file, basically if on Fedora we should not activate RHEL-5 Xen specific support, but on RHEL and possibly CentOS the flag should be passed to %configure. The test is somehow reversed because it's hard to detect building on a RHEL platform from the spec file, and that should cope well with CentOS too. Now for other rpm based environment, I welcome improvements! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH 3/4] use monitor fd for domain shutdown
by Guido Günther 20 Jan '09

20 Jan '09

This way we don't have to bother about stdin/stdout/stderr on reconnect. Since we dup stdin/stderr on the logfile we need to reparse it for the monitor path. Cheers, -- Guido --- src/domain_conf.h | 1 + src/qemu_driver.c | 155 +++++++++++++++++++++++++++-------------------------- 2 files changed, 80 insertions(+), 76 deletions(-) diff --git a/src/domain_conf.h b/src/domain_conf.h index 45b3e10..c236a66 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -465,6 +465,7 @@ struct _virDomainObj { int stderr_fd; int stderr_watch; int monitor; + int monitor_watch; char *monitorpath; int monitorWatch; int logfile; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 06f444b..734a329 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -181,6 +181,45 @@ qemudLogFD(virConnectPtr conn, const char* logDir, const char* name) } +static int +qemudLogReadFD(virConnectPtr conn, const char* logDir, const char* name, off_t pos) +{ + char logfile[PATH_MAX]; + mode_t logmode = O_RDONLY; + int ret, fd = -1; + + if ((ret = snprintf(logfile, sizeof(logfile), "%s/%s.log", logDir, name)) + < 0 || ret >= sizeof(logfile)) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("failed to build logfile name %s/%s.log"), + logDir, name); + return -1; + } + + + if ((fd = open(logfile, logmode)) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("failed to create logfile %s: %s"), + logfile, strerror(errno)); + return -1; + } + if (qemudSetCloseExec(fd) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unable to set VM logfile close-on-exec flag: %s"), + strerror(errno)); + close(fd); + return -1; + } + if (lseek(fd, pos, SEEK_SET) < 0) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unable to seek to %lld in %s: %s"), + pos, logfile, strerror(errno)); + close(fd); + } + return fd; +} + + static void qemudAutostartConfigs(struct qemud_driver *driver) { unsigned int i; @@ -516,11 +555,7 @@ qemudReadMonitorOutput(virConnectPtr conn, int ret; ret = read(fd, buf+got, buflen-got-1); - if (ret == 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("QEMU quit during %s startup\n%s"), what, buf); - return -1; - } + if (ret < 0) { struct pollfd pfd = { .fd = fd, .events = POLLIN }; if (errno == EINTR) @@ -584,6 +619,7 @@ qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, } static int qemudOpenMonitor(virConnectPtr conn, + struct qemud_driver* driver, virDomainObjPtr vm, const char *monitor) { int monfd; @@ -618,6 +654,12 @@ static int qemudOpenMonitor(virConnectPtr conn, goto error; } + if ((vm->monitor_watch = virEventAddHandle(vm->monitor, 0, + qemudDispatchVMEvent, + driver, NULL)) < 0) + goto error; + + /* Keep monitor open upon success */ if (ret == 0) return ret; @@ -677,6 +719,7 @@ qemudFindCharDevicePTYs(virConnectPtr conn, const char *output, int fd ATTRIBUTE_UNUSED) { + struct qemud_driver* driver = conn->privateData; char *monitor = NULL; size_t offset = 0; int ret, i; @@ -711,7 +754,9 @@ qemudFindCharDevicePTYs(virConnectPtr conn, } /* Got them all, so now open the monitor console */ - ret = qemudOpenMonitor(conn, vm, monitor); + qemuDriverLock(driver); + ret = qemudOpenMonitor(conn, driver, vm, monitor, 0); + qemuDriverUnlock(driver); cleanup: VIR_FREE(monitor); @@ -719,21 +764,23 @@ cleanup: } static int qemudWaitForMonitor(virConnectPtr conn, - virDomainObjPtr vm) { + struct qemud_driver* driver, + virDomainObjPtr vm, off_t pos) +{ char buf[1024]; /* Plenty of space to get startup greeting */ - int ret = qemudReadMonitorOutput(conn, - vm, vm->stderr_fd, - buf, sizeof(buf), - qemudFindCharDevicePTYs, - "console", 3000); + int logfd; + int ret; - buf[sizeof(buf)-1] = '\0'; + if ((logfd = qemudLogReadFD(conn, driver->logDir, vm->def->name, pos)) + < 0) + return logfd; - if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { - /* Log, but ignore failures to write logfile for VM */ - qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s\n"), + ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf), + qemudFindCharDevicePTYs, + "console", 3000); + if (close(logfd) < 0) + qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"), strerror(errno)); - } return ret; } @@ -942,6 +989,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, fd_set keepfd; const char *emulator; pid_t child; + int pos = -1; FD_ZERO(&keepfd); @@ -1034,12 +1082,14 @@ static int qemudStartVMDaemon(virConnectPtr conn, qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s\n"), errno, strerror(errno)); - vm->stdout_fd = -1; - vm->stderr_fd = -1; + if ((pos = lseek(vm->logfile, 0, SEEK_END)) < 0) + qemudLog(QEMUD_WARN, _("Unable to seek to end of logfile %d: %s\n"), + errno, strerror(errno)); for (i = 0 ; i < ntapfds ; i++) FD_SET(tapfds[i], &keepfd); + vm->stderr_fd = vm->stdout_fd = vm->logfile; ret = virExec(conn, argv, progenv, &keepfd, &child, vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd, VIR_EXEC_NONBLOCK | VIR_EXEC_DAEMON); @@ -1078,19 +1128,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, } if (ret == 0) { - if (((vm->stdout_watch = virEventAddHandle(vm->stdout_fd, - VIR_EVENT_HANDLE_READABLE | - VIR_EVENT_HANDLE_ERROR | - VIR_EVENT_HANDLE_HANGUP, - qemudDispatchVMEvent, - driver, NULL)) < 0) || - ((vm->stderr_watch = virEventAddHandle(vm->stderr_fd, - VIR_EVENT_HANDLE_READABLE | - VIR_EVENT_HANDLE_ERROR | - VIR_EVENT_HANDLE_HANGUP, - qemudDispatchVMEvent, - driver, NULL)) < 0) || - (qemudWaitForMonitor(conn, vm) < 0) || + if ((qemudWaitForMonitor(conn, driver, vm, pos) < 0) || (qemudDetectVcpuPIDs(conn, vm) < 0) || (qemudInitCpus(conn, vm, migrateFrom) < 0)) { qemudShutdownVMDaemon(conn, driver, vm); @@ -1102,32 +1140,6 @@ static int qemudStartVMDaemon(virConnectPtr conn, return ret; } -static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, int fd) { - char buf[4096]; - if (vm->pid < 0) - return 0; - - for (;;) { - int ret = read(fd, buf, sizeof(buf)-1); - if (ret < 0) { - if (errno == EAGAIN) - return 0; - return -1; - } - if (ret == 0) { - return 0; - } - buf[ret] = '\0'; - - if (safewrite(vm->logfile, buf, ret) < 0) { - /* Log, but ignore failures to write logfile for VM */ - qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s\n"), - strerror(errno)); - } - } -} - static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, struct qemud_driver *driver, virDomainObjPtr vm) { @@ -1141,17 +1153,11 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, qemudLog(QEMUD_ERROR, _("Failed to send SIGTERM to %s (%d): %s\n"), vm->def->name, vm->pid, strerror(errno)); - qemudVMData(driver, vm, vm->stdout_fd); - qemudVMData(driver, vm, vm->stderr_fd); - - virEventRemoveHandle(vm->stdout_watch); - virEventRemoveHandle(vm->stderr_watch); + virEventRemoveHandle(vm->monitor_watch); if (close(vm->logfile) < 0) qemudLog(QEMUD_WARN, _("Unable to close logfile %d: %s\n"), errno, strerror(errno)); - close(vm->stdout_fd); - close(vm->stderr_fd); if (vm->monitor != -1) close(vm->monitor); vm->logfile = -1; @@ -1191,8 +1197,7 @@ qemudDispatchVMEvent(int watch, int fd, int events, void *opaque) { virDomainObjPtr tmpvm = driver->domains.objs[i]; virDomainObjLock(tmpvm); if (virDomainIsActive(tmpvm) && - (tmpvm->stdout_watch == watch || - tmpvm->stderr_watch == watch)) { + tmpvm->monitor_watch == watch) { vm = tmpvm; break; } @@ -1202,16 +1207,14 @@ qemudDispatchVMEvent(int watch, int fd, int events, void *opaque) { if (!vm) goto cleanup; - if (vm->stdout_fd != fd && - vm->stderr_fd != fd) { + if (vm->monitor != fd) { failed = 1; } else { - if (events & VIR_EVENT_HANDLE_READABLE) { - if (qemudVMData(driver, vm, fd) < 0) - failed = 1; - } else { + if (events & (VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR)) quit = 1; - } + else + qemudLog(QEMUD_ERROR, _("unhandled fd event %d for %s"), + events, vm->def->name); } if (failed || quit) { -- 1.6.0.6

3 5

[libvirt] [PATCH]: remove stdout_fd, stderr_fd from virDomainObj
by Guido Günther 20 Jan '09

20 Jan '09

Hi, After applying the previous two patches the qemu driver doesn't need these anymore and they can then be removed from lxc/uml as well. -- Guido

3 2

[libvirt] [PATCH 4/4] read saved vm status on libvirtd startup
by Guido Günther 20 Jan '09

20 Jan '09

connect back to running vms. changes: * don't use proc * don't bother about stdin * don't use global qemu_driver directly Cheer, -- Guido --- src/qemu_driver.c | 112 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 96 insertions(+), 16 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 2dedca2..3b01fd4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -297,6 +297,86 @@ cleanup: } +static int qemudOpenMonitor(virConnectPtr conn, + struct qemud_driver* driver, + virDomainObjPtr vm, + const char *monitor, + int reconnect); + +/** + * qemudReconnectVMs + * + * Reconnect running vms to the daemon process + */ +static int +qemudReconnectVMs(struct qemud_driver *driver) +{ + int i; + + for (i = 0 ; i < driver->domains.count ; i++) { + virDomainObjPtr vm = driver->domains.objs[i]; + qemudDomainStatusPtr status = NULL; + char *config = NULL; + int rc; + + virDomainObjLock(vm); + if ((rc = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) + DEBUG("Found pid %d for '%s'", vm->pid, vm->def->name); + else + goto next; + + if ((config = virDomainConfigFile(NULL, + driver->stateDir, + vm->def->name)) == NULL) { + qemudLog(QEMUD_ERR, _("Failed to read domain status for %s\n"), + vm->def->name); + goto next_error; + } + + status = qemudDomainStatusParseFile(NULL, driver->caps, config, 0); + if (status) { + vm->newDef = vm->def; + vm->def = status->def; + } else { + qemudLog(QEMUD_ERR, _("Failed to parse domain status for %s\n"), + vm->def->name); + goto next_error; + } + + if ((rc = qemudOpenMonitor(NULL, driver, vm, status->monitorpath, 1)) != 0) { + qemudLog(QEMUD_ERR, _("Failed to reconnect monitor for %s: %d\n"), + vm->def->name, rc); + goto next_error; + } else + vm->monitorpath = status->monitorpath; + + if((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0) + return -1; + + vm->stdout_fd = vm->stderr_fd = vm->logfile; + + if (vm->def->id >= driver->nextvmid) + driver->nextvmid = vm->def->id + 1; + + vm->state = status->state; + goto next; + +next_error: + /* we failed to reconnect the vm so remove it's traces */ + vm->def->id = -1; + qemudRemoveDomainStatus(NULL, driver, vm); + virDomainDefFree(vm->def); + vm->def = vm->newDef; + vm->newDef = NULL; +next: + virDomainObjUnlock(vm); + VIR_FREE(status); + VIR_FREE(config); + } + return 0; +} + + /** * qemudStartup: * @@ -396,6 +476,7 @@ qemudStartup(void) { qemu_driver->autostartDir, NULL, NULL) < 0) goto error; + qemudReconnectVMs(qemu_driver); qemudAutostartConfigs(qemu_driver); qemuDriverUnlock(qemu_driver); @@ -488,7 +569,6 @@ qemudActive(void) { */ static int qemudShutdown(void) { - unsigned int i; if (!qemu_driver) return -1; @@ -496,15 +576,6 @@ qemudShutdown(void) { qemuDriverLock(qemu_driver); virCapabilitiesFree(qemu_driver->caps); - /* shutdown active VMs */ - for (i = 0 ; i < qemu_driver->domains.count ; i++) { - virDomainObjPtr dom = qemu_driver->domains.objs[i]; - virDomainObjLock(dom); - if (virDomainIsActive(dom)) - qemudShutdownVMDaemon(NULL, qemu_driver, dom); - virDomainObjUnlock(dom); - } - virDomainObjListFree(&qemu_driver->domains); VIR_FREE(qemu_driver->logDir); @@ -621,7 +692,8 @@ qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, static int qemudOpenMonitor(virConnectPtr conn, struct qemud_driver* driver, virDomainObjPtr vm, - const char *monitor) { + const char *monitor, + int reconnect) { int monfd; char buf[1024]; int ret = -1; @@ -642,11 +714,19 @@ static int qemudOpenMonitor(virConnectPtr conn, goto error; } - ret = qemudReadMonitorOutput(conn, - vm, monfd, - buf, sizeof(buf), - qemudCheckMonitorPrompt, - "monitor", 10000); + if (!reconnect) { + ret = qemudReadMonitorOutput(conn, + vm, monfd, + buf, sizeof(buf), + qemudCheckMonitorPrompt, + "monitor", 10000); + } else { + vm->monitor = monfd; + ret = 0; + } + + if (ret != 0) + goto error; if (!(vm->monitorpath = strdup(monitor))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, -- 1.6.0.6

3 4

[libvirt] [PATCH] Solaris least privilege support
by john.levon＠sun.com 20 Jan '09

20 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232039546 28800 # Node ID b9d4d60bca87633897cb133461e1415d1223c823 # Parent 25a0c46588d5de1653b16dfed6bc357abf11db77 Solaris least privilege support On Solaris dom0, virtd runs as a privilege barrier: all libvirt connections are routed through it, and it performs the relevant privilege checks for any clients. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/qemud.c b/qemud/qemud.c --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -84,6 +84,39 @@ #endif +#ifdef __sun +#include <ucred.h> +#include <priv.h> + +#ifndef PRIV_VIRT_MANAGE +#define PRIV_VIRT_MANAGE ((const char *)"virt_manage") +#endif + +#ifndef PRIV_XVM_CONTROL +#define PRIV_XVM_CONTROL ((const char *)"xvm_control") +#endif + +#define PU_RESETGROUPS 0x0001 /* Remove supplemental groups */ +#define PU_CLEARLIMITSET 0x0008 /* L=0 */ + +extern int __init_daemon_priv(int, uid_t, gid_t, ...); + +#define SYSTEM_UID 60 + +static gid_t unix_sock_gid = 60; /* Not used */ +static int unix_sock_rw_mask = 0666; +static int unix_sock_ro_mask = 0666; + +#else + +#define SYSTEM_UID 0 + +static gid_t unix_sock_gid = 0; /* Only root by default */ +static int unix_sock_rw_mask = 0700; /* Allow user only */ +static int unix_sock_ro_mask = 0777; /* Allow world */ + +#endif /* __sun */ + static int godaemon = 0; /* -d: Be a daemon */ static int verbose = 0; /* -v: Verbose mode */ static int timeout = -1; /* -t: Shutdown timeout */ @@ -101,10 +134,6 @@ static char *listen_addr = (char *) LIB static char *listen_addr = (char *) LIBVIRTD_LISTEN_ADDR; static char *tls_port = (char *) LIBVIRTD_TLS_PORT; static char *tcp_port = (char *) LIBVIRTD_TCP_PORT; - -static gid_t unix_sock_gid = 0; /* Only root by default */ -static int unix_sock_rw_mask = 0700; /* Allow user only */ -static int unix_sock_ro_mask = 0777; /* Allow world */ #if HAVE_POLKIT static int auth_unix_rw = REMOTE_AUTH_POLKIT; @@ -638,10 +667,11 @@ static int qemudInitPaths(struct qemud_s static int qemudInitPaths(struct qemud_server *server, char *sockname, char *roSockname, - int maxlen) { + int maxlen) +{ uid_t uid = geteuid(); - if (!uid) { + if (uid == SYSTEM_UID) { if (snprintf (sockname, maxlen, "%s/run/libvirt/libvirt-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -1105,6 +1135,29 @@ static int qemudDispatchServer(struct qe return -1; } +#ifdef __sun + { + ucred_t *ucred = NULL; + const priv_set_t *privs; + + if (getpeerucred (fd, &ucred) == -1 || + (privs = ucred_getprivset (ucred, PRIV_EFFECTIVE)) == NULL) { + if (ucred != NULL) + ucred_free (ucred); + close (fd); + return -1; + } + + if (!priv_ismember (privs, PRIV_VIRT_MANAGE)) { + ucred_free (ucred); + close (fd); + return -1; + } + + ucred_free (ucred); + } +#endif /* __sun */ + /* Disable Nagle. Unix sockets will ignore this. */ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&no_slow_start, sizeof no_slow_start); @@ -2239,6 +2292,29 @@ version (const char *argv0) { printf ("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); } + +#ifdef __sun +static void +qemudSetupPrivs (struct qemud_server *server) +{ + chown ("/var/run/libvirt", SYSTEM_UID, SYSTEM_UID); + chown (server->logDir, SYSTEM_UID, SYSTEM_UID); + + if (__init_daemon_priv (PU_RESETGROUPS | PU_CLEARLIMITSET, + SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { + fprintf (stderr, "additional privileges are required\n"); + exit (1); + } + + if (priv_set (PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, + PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { + fprintf (stderr, "failed to set reduced privileges\n"); + exit (1); + } +} +#else +#define qemudSetupPrivs(a) +#endif /* Print command-line usage. */ static void @@ -2417,6 +2493,20 @@ int main(int argc, char **argv) { sig_action.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sig_action, NULL); + /* Change the group ownership of /var/run/libvirt to unix_sock_gid */ + if (geteuid () == 0) { + const char *rundir = LOCAL_STATE_DIR "/run/libvirt"; + + if (mkdir (rundir, 0755)) { + if (errno != EEXIST) { + VIR_ERROR0 (_("unable to create rundir")); + return (-1); + } + } + } + + qemudSetupPrivs(server); + if (!(server = qemudInitialize(sigpipe[0]))) { ret = 2; goto error2; diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -90,7 +90,7 @@ #define MAGIC 999 /* private_data->magic if OK */ #define DEAD 998 /* private_data->magic if dead/closed */ -static int inside_daemon = 0; +int inside_daemon = 0; struct private_data { int magic; /* Should be MAGIC or DEAD. */ @@ -903,18 +903,21 @@ remoteOpen (virConnectPtr conn, } /* - * If URI is NULL, then do a UNIX connection - * possibly auto-spawning unprivileged server - * and probe remote server for URI + * If URI is NULL, then do a UNIX connection possibly auto-spawning + * unprivileged server and probe remote server for URI. On Solaris, + * this isn't supported, but we may be privileged enough to connect + * to the UNIX socket anyway. */ if (!conn->uri) { DEBUG0("Auto-probe remote URI"); rflags |= VIR_DRV_OPEN_REMOTE_UNIX; +#ifndef __sun if (getuid() > 0) { DEBUG0("Auto-spawn user daemon instance"); rflags |= VIR_DRV_OPEN_REMOTE_USER; rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; } +#endif } priv->magic = DEAD; diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -26,6 +26,17 @@ #include <errno.h> #include <sys/utsname.h> +#ifdef __sun +#include <sys/systeminfo.h> + +#include <priv.h> + +#ifndef PRIV_XVM_CONTROL +#define PRIV_XVM_CONTROL ((const char *)"xvm_control") +#endif + +#endif /* __sun */ + /* required for dom0_getdomaininfo_t */ #include <xen/dom0_ops.h> #include <xen/version.h> @@ -35,10 +46,6 @@ #ifdef HAVE_XEN_SYS_PRIVCMD_H #include <xen/sys/privcmd.h> #endif -#endif - -#ifdef __sun -#include <sys/systeminfo.h> #endif /* required for shutdown flags */ @@ -3387,3 +3394,17 @@ xenHypervisorGetVcpuMax(virDomainPtr dom return maxcpu; } +/** + * xenHavePrivilege() + * + * Return true if the current process should be able to connect to Xen. + */ +int +xenHavePrivilege() +{ +#ifdef __sun + return priv_ineffect (PRIV_XVM_CONTROL); +#else + return getuid () == 0; +#endif +} diff --git a/src/xen_internal.h b/src/xen_internal.h --- a/src/xen_internal.h +++ b/src/xen_internal.h @@ -104,4 +104,6 @@ int xenHypervisorNodeGetCellsFreeMem int startCell, int maxCells); +int xenHavePrivilege(void); + #endif /* __VIR_XEN_INTERNAL_H__ */ diff --git a/src/xen_unified.c b/src/xen_unified.c --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -231,6 +231,16 @@ xenUnifiedOpen (virConnectPtr conn, virC xenUnifiedPrivatePtr priv; virDomainEventCallbackListPtr cbList; +#ifdef __sun + extern int inside_daemon; + /* + * Only the libvirtd instance can open this driver. + * Everything else falls back to the remote driver. + */ + if (!inside_daemon) + return VIR_DRV_OPEN_DECLINED; +#endif + if (conn->uri == NULL) { if (!xenUnifiedProbe()) return VIR_DRV_OPEN_DECLINED; @@ -283,8 +293,8 @@ xenUnifiedOpen (virConnectPtr conn, virC priv->proxy = -1; - /* Hypervisor is only run as root & required to succeed */ - if (getuid() == 0) { + /* Hypervisor is only run with privilege & required to succeed */ + if (xenHavePrivilege()) { DEBUG0("Trying hypervisor sub-driver"); if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { @@ -293,7 +303,7 @@ xenUnifiedOpen (virConnectPtr conn, virC } } - /* XenD is required to suceed if root. + /* XenD is required to succeed if privileged. * If it fails as non-root, then the proxy driver may take over */ DEBUG0("Trying XenD sub-driver"); @@ -318,12 +328,12 @@ xenUnifiedOpen (virConnectPtr conn, virC DEBUG0("Activated XS sub-driver"); priv->opened[XEN_UNIFIED_XS_OFFSET] = 1; } else { - if (getuid() == 0) - goto fail; /* XS is mandatory as root */ + if (xenHavePrivilege()) + goto fail; /* XS is mandatory when privileged */ } } else { - if (getuid() == 0) { - goto fail; /* XenD is mandatory as root */ + if (xenHavePrivilege()) { + goto fail; /* XenD is mandatory when privileged */ } else { #if WITH_PROXY DEBUG0("Trying proxy sub-driver"); diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -42,7 +42,7 @@ #include "buf.h" #include "uuid.h" #include "xen_unified.h" -#include "xen_internal.h" /* for DOM0_INTERFACE_VERSION */ +#include "xen_internal.h" #include "xs_internal.h" /* To extract VNC port & Serial console TTY */ #include "memory.h" @@ -151,9 +151,10 @@ do_connect(virConnectPtr xend) s = -1; /* - * Connecting to XenD as root is mandatory, so log this error + * Connecting to XenD when privileged is mandatory, so log this + * error */ - if (getuid() == 0) { + if (xenHavePrivilege()) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, "%s", _("failed to connect to xend")); } diff --git a/src/xs_internal.c b/src/xs_internal.c --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -35,7 +35,7 @@ #include "uuid.h" #include "xen_unified.h" #include "xs_internal.h" -#include "xen_internal.h" /* for xenHypervisorCheckID */ +#include "xen_internal.h" #ifdef __linux__ #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" @@ -299,11 +299,11 @@ xenStoreOpen(virConnectPtr conn, if (priv->xshandle == NULL) { /* - * not being able to connect via the socket as a normal user - * is rather normal, this should fallback to the proxy (or + * not being able to connect via the socket as an unprivileged + * user is rather normal, this should fallback to the proxy (or * remote) mechanism. */ - if (getuid() == 0) { + if (xenHavePrivilege()) { virXenStoreError(NULL, VIR_ERR_NO_XEN, "%s", _("failed to connect to Xen Store")); }

7 10

[libvirt] [PATCH 0/7 RFC] RHEL-5 support, and a few preparatory fixes
by Markus Armbruster 19 Jan '09

19 Jan '09

This patch series attempts to make libvirt just work on RHEL-5. Right now it doesn't, mostly because libvirt relies on version number checks in a couple of places, and RHEL-5's version numbers aren't the whole truth due to various backports of later stuff. The first two patches are plain bug fixes: [PATCH 1/7] Fix network device inconsistency between xm and sxpr [PATCH 2/7] Fix graphics configuration inconsistency between xm and sxpr The next three add a few special cases for RHEL-5: [PATCH 3/7] New configure option --with-rhel5-api [PATCH 4/7] Fix HVM network device configuration for RHEL-5 [PATCH 5/7] Fix PVFB device configuration for RHEL-5 [PATCH 6/7] Enable NUMA support for RHEL-5 The last one drops a counter-productive error check: [PATCH 7/7] Don't treat missing topology information as error See the patches for more detailed descriptions. I'm not proposing this for immediate commit, as I'm still testing. But I'd appreciate review: is this the right way to do it? Thanks, Markus

4 15

[libvirt] [PATCH 2/4] daemonize qemu processes
by Guido Günther 19 Jan '09

19 Jan '09

so they doen't get killed when the libvirtd quits unexpectedly changes: * longer timeouts when waiting for procs to show up * check if process exists before killing it * use virKill this one basically got acked before but makes little sense without the follow up patches. Cheers, -- Guido --- src/qemu_driver.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 1619154..06f444b 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -941,6 +941,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, unsigned int qemuCmdFlags; fd_set keepfd; const char *emulator; + pid_t child; FD_ZERO(&keepfd); @@ -1039,12 +1040,26 @@ static int qemudStartVMDaemon(virConnectPtr conn, for (i = 0 ; i < ntapfds ; i++) FD_SET(tapfds[i], &keepfd); - ret = virExec(conn, argv, progenv, &keepfd, &vm->pid, + ret = virExec(conn, argv, progenv, &keepfd, &child, vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd, - VIR_EXEC_NONBLOCK); - if (ret == 0) + VIR_EXEC_NONBLOCK | VIR_EXEC_DAEMON); + + /* wait for qemu process to to show up */ + if (ret == 0) { + int retries = 100; + while (retries) { + if ((ret = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) + break; + usleep(100*1000); + retries--; + } + if (ret) + qemudLog(QEMUD_WARN, _("Domain %s didn't show up\n"), vm->def->name); + } + + if (ret == 0) { vm->state = migrateFrom ? VIR_DOMAIN_PAUSED : VIR_DOMAIN_RUNNING; - else + } else vm->def->id = -1; for (i = 0 ; argv[i] ; i++) @@ -1121,7 +1136,10 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, qemudLog(QEMUD_INFO, _("Shutting down VM '%s'\n"), vm->def->name); - kill(vm->pid, SIGTERM); + if (virKillProcess(vm->pid, 0) == 0 && + virKillProcess(vm->pid, SIGTERM) < 0) + qemudLog(QEMUD_ERROR, _("Failed to send SIGTERM to %s (%d): %s\n"), + vm->def->name, vm->pid, strerror(errno)); qemudVMData(driver, vm, vm->stdout_fd); qemudVMData(driver, vm, vm->stderr_fd); @@ -1141,15 +1159,10 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, vm->stderr_fd = -1; vm->monitor = -1; - if (waitpid(vm->pid, NULL, WNOHANG) != vm->pid) { - kill(vm->pid, SIGKILL); - if (waitpid(vm->pid, NULL, 0) != vm->pid) { - qemudLog(QEMUD_WARN, - "%s", _("Got unexpected pid, damn\n")); - } - } - qemudRemoveDomainStatus(conn, driver, vm); + /* shut it off for sure */ + virKillProcess(vm->pid, SIGKILL); + qemudRemoveDomainStatus(conn, driver, vm); vm->pid = -1; vm->def->id = -1; vm->state = VIR_DOMAIN_SHUTOFF; -- 1.6.0.6

2 2

[libvirt] [PATCH 1/4] save domstate as string in status file
by Guido Günther 19 Jan '09

19 Jan '09

This one is as posted before. Not really necessary, but makes things look nicer. -- Guido --- src/domain_conf.c | 9 +++++++++ src/domain_conf.h | 2 ++ src/libvirt_private.syms | 2 ++ src/qemu_conf.c | 12 ++++++++---- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 94196e8..8deb992 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -142,6 +142,15 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST, "usb", "pci") +VIR_ENUM_IMPL(virDomainState, VIR_DOMAIN_CRASHED+1, + "nostate", + "running", + "blocked", + "paused", + "shutdown", + "shutoff", + "crashed") + #define virDomainReportError(conn, code, fmt...) \ virReportErrorHelper(conn, VIR_FROM_DOMAIN, code, __FILE__, \ __FUNCTION__, __LINE__, fmt) diff --git a/src/domain_conf.h b/src/domain_conf.h index 1e5c103..45b3e10 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -625,5 +625,7 @@ VIR_ENUM_DECL(virDomainHostdevSubsys) VIR_ENUM_DECL(virDomainInput) VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) +/* from libvirt.h */ +VIR_ENUM_DECL(virDomainState) #endif /* __DOMAIN_CONF_H */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c76b6c2..3f83a07 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -94,6 +94,8 @@ virDomainVirtTypeToString; virDomainFSDefFree; virDomainObjLock; virDomainObjUnlock; +virDomainStateTypeToString; +virDomainStateTypeFromString; # domain_event.h diff --git a/src/qemu_conf.c b/src/qemu_conf.c index faf1e12..45108f3 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1375,12 +1375,14 @@ qemudDomainStatusParseFile(virConnectPtr conn, } ctxt->node = root; - if((virXPathLong(conn, "string(./@state)", ctxt, &val)) < 0) { + if(!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("invalid domain state")); goto error; - } else - status->state = (int)val; + } else { + status->state = virDomainStateTypeFromString(tmp); + VIR_FREE(tmp); + } if((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -1433,7 +1435,9 @@ qemudDomainStatusFormat(virConnectPtr conn, char *config_xml = NULL, *xml = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; - virBufferVSprintf(&buf, "<domstatus state='%d' pid='%d'>\n", vm->state, vm->pid); + virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", + virDomainStateTypeToString(vm->state), + vm->pid); virBufferEscapeString(&buf, " <monitor path='%s'/>\n", vm->monitorpath); if (!(config_xml = virDomainDefFormat(conn, -- 1.6.0.6

3 3

[libvirt] [PATCH] don't ignore write failure [was PATCH: 10/25: ...
by Jim Meyering 19 Jan '09

19 Jan '09

"Daniel P. Berrange" <berrange(a)redhat.com> wrote: > The strerror() method is not guarenteed to be re-entrant, which is ... > @@ -759,8 +762,8 @@ static int networkStartNetworkDaemon(vir > > if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE && > !networkEnableIpForwarding()) { > - networkReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, > - _("failed to enable IP forwarding : %s"), strerror(err)); > + virReportSystemError(conn, errno, "%s", > + _("failed to enable IP forwarding")); > goto err_delbr2; > } > Looking at this chunk and the s/err/errno/ change (that's a bug fix), I spotted another small bug: Any write error in networkEnableIpForwarding was ignored, I added a check for failed close, too, just in case. Jim >From b4abd36014b56cdb33a91ab336eff6450a5d3c8a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 19 Jan 2009 10:11:15 +0100 Subject: [PATCH] don't ignore write failure * src/network_driver.c (networkEnableIpForwarding): This function would always return 1 (success). Now it returns 0 upon write or close failure, being careful to preserve any errno from a write failure. Add comments. --- src/network_driver.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/network_driver.c b/src/network_driver.c index 695acfb..51cfbbd 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -1,7 +1,7 @@ /* * driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. + * Copyright (C) 2006-2009 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -774,20 +774,29 @@ networkRemoveIptablesRules(struct network_driver *driver, iptablesSaveRules(driver->iptables); } +/* Enable IP Forwarding. + Return 0 for success, nonzero for failure. + Be careful to preserve any errno value upon failure. */ static int networkEnableIpForwarding(void) { #define PROC_IP_FORWARD "/proc/sys/net/ipv4/ip_forward" - int fd, ret; + int fd; if ((fd = open(PROC_IP_FORWARD, O_WRONLY|O_TRUNC)) == -1) return 0; - if (safewrite(fd, "1\n", 2) < 0) - ret = 0; + if (safewrite(fd, "1\n", 2) < 0) { + int saved_errno = errno; + close (fd); + errno = saved_errno; + return 0; + } - close (fd); + /* Use errno from failed close only if there was no write error. */ + if (close (fd) != 0) + return 0; return 1; @@ -1429,4 +1438,3 @@ int networkRegister(void) { virRegisterStateDriver(&networkStateDriver); return 0; } - -- 1.6.1.258.g7ff14

1 0

[libvirt] [PATCH] Parse ipaddr for bridge network types
by john.levon＠sun.com 19 Jan '09

19 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232054247 28800 # Node ID 2b8a53968637c1ba806a1cdd94a24f4d15f8072a # Parent 04139c088854c23dc548c0f9f4abf54c4ed07e0d Parse ipaddr for bridge network types As well as supporting round-tripping of the IP address, this fixes a leak if ipaddr was specified in the Xen domain config. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -277,6 +277,7 @@ void virDomainNetDefFree(virDomainNetDef case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); VIR_FREE(def->data.bridge.script); + VIR_FREE(def->data.bridge.ipaddr); break; } @@ -867,7 +868,8 @@ virDomainNetDefParseXML(virConnectPtr co address = virXMLPropString(cur, "address"); port = virXMLPropString(cur, "port"); } else if ((address == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET) && + (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || + def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && (xmlStrEqual(cur->name, BAD_CAST "ip"))) { address = virXMLPropString(cur, "address"); } else if ((ifname == NULL) && @@ -933,6 +935,10 @@ virDomainNetDefParseXML(virConnectPtr co if (script != NULL) { def->data.bridge.script = script; script = NULL; + } + if (address != NULL) { + def->data.bridge.ipaddr = address; + address = NULL; } break; @@ -2870,6 +2876,9 @@ virDomainNetDefFormat(virConnectPtr conn case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.ipaddr) + virBufferVSprintf(buf, " <ip address='%s'/>\n", + def->data.bridge.ipaddr); if (def->data.bridge.script) virBufferEscapeString(buf, " <script path='%s'/>\n", def->data.bridge.script); diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -154,6 +154,7 @@ struct _virDomainNetDef { struct { char *brname; char *script; + char *ipaddr; } bridge; } data; char *ifname; diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1792,10 +1792,18 @@ xenDaemonParseSxprNets(virConnectPtr con net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && !(net->data.bridge.script = strdup(tmp2))) goto no_memory; + tmp = sexpr_node(node, "device/vif/ip"); + if (tmp && + !(net->data.bridge.ipaddr = strdup(tmp))) + goto no_memory; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; if (tmp2 && !(net->data.ethernet.script = strdup(tmp2))) + goto no_memory; + tmp = sexpr_node(node, "device/vif/ip"); + if (tmp && + !(net->data.ethernet.ipaddr = strdup(tmp))) goto no_memory; } @@ -1829,11 +1837,6 @@ xenDaemonParseSxprNets(virConnectPtr con 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 (model && !(net->model = strdup(model))) @@ -5128,6 +5131,8 @@ xenDaemonFormatSxprNet(virConnectPtr con script = def->data.bridge.script; virBufferVSprintf(buf, "(script '%s')", script); + if (def->data.bridge.ipaddr != NULL) + virBufferVSprintf(buf, "(ip '%s')", def->data.bridge.ipaddr); break; case VIR_DOMAIN_NET_TYPE_NETWORK: diff --git a/src/xm_internal.c b/src/xm_internal.c --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1086,6 +1086,9 @@ xenXMDomainConfigParse(virConnectPtr con if (script[0] && !(net->data.bridge.script = strdup(script))) goto no_memory; + if (ip[0] && + !(net->data.bridge.ipaddr = strdup(ip))) + goto no_memory; } else { if (script[0] && !(net->data.ethernet.script = strdup(script))) @@ -1822,6 +1825,8 @@ static int xenXMDomainConfigFormatNet(vi switch (net->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferVSprintf(&buf, ",bridge=%s", net->data.bridge.brname); + if (net->data.bridge.ipaddr) + virBufferVSprintf(&buf, ",ip=%s", net->data.bridge.ipaddr); break; case VIR_DOMAIN_NET_TYPE_ETHERNET:

2 1

[libvirt] [PATCH] patch queue: bridge-script
by john.levon＠sun.com 19 Jan '09

19 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1232052415 28800 # Node ID 04139c088854c23dc548c0f9f4abf54c4ed07e0d # Parent 253da3acb103a4ce764cb8192a65a4d51833c2f1 patch queue: bridge-script diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -276,6 +276,7 @@ void virDomainNetDefFree(virDomainNetDef case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); + VIR_FREE(def->data.bridge.script); break; } @@ -877,7 +878,8 @@ virDomainNetDefParseXML(virConnectPtr co VIR_FREE(ifname); } } else if ((script == NULL) && - (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET) && + (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET || + def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); } else if (xmlStrEqual (cur->name, BAD_CAST "model")) { @@ -928,6 +930,10 @@ virDomainNetDefParseXML(virConnectPtr co } def->data.bridge.brname = bridge; bridge = NULL; + if (script != NULL) { + def->data.bridge.script = script; + script = NULL; + } break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -2864,6 +2870,9 @@ virDomainNetDefFormat(virConnectPtr conn case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.script) + virBufferEscapeString(buf, " <script path='%s'/>\n", + def->data.bridge.script); break; case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -153,6 +153,7 @@ struct _virDomainNetDef { } network; struct { char *brname; + char *script; } bridge; } data; char *ifname; diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -58,6 +58,12 @@ #define XEN_SCHED_CRED_NPARAM 2 #endif /* PROXY */ + +#ifdef __sun +#define DEFAULT_VIF_SCRIPT "vif-vnic" +#else +#define DEFAULT_VIF_SCRIPT "vif-bridge" +#endif /** * xend_connection_type: @@ -1775,15 +1781,22 @@ xenDaemonParseSxprNets(virConnectPtr con if (VIR_ALLOC(net) < 0) goto no_memory; - if ((tmp2 && strstr(tmp2, "bridge")) || tmp) { + if (tmp != NULL || (STREQ(tmp2, DEFAULT_VIF_SCRIPT))) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; /* XXX virtual network reverse resolve */ if (tmp && !(net->data.bridge.brname = strdup(tmp))) goto no_memory; + if (tmp2 && + net->type == VIR_DOMAIN_NET_TYPE_BRIDGE && + !(net->data.bridge.script = strdup(tmp2))) + goto no_memory; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + if (tmp2 && + !(net->data.ethernet.script = strdup(tmp2))) + goto no_memory; } tmp = sexpr_node(node, "device/vif/vifname"); @@ -1820,11 +1833,6 @@ xenDaemonParseSxprNets(virConnectPtr con 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 && @@ -5093,6 +5101,8 @@ xenDaemonFormatSxprNet(virConnectPtr con int xendConfigVersion, int isAttach) { + const char *script = DEFAULT_VIF_SCRIPT; + if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && def->type != VIR_DOMAIN_NET_TYPE_NETWORK && def->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { @@ -5114,7 +5124,10 @@ xenDaemonFormatSxprNet(virConnectPtr con switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferVSprintf(buf, "(bridge '%s')", def->data.bridge.brname); - virBufferAddLit(buf, "(script 'vif-bridge')"); + if (def->data.bridge.script) + script = def->data.bridge.script; + + virBufferVSprintf(buf, "(script '%s')", script); break; case VIR_DOMAIN_NET_TYPE_NETWORK: @@ -5137,7 +5150,7 @@ xenDaemonFormatSxprNet(virConnectPtr con return -1; } virBufferVSprintf(buf, "(bridge '%s')", bridge); - virBufferAddLit(buf, "(script 'vif-bridge')"); + virBufferVSprintf(buf, "(script '%s')", script); VIR_FREE(bridge); } break; diff --git a/src/xm_internal.c b/src/xm_internal.c --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1072,14 +1072,19 @@ xenXMDomainConfigParse(virConnectPtr con net->mac[5] = rawmac[5]; } - if (bridge[0] || STREQ(script, "vif-bridge")) + if (bridge[0] || STREQ(script, "vif-bridge") || + STREQ(script, "vif-vnic")) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - else + } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + } if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (bridge[0] && !(net->data.bridge.brname = strdup(bridge))) + goto no_memory; + if (script[0] && + !(net->data.bridge.script = strdup(script))) goto no_memory; } else { if (script[0] &&

4 3