- Devel - libvirt List Archives

[libvirt] [PATCHv3 0/2] more audit patches - audit network device fds
by Eric Blake 10 Mar '11

10 Mar '11

I hope this closes out my audit series. As promised in https://www.redhat.com/archives/libvir-list/2011-March/msg00415.html, here's the updated and tested network device auditing patches. This time, I've completed testing: in virt-manager, I attached a hypervisor default (non-virtio, so no /dev/vhost-net), then detached it, then attached a virtio interface in its place, and got the following audit messages: type=VIRT_RESOURCE msg=audit(1299702937.924:81114): user pid=499 uid=0 auid=500 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='resrc=net reason=open vm="fedora_12" uuid=51c6fc83-65a4-e627-b698-042b00145201 net='52:54:00:80:C6:06' path="/dev/net/tun" rdev=0A:C8: exe="/home/dummy/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/0 res=success' type=VIRT_RESOURCE msg=audit(1299702937.928:81115): user pid=499 uid=0 auid=500 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='resrc=net reason=attach vm="fedora_12" uuid=51c6fc83-65a4-e627-b698-042b00145201 old-net='?' new-net='52:54:00:80:C6:06': exe="/home/dummy/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/0 res=success' type=VIRT_RESOURCE msg=audit(1299702995.378:81117): user pid=499 uid=0 auid=500 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='resrc=net reason=detach vm="fedora_12" uuid=51c6fc83-65a4-e627-b698-042b00145201 old-net='52:54:00:80:C6:06' new-net='?': exe="/home/dummy/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/0 res=success' type=VIRT_RESOURCE msg=audit(1299703012.919:81119): user pid=499 uid=0 auid=500 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='resrc=net reason=open vm="fedora_12" uuid=51c6fc83-65a4-e627-b698-042b00145201 net='52:54:00:31:26:F9' path="/dev/net/tun" rdev=0A:C8: exe="/home/dummy/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/0 res=success' type=VIRT_RESOURCE msg=audit(1299703012.919:81120): user pid=499 uid=0 auid=500 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='resrc=net reason=open vm="fedora_12" uuid=51c6fc83-65a4-e627-b698-042b00145201 net='52:54:00:31:26:F9' path="/dev/vhost-net" rdev=0A:39: exe="/home/dummy/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/0 res=success' type=VIRT_RESOURCE msg=audit(1299703013.002:81121): user pid=499 uid=0 auid=500 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='resrc=net reason=attach vm="fedora_12" uuid=51c6fc83-65a4-e627-b698-042b00145201 old-net='?' new-net='52:54:00:31:26:F9': exe="/home/dummy/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/0 res=success' Changes in v3: rename the audit method to qemuAuditNetDevice, and insert audit points after all attempts to open a network device that might later be passed to a qemu -netdev; document why I didn't audit closeout of said fds Eric Blake (2): qemu: support vhost in attach-interface audit: audit use of /dev/net/tun, /dev/tapN, /dev/vhost-net src/qemu/qemu_audit.c | 41 ++++++++++++++++++++++++++++++++ src/qemu/qemu_audit.h | 5 ++++ src/qemu/qemu_command.c | 43 ++++++++++++++++----------------- src/qemu/qemu_command.h | 14 ++++++++--- src/qemu/qemu_hotplug.c | 60 ++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 129 insertions(+), 34 deletions(-) -- 1.7.4

2 9

[libvirt] [PATCH v3 0/5] qemu: Support domain snapshots with current QMP
by Jiri Denemark 10 Mar '11

10 Mar '11

This version 3 gets back to the second alternative for HMP passthrough implementation provided in version 1. Changes made sinve that version 1 was posted are: - separate HMP passthrough infrastructure into a standalone patch - use qemuMonitorHMPCommand* and qemuMonitorTextCommand* instead of just qemuMonitorCommand* to make it obvious they deal with HMP/text monitor - implement HMP fallback for {load,del}vm in addition to savevm - escape snapshot name Jiri Denemark (5): qemu: Setup infrastructure for HMP passthrough qemu: Rename qemuMonitorCommand{,WithFd} as qemuMonitorHMP* qemu: Rename qemuMonitorCommandWithHandler as qemuMonitorText* qemu: Fallback to HMP for snapshot commands qemu: Escape snapshot name passed to {save,load,del}vm src/qemu/qemu_monitor.c | 12 +++ src/qemu/qemu_monitor.h | 8 ++- src/qemu/qemu_monitor_json.c | 121 ++++++++++++++++++++++--------- src/qemu/qemu_monitor_json.h | 5 ++ src/qemu/qemu_monitor_text.c | 163 ++++++++++++++++++++++-------------------- src/qemu/qemu_monitor_text.h | 5 ++ 6 files changed, 200 insertions(+), 114 deletions(-) -- 1.7.4.1

2 12

[libvirt] [PATCH] qemu: Fix warnings in event handlers
by Jiri Denemark 10 Mar '11

10 Mar '11

Some qemu monitor event handlers were issuing inadequate warning when virDomainSaveStatus() failed. They copied the message from I/O error handler without customizing it to provide better information on why virDomainSaveStatus() was called. --- src/qemu/qemu_process.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ee1b4c4..4414a7c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -339,15 +339,18 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjLock(vm); if (vm->state == VIR_DOMAIN_RUNNING) { - VIR_DEBUG("Transitioned guest %s to paused state due to unknown event", vm->def->name); + VIR_DEBUG("Transitioned guest %s to paused state due to unknown event", + vm->def->name); vm->state = VIR_DOMAIN_PAUSED; event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) - VIR_WARN("Unable to save status on vm %s after IO error", vm->def->name); + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } } virDomainObjUnlock(vm); @@ -412,8 +415,10 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_WATCHDOG); - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) - VIR_WARN("Unable to save status on vm %s after IO error", vm->def->name); + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after watchdog event", + vm->def->name); + } } if (vm->def->watchdog->action == VIR_DOMAIN_WATCHDOG_ACTION_DUMP) { -- 1.7.4.1

2 2

[libvirt] [PATCH 0/3] Support domain snapshots with current QMP whithout savevm command
by Jiri Denemark 10 Mar '11

10 Mar '11

This is quite hacky since it involves falling back to HMP when savevm command is not found in QMP, which is something qemu monitor code was not designed to support. Hence, I'm providing 2 version of the first patch: 1.1/3 and 1.2/3. - 1.1/3 version only touches JSON monitor code but involves copy&paste of the snapshot code from text monitor - 1.2/3 touches more files but doesn't require duplicating the text monitor snapshot implementation into qemu_monitor_json.c. However, it results in somewhat funky call graphs: -> qemuMonitorJSONCreateSnapshot -> qemuMonitorTextCreateSnapshot -> qemuMonitorCommand (a macro expanding to qemuMonitorCommandWithFd) -> qemuMonitorJSONHumanCommandWithFd -> qemuMonitorJSONCommandWithFd The possibility to call qemuMonitorTextCreateSnapshot directly on JSON monitor is implemented by generalizing qemuMonitorCommandWithFd, which now either calls to qemuMonitorJSONHumanCommandWithFd or qemuMonitorTextCommandWithFd (former qemuMonitorCommandWithFd) depending on the monitor type. I prefer version 2 since it reuses text monitor implementation, but other may prefer version 1, which is a bit more local... Jiri Denemark (3): qemu: Fallback to HMP when savevm QMP command is not found qemu: Refactor qemuDomainSnapshotCreateXML qemu: Stop guest CPUs before creating a snapshot -- 1.7.4.1

2 11

[libvirt] [PATCH v2] Make LXC container startup/shutdown/I/O more robust
by Daniel P. Berrange 10 Mar '11

10 Mar '11

The current LXC I/O controller looks for HUP to detect when a guest has quit. This isn't reliable as during initial bootup it is possible that 'init' will close the console and let mingetty re-open it. The shutdown of containers was also flakey because it only killed the libvirt I/O controller and expected container processes to gracefully follow. Change the I/O controller such that when it see HUP or an I/O error, it uses kill($PID, 0) to see if the process has really quit. Change the container shutdown sequence to use the virCgroupKillPainfully function to ensure every really goes away This change makes the use of the 'cpu', 'cpuacct' and 'memory' cgroups controllers compulsory with LXC * docs/drvlxc.html.in: Document that certain cgroups controllers are now mandatory * src/lxc/lxc_controller.c: Check if PID is still alive before quitting on I/O error/HUP * src/lxc/lxc_driver.c: Use virCgroupKillPainfully --- docs/drvlxc.html.in | 18 +++++ src/lxc/lxc_controller.c | 42 +++++++++--- src/lxc/lxc_driver.c | 155 ++++++++++++++++++---------------------------- 3 files changed, 110 insertions(+), 105 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 35058c4..3e715b1 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -9,6 +9,24 @@ light-weight "application container" which does not have it's own root image. Y start it using </p> +<h2>Cgroups Requirements</h2> + +<p> +The libvirt LXC driver requires that certain cgroups controllers are +mounted on the host OS. The minimum required controllers are 'cpuacct', +'memory' and 'devices', while recommended extra controllers are +'cpu', 'freezer' and 'blkio'. The /etc/cgconfig.conf & cgconfig +init service used to mount cgroups at host boot time. To manually +mount them use. NB, the blkio controller in some kernels will not +allow creation of nested sub-directories which will prevent correct +operation of the libvirt LXC driver. On such kernels the blkio controller +must not be mounted. +</p> + +<pre> + # mount -t cgroup cgroup /dev/cgroup -o cpuacct,memory,devices,cpu,freezer,blkio +</pre> + <h3>Example config version 1</h3> <p></p> <pre> diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index d2b113c..61e21c3 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -32,6 +32,7 @@ #include <sys/personality.h> #include <unistd.h> #include <paths.h> +#include <errno.h> #include <fcntl.h> #include <signal.h> #include <getopt.h> @@ -120,12 +121,10 @@ static int lxcSetContainerResources(virDomainDefPtr def) virReportSystemError(-rc, _("Unable to set memory limit for domain %s"), def->name); - /* Don't fail if we can't set memory due to lack of kernel support */ - if (rc != -ENOENT) - goto cleanup; + goto cleanup; } - if(def->mem.hard_limit) { + if (def->mem.hard_limit) { rc = virCgroupSetMemoryHardLimit(cgroup, def->mem.hard_limit); if (rc != 0) { virReportSystemError(-rc, @@ -135,7 +134,7 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } - if(def->mem.soft_limit) { + if (def->mem.soft_limit) { rc = virCgroupSetMemorySoftLimit(cgroup, def->mem.soft_limit); if (rc != 0) { virReportSystemError(-rc, @@ -145,7 +144,7 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } - if(def->mem.swap_hard_limit) { + if (def->mem.swap_hard_limit) { rc = virCgroupSetSwapHardLimit(cgroup, def->mem.swap_hard_limit); if (rc != 0) { virReportSystemError(-rc, @@ -324,6 +323,18 @@ ignorable_epoll_accept_errno(int errnum) || errnum == EWOULDBLOCK); } +static bool +lxcPidGone(pid_t container) +{ + waitpid(container, NULL, WNOHANG); + + if (kill(container, 0) < 0 && + errno == ESRCH) + return true; + + return false; +} + /** * lxcControllerMain * @monitor: server socket fd to accept client requests @@ -341,7 +352,8 @@ ignorable_epoll_accept_errno(int errnum) static int lxcControllerMain(int monitor, int client, int appPty, - int contPty) + int contPty, + pid_t container) { int rc = -1; int epollFd; @@ -447,7 +459,13 @@ static int lxcControllerMain(int monitor, ++numActive; } } else if (epollEvent.events & EPOLLHUP) { - VIR_DEBUG("EPOLLHUP from fd %d", epollEvent.data.fd); + if (lxcPidGone(container)) + goto cleanup; + curFdOff = epollEvent.data.fd == appPty ? 0 : 1; + if (fdArray[curFdOff].active) { + fdArray[curFdOff].active = 0; + --numActive; + } continue; } else { lxcError(VIR_ERR_INTERNAL_ERROR, @@ -486,7 +504,9 @@ static int lxcControllerMain(int monitor, --numActive; fdArray[curFdOff].active = 0; } else if (-1 == rc) { - goto cleanup; + if (lxcPidGone(container)) + goto cleanup; + continue; } } @@ -584,7 +604,7 @@ lxcControllerRun(virDomainDefPtr def, int rc = -1; int control[2] = { -1, -1}; int containerPty = -1; - char *containerPtyPath; + char *containerPtyPath = NULL; pid_t container = -1; virDomainFSDefPtr root; char *devpts = NULL; @@ -706,7 +726,7 @@ lxcControllerRun(virDomainDefPtr def, if (lxcControllerClearCapabilities() < 0) goto cleanup; - rc = lxcControllerMain(monitor, client, appPty, containerPty); + rc = lxcControllerMain(monitor, client, appPty, containerPty, container); cleanup: VIR_FREE(devptmx); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 5b6f784..7aaa5cd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -952,36 +952,16 @@ cleanup: * @driver: pointer to driver structure * @vm: pointer to VM to clean up * - * waitpid() on the container process. kill and wait the tty process - * This is called by both lxcDomainDestroy and lxcSigHandler when a - * container exits. - * - * Returns 0 on success or -1 in case of error + * Cleanout resources associated with the now dead VM + * */ -static int lxcVmCleanup(lxc_driver_t *driver, +static void lxcVmCleanup(lxc_driver_t *driver, virDomainObjPtr vm) { - int rc = 0; - int waitRc; - int childStatus = -1; virCgroupPtr cgroup; int i; lxcDomainObjPrivatePtr priv = vm->privateData; - while (((waitRc = waitpid(vm->pid, &childStatus, 0)) == -1) && - errno == EINTR) - ; /* empty */ - - if ((waitRc != vm->pid) && (errno != ECHILD)) { - virReportSystemError(errno, - _("waitpid failed to wait for container %d: %d"), - vm->pid, waitRc); - rc = -1; - } else if (WIFEXITED(childStatus)) { - VIR_DEBUG("container exited with rc: %d", WEXITSTATUS(childStatus)); - rc = -1; - } - /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); @@ -1021,8 +1001,6 @@ static int lxcVmCleanup(lxc_driver_t *driver, vm->def->id = -1; vm->newDef = NULL; } - - return rc; } /** @@ -1181,11 +1159,10 @@ error: static int lxcVmTerminate(lxc_driver_t *driver, - virDomainObjPtr vm, - int signum) + virDomainObjPtr vm) { - if (signum == 0) - signum = SIGINT; + virCgroupPtr group = NULL; + int rc; if (vm->pid <= 0) { lxcError(VIR_ERR_INTERNAL_ERROR, @@ -1193,18 +1170,29 @@ static int lxcVmTerminate(lxc_driver_t *driver, return -1; } - if (kill(vm->pid, signum) < 0) { - if (errno != ESRCH) { - virReportSystemError(errno, - _("Failed to kill pid %d"), - vm->pid); - return -1; - } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) + return -1; + + rc = virCgroupKillPainfully(group); + if (rc < 0) { + virReportSystemError(-rc, "%s", + _("Failed to kill container PIDs")); + rc = -1; + goto cleanup; } + if (rc == 1) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Some container PIDs refused to die")); + rc = -1; + goto cleanup; + } + lxcVmCleanup(driver, vm); - vm->state = VIR_DOMAIN_SHUTDOWN; + rc = 0; - return lxcVmCleanup(driver, vm); +cleanup: + virCgroupFree(&group); + return rc; } static void lxcMonitorEvent(int watch, @@ -1228,7 +1216,7 @@ static void lxcMonitorEvent(int watch, goto cleanup; } - if (lxcVmTerminate(driver, vm, SIGINT) < 0) { + if (lxcVmTerminate(driver, vm) < 0) { virEventRemoveHandle(watch); } else { event = virDomainEventNewFromObj(vm, @@ -1473,6 +1461,31 @@ static int lxcVmStart(virConnectPtr conn, char **veths = NULL; lxcDomainObjPrivatePtr priv = vm->privateData; + if (!lxc_driver->cgroup) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The 'cpuacct', 'devices' & 'memory' cgroups controllers must be mounted")); + return -1; + } + + if (!virCgroupMounted(lxc_driver->cgroup, + VIR_CGROUP_CONTROLLER_CPUACCT)) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to find 'cpuacct' cgroups controller mount")); + return -1; + } + if (!virCgroupMounted(lxc_driver->cgroup, + VIR_CGROUP_CONTROLLER_DEVICES)) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to find 'devices' cgroups controller mount")); + return -1; + } + if (!virCgroupMounted(lxc_driver->cgroup, + VIR_CGROUP_CONTROLLER_MEMORY)) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to find 'memory' cgroups controller mount")); + return -1; + } + if ((r = virFileMakePath(driver->logDir)) != 0) { virReportSystemError(r, _("Cannot create log directory '%s'"), @@ -1543,7 +1556,7 @@ static int lxcVmStart(virConnectPtr conn, VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, lxcMonitorEvent, vm, NULL)) < 0) { - lxcVmTerminate(driver, vm, 0); + lxcVmTerminate(driver, vm); goto cleanup; } @@ -1711,55 +1724,6 @@ cleanup: return dom; } -/** - * lxcDomainShutdown: - * @dom: pointer to domain to shutdown - * - * Sends SIGINT to container root process to request it to shutdown - * - * Returns 0 on success or -1 in case of error - */ -static int lxcDomainShutdown(virDomainPtr dom) -{ - lxc_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm; - virDomainEventPtr event = NULL; - int ret = -1; - - lxcDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, dom->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(dom->uuid, uuidstr); - lxcError(VIR_ERR_NO_DOMAIN, - _("No domain with matching uuid '%s'"), uuidstr); - goto cleanup; - } - - if (!virDomainObjIsActive(vm)) { - lxcError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); - goto cleanup; - } - - ret = lxcVmTerminate(driver, vm, 0); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); - if (!vm->persistent) { - virDomainRemoveInactive(&driver->domains, vm); - vm = NULL; - } - -cleanup: - if (vm) - virDomainObjUnlock(vm); - if (event) - lxcDomainEventQueue(driver, event); - lxcDriverUnlock(driver); - return ret; -} - static int lxcDomainEventRegister(virConnectPtr conn, @@ -1927,7 +1891,7 @@ static int lxcDomainDestroy(virDomainPtr dom) goto cleanup; } - ret = lxcVmTerminate(driver, vm, SIGKILL); + ret = lxcVmTerminate(driver, vm); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); @@ -2056,7 +2020,7 @@ lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, lxcMonitorEvent, vm, NULL)) < 0) { - lxcVmTerminate(driver, vm, 0); + lxcVmTerminate(driver, vm); goto cleanup; } } else { @@ -2123,8 +2087,11 @@ static int lxcStartup(int privileged) rc = virCgroupForDriver("lxc", &lxc_driver->cgroup, privileged, 1); if (rc < 0) { char buf[1024]; - VIR_WARN("Unable to create cgroup for driver: %s", - virStrerror(-rc, buf, sizeof(buf))); + VIR_DEBUG("Unable to create cgroup for LXC driver: %s", + virStrerror(-rc, buf, sizeof(buf))); + /* Don't abort startup. We will explicitly report to + * the user when they try to start a VM + */ } /* Call function to load lxc driver configuration information */ @@ -2844,7 +2811,7 @@ static virDriver lxcDriver = { lxcDomainLookupByName, /* domainLookupByName */ lxcDomainSuspend, /* domainSuspend */ lxcDomainResume, /* domainResume */ - lxcDomainShutdown, /* domainShutdown */ + NULL, /* domainShutdown */ NULL, /* domainReboot */ lxcDomainDestroy, /* domainDestroy */ lxcGetOSType, /* domainGetOSType */ -- 1.7.4

2 3

[libvirt] [PATCH] Raise default limit on number of processes for qemu user
by Jiri Denemark 10 Mar '11

10 Mar '11

The daemon/libvirtd.limits file (which is supposed to be copied to /etc/security/limits.d/libvirtd.conf) is generated based on --qemu-user option passed at configure time. The file is intentionally not installed by make install since installing it on distributions with higher or no limit on number of process could actually result in lowering the limit. Packagers may choose whether to install the file or not. It is installed by libvirt.spec for RPM based distributions. --- configure.ac | 3 ++- daemon/libvirtd.limits.in | 6 ++++++ libvirt.spec.in | 7 +++++++ src/qemu/qemu.conf | 4 +++- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 daemon/libvirtd.limits.in diff --git a/configure.ac b/configure.ac index a58ee4e..d8002b4 100644 --- a/configure.ac +++ b/configure.ac @@ -2237,6 +2237,7 @@ AC_ARG_WITH([qemu-group], [QEMU_GROUP=root]) AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account]) +AC_SUBST([QEMU_USER]) AC_ARG_WITH([macvtap], @@ -2344,7 +2345,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \ - daemon/Makefile \ + daemon/Makefile daemon/libvirtd.limits \ tools/Makefile \ tests/Makefile \ examples/apparmor/Makefile \ diff --git a/daemon/libvirtd.limits.in b/daemon/libvirtd.limits.in new file mode 100644 index 0000000..7b580ae --- /dev/null +++ b/daemon/libvirtd.limits.in @@ -0,0 +1,6 @@ +# /etc/security/limits.d/libvirtd.conf +# +# Increase default limit for number of processes owned by qemu-user +# Also see @sysconfdir@/libvirt/qemu.conf where qemu-user can be overridden + +@QEMU_USER@ soft nproc 10000 diff --git a/libvirt.spec.in b/libvirt.spec.in index 45a8fe0..02be928 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -705,6 +705,12 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}/html \ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu %endif + +%if %{with_libvirtd} && %{with_qemu} +install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/ +cp daemon/libvirtd.limits \ + $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/libvirtd.conf +%endif %if ! %{with_lxc} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc @@ -869,6 +875,7 @@ fi %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu +%config(noreplace) %{_sysconfdir}/security/limits.d/libvirtd.conf %endif %if %{with_lxc} %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 8c6b996..52c6ac7 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -139,7 +139,9 @@ # security_driver = "selinux" -# The user ID for QEMU processes run by the system instance. +# The user ID for QEMU processes run by the system instance. If you +# change this setting, /etc/security/limits.d/libvirtd.conf (if +# installed) needs to be changed to match this user ID. #user = "root" # The group ID for QEMU processes run by the system instance. -- 1.7.4.1

3 3

[libvirt] [libvirt-snmp][PATCH v2] resolve licensing conflicts
by Michal Privoznik 10 Mar '11

10 Mar '11

and add unified header to source files. --- README | 3 ++- libvirt-snmp.spec.in | 9 ++++++--- src/libvirtGuestTable.c | 24 +++++++++++++++++------- src/libvirtGuestTable.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_access.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_access.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_get.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_get.h | 22 +++++++++++++++------- src/libvirtGuestTable_data_set.c | 21 ++++++++++++++++++--- src/libvirtGuestTable_data_set.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_enums.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_interface.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_interface.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_oids.h | 22 +++++++++++++++++++--- src/libvirtMib_subagent.c | 22 ++++++++++++++++++++-- src/libvirtSnmp.c | 29 +++++++++++++++++++++-------- src/libvirtSnmp.h | 22 ++++++++++++++++++++++ 17 files changed, 292 insertions(+), 58 deletions(-) diff --git a/README b/README index acb916b..b4f4a45 100644 --- a/README +++ b/README @@ -6,4 +6,5 @@ it is now possible to gather and set domain status over SNMP from one place. This allows to create views of entire platforms end to end. -This code is distributed under GPLv3. \ No newline at end of file +This code is distributed under GPLv2, or (at your option) any later +version. diff --git a/libvirt-snmp.spec.in b/libvirt-snmp.spec.in index 5bf0032..65042af 100644 --- a/libvirt-snmp.spec.in +++ b/libvirt-snmp.spec.in @@ -1,10 +1,10 @@ Name: libvirt-snmp Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: SNMP functionality for libvirt Group: Development/Libraries -License: GPLv3 +License: GPLv2+ URL: http://libvirt.org Source0: http://www.libvirt.org/sources/snmp/libvirt-snmp-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -36,6 +36,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Mar 9 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-2 +- resolve licensing conflicts +- add unified header to sources + * Thu Feb 2 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-1 - initial revision - diff --git a/src/libvirtGuestTable.c b/src/libvirtGuestTable.c index ed50f69..d595568 100644 --- a/src/libvirtGuestTable.c +++ b/src/libvirtGuestTable.c @@ -1,15 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 17337 $ of $ + * libvirtGuestTable.c: SNMP table of running domains * - * $Id:$ - */ -/** \page MFD helper for libvirtGuestTable + * Copyright (C) 2011 Red Hat, Inc. + * + * 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. * - * \section intro Introduction - * Introductory text. + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index 85eb866..eb64048 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 17337 $ of $ + * libvirtGuestTable.h: SNMP table of running domains * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_H #define LIBVIRTGUESTTABLE_H diff --git a/src/libvirtGuestTable_data_access.c b/src/libvirtGuestTable_data_access.c index 6864b25..f602021 100644 --- a/src/libvirtGuestTable_data_access.c +++ b/src/libvirtGuestTable_data_access.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 14170 $ of $ + * libvirtGuestTable_data_access.c: SNMP table data access routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_access.h b/src/libvirtGuestTable_data_access.h index 6c54890..3491aa4 100644 --- a/src/libvirtGuestTable_data_access.h +++ b/src/libvirtGuestTable_data_access.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 14170 $ of $ + * libvirtGuestTable_data_access.h: SNMP table data access routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_DATA_ACCESS_H #define LIBVIRTGUESTTABLE_DATA_ACCESS_H diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index 72f07bd..2430f9c 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12088 $ of $ + * libvirtGuestTable_data_get.c: SNMP table data get routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 76baf81..450d112 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -1,17 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12088 $ of $ + * libvirtGuestTable_data_get.h: SNMP table data get routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. * - * @file libvirtGuestTable_data_get.h + * 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. * - * @addtogroup get + * 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. * - * Prototypes for get functions + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA * - * @{ + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_DATA_GET_H #define LIBVIRTGUESTTABLE_DATA_GET_H diff --git a/src/libvirtGuestTable_data_set.c b/src/libvirtGuestTable_data_set.c index f3f4ea5..c1f6625 100644 --- a/src/libvirtGuestTable_data_set.c +++ b/src/libvirtGuestTable_data_set.c @@ -1,10 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12077 $ of $ + * libvirtGuestTable_data_set.c: SNMP table data set routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index 8afb3ce..cce0fe7 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12077 $ of $ + * libvirtGuestTable_data_set.h: SNMP table data set routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_DATA_SET_H #define LIBVIRTGUESTTABLE_DATA_SET_H diff --git a/src/libvirtGuestTable_enums.h b/src/libvirtGuestTable_enums.h index 12617db..ea7e6df 100644 --- a/src/libvirtGuestTable_enums.h +++ b/src/libvirtGuestTable_enums.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * : generic-table-enums.m2c 12526 2005-07-15 22:41:16Z rstory $ + * libvirtGuestTable_enums.h: SNMP table enums * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_ENUMS_H #define LIBVIRTGUESTTABLE_ENUMS_H diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index 9dc428d..2d78d5b 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 16927 $ of $ + * libvirtGuestTable_interface.c: SNMP table interface * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* * ********************************************************************* * ********************************************************************* diff --git a/src/libvirtGuestTable_interface.h b/src/libvirtGuestTable_interface.h index 2fd4959..97a7ccc 100644 --- a/src/libvirtGuestTable_interface.h +++ b/src/libvirtGuestTable_interface.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 16927 $ of $ + * libvirtGuestTable_interface.h: SNMP table interface * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /** @ingroup interface: Routines to interface to Net-SNMP * * \warning This code should not be modified, called directly, diff --git a/src/libvirtGuestTable_oids.h b/src/libvirtGuestTable_oids.h index ab6055b..a8f97fd 100644 --- a/src/libvirtGuestTable_oids.h +++ b/src/libvirtGuestTable_oids.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * : generic-table-oids.m2c 17548 2009-04-23 16:35:18Z hardaker $ + * libvirtGuestTable_oids.h: SNMP table OIDs * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_OIDS_H #define LIBVIRTGUESTTABLE_OIDS_H diff --git a/src/libvirtMib_subagent.c b/src/libvirtMib_subagent.c index 5eda993..f5749be 100644 --- a/src/libvirtMib_subagent.c +++ b/src/libvirtMib_subagent.c @@ -1,7 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 15795 $ of $ + * libvirtMib_subagent.c: SNMP subagent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index c15431a..dd1bd33 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -1,11 +1,24 @@ -/* This file contains trivial example code to connect to the running - * hypervisor and gather a few bits of information. */ - -/* compile with: - -gcc -lvirt activeguests.c - -*/ +/* + * libvirtSnmp.c: interface between libvirt and the agent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ #include <stdio.h> #include <stdlib.h> diff --git a/src/libvirtSnmp.h b/src/libvirtSnmp.h index 4ac6130..bac9988 100644 --- a/src/libvirtSnmp.h +++ b/src/libvirtSnmp.h @@ -1,3 +1,25 @@ +/* + * libvirtSnmp.h: interface between libvirt and agent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + #ifndef __VIR_SNMP_H__ #define __VIR_SNMP_H__ -- 1.7.4

2 1

[libvirt] [libvirt-snmp][PATCH] resolve licensing conflicts
by Michal Privoznik 10 Mar '11

10 Mar '11

and add unified header to source files. Also remove LIBVIRT-MIB.txt from %doc dir. --- README | 4 +++- libvirt-snmp.spec.in | 10 +++++++--- src/libvirtGuestTable.c | 24 +++++++++++++++++------- src/libvirtGuestTable.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_access.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_access.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_get.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_get.h | 22 +++++++++++++++------- src/libvirtGuestTable_data_set.c | 21 ++++++++++++++++++--- src/libvirtGuestTable_data_set.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_enums.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_interface.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_interface.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_oids.h | 22 +++++++++++++++++++--- src/libvirtMib_subagent.c | 22 ++++++++++++++++++++-- src/libvirtSnmp.c | 29 +++++++++++++++++++++-------- src/libvirtSnmp.h | 22 ++++++++++++++++++++++ 17 files changed, 294 insertions(+), 58 deletions(-) diff --git a/README b/README index acb916b..6f9f349 100644 --- a/README +++ b/README @@ -6,4 +6,6 @@ it is now possible to gather and set domain status over SNMP from one place. This allows to create views of entire platforms end to end. -This code is distributed under GPLv3. \ No newline at end of file +This code is distributed under GPLv2, or (at your option) any later +version. + diff --git a/libvirt-snmp.spec.in b/libvirt-snmp.spec.in index 5bf0032..a59b991 100644 --- a/libvirt-snmp.spec.in +++ b/libvirt-snmp.spec.in @@ -1,10 +1,10 @@ Name: libvirt-snmp Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: SNMP functionality for libvirt Group: Development/Libraries -License: GPLv3 +License: GPLv2+ URL: http://libvirt.org Source0: http://www.libvirt.org/sources/snmp/libvirt-snmp-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -31,11 +31,15 @@ make install DESTDIR=$RPM_BUILD_ROOT %defattr(-,root,root,-) %{_bindir}/libvirtMib_subagent %{_datadir}/snmp/mibs/LIBVIRT-MIB.txt -%doc README NEWS ChangeLog AUTHORS src/LIBVIRT-MIB.txt +%doc README NEWS ChangeLog AUTHORS %{_mandir}/man1/libvirtMib_subagent.1* %changelog +* Wed Mar 9 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-2 +- resolve licensing conflicts +- add unified header to sources + * Thu Feb 2 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-1 - initial revision diff --git a/src/libvirtGuestTable.c b/src/libvirtGuestTable.c index ed50f69..d595568 100644 --- a/src/libvirtGuestTable.c +++ b/src/libvirtGuestTable.c @@ -1,15 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 17337 $ of $ + * libvirtGuestTable.c: SNMP table of running domains * - * $Id:$ - */ -/** \page MFD helper for libvirtGuestTable + * Copyright (C) 2011 Red Hat, Inc. + * + * 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. * - * \section intro Introduction - * Introductory text. + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index 85eb866..eb64048 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 17337 $ of $ + * libvirtGuestTable.h: SNMP table of running domains * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_H #define LIBVIRTGUESTTABLE_H diff --git a/src/libvirtGuestTable_data_access.c b/src/libvirtGuestTable_data_access.c index 6864b25..f602021 100644 --- a/src/libvirtGuestTable_data_access.c +++ b/src/libvirtGuestTable_data_access.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 14170 $ of $ + * libvirtGuestTable_data_access.c: SNMP table data access routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_access.h b/src/libvirtGuestTable_data_access.h index 6c54890..3491aa4 100644 --- a/src/libvirtGuestTable_data_access.h +++ b/src/libvirtGuestTable_data_access.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 14170 $ of $ + * libvirtGuestTable_data_access.h: SNMP table data access routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_DATA_ACCESS_H #define LIBVIRTGUESTTABLE_DATA_ACCESS_H diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index 72f07bd..2430f9c 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12088 $ of $ + * libvirtGuestTable_data_get.c: SNMP table data get routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 76baf81..450d112 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -1,17 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12088 $ of $ + * libvirtGuestTable_data_get.h: SNMP table data get routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. * - * @file libvirtGuestTable_data_get.h + * 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. * - * @addtogroup get + * 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. * - * Prototypes for get functions + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA * - * @{ + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_DATA_GET_H #define LIBVIRTGUESTTABLE_DATA_GET_H diff --git a/src/libvirtGuestTable_data_set.c b/src/libvirtGuestTable_data_set.c index f3f4ea5..c1f6625 100644 --- a/src/libvirtGuestTable_data_set.c +++ b/src/libvirtGuestTable_data_set.c @@ -1,10 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12077 $ of $ + * libvirtGuestTable_data_set.c: SNMP table data set routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index 8afb3ce..cce0fe7 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12077 $ of $ + * libvirtGuestTable_data_set.h: SNMP table data set routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_DATA_SET_H #define LIBVIRTGUESTTABLE_DATA_SET_H diff --git a/src/libvirtGuestTable_enums.h b/src/libvirtGuestTable_enums.h index 12617db..ea7e6df 100644 --- a/src/libvirtGuestTable_enums.h +++ b/src/libvirtGuestTable_enums.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * : generic-table-enums.m2c 12526 2005-07-15 22:41:16Z rstory $ + * libvirtGuestTable_enums.h: SNMP table enums * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_ENUMS_H #define LIBVIRTGUESTTABLE_ENUMS_H diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index 9dc428d..2d78d5b 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 16927 $ of $ + * libvirtGuestTable_interface.c: SNMP table interface * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* * ********************************************************************* * ********************************************************************* diff --git a/src/libvirtGuestTable_interface.h b/src/libvirtGuestTable_interface.h index 2fd4959..97a7ccc 100644 --- a/src/libvirtGuestTable_interface.h +++ b/src/libvirtGuestTable_interface.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 16927 $ of $ + * libvirtGuestTable_interface.h: SNMP table interface * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /** @ingroup interface: Routines to interface to Net-SNMP * * \warning This code should not be modified, called directly, diff --git a/src/libvirtGuestTable_oids.h b/src/libvirtGuestTable_oids.h index ab6055b..a8f97fd 100644 --- a/src/libvirtGuestTable_oids.h +++ b/src/libvirtGuestTable_oids.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * : generic-table-oids.m2c 17548 2009-04-23 16:35:18Z hardaker $ + * libvirtGuestTable_oids.h: SNMP table OIDs * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + #ifndef LIBVIRTGUESTTABLE_OIDS_H #define LIBVIRTGUESTTABLE_OIDS_H diff --git a/src/libvirtMib_subagent.c b/src/libvirtMib_subagent.c index 5eda993..4adfbb8 100644 --- a/src/libvirtMib_subagent.c +++ b/src/libvirtMib_subagent.c @@ -1,7 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 15795 $ of $ + * libvirtMib_subagent.c: SNMP subagent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index c15431a..0401d53 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -1,11 +1,24 @@ -/* This file contains trivial example code to connect to the running - * hypervisor and gather a few bits of information. */ - -/* compile with: - -gcc -lvirt activeguests.c - -*/ +/* + * libvirtSnmp.c: interface between libvirt and the agent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ #include <stdio.h> #include <stdlib.h> diff --git a/src/libvirtSnmp.h b/src/libvirtSnmp.h index 4ac6130..52355c7 100644 --- a/src/libvirtSnmp.h +++ b/src/libvirtSnmp.h @@ -1,3 +1,25 @@ +/* + * libvirtSnmp.h: interface between libvirt and agent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + #ifndef __VIR_SNMP_H__ #define __VIR_SNMP_H__ -- 1.7.4

3 2

[libvirt] [PATCH V4] Add libxenlight driver
by Jim Fehlig 10 Mar '11

10 Mar '11

Add a new xen driver based on libxenlight [1], which is the primary toolstack starting with Xen 4.1.0. The driver is stateful, runs privileged only, and is accessed with libxl:/// URI. V4: - Handle restart of libvirtd, reconnecting to previously started domains - Rebased to current master - Tested against Xen 4.1 RC7-pre (c/s 22961:c5d121fd35c0) V3: - Reserve vnc port within driver when autoport=yes V2: - Update to Xen 4.1 RC6-pre (c/s 22940:5a4710640f81) - Rebased to current master - Plug memory leaks found by Stefano Stabellini and valgrind - Handle SHUTDOWN_crash domain death event [1] http://lists.xensource.com/archives/html/xen-devel/2009-11/msg00436.html --- cfg.mk | 1 + configure.ac | 48 ++ daemon/Makefile.am | 4 + daemon/libvirtd.c | 6 + docs/drivers.html.in | 3 +- docs/drvxen.html.in | 6 +- docs/drvxenlight.html.in | 53 ++ docs/sitemap.html.in | 6 +- include/libvirt/virterror.h | 1 + po/POTFILES.in | 2 + src/Makefile.am | 32 + src/driver.h | 3 +- src/libvirt.c | 4 + src/libxl/libxl_conf.c | 896 +++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 91 +++ src/libxl/libxl_driver.c | 1411 +++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.h | 27 + src/util/virterror.c | 3 + 18 files changed, 2593 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5cb2ead..ef71cd5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -402,6 +402,7 @@ msg_gen_function += virXenStoreError msg_gen_function += virXendError msg_gen_function += vmwareError msg_gen_function += xenapiSessionErrorHandler +msg_gen_function += libxlError msg_gen_function += xenUnifiedError msg_gen_function += xenXMError msg_gen_function += VIR_ERROR diff --git a/configure.ac b/configure.ac index a58ee4e..0ef90e1 100644 --- a/configure.ac +++ b/configure.ac @@ -263,6 +263,8 @@ AC_ARG_WITH([phyp], AC_HELP_STRING([--with-phyp], [add PHYP support @<:@default=check@:>@]),[],[with_phyp=check]) AC_ARG_WITH([xenapi], AC_HELP_STRING([--with-xenapi], [add XenAPI support @<:@default=check@:>@]),[],[with_xenapi=check]) +AC_ARG_WITH([libxl], + AC_HELP_STRING([--with-libxl], [add libxenlight support @<:@default=check@:>@]),[],[with_libxl=check]) AC_ARG_WITH([vbox], AC_HELP_STRING([--with-vbox=@<:@PFX@:>@], [VirtualBox XPCOMC location @<:@default=yes@:>@]),[], @@ -497,6 +499,46 @@ fi AC_SUBST([LIBXENSERVER_CFLAGS]) AC_SUBST([LIBXENSERVER_LIBS]) +old_LIBS="$LIBS" +old_CFLAGS="$CFLAGS" +LIBXL_LIBS="" +LIBXL_CFLAGS="" +dnl search for libxl, aka libxenlight +fail=0 +if test "$with_libxl" != "no" ; then + if test "$with_libxl" != "yes" && test "$with_libxl" != "check" ; then + LIBXL_CFLAGS="-I$with_libxl/include" + LIBXL_LIBS="-L$with_libxl" + fi + CFLAGS="$CFLAGS $LIBXL_CFLAGS" + LIBS="$LIBS $LIBXL_LIBS" + AC_CHECK_LIB([xenlight], [libxl_ctx_init], [ + with_libxl=yes + LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl" + ],[ + if test "$with_libxl" = "yes"; then + fail=1 + fi + with_libxl=no + ],[ + -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl + ]) +fi + +LIBS="$old_LIBS" +CFLAGS="$old_CFLAGS" + +if test $fail = 1; then + AC_MSG_ERROR([You must install the libxl Library to compile libxenlight driver with -lxl]) +fi + +if test "$with_libxl" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_LIBXL], 1, [whether libxenlight driver is enabled]) +fi +AM_CONDITIONAL([WITH_LIBXL], [test "$with_libxl" = "yes"]) + +AC_SUBST([LIBXL_CFLAGS]) +AC_SUBST([LIBXL_LIBS]) old_LIBS="$LIBS" old_CFLAGS="$CFLAGS" @@ -2370,6 +2412,7 @@ AC_MSG_NOTICE([ OpenVZ: $with_openvz]) AC_MSG_NOTICE([ VMware: $with_vmware]) AC_MSG_NOTICE([ VBox: $with_vbox]) AC_MSG_NOTICE([ XenAPI: $with_xenapi]) +AC_MSG_NOTICE([libxenlight: $with_libxl]) AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ PHYP: $with_phyp]) AC_MSG_NOTICE([ ONE: $with_one]) @@ -2479,6 +2522,11 @@ AC_MSG_NOTICE([ xenapi: $LIBXENSERVER_CFLAGS $LIBXENSERVER_LIBS]) else AC_MSG_NOTICE([ xenapi: no]) fi +if test "$with_libxl" = "yes" ; then +AC_MSG_NOTICE([ libxenlight: $LIBXL_CFLAGS $LIBXL_LIBS]) +else +AC_MSG_NOTICE([ libxenlight: no]) +fi if test "$with_hal" = "yes" ; then AC_MSG_NOTICE([ hal: $HAL_CFLAGS $HAL_LIBS]) else diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 912440c..195b8c8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -112,6 +112,10 @@ if WITH_LXC libvirtd_LDADD += ../src/libvirt_driver_lxc.la endif +if WITH_LIBXL + libvirtd_LDADD += ../src/libvirt_driver_libxl.la +endif + if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 452566c..57795f8 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -81,6 +81,9 @@ # ifdef WITH_LXC # include "lxc/lxc_driver.h" # endif +# ifdef WITH_LIBXL +# include "libxl/libxl_driver.h" +# endif # ifdef WITH_UML # include "uml/uml_driver.h" # endif @@ -948,6 +951,9 @@ static struct qemud_server *qemudInitialize(void) { # ifdef WITH_LXC lxcRegister(); # endif +# ifdef WITH_LIBXL + libxlRegister(); +# endif # ifdef WITH_UML umlRegister(); # endif diff --git a/docs/drivers.html.in b/docs/drivers.html.in index ecad03a..368664e 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -28,7 +28,8 @@ <li><strong><a href="drvvbox.html">VirtualBox</a></strong></li> <li><strong><a href="drvesx.html">VMware ESX</a></strong></li> <li><strong><a href="drvvmware.html">VMware Workstation/Player</a></strong></li> - <li><strong><a href="drvxen.html">Xen</a></strong></li> + <li><strong><a href="drvxen.html">Xen 3.0.1 - 4.0.x</a></strong></li> + <li><strong><a href="drvxenlight.html">Xen 4.1.0 onwards</a></strong></li> </ul> <h2><a name="stroage">Storage drivers</a></h2> diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in index 4e35afa..4b88a7d 100644 --- a/docs/drvxen.html.in +++ b/docs/drvxen.html.in @@ -6,7 +6,11 @@ <p> The libvirt Xen driver provides the ability to manage virtual machines - on any Xen release from 3.0.1 onwards. + on any Xen release from 3.0.1 to 4.0.x. Starting with Xen 4.1.0, + the traditional xm/xend toolstack is replaced with a new toolstack + based on libxenlight. Consult the + <a href="drvxenlight.html">libxenlight driver</a> if your Xen host is + configured to use the new toolstack. </p> <h2><a name="prereq">Deployment pre-requisites</a></h2> diff --git a/docs/drvxenlight.html.in b/docs/drvxenlight.html.in new file mode 100644 index 0000000..fe60786 --- /dev/null +++ b/docs/drvxenlight.html.in @@ -0,0 +1,53 @@ +<html> + <body> + <h1>libxenlight hypervisor driver</h1> + + <ul id="toc"></ul> + + <p> + The libvirt libxenlight driver provides the ability to manage virtual + machines on any Xen release from 4.1.0 onwards. + </p> + + <h2><a name="prereq">Deployment pre-requisites</a></h2> + + <p> + This driver uses Xen's libxenlight toolstack, which is the default + toolstack configuration starting with Xen 4.1.0. The traditional + xm/xend toolstack is still provided, but it is no longer maintained + and may be removed in a future Xen release. + </p> + + <p> + The libxenlight toolstack uses xenstored and blktap2. Ensure + xenstored is running, or use the xencommons init script provided. + Ensure your kernel supports the blktap2 module and it is loaded. + </p> + + <h2><a name="uri">Connections to libxenlight driver</a></h2> + + <p> + The libvirt libxenlight driver is a stateful, privileged driver, + with a driver name of 'libxl'. Some example conection URIs for + the libxenlight driver are: + </p> + +<pre> +libxl:/// (local access, direct) +libxl://example.com/ (remote access, TLS/x509) +libxl+tcp://example.com/ (remote access, SASl/Kerberos) +libxl+ssh://root@example.com/ (remote access, SSH tunnelled) +</pre> + + <h2><a name="xmlconfig">Example domain XML config</a></h2> + + <p> + The libxenlight toolstack attempts to be compatible with the + legacy xm/xend toolstack, supporting the traditional python + configuration files (xen-xm). Fortunately, the libvirt XML + syntax is unchanged with the libxenlight driver. Consult + the <a href="drvxen.html#xmlconfig">Xen driver examples</a>. + </p> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index ac0af71..538f227 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -156,7 +156,11 @@ <ul> <li> <a href="drvxen.html">Xen</a> - <span>Driver the Xen hypervisor</span> + <span>Driver the Xen hypervisor, versions 3.0.1 - 4.0.x</span> + </li> + <li> + <a href="drvxenlight.html">libxenlight</a> + <span>Driver the Xen hypervisor, version 4.1.0 onwards</span> </li> <li> <a href="drvqemu.html">QEMU / KVM</a> diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 6b8c789..1d8275b 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -80,6 +80,7 @@ typedef enum { VIR_FROM_STREAMS = 38, /* Error from I/O streams */ VIR_FROM_VMWARE = 39, /* Error from VMware driver */ VIR_FROM_EVENT = 40, /* Error from event loop impl */ + VIR_FROM_LIBXL = 41, /* Error from libxenlight driver */ } virErrorDomain; diff --git a/po/POTFILES.in b/po/POTFILES.in index 1ed2765..4bd2b13 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -34,6 +34,8 @@ src/lxc/lxc_conf.c src/lxc/lxc_controller.c src/lxc/lxc_driver.c src/lxc/veth.c +src/libxl/libxl_driver.c +src/libxl/libxl_conf.c src/network/bridge_driver.c src/node_device/node_device_driver.c src/node_device/node_device_hal.c diff --git a/src/Makefile.am b/src/Makefile.am index 25f0e48..f9c6066 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -298,6 +298,10 @@ XENAPI_DRIVER_SOURCES = \ xenapi/xenapi_driver_private.h \ xenapi/xenapi_utils.c xenapi/xenapi_utils.h +LIBXL_DRIVER_SOURCES = \ + libxl/libxl_conf.c libxl/libxl_conf.h \ + libxl/libxl_driver.c libxl/libxl_driver.h + UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ uml/uml_driver.c uml/uml_driver.h @@ -692,6 +696,25 @@ endif libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES) endif +if WITH_LIBXL +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_libxl.la +else +noinst_LTLIBRARIES += libvirt_driver_libxl.la +# Stateful, so linked to daemon instead +#libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la +endif +libvirt_driver_libxl_la_CFLAGS = $(LIBXL_CFLAGS) \ + -I@top_srcdir@/src/conf $(AM_CFLAGS) +libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_libxl_la_LIBADD = $(LIBXL_LIBS) +if WITH_DRIVER_MODULES +libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_libxl_la_LDFLAGS += -module -avoid-version +endif +libvirt_driver_libxl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) +endif + if WITH_QEMU if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_qemu.la @@ -991,6 +1014,7 @@ EXTRA_DIST += \ $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ + $(LIBXL_DRIVER_SOURCES) \ $(ESX_DRIVER_SOURCES) \ $(ESX_DRIVER_EXTRA_DIST) \ $(NETWORK_DRIVER_SOURCES) \ @@ -1245,6 +1269,10 @@ if WITH_LXC $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" endif +if WITH_LIBXL + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" +endif if WITH_UML $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml" @@ -1282,6 +1310,10 @@ if WITH_LXC rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: endif +if WITH_LIBXL + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||: +endif if WITH_UML rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||: diff --git a/src/driver.h b/src/driver.h index c65a4b9..c8c9624 100644 --- a/src/driver.h +++ b/src/driver.h @@ -27,7 +27,8 @@ typedef enum { VIR_DRV_ESX = 10, VIR_DRV_PHYP = 11, VIR_DRV_XENAPI = 12, - VIR_DRV_VMWARE = 13 + VIR_DRV_VMWARE = 13, + VIR_DRV_LIBXL = 14, } virDrvNo; diff --git a/src/libvirt.c b/src/libvirt.c index e4b451e..5e2876b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -912,6 +912,10 @@ virGetVersion(unsigned long *libVer, const char *type, if (STRCASEEQ(type, "LXC")) *typeVer = LIBVIR_VERSION_NUMBER; # endif +# if WITH_LIBXL + if (STRCASEEQ(type, "libxl")) + *typeVer = LIBVIR_VERSION_NUMBER; +# endif # if WITH_PHYP if (STRCASEEQ(type, "phyp")) *typeVer = LIBVIR_VERSION_NUMBER; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c new file mode 100644 index 0000000..a48eea3 --- /dev/null +++ b/src/libxl/libxl_conf.c @@ -0,0 +1,896 @@ +/*---------------------------------------------------------------------------*/ +/* Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/*---------------------------------------------------------------------------*/ + +#include <config.h> + +#include <regex.h> +#include <libxl.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/utsname.h> + +#include "internal.h" +#include "logging.h" +#include "virterror_internal.h" +#include "datatypes.h" +#include "files.h" +#include "memory.h" +#include "uuid.h" +#include "capabilities.h" +#include "libxl_driver.h" +#include "libxl_conf.h" + + +#define VIR_FROM_THIS VIR_FROM_LIBXL + + +struct guest_arch { + const char *model; + int bits; + int hvm; + int pae; + int nonpae; + int ia64_be; +}; + +static const char *xen_cap_re = "(xen|hvm)-[[:digit:]]+\\.[[:digit:]]+-(x86_32|x86_64|ia64|powerpc64)(p|be)?"; +static regex_t xen_cap_rec; + + +static int +libxlNextFreeVncPort(libxlDriverPrivatePtr driver, int startPort) +{ + int i; + + for (i = startPort ; i < LIBXL_VNC_PORT_MAX; i++) { + int fd; + int reuse = 1; + struct sockaddr_in addr; + bool used = false; + + if (virBitmapGetBit(driver->reservedVNCPorts, + i - LIBXL_VNC_PORT_MIN, &used) < 0) + VIR_DEBUG("virBitmapGetBit failed on bit %d", i - LIBXL_VNC_PORT_MIN); + + if (used) + continue; + + addr.sin_family = AF_INET; + addr.sin_port = htons(i); + addr.sin_addr.s_addr = htonl(INADDR_ANY); + fd = socket(PF_INET, SOCK_STREAM, 0); + if (fd < 0) + return -1; + + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&reuse, sizeof(reuse)) < 0) { + VIR_FORCE_CLOSE(fd); + break; + } + + if (bind(fd, (struct sockaddr*)&addr, sizeof(addr)) == 0) { + /* Not in use, lets grab it */ + VIR_FORCE_CLOSE(fd); + /* Add port to bitmap of reserved ports */ + if (virBitmapSetBit(driver->reservedVNCPorts, + i - LIBXL_VNC_PORT_MIN) < 0) { + VIR_DEBUG("virBitmapSetBit failed on bit %d", + i - LIBXL_VNC_PORT_MIN); + } + return i; + } + VIR_FORCE_CLOSE(fd); + + if (errno == EADDRINUSE) { + /* In use, try next */ + continue; + } + /* Some other bad failure, get out.. */ + break; + } + return -1; +} + +static virCapsPtr +libxlBuildCapabilities(const char *hostmachine, + int host_pae, + struct guest_arch *guest_archs, + int nr_guest_archs) +{ + virCapsPtr caps; + int i; + + if ((caps = virCapabilitiesNew(hostmachine, 1, 1)) == NULL) + goto no_memory; + + virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x16, 0x3e }); + + if (host_pae && + virCapabilitiesAddHostFeature(caps, "pae") < 0) + goto no_memory; + + for (i = 0; i < nr_guest_archs; ++i) { + virCapsGuestPtr guest; + char const *const xen_machines[] = {guest_archs[i].hvm ? "xenfv" : "xenpv"}; + virCapsGuestMachinePtr *machines; + + if ((machines = virCapabilitiesAllocMachines(xen_machines, 1)) == NULL) + goto no_memory; + + if ((guest = virCapabilitiesAddGuest(caps, + guest_archs[i].hvm ? "hvm" : "xen", + guest_archs[i].model, + guest_archs[i].bits, + (STREQ(hostmachine, "x86_64") ? + "/usr/lib64/xen/bin/qemu-dm" : + "/usr/lib/xen/bin/qemu-dm"), + (guest_archs[i].hvm ? + "/usr/lib/xen/boot/hvmloader" : + NULL), + 1, + machines)) == NULL) { + virCapabilitiesFreeMachines(machines, 1); + goto no_memory; + } + machines = NULL; + + if (virCapabilitiesAddGuestDomain(guest, + "xen", + NULL, + NULL, + 0, + NULL) == NULL) + goto no_memory; + + if (guest_archs[i].pae && + virCapabilitiesAddGuestFeature(guest, + "pae", + 1, + 0) == NULL) + goto no_memory; + + if (guest_archs[i].nonpae && + virCapabilitiesAddGuestFeature(guest, + "nonpae", + 1, + 0) == NULL) + goto no_memory; + + if (guest_archs[i].ia64_be && + virCapabilitiesAddGuestFeature(guest, + "ia64_be", + 1, + 0) == NULL) + goto no_memory; + + if (guest_archs[i].hvm) { + if (virCapabilitiesAddGuestFeature(guest, + "acpi", + 1, + 1) == NULL) + goto no_memory; + + if (virCapabilitiesAddGuestFeature(guest, "apic", + 1, + 0) == NULL) + goto no_memory; + + if (virCapabilitiesAddGuestFeature(guest, + "hap", + 0, + 1) == NULL) + goto no_memory; + } + } + + caps->defaultConsoleTargetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + + return caps; + + no_memory: + virCapabilitiesFree(caps); + return NULL; +} + +static virCapsPtr +libxlMakeCapabilitiesInternal(const char *hostmachine, + libxl_physinfo *phy_info, + char *capabilities) +{ + char *str, *token; + regmatch_t subs[4]; + char *saveptr = NULL; + int i; + + int host_pae = 0; + struct guest_arch guest_archs[32]; + int nr_guest_archs = 0; + virCapsPtr caps = NULL; + + memset(guest_archs, 0, sizeof(guest_archs)); + + // TODO: extract pae from phy_info->phys_cap + // for now, better default is 1 + (void)phy_info; + host_pae = 1; + + /* Format of capabilities string is documented in the code in + * xen-unstable.hg/xen/arch/.../setup.c. + * + * It is a space-separated list of supported guest architectures. + * + * For x86: + * TYP-VER-ARCH[p] + * ^ ^ ^ ^ + * | | | +-- PAE supported + * | | +------- x86_32 or x86_64 + * | +----------- the version of Xen, eg. "3.0" + * +--------------- "xen" or "hvm" for para or full virt respectively + * + * For IA64: + * TYP-VER-ARCH[be] + * ^ ^ ^ ^ + * | | | +-- Big-endian supported + * | | +------- always "ia64" + * | +----------- the version of Xen, eg. "3.0" + * +--------------- "xen" or "hvm" for para or full virt respectively + */ + + /* Split capabilities string into tokens. strtok_r is OK here because + * we "own" the buffer. Parse out the features from each token. + */ + for (str = capabilities, nr_guest_archs = 0; + nr_guest_archs < sizeof guest_archs / sizeof guest_archs[0] + && (token = strtok_r (str, " ", &saveptr)) != NULL; + str = NULL) { + if (regexec(&xen_cap_rec, token, sizeof subs / sizeof subs[0], + subs, 0) == 0) { + int hvm = STRPREFIX(&token[subs[1].rm_so], "hvm"); + const char *model; + int bits, pae = 0, nonpae = 0, ia64_be = 0; + + if (STRPREFIX(&token[subs[2].rm_so], "x86_32")) { + model = "i686"; + bits = 32; + if (subs[3].rm_so != -1 && + STRPREFIX(&token[subs[3].rm_so], "p")) + pae = 1; + else + nonpae = 1; + } + else if (STRPREFIX(&token[subs[2].rm_so], "x86_64")) { + model = "x86_64"; + bits = 64; + } + else if (STRPREFIX(&token[subs[2].rm_so], "ia64")) { + model = "ia64"; + bits = 64; + if (subs[3].rm_so != -1 && + STRPREFIX(&token[subs[3].rm_so], "be")) + ia64_be = 1; + } + else if (STRPREFIX(&token[subs[2].rm_so], "powerpc64")) { + model = "ppc64"; + bits = 64; + } else { + continue; + } + + /* Search for existing matching (model,hvm) tuple */ + for (i = 0 ; i < nr_guest_archs ; i++) { + if (STREQ(guest_archs[i].model, model) && + guest_archs[i].hvm == hvm) { + break; + } + } + + /* Too many arch flavours - highly unlikely ! */ + if (i >= ARRAY_CARDINALITY(guest_archs)) + continue; + /* Didn't find a match, so create a new one */ + if (i == nr_guest_archs) + nr_guest_archs++; + + guest_archs[i].model = model; + guest_archs[i].bits = bits; + guest_archs[i].hvm = hvm; + + /* Careful not to overwrite a previous positive + setting with a negative one here - some archs + can do both pae & non-pae, but Xen reports + separately capabilities so we're merging archs */ + if (pae) + guest_archs[i].pae = pae; + if (nonpae) + guest_archs[i].nonpae = nonpae; + if (ia64_be) + guest_archs[i].ia64_be = ia64_be; + } + } + + if ((caps = libxlBuildCapabilities(hostmachine, + host_pae, + guest_archs, + nr_guest_archs)) == NULL) + goto no_memory; + + return caps; + + no_memory: + virReportOOMError(); + virCapabilitiesFree(caps); + return NULL; +} + +static int +libxlMakeDomCreateInfo(virDomainDefPtr def, libxl_domain_create_info *c_info) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + libxl_init_create_info(c_info); + + c_info->hvm = STREQ(def->os.type, "hvm"); + if ((c_info->name = strdup(def->name)) == NULL) { + virReportOOMError(); + goto error; + } + + virUUIDFormat(def->uuid, uuidstr); + if (libxl_uuid_from_string(&c_info->uuid, uuidstr) ) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to parse UUID '%s'"), uuidstr); + goto error; + } + + return 0; + +error: + libxl_domain_create_info_destroy(c_info); + return -1; +} + +static int +libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) +{ + libxl_domain_build_info *b_info = &d_config->b_info; + int hvm = STREQ(def->os.type, "hvm"); + + libxl_init_build_info(b_info, &d_config->c_info); + + b_info->hvm = hvm; + b_info->max_vcpus = def->maxvcpus; + b_info->cur_vcpus = def->vcpus; + if (def->clock.ntimers > 0 && + def->clock.timers[0]->name == VIR_DOMAIN_TIMER_NAME_TSC) { + switch (def->clock.timers[0]->mode) { + case VIR_DOMAIN_TIMER_MODE_NATIVE: + b_info->tsc_mode = 2; + break; + case VIR_DOMAIN_TIMER_MODE_PARAVIRT: + b_info->tsc_mode = 3; + break; + default: + b_info->tsc_mode = 1; + } + } + b_info->max_memkb = def->mem.max_balloon; + b_info->target_memkb = def->mem.cur_balloon; + if (hvm) { + b_info->u.hvm.pae = def->features & (1 << VIR_DOMAIN_FEATURE_PAE); + b_info->u.hvm.apic = def->features & (1 << VIR_DOMAIN_FEATURE_APIC); + b_info->u.hvm.acpi = def->features & (1 << VIR_DOMAIN_FEATURE_ACPI); + /* + * The following comment and calculation were taken directly from + * libxenlight's internal function libxl_get_required_shadow_memory(): + * + * 256 pages (1MB) per vcpu, plus 1 page per MiB of RAM for the P2M map, + * plus 1 page per MiB of RAM to shadow the resident processes. + */ + b_info->shadow_memkb = 4 * (256 * b_info->cur_vcpus + + 2 * (b_info->max_memkb / 1024)); + } else { + if (def->os.bootloader) { + if ((b_info->u.pv.bootloader = strdup(def->os.bootloader)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (def->os.bootloaderArgs) { + if ((b_info->u.pv.bootloader_args = strdup(def->os.bootloaderArgs)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (def->os.cmdline) { + if ((b_info->u.pv.cmdline = strdup(def->os.cmdline)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (def->os.kernel) { + /* libxl_init_build_info() sets kernel.path = strdup("hvmloader") */ + free(b_info->kernel.path); + if ((b_info->kernel.path = strdup(def->os.kernel)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (def->os.initrd) { + if ((b_info->u.pv.ramdisk.path = strdup(def->os.initrd)) == NULL) { + virReportOOMError(); + goto error; + } + } + } + + return 0; + +error: + libxl_domain_build_info_destroy(b_info); + return -1; +} + +static int +libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) +{ + virDomainDiskDefPtr *l_disks = def->disks; + int ndisks = def->ndisks; + libxl_device_disk *x_disks; + int i; + + if (VIR_ALLOC_N(x_disks, ndisks) < 0) { + virReportOOMError(); + return -1; + } + + for (i = 0; i < ndisks; i++) { + if (l_disks[i]->src && + (x_disks[i].pdev_path = strdup(l_disks[i]->src)) == NULL) { + virReportOOMError(); + goto error; + } + + if (l_disks[i]->dst && + (x_disks[i].vdev = strdup(l_disks[i]->dst)) == NULL) { + virReportOOMError(); + goto error; + } + + if (l_disks[i]->driverName) { + if (STREQ(l_disks[i]->driverName, "tap") || + STREQ(l_disks[i]->driverName, "tap2")) { + if (l_disks[i]->driverType) { + if (STREQ(l_disks[i]->driverType, "qcow")) { + x_disks[i].format = DISK_FORMAT_QCOW; + x_disks[i].backend = DISK_BACKEND_QDISK; + } else if (STREQ(l_disks[i]->driverType, "qcow2")) { + x_disks[i].format = DISK_FORMAT_QCOW2; + x_disks[i].backend = DISK_BACKEND_QDISK; + } else if (STREQ(l_disks[i]->driverType, "vhd")) { + x_disks[i].format = DISK_FORMAT_VHD; + x_disks[i].backend = DISK_BACKEND_TAP; + } else if (STREQ(l_disks[i]->driverType, "aio") || + STREQ(l_disks[i]->driverType, "raw")) { + x_disks[i].format = DISK_FORMAT_RAW; + x_disks[i].backend = DISK_BACKEND_TAP; + } + } else { + /* No subtype specified, default to raw/tap */ + x_disks[i].format = DISK_FORMAT_RAW; + x_disks[i].backend = DISK_BACKEND_TAP; + } + } else if (STREQ(l_disks[i]->driverName, "file")) { + x_disks[i].format = DISK_FORMAT_RAW; + x_disks[i].backend = DISK_BACKEND_TAP; + } else if (STREQ(l_disks[i]->driverName, "phy")) { + x_disks[i].format = DISK_FORMAT_RAW; + x_disks[i].backend = DISK_BACKEND_PHY; + } else { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight does not support disk driver %s"), + l_disks[i]->driverName); + goto error; + } + } else { + /* No driverName - default to raw/tap?? */ + x_disks[i].format = DISK_FORMAT_RAW; + x_disks[i].backend = DISK_BACKEND_TAP; + } + + /* How to set unpluggable? */ + x_disks[i].unpluggable = 1; + x_disks[i].readwrite = !l_disks[i]->readonly; + x_disks[i].is_cdrom = + l_disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; + } + + d_config->disks = x_disks; + d_config->num_disks = ndisks; + + return 0; + +error: + for (i = 0; i < ndisks; i++) + libxl_device_disk_destroy(&x_disks[i]); + VIR_FREE(x_disks); + return -1; +} + +static int +libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) +{ + virDomainNetDefPtr *l_nics = def->nets; + int nnics = def->nnets; + libxl_device_nic *x_nics; + int i; + + if (VIR_ALLOC_N(x_nics, nnics) < 0) { + virReportOOMError(); + return -1; + } + + for (i = 0; i < nnics; i++) { + x_nics[i].devid = i; + + // TODO: Where is mtu stored? + x_nics[i].mtu = 1492; + + memcpy(x_nics[i].mac, l_nics[i]->mac, sizeof(libxl_mac)); + + if (l_nics[i]->model && !STREQ(l_nics[i]->model, "netfront")) { + if ((x_nics[i].model = strdup(l_nics[i]->model)) == NULL) { + virReportOOMError(); + goto error; + } + x_nics[i].nictype = NICTYPE_IOEMU; + } else { + x_nics[i].nictype = NICTYPE_VIF; + } + + if (l_nics[i]->ifname && + (x_nics[i].ifname = strdup(l_nics[i]->ifname)) == NULL) { + virReportOOMError(); + goto error; + } + + if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { + if (l_nics[i]->data.bridge.brname && + (x_nics[i].bridge = + strdup(l_nics[i]->data.bridge.brname)) == NULL) { + virReportOOMError(); + goto error; + } + if (l_nics[i]->data.bridge.script && + (x_nics[i].script = + strdup(l_nics[i]->data.bridge.script)) == NULL) { + virReportOOMError(); + goto error; + } + } + + //TODO + //x_nics[i].ip = ; + } + + d_config->vifs = x_nics; + d_config->num_vifs = nnics; + + return 0; + +error: + for (i = 0; i < nnics; i++) + libxl_device_nic_destroy(&x_nics[i]); + VIR_FREE(x_nics); + return -1; +} + +static int +libxlMakeVfbList(libxlDriverPrivatePtr driver, + virDomainDefPtr def, libxl_domain_config *d_config) +{ + virDomainGraphicsDefPtr *l_vfbs = def->graphics; + int nvfbs = def->ngraphics; + libxl_device_vfb *x_vfbs; + libxl_device_vkb *x_vkbs; + int i; + int port; + + if (nvfbs == 0) + return 0; + + if (VIR_ALLOC_N(x_vfbs, nvfbs) < 0) { + virReportOOMError(); + return -1; + } + if (VIR_ALLOC_N(x_vkbs, nvfbs) < 0) { + virReportOOMError(); + VIR_FREE(x_vfbs); + return -1; + } + + for (i = 0; i < nvfbs; i++) { + libxl_device_vfb_init(&x_vfbs[i], i); + libxl_device_vkb_init(&x_vkbs[i], i); + + switch (l_vfbs[i]->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + x_vfbs[i].sdl = 1; + if (l_vfbs[i]->data.sdl.display && + (x_vfbs[i].display = + strdup(l_vfbs[i]->data.sdl.display)) == NULL) { + virReportOOMError(); + goto error; + } + if (l_vfbs[i]->data.sdl.xauth && + (x_vfbs[i].xauthority = + strdup(l_vfbs[i]->data.sdl.xauth)) == NULL) { + virReportOOMError(); + goto error; + } + break; + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + x_vfbs[i].vnc = 1; + /* driver handles selection of free port */ + x_vfbs[i].vncunused = 0; + if (l_vfbs[i]->data.vnc.autoport) { + port = libxlNextFreeVncPort(driver, LIBXL_VNC_PORT_MIN); + if (port < 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unable to find an unused VNC port")); + goto error; + } + l_vfbs[i]->data.vnc.port = port; + } + x_vfbs[i].vncdisplay = l_vfbs[i]->data.vnc.port - + LIBXL_VNC_PORT_MIN; + + if (l_vfbs[i]->data.vnc.listenAddr) { + /* libxl_device_vfb_init() does strdup("127.0.0.1") */ + free(x_vfbs[i].vnclisten); + if ((x_vfbs[i].vnclisten = + strdup(l_vfbs[i]->data.vnc.listenAddr)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (l_vfbs[i]->data.vnc.keymap && + (x_vfbs[i].keymap = + strdup(l_vfbs[i]->data.vnc.keymap)) == NULL) { + virReportOOMError(); + goto error; + } + break; + } + } + + d_config->vfbs = x_vfbs; + d_config->vkbs = x_vkbs; + d_config->num_vfbs = d_config->num_vkbs = nvfbs; + + return 0; + +error: + for (i = 0; i < nvfbs; i++) { + libxl_device_vfb_destroy(&x_vfbs[i]); + libxl_device_vkb_destroy(&x_vkbs[i]); + } + VIR_FREE(x_vfbs); + VIR_FREE(x_vkbs); + return -1; +} + +static int +libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) +{ + const char *type = virDomainChrTypeToString(def->source.type); + + if (!type) { + libxlError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unexpected chr device type")); + return -1; + } + + switch (def->source.type) { + case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_STDIO: + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_PTY: + if (virAsprintf(buf, "%s", type) < 0) { + virReportOOMError(); + return -1; + } + break; + + case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_PIPE: + if (virAsprintf(buf, "%s:%s", type, + def->source.data.file.path) < 0) { + virReportOOMError(); + return -1; + } + break; + + case VIR_DOMAIN_CHR_TYPE_DEV: + if (virAsprintf(buf, "%s", def->source.data.file.path) < 0) { + virReportOOMError(); + return -1; + } + break; + } + + return 0; +} + +static int +libxlMakeDeviceModelInfo(virDomainDefPtr def, libxl_domain_config *d_config) +{ + libxl_device_model_info *dm_info = &d_config->dm_info; + int i; + char b_order[VIR_DOMAIN_BOOT_LAST+1]; + + libxl_init_dm_info(dm_info, &d_config->c_info, &d_config->b_info); + + if (d_config->b_info.hvm) { + /* HVM-specific device model info */ + dm_info->type = XENFV; + if (def->os.nBootDevs > 0) { + free(dm_info->boot); + for (i = 0; i < def->os.nBootDevs; i++) { + switch (def->os.bootDevs[i]) { + case VIR_DOMAIN_BOOT_FLOPPY: + b_order[i] = 'a'; + break; + default: + case VIR_DOMAIN_BOOT_DISK: + b_order[i] = 'c'; + break; + case VIR_DOMAIN_BOOT_CDROM: + b_order[i] = 'd'; + break; + case VIR_DOMAIN_BOOT_NET: + b_order[i] = 'n'; + break; + } + } + b_order[def->os.nBootDevs] = '\0'; + if ((dm_info->boot = strdup(b_order)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (def->serials && + (libxlMakeChrdevStr(def->serials[0], &dm_info->serial) < 0)) + goto error; + } else { + /* PV-specific device model info */ + dm_info->type = XENPV; + } + + /* Build qemu graphics options from previously parsed vfb */ + if (d_config->num_vfbs > 0) { + if (d_config->vfbs[0].vnc) { + dm_info->vnc = 1; + /* driver handles selection of free port */ + dm_info->vncunused = 0; + if (d_config->vfbs[0].vnclisten) { + free(dm_info->vnclisten); + if ((dm_info->vnclisten = + strdup(d_config->vfbs[0].vnclisten)) == NULL) { + virReportOOMError(); + goto error; + } + } + if (d_config->vfbs[0].keymap && + (dm_info->keymap = strdup(d_config->vfbs[0].keymap)) == NULL) { + virReportOOMError(); + goto error; + } + dm_info->vncdisplay = d_config->vfbs[0].vncdisplay; + if (d_config->vfbs[0].vncpasswd && + (dm_info->vncpasswd = + strdup(d_config->vfbs[0].vncpasswd)) == NULL) { + virReportOOMError(); + goto error; + } + } else if (d_config->vfbs[0].sdl) { + dm_info->sdl = 1; + dm_info->vnc = 0; + } + } else if (d_config->num_vfbs == 0) { + dm_info->nographic = 1; + dm_info->vnc = 0; + } + + // TODO + //dm_info->usb = ; + //dm_info->usbdevice = ; + //dm_info->soundhw = ; + + return 0; + +error: + libxl_device_model_info_destroy(dm_info); + return -1; +} + +virCapsPtr +libxlMakeCapabilities(libxl_ctx *ctx) +{ + libxl_physinfo phy_info; + const libxl_version_info *ver_info; + struct utsname utsname; + + regcomp (&xen_cap_rec, xen_cap_re, REG_EXTENDED); + + if (libxl_get_physinfo(ctx, &phy_info) != 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get node physical info from libxenlight")); + return NULL; + } + + if ((ver_info = libxl_get_version_info(ctx)) == NULL) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get version info from libxenlight")); + return NULL; + } + + uname(&utsname); + + return libxlMakeCapabilitiesInternal(utsname.machine, + &phy_info, + ver_info->capabilities); +} + +int +libxlBuildDomainConfig(libxlDriverPrivatePtr driver, + virDomainDefPtr def, libxl_domain_config *d_config) +{ + + if (libxlMakeDomCreateInfo(def, &d_config->c_info) < 0) + return -1; + + if (libxlMakeDomBuildInfo(def, d_config) < 0) { + goto error; + } + + if (libxlMakeDiskList(def, d_config) < 0) { + goto error; + } + + if (libxlMakeNicList(def, d_config) < 0) { + goto error; + } + + if (libxlMakeVfbList(driver, def, d_config) < 0) { + goto error; + } + + if (libxlMakeDeviceModelInfo(def, d_config) < 0) { + goto error; + } + + d_config->on_reboot = def->onReboot; + d_config->on_poweroff = def->onPoweroff; + d_config->on_crash = def->onCrash; + + return 0; + +error: + libxl_domain_config_destroy(d_config); + return -1; +} diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h new file mode 100644 index 0000000..bb49d35 --- /dev/null +++ b/src/libxl/libxl_conf.h @@ -0,0 +1,91 @@ +/*---------------------------------------------------------------------------*/ +/* Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/*---------------------------------------------------------------------------*/ + +#ifndef LIBXL_CONF_H +# define LIBXL_CONF_H + +# include <config.h> + +# include <libxl.h> + +# include "internal.h" +# include "domain_conf.h" +# include "capabilities.h" +# include "configmake.h" +# include "bitmap.h" + + +# define LIBXL_VNC_PORT_MIN 5900 +# define LIBXL_VNC_PORT_MAX 65535 + +# define LIBXL_CONFIG_DIR SYSCONFDIR "/libvirt/libxl" +# define LIBXL_AUTOSTART_DIR LIBXL_CONFIG_DIR "/autostart" +# define LIBXL_STATE_DIR LOCALSTATEDIR "/run/libvirt/libxl" +# define LIBXL_LOG_DIR LOCALSTATEDIR "/log/libvirt/libxl" +# define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" +# define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" + + +typedef struct _libxlDriverPrivate libxlDriverPrivate; +typedef libxlDriverPrivate *libxlDriverPrivatePtr; +struct _libxlDriverPrivate { + virMutex lock; + virCapsPtr caps; + unsigned int version; + + FILE *logger_file; + xentoollog_logger *logger; + /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ + libxl_ctx ctx; + + virBitmapPtr reservedVNCPorts; + virDomainObjList domains; + + char *configDir; + char *autostartDir; + char *logDir; + char *stateDir; + char *libDir; + char *saveDir; +}; + +typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate; +typedef libxlDomainObjPrivate *libxlDomainObjPrivatePtr; +struct _libxlDomainObjPrivate { + /* per domain libxl ctx */ + libxl_ctx ctx; + libxl_waiter *dWaiter; + int waiterFD; + int eventHdl; +}; + + +# define libxlError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_LIBXL, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + +virCapsPtr +libxlMakeCapabilities(libxl_ctx *ctx); + +int +libxlBuildDomainConfig(libxlDriverPrivatePtr driver, + virDomainDefPtr def, libxl_domain_config *d_config); + + +#endif /* LIBXL_CONF_H */ diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c new file mode 100644 index 0000000..d137474 --- /dev/null +++ b/src/libxl/libxl_driver.c @@ -0,0 +1,1411 @@ +/*---------------------------------------------------------------------------*/ +/* Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. + * Copyright (C) 2011 Univention GmbH. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/*---------------------------------------------------------------------------*/ + +#include <config.h> + +#include <sys/utsname.h> +#include <libxl.h> + +#include "internal.h" +#include "logging.h" +#include "virterror_internal.h" +#include "datatypes.h" +#include "files.h" +#include "memory.h" +#include "event.h" +#include "uuid.h" +#include "libxl_driver.h" +#include "libxl_conf.h" + + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +#define LIBXL_DOM_REQ_POWEROFF 0 +#define LIBXL_DOM_REQ_REBOOT 1 +#define LIBXL_DOM_REQ_SUSPEND 2 +#define LIBXL_DOM_REQ_CRASH 3 +#define LIBXL_DOM_REQ_HALT 4 + +static libxlDriverPrivatePtr libxl_driver = NULL; + + +/* Function declarations */ +static int +libxlVmStart(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, bool start_paused); + + +/* Function definitions */ +static void +libxlDriverLock(libxlDriverPrivatePtr driver) +{ + virMutexLock(&driver->lock); +} + +static void +libxlDriverUnlock(libxlDriverPrivatePtr driver) +{ + virMutexUnlock(&driver->lock); +} + +static void * +libxlDomainObjPrivateAlloc(void) +{ + libxlDomainObjPrivatePtr priv; + + if (VIR_ALLOC(priv) < 0) + return NULL; + + libxl_ctx_init(&priv->ctx, LIBXL_VERSION, libxl_driver->logger); + priv->waiterFD = -1; + priv->eventHdl = -1; + + return priv; +} + +static void +libxlDomainObjPrivateFree(void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + if (priv->dWaiter) { + libxl_free_waiter(priv->dWaiter); + VIR_FREE(priv->dWaiter); + } + libxl_ctx_free(&priv->ctx); + VIR_FREE(priv); +} + +/* + * Cleanup function for domain that has reached shutoff state. + * + * virDomainObjPtr should be locked on invocation + */ +static void +libxlVmCleanup(libxlDriverPrivatePtr driver, virDomainObjPtr vm) +{ + libxlDomainObjPrivatePtr priv = vm->privateData; + int vnc_port; + char *file; + + if (priv->dWaiter) { + libxl_free_waiter(priv->dWaiter); + VIR_FREE(priv->dWaiter); + } + + if (vm->persistent) { + vm->def->id = -1; + vm->state = VIR_DOMAIN_SHUTOFF; + } + + if ((vm->def->ngraphics == 1) && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + vm->def->graphics[0]->data.vnc.autoport) { + vnc_port = vm->def->graphics[0]->data.vnc.port; + if (vnc_port >= LIBXL_VNC_PORT_MIN) { + if (virBitmapClearBit(driver->reservedVNCPorts, + vnc_port - LIBXL_VNC_PORT_MIN) < 0) + VIR_DEBUG("Could not mark port %d as unused", vnc_port); + } + } + + if (virAsprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) > 0) { + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) + VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); + VIR_FREE(file); + } +} + +/* + * Reap a domain from libxenlight. + * + * virDomainObjPtr should be locked on invocation + */ +static int +libxlVmReap(libxlDriverPrivatePtr driver, virDomainObjPtr vm, int force) +{ + libxlDomainObjPrivatePtr priv = vm->privateData; + + if (libxl_domain_destroy(&priv->ctx, vm->def->id, force) < 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Unable to cleanup domain %d"), vm->def->id); + return -1; + } + + libxlVmCleanup(driver, vm); + return 0; +} + +/* + * Handle previously registered event notification from libxenlight + */ +static void libxlEventHandler(int watch, + int fd, + int events, + void *data) +{ + libxlDriverPrivatePtr driver = libxl_driver; + virDomainObjPtr vm = data; + libxlDomainObjPrivatePtr priv; + libxl_event event; + libxl_dominfo info; + + libxlDriverLock(driver); + virDomainObjLock(vm); + libxlDriverUnlock(driver); + + priv = vm->privateData; + + memset(&event, 0, sizeof(event)); + memset(&info, 0, sizeof(info)); + + if (priv->waiterFD != fd || priv->eventHdl != watch) { + virEventRemoveHandle(watch); + goto cleanup; + } + + if (!(events & VIR_EVENT_HANDLE_READABLE)) + goto cleanup; + + if (libxl_get_event(&priv->ctx, &event)) + goto cleanup; + + if (event.type == LIBXL_EVENT_DOMAIN_DEATH) { + /* libxl_event_get_domain_death_info returns 1 if death + * event was for this domid */ + if (libxl_event_get_domain_death_info(&priv->ctx, + vm->def->id, + &event, + &info) != 1) + goto cleanup; + + virEventRemoveHandle(watch); + switch (info.shutdown_reason) { + case SHUTDOWN_poweroff: + case SHUTDOWN_crash: + libxlVmReap(driver, vm, 0); + if (!vm->persistent) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + } + break; + case SHUTDOWN_reboot: + libxlVmReap(driver, vm, 0); + libxlVmStart(driver, vm, 0); + break; + default: + VIR_INFO("Unhandled shutdown_reason %d", info.shutdown_reason); + break; + } + } + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxl_free_event(&event); +} + +/* + * Register domain events with libxenlight and insert event handles + * in libvirt's event loop. + */ +static int +libxlCreateDomEvents(virDomainObjPtr vm) +{ + libxlDomainObjPrivatePtr priv = vm->privateData; + int fd; + + /* Do we already have a waiter for this domain? */ + if (priv->dWaiter == NULL) { + if (VIR_ALLOC(priv->dWaiter) < 0) { + virReportOOMError(); + return -1; + } + + if (libxl_wait_for_domain_death(&priv->ctx, + vm->def->id, + priv->dWaiter)) + goto error; + } + + libxl_get_wait_fd(&priv->ctx, &fd); + if (fd < 0) + goto error; + + priv->waiterFD = fd; + if ((priv->eventHdl = virEventAddHandle( + fd, + VIR_EVENT_HANDLE_READABLE | VIR_EVENT_HANDLE_ERROR, + libxlEventHandler, + vm, NULL)) < 0) + goto error; + + return 0; + +error: + libxl_free_waiter(priv->dWaiter); + VIR_FREE(priv->dWaiter); + return -1; +} + +/* + * Start a domain through libxenlight. + * + * virDomainObjPtr should be locked on invocation + */ +static int +libxlVmStart(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, bool start_paused) +{ + libxl_domain_config d_config; + virDomainDefPtr def = vm->def; + int ret; + uint32_t domid = 0; + char *dom_xml = NULL; + pid_t child_console_pid = -1; + libxlDomainObjPrivatePtr priv = vm->privateData; + + memset(&d_config, 0, sizeof(d_config)); + + if (libxlBuildDomainConfig(driver, def, &d_config) < 0 ) + return -1; + + //TODO: Balloon dom0 ?? + //ret = freemem(&d_config->b_info, &d_config->dm_info); + + ret = libxl_domain_create_new(&priv->ctx, &d_config, + NULL, &child_console_pid, &domid); + if (ret) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to create new domain '%s'"), + d_config.c_info.name); + goto error; + } + + def->id = domid; + if ((dom_xml = virDomainDefFormat(def, 0)) == NULL) + goto error; + + if(libxl_userdata_store(&priv->ctx, domid, "libvirt-xml", + (uint8_t *)dom_xml, strlen(dom_xml) + 1)) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to store userdata")); + goto error; + } + + if (libxlCreateDomEvents(vm) < 0) + goto error; + + if (!start_paused) { + libxl_domain_unpause(&priv->ctx, domid); + vm->state = VIR_DOMAIN_RUNNING; + } else { + vm->state = VIR_DOMAIN_PAUSED; + } + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) + goto error; + + libxl_domain_config_destroy(&d_config); + VIR_FREE(dom_xml); + return 0; + +error: + if (domid > 0) { + libxl_domain_destroy(&priv->ctx, domid, 0); + def->id = -1; + vm->state = VIR_DOMAIN_SHUTOFF; + } + libxl_domain_config_destroy(&d_config); + VIR_FREE(dom_xml); + return -1; +} + + +/* + * Reconnect to running domains that were previously started/created + * with libxenlight driver. + */ +static void +libxlReconnectDomain(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virDomainObjPtr vm = payload; + libxlDriverPrivatePtr driver = opaque; + int rc; + libxl_dominfo d_info; + int len; + uint8_t *data = NULL; + + virDomainObjLock(vm); + + /* Does domain still exist? */ + rc = libxl_domain_info(&driver->ctx, &d_info, vm->def->id); + if (rc == ERROR_INVAL) { + goto out; + } else if (rc != 0) { + VIR_DEBUG("libxl_domain_info failed (code %d), ignoring domain %d", + rc, vm->def->id); + goto out; + } + + /* Is this a domain that was under libvirt control? */ + if (libxl_userdata_retrieve(&driver->ctx, vm->def->id, + "libvirt-xml", &data, &len)) { + VIR_DEBUG("libxl_userdata_retrieve failed, ignoring domain %d", vm->def->id); + goto out; + } + + /* Update domid in case it changed (e.g. reboot) while we were gone? */ + vm->def->id = d_info.domid; + vm->state = VIR_DOMAIN_RUNNING; + + /* Recreate domain death et. al. events */ + libxlCreateDomEvents(vm); + virDomainObjUnlock(vm); + return; + +out: + libxlVmCleanup(driver, vm); + if (!vm->persistent) + virDomainRemoveInactive(&driver->domains, vm); + else + virDomainObjUnlock(vm); +} + +static void +libxlReconnectDomains(libxlDriverPrivatePtr driver) +{ + virHashForEach(driver->domains.objs, libxlReconnectDomain, driver); +} + +static int +libxlShutdown(void) +{ + if (!libxl_driver) + return -1; + + libxlDriverLock(libxl_driver); + virCapabilitiesFree(libxl_driver->caps); + virDomainObjListDeinit(&libxl_driver->domains); + libxl_ctx_free(&libxl_driver->ctx); + xtl_logger_destroy(libxl_driver->logger); + if (libxl_driver->logger_file) + VIR_FORCE_FCLOSE(libxl_driver->logger_file); + + virBitmapFree(libxl_driver->reservedVNCPorts); + + VIR_FREE(libxl_driver->configDir); + VIR_FREE(libxl_driver->autostartDir); + VIR_FREE(libxl_driver->logDir); + VIR_FREE(libxl_driver->stateDir); + VIR_FREE(libxl_driver->libDir); + VIR_FREE(libxl_driver->saveDir); + + libxlDriverUnlock(libxl_driver); + virMutexDestroy(&libxl_driver->lock); + VIR_FREE(libxl_driver); + + return 0; +} + +static int +libxlStartup(int privileged) { + const libxl_version_info *ver_info; + char *log_file = NULL; + + /* Check that the user is root, silently disable if not */ + if (!privileged) { + VIR_INFO0("Not running privileged, disabling libxenlight driver"); + return 0; + } + + if (VIR_ALLOC(libxl_driver) < 0) + return -1; + + if (virMutexInit(&libxl_driver->lock) < 0) { + VIR_ERROR0(_("cannot initialize mutex")); + VIR_FREE(libxl_driver); + return -1; + } + libxlDriverLock(libxl_driver); + + /* Allocate bitmap for vnc port reservation */ + if ((libxl_driver->reservedVNCPorts = + virBitmapAlloc(LIBXL_VNC_PORT_MAX - LIBXL_VNC_PORT_MIN)) == NULL) + goto out_of_memory; + + if (virDomainObjListInit(&libxl_driver->domains) < 0) + goto out_of_memory; + + if (virAsprintf(&libxl_driver->configDir, + "%s", LIBXL_CONFIG_DIR) == -1) + goto out_of_memory; + + if (virAsprintf(&libxl_driver->autostartDir, + "%s", LIBXL_AUTOSTART_DIR) == -1) + goto out_of_memory; + + if (virAsprintf(&libxl_driver->logDir, + "%s", LIBXL_LOG_DIR) == -1) + goto out_of_memory; + + if (virAsprintf(&libxl_driver->stateDir, + "%s", LIBXL_STATE_DIR) == -1) + goto out_of_memory; + + if (virAsprintf(&libxl_driver->libDir, + "%s", LIBXL_LIB_DIR) == -1) + goto out_of_memory; + + if (virAsprintf(&libxl_driver->saveDir, + "%s", LIBXL_SAVE_DIR) == -1) + goto out_of_memory; + + if (virFileMakePath(libxl_driver->logDir) != 0) { + char ebuf[1024]; + VIR_ERROR(_("Failed to create log dir '%s': %s"), + libxl_driver->logDir, virStrerror(errno, ebuf, sizeof ebuf)); + goto error; + } + if (virFileMakePath(libxl_driver->stateDir) != 0) { + char ebuf[1024]; + VIR_ERROR(_("Failed to create state dir '%s': %s"), + libxl_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); + goto error; + } + if (virFileMakePath(libxl_driver->libDir) != 0) { + char ebuf[1024]; + VIR_ERROR(_("Failed to create lib dir '%s': %s"), + libxl_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); + goto error; + } + if (virFileMakePath(libxl_driver->saveDir) != 0) { + char ebuf[1024]; + VIR_ERROR(_("Failed to create save dir '%s': %s"), + libxl_driver->saveDir, virStrerror(errno, ebuf, sizeof ebuf)); + goto error; + } + + if (virAsprintf(&log_file, "%s/libxl.log", libxl_driver->logDir) < 0) { + goto out_of_memory; + } + + if ((libxl_driver->logger_file = fopen(log_file, "a")) == NULL) { + virReportSystemError(errno, + _("failed to create logfile %s"), + log_file); + goto error; + } + VIR_FREE(log_file); + + libxl_driver->logger = + (xentoollog_logger *)xtl_createlogger_stdiostream(libxl_driver->logger_file, XTL_DEBUG, 0); + if (!libxl_driver->logger) { + VIR_ERROR0(_("cannot create logger for libxenlight")); + goto error; + } + + if (libxl_ctx_init(&libxl_driver->ctx, + LIBXL_VERSION, + libxl_driver->logger)) { + VIR_ERROR0(_("cannot initialize libxenlight context")); + goto error; + } + + if ((ver_info = libxl_get_version_info(&libxl_driver->ctx)) == NULL) { + VIR_ERROR0(_("cannot version information from libxenlight")); + goto error; + } + libxl_driver->version = (ver_info->xen_version_major * 1000000) + + (ver_info->xen_version_minor * 1000); + + if ((libxl_driver->caps = + libxlMakeCapabilities(&libxl_driver->ctx)) == NULL) { + VIR_ERROR0(_("cannot create capabilities for libxenlight")); + goto error; + } + + libxl_driver->caps->privateDataAllocFunc = libxlDomainObjPrivateAlloc; + libxl_driver->caps->privateDataFreeFunc = libxlDomainObjPrivateFree; + + /* Load running domains first. */ + if (virDomainLoadAllConfigs(libxl_driver->caps, + &libxl_driver->domains, + libxl_driver->stateDir, + libxl_driver->autostartDir, + 1, NULL, NULL) < 0) + goto error; + + libxlReconnectDomains(libxl_driver); + + /* Then inactive persistent configs */ + if (virDomainLoadAllConfigs(libxl_driver->caps, + &libxl_driver->domains, + libxl_driver->configDir, + libxl_driver->autostartDir, + 0, NULL, NULL) < 0) + goto error; + + libxlDriverUnlock(libxl_driver); + + // TODO: autostart domains + //libxlAutostartConfigs(libxl_driver); + + return 0; + +out_of_memory: + virReportOOMError(); +error: + VIR_FREE(log_file); + if (libxl_driver) + libxlDriverUnlock(libxl_driver); + libxlShutdown(); + return -1; +} + +static int +libxlReload(void) +{ + if (!libxl_driver) + return 0; + + libxlDriverLock(libxl_driver); + virDomainLoadAllConfigs(libxl_driver->caps, + &libxl_driver->domains, + libxl_driver->configDir, + libxl_driver->autostartDir, + 0, NULL, libxl_driver); + libxlDriverUnlock(libxl_driver); + + // TODO + //libxlAutostartConfigs(libxl_driver); + + return 0; +} + +static int +libxlActive(void) +{ + if (!libxl_driver) + return 0; + + return 1; +} + +static virDrvOpenStatus +libxlOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (conn->uri == NULL) { + if (libxl_driver == NULL) + return VIR_DRV_OPEN_DECLINED; + + conn->uri = xmlParseURI("libxl:///"); + if (!conn->uri) { + virReportOOMError(); + return VIR_DRV_OPEN_ERROR; + } + } else { + if (conn->uri->scheme == NULL || STRNEQ(conn->uri->scheme, "libxl")) + return VIR_DRV_OPEN_DECLINED; + + /* If server name is given, its for remote driver */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + if (libxl_driver == NULL) { + libxlError(VIR_ERR_INTERNAL_ERROR, "%s", + _("libxenlight state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } + + /* /session isn't supported in libxenlight */ + if (conn->uri->path && + STRNEQ(conn->uri->path, "") && + STRNEQ(conn->uri->path, "/") && + STRNEQ(conn->uri->path, "/system")) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("unexpected Xen URI path '%s', try libxl:///"), + NULLSTR(conn->uri->path)); + return VIR_DRV_OPEN_ERROR; + } + } + + conn->privateData = libxl_driver; + + return VIR_DRV_OPEN_SUCCESS; +}; + +static int +libxlClose(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + conn->privateData = NULL; + return 0; +} + +static const char * +libxlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return "libxl"; +} + +static int +libxlGetVersion(virConnectPtr conn, unsigned long *version) +{ + libxlDriverPrivatePtr driver = conn->privateData; + + libxlDriverLock(driver); + *version = driver->version; + libxlDriverUnlock(driver); + return 0; +} + +static int +libxlGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) +{ + int ret; + libxlDriverPrivatePtr driver = conn->privateData; + + ret = libxl_get_max_cpus(&driver->ctx); + /* libxl_get_max_cpus() will return 0 if there were any failures, + e.g. xc_physinfo() failing */ + if (ret == 0) + return -1; + + return ret; +} + +static int +libxlNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) +{ + libxl_physinfo phy_info; + const libxl_version_info* ver_info; + libxlDriverPrivatePtr driver = conn->privateData; + struct utsname utsname; + + if (libxl_get_physinfo(&driver->ctx, &phy_info)) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxl_get_physinfo_info failed")); + return -1; + } + + if ((ver_info = libxl_get_version_info(&driver->ctx)) == NULL) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("libxl_get_version_info failed")); + return -1; + } + + uname(&utsname); + if (virStrncpy(info->model, + utsname.machine, + strlen(utsname.machine), + sizeof(info->model)) == NULL) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("machine type %s too big for destination"), + utsname.machine); + return -1; + } + + info->memory = phy_info.total_pages * (ver_info->pagesize / 1024); + info->cpus = phy_info.nr_cpus; + info->nodes = phy_info.nr_nodes; + info->cores = phy_info.cores_per_socket; + info->threads = phy_info.threads_per_core; + info->sockets = 1; + info->mhz = phy_info.cpu_khz / 1000; + return 0; +} + +static char * +libxlGetCapabilities(virConnectPtr conn) +{ + libxlDriverPrivatePtr driver = conn->privateData; + char *xml; + + libxlDriverLock(driver); + if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + virReportOOMError(); + libxlDriverUnlock(driver); + + return xml; +} + +static int +libxlListDomains(virConnectPtr conn, int *ids, int nids) +{ + libxlDriverPrivatePtr driver = conn->privateData; + int n; + + libxlDriverLock(driver); + n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); + libxlDriverUnlock(driver); + + return n; +} + +static int +libxlNumDomains(virConnectPtr conn) +{ + libxlDriverPrivatePtr driver = conn->privateData; + int n; + + libxlDriverLock(driver); + n = virDomainObjListNumOfDomains(&driver->domains, 1); + libxlDriverUnlock(driver); + + return n; +} + +static virDomainPtr +libxlDomainCreateXML(virConnectPtr conn, const char *xml, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = conn->privateData; + virDomainDefPtr def; + virDomainObjPtr vm = NULL; + virDomainPtr dom = NULL; + + virCheckFlags(VIR_DOMAIN_START_PAUSED, NULL); + + libxlDriverLock(driver); + if (!(def = virDomainDefParseString(driver->caps, xml, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) + goto cleanup; + + if (!(vm = virDomainAssignDef(driver->caps, + &driver->domains, def, false))) + goto cleanup; + def = NULL; + + if (libxlVmStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0) < 0) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + goto cleanup; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + +cleanup: + virDomainDefFree(def); + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return dom; +} + +static virDomainPtr +libxlDomainLookupByID(virConnectPtr conn, int id) +{ + libxlDriverPrivatePtr driver = conn->privateData; + virDomainObjPtr vm; + virDomainPtr dom = NULL; + + libxlDriverLock(driver); + vm = virDomainFindByID(&driver->domains, id); + libxlDriverUnlock(driver); + + if (!vm) { + libxlError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + return dom; +} + +static virDomainPtr +libxlDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) +{ + libxlDriverPrivatePtr driver = conn->privateData; + virDomainObjPtr vm; + virDomainPtr dom = NULL; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, uuid); + libxlDriverUnlock(driver); + + if (!vm) { + libxlError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + return dom; +} + +static virDomainPtr +libxlDomainLookupByName(virConnectPtr conn, const char *name) +{ + libxlDriverPrivatePtr driver = conn->privateData; + virDomainObjPtr vm; + virDomainPtr dom = NULL; + + libxlDriverLock(driver); + vm = virDomainFindByName(&driver->domains, name); + libxlDriverUnlock(driver); + + if (!vm) { + libxlError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + return dom; +} + +static int +libxlDomainShutdown(virDomainPtr dom) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + libxlDomainObjPrivatePtr priv; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + + priv = vm->privateData; + if (libxl_domain_shutdown(&priv->ctx, dom->id, LIBXL_DOM_REQ_POWEROFF) != 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to shutdown domain '%d' with libxenlight"), + dom->id); + goto cleanup; + } + + /* vm is marked shutoff (or removed from domains list if not persistent) + * in shutdown event handler. + */ + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} + +static int +libxlDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + libxlDomainObjPrivatePtr priv; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + + priv = vm->privateData; + if (libxl_domain_shutdown(&priv->ctx, dom->id, LIBXL_DOM_REQ_REBOOT) != 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to reboot domain '%d' with libxenlight"), + dom->id); + goto cleanup; + } + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} + +static int +libxlDomainDestroy(virDomainPtr dom) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + libxlDomainObjPrivatePtr priv; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + + priv = vm->privateData; + if (libxlVmReap(driver, vm, 1) != 0) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("Failed to destroy domain '%d'"), dom->id); + goto cleanup; + } + + if (!vm->persistent) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + } + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} + +static int +libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + libxlDriverUnlock(driver); + + if (!vm) { + libxlError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + info->state = vm->state; + info->cpuTime = 0; + info->maxMem = vm->def->mem.max_balloon; + info->memory = vm->def->mem.cur_balloon; + info->nrVirtCpu = vm->def->vcpus; + ret = 0; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + +static char * +libxlDomainDumpXML(virDomainPtr dom, int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + char *ret = NULL; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + libxlDriverUnlock(driver); + + if (!vm) { + libxlError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + ret = virDomainDefFormat(vm->def, flags); + + cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + +static int +libxlListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) +{ + libxlDriverPrivatePtr driver = conn->privateData; + int n; + + libxlDriverLock(driver); + n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); + libxlDriverUnlock(driver); + return n; +} + +static int +libxlNumDefinedDomains(virConnectPtr conn) +{ + libxlDriverPrivatePtr driver = conn->privateData; + int n; + + libxlDriverLock(driver); + n = virDomainObjListNumOfDomains(&driver->domains, 0); + libxlDriverUnlock(driver); + + return n; +} + +static int +libxlDomainCreateWithFlags(virDomainPtr dom, + unsigned int flags ATTRIBUTE_UNUSED) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_START_PAUSED, -1); + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (virDomainObjIsActive(vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is already running")); + goto cleanup; + } + + ret = libxlVmStart(driver, vm, (flags & VIR_DOMAIN_START_PAUSED) != 0); + +cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} + +static int +libxlDomainCreate(virDomainPtr dom) +{ + return libxlDomainCreateWithFlags(dom, 0); +} + +static virDomainPtr +libxlDomainDefineXML(virConnectPtr conn, const char *xml) +{ + libxlDriverPrivatePtr driver = conn->privateData; + virDomainDefPtr def = NULL; + virDomainObjPtr vm = NULL; + virDomainPtr dom = NULL; + int dupVM; + + libxlDriverLock(driver); + if (!(def = virDomainDefParseString(driver->caps, xml, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) + goto cleanup; + + if (!(vm = virDomainAssignDef(driver->caps, + &driver->domains, def, false))) + goto cleanup; + def = NULL; + vm->persistent = 1; + + if (virDomainSaveConfig(driver->configDir, + vm->newDef ? vm->newDef : vm->def) < 0) { + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + goto cleanup; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + +cleanup: + virDomainDefFree(def); + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return dom; +} + +static int +libxlDomainUndefine(virDomainPtr dom) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (virDomainObjIsActive(vm)) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot undefine active domain")); + goto cleanup; + } + + if (!vm->persistent) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot undefine transient domain")); + goto cleanup; + } + + if (virDomainDeleteConfig(driver->configDir, + driver->autostartDir, + vm) < 0) + goto cleanup; + + virDomainRemoveInactive(&driver->domains, vm); + vm = NULL; + ret = 0; + + cleanup: + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} + +static int +libxlDomainIsActive(virDomainPtr dom) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + libxlDriverLock(driver); + obj = virDomainFindByUUID(&driver->domains, dom->uuid); + libxlDriverUnlock(driver); + if (!obj) { + libxlError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = virDomainObjIsActive(obj); + + cleanup: + if (obj) + virDomainObjUnlock(obj); + return ret; +} + +static int +libxlDomainIsPersistent(virDomainPtr dom) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr obj; + int ret = -1; + + libxlDriverLock(driver); + obj = virDomainFindByUUID(&driver->domains, dom->uuid); + libxlDriverUnlock(driver); + if (!obj) { + libxlError(VIR_ERR_NO_DOMAIN, NULL); + goto cleanup; + } + ret = obj->persistent; + + cleanup: + if (obj) + virDomainObjUnlock(obj); + return ret; +} + + +static virDriver libxlDriver = { + VIR_DRV_LIBXL, + "libxenlight", + libxlOpen, /* open */ + libxlClose, /* close */ + NULL, /* supports_feature */ + libxlGetType, /* type */ + libxlGetVersion, /* version */ + NULL, /* libvirtVersion (impl. in libvirt.c) */ + virGetHostname, /* getHostname */ + NULL, /* getSysinfo */ + libxlGetMaxVcpus, /* getMaxVcpus */ + libxlNodeGetInfo, /* nodeGetInfo */ + libxlGetCapabilities, /* getCapabilities */ + libxlListDomains, /* listDomains */ + libxlNumDomains, /* numOfDomains */ + libxlDomainCreateXML, /* domainCreateXML */ + libxlDomainLookupByID, /* domainLookupByID */ + libxlDomainLookupByUUID, /* domainLookupByUUID */ + libxlDomainLookupByName, /* domainLookupByName */ + NULL, /* domainSuspend */ + NULL, /* domainResume */ + libxlDomainShutdown, /* domainShutdown */ + libxlDomainReboot, /* domainReboot */ + libxlDomainDestroy, /* domainDestroy */ + NULL, /* domainGetOSType */ + NULL, /* domainGetMaxMemory */ + NULL, /* domainSetMaxMemory */ + NULL, /* domainSetMemory */ + libxlDomainGetInfo, /* domainGetInfo */ + NULL, /* domainSave */ + NULL, /* domainRestore */ + NULL, /* domainCoreDump */ + NULL, /* domainSetVcpus */ + NULL, /* domainSetVcpusFlags */ + NULL, /* domainGetVcpusFlags */ + NULL, /* domainPinVcpu */ + NULL, /* domainGetVcpus */ + NULL, /* domainGetMaxVcpus */ + NULL, /* domainGetSecurityLabel */ + NULL, /* nodeGetSecurityModel */ + libxlDomainDumpXML, /* domainDumpXML */ + NULL, /* domainXmlFromNative */ + NULL, /* domainXmlToNative */ + libxlListDefinedDomains, /* listDefinedDomains */ + libxlNumDefinedDomains, /* numOfDefinedDomains */ + libxlDomainCreate, /* domainCreate */ + libxlDomainCreateWithFlags, /* domainCreateWithFlags */ + libxlDomainDefineXML, /* domainDefineXML */ + libxlDomainUndefine, /* domainUndefine */ + NULL, /* domainAttachDevice */ + NULL, /* domainAttachDeviceFlags */ + NULL, /* domainDetachDevice */ + NULL, /* domainDetachDeviceFlags */ + NULL, /* domainUpdateDeviceFlags */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ + NULL, /* domainGetSchedulerType */ + NULL, /* domainGetSchedulerParameters */ + NULL, /* domainSetSchedulerParameters */ + NULL, /* domainMigratePrepare */ + NULL, /* domainMigratePerform */ + NULL, /* domainMigrateFinish */ + NULL, /* domainBlockStats */ + NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ + NULL, /* domainBlockPeek */ + NULL, /* domainMemoryPeek */ + NULL, /* domainGetBlockInfo */ + NULL, /* nodeGetCellsFreeMemory */ + NULL, /* getFreeMemory */ + NULL, /* domainEventRegister */ + NULL, /* domainEventDeregister */ + NULL, /* domainMigratePrepare2 */ + NULL, /* domainMigrateFinish2 */ + NULL, /* nodeDeviceDettach */ + NULL, /* nodeDeviceReAttach */ + NULL, /* nodeDeviceReset */ + NULL, /* domainMigratePrepareTunnel */ + NULL, /* IsEncrypted */ + NULL, /* IsSecure */ + libxlDomainIsActive, /* DomainIsActive */ + libxlDomainIsPersistent, /* DomainIsPersistent */ + NULL, /* domainIsUpdated */ + NULL, /* cpuCompare */ + NULL, /* cpuBaseline */ + NULL, /* domainGetJobInfo */ + NULL, /* domainAbortJob */ + NULL, /* domainMigrateSetMaxDowntime */ + NULL, /* domainEventRegisterAny */ + NULL, /* domainEventDeregisterAny */ + NULL, /* domainManagedSave */ + NULL, /* domainHasManagedSaveImage */ + NULL, /* domainManagedSaveRemove */ + NULL, /* domainSnapshotCreateXML */ + NULL, /* domainSnapshotDumpXML */ + NULL, /* domainSnapshotNum */ + NULL, /* domainSnapshotListNames */ + NULL, /* domainSnapshotLookupByName */ + NULL, /* domainHasCurrentSnapshot */ + NULL, /* domainSnapshotCurrent */ + NULL, /* domainRevertToSnapshot */ + NULL, /* domainSnapshotDelete */ + NULL, /* qemuDomainMonitorCommand */ + NULL, /* domainSetMemoryParameters */ + NULL, /* domainGetMemoryParameters */ + NULL, /* domainOpenConsole */ +}; + +static virStateDriver libxlStateDriver = { + .name = "LIBXL", + .initialize = libxlStartup, + .cleanup = libxlShutdown, + .reload = libxlReload, + .active = libxlActive, +}; + + +int +libxlRegister(void) +{ + if (virRegisterDriver(&libxlDriver) < 0) + return -1; + if (virRegisterStateDriver(&libxlStateDriver) < 0) + return -1; + + return 0; +} diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h new file mode 100644 index 0000000..e047552 --- /dev/null +++ b/src/libxl/libxl_driver.h @@ -0,0 +1,27 @@ +/*---------------------------------------------------------------------------*/ +/* Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/*---------------------------------------------------------------------------*/ + +#ifndef LIBXL_DRIVER_H +# define LIBXL_DRIVER_H + +# include <config.h> + +int libxlRegister(void); + +#endif /* LIBXL_DRIVER_H */ diff --git a/src/util/virterror.c b/src/util/virterror.c index aaa3720..3e1c495 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -89,6 +89,9 @@ static const char *virErrorDomainName(virErrorDomain domain) { case VIR_FROM_XENAPI: dom = "XenAPI "; break; + case VIR_FROM_LIBXL: + dom = "libxenlight "; + break; case VIR_FROM_XML: dom = "XML "; break; -- 1.7.3.1

3 3

[libvirt] [PATCH] util: Forbid calling hash APIs from iterator callback
by Jiri Denemark 10 Mar '11

10 Mar '11

Calling most hash APIs is not safe from inside of an iterator callback. Exceptions are APIs that do not modify the hash table and removing current hash entry from virHashFroEach callback. This patch make all APIs which are not safe fail instead of just relying on the callback being nice not calling any unsafe APIs. --- src/util/hash.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/util/hash.c b/src/util/hash.c index 2a9a9cf..1a300f6 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -54,6 +54,10 @@ struct _virHashTable { struct _virHashEntry *table; int size; int nbElems; + /* True iff we are iterating over hash entries. */ + bool iterating; + /* Pointer to the current entry during iteration. */ + virHashEntryPtr current; virHashDataFree dataFree; virHashKeyCode keyCode; virHashKeyEqual keyEqual; @@ -313,7 +317,7 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, char *new_name; bool found; - if ((table == NULL) || (name == NULL)) + if ((table == NULL) || (name == NULL) || table->iterating) return (-1); /* @@ -513,6 +517,8 @@ virHashRemoveEntry(virHashTablePtr table, const void *name) for (entry = &(table->table[key]); entry != NULL; entry = entry->next) { if (table->keyEqual(entry->name, name)) { + if (table->iterating && table->current != entry) + return -1; if (table->dataFree && (entry->payload != NULL)) table->dataFree(entry->payload, entry->name); entry->payload = NULL; @@ -548,28 +554,35 @@ virHashRemoveEntry(virHashTablePtr table, const void *name) * @data: opaque data to pass to the iterator * * Iterates over every element in the hash table, invoking the - * 'iter' callback. The callback is allowed to remove the element using - * virHashRemoveEntry but calling other virHash* functions is prohibited. + * 'iter' callback. The callback is allowed to remove the current element + * using virHashRemoveEntry but calling other virHash* functions is prohibited. * * Returns number of items iterated over upon completion, -1 on failure */ -int virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) { +int virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) +{ int i, count = 0; - if (table == NULL || iter == NULL) + if (table == NULL || iter == NULL || table->iterating) return (-1); + table->iterating = true; + table->current = NULL; for (i = 0 ; i < table->size ; i++) { virHashEntryPtr entry = table->table + i; while (entry) { virHashEntryPtr next = entry->next; if (entry->valid) { + table->current = entry; iter(entry->payload, entry->name, data); + table->current = NULL; count++; } entry = next; } } + table->iterating = false; + return (count); } @@ -590,9 +603,11 @@ int virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) { int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, const void *data) { int i, count = 0; - if (table == NULL || iter == NULL) + if (table == NULL || iter == NULL || table->iterating) return (-1); + table->iterating = true; + table->current = NULL; for (i = 0 ; i < table->size ; i++) { virHashEntryPtr prev = NULL; virHashEntryPtr entry = &(table->table[i]); @@ -629,6 +644,8 @@ int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, const void *da } } } + table->iterating = false; + return (count); } @@ -646,18 +663,24 @@ int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, const void *da void *virHashSearch(virHashTablePtr table, virHashSearcher iter, const void *data) { int i; - if (table == NULL || iter == NULL) + if (table == NULL || iter == NULL || table->iterating) return (NULL); + table->iterating = true; + table->current = NULL; for (i = 0 ; i < table->size ; i++) { virHashEntryPtr entry = table->table + i; while (entry) { if (entry->valid) { - if (iter(entry->payload, entry->name, data)) + if (iter(entry->payload, entry->name, data)) { + table->iterating = false; return entry->payload; + } } entry = entry->next; } } + table->iterating = false; + return (NULL); } -- 1.7.4.1

3 2