- Devel - libvirt List Archives

[libvirt] [PATCH] Fix an occurence of 0.8.9 in the doc
by Daniel Veillard 30 Mar '11

30 Mar '11

Eric found this out during a review, I then searched the full tree and this was the only occurence of 0.8.9 hopefully that's enough, pushed as this is trivial, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Add support for DNS TXT records
by Michal Novotny 30 Mar '11

30 Mar '11

Hi, this is the patch to add DNS TXT record support to libvirt networking driver since this is feature that's supported by DNSMasq that's being used by the bridge driver. Maybe you fail to understand the reasons why to implement such a feature however it's a good thing IMHO since user could provide some information in the DNS TXT record headers. The headers are, of course, configurable in the network XML description and the idea got to me when I was reading an article about DKIM (DomainKeys Identified Mail) since it's using TXT records in the DNS to provide the public keys. This inspired me to implement the DNS TXT record support to libvirt bridge driver to allow users expose some information to the guest if they want to do so etc. Limitations: - Records names and values containing space (' ') arguments are altered to change spaces to underscores ('_'). This is because of proper argument handling when spawning dnsmasq. Technical details: The --txt-record argument should be supported by all version of DNSMasq which allows us to use it in all of the cases for the libvirt bridge driver. The only thing user has to do is to edit the network XML description in libvirt and append: <dns> <txt_record name='some name' value='some value' /> </dns> after the DHCP elements of network IP (<ip>) tree. After creating such a definition user has to restart this virtual network for changes to take effect, i.e. to spawn DNSMasq with new --txt-record arguments. User can confirm the proper configuration of DNS TXT records both by looking to the dnsmasq command-line (i.e. `ps aux | grep dnsmasq`) where information about --txt-record=some_name,some_value should be present or test it in the host/guest itself by digging the TXT record from there, i.e. using `dig TXT some_name @ip` from the host (since the it's running on the @ip and not the gateway for host) or `dig TXT some_name` from the guest where the value "some_value" should be output in both cases. This has been developed and tested on Fedora i386 box and everything was working fine. Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/conf/network_conf.c | 64 +++++++++++++++++++++++++++++++++++++++++++ src/conf/network_conf.h | 16 +++++++++++ src/network/bridge_driver.c | 28 +++++++++++++++++++ 3 files changed, 108 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index dcab9de..3e07496 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -435,6 +435,53 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, } static int +virNetworkDNSDefParseXML(virNetworkIpDefPtr def, + xmlNodePtr node) +{ + + xmlNodePtr cur; + + if (VIR_ALLOC(def->dns)) { + virReportOOMError(); + return -1; + } + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "txt_record")) { + char *name, *value; + + if (!(name = virXMLPropString(cur, "name"))) { + cur = cur->next; + continue; + } + if (!(value = virXMLPropString(cur, "value"))) { + VIR_FREE(name); + cur = cur->next; + continue; + } + + if (VIR_REALLOC_N(def->dns->txtrecords, def->dns->ntxtrecords + 1) < 0) { + virReportOOMError(); + return -1; + } + + def->dns->txtrecords[def->dns->ntxtrecords].name = strdup(name); + def->dns->txtrecords[def->dns->ntxtrecords].value = strdup(value); + def->dns->ntxtrecords++; + + VIR_FREE(name); + VIR_FREE(value); + } + + cur = cur->next; + } + + return 0; +} + +static int virNetworkIPParseXML(const char *networkName, virNetworkIpDefPtr def, xmlNodePtr node, @@ -550,6 +597,12 @@ virNetworkIPParseXML(const char *networkName, goto error; } else if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "dns")) { + result = virNetworkDNSDefParseXML(def, cur); + if (result) + goto error; + + } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "tftp")) { char *root; @@ -828,6 +881,17 @@ virNetworkIpDefFormat(virBufferPtr buf, virBufferAddLit(buf, " </dhcp>\n"); } + if ((def->dns != NULL) && (def->dns->ntxtrecords)) { + int ii; + + virBufferAddLit(buf, " <dns>\n"); + for (ii = 0 ; ii < def->dns->ntxtrecords ; ii++) { + virBufferVSprintf(buf, " <txt_record name='%s' value='%s' />\n", + def->dns->txtrecords[ii].name, + def->dns->txtrecords[ii].value); + } + virBufferAddLit(buf, " </dns>\n"); + } virBufferAddLit(buf, " </ip>\n"); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 281124b..5f47595 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -57,6 +57,20 @@ struct _virNetworkDHCPHostDef { virSocketAddr ip; }; +typedef struct _virNetworkDNSTxtRecordsDef virNetworkDNSTxtRecordsDef; +typedef virNetworkDNSTxtRecordsDef *virNetworkDNSTxtRecordsDefPtr; +struct _virNetworkDNSTxtRecordsDef { + char *name; + char *value; +}; + +struct virNetworkDNSDef { + unsigned int ntxtrecords; + virNetworkDNSTxtRecordsDefPtr txtrecords; +} virNetworkDNSDef; + +typedef struct virNetworkDNSDef *virNetworkDNSDefPtr; + typedef struct _virNetworkIpDef virNetworkIpDef; typedef virNetworkIpDef *virNetworkIpDefPtr; struct _virNetworkIpDef { @@ -75,6 +89,8 @@ struct _virNetworkIpDef { unsigned int nranges; /* Zero or more dhcp ranges */ virNetworkDHCPRangeDefPtr ranges; + virNetworkDNSDefPtr dns; /* DNS related settings for DNSMasq */ + unsigned int nhosts; /* Zero or more dhcp hosts */ virNetworkDHCPHostDefPtr hosts; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c30620a..89c1431 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -442,6 +442,19 @@ networkSaveDnsmasqHostsfile(virNetworkIpDefPtr ipdef, return 0; } +static char * +replace_all(char *input, int chr1, int chr2) +{ + int pos; + char *tmp; + char *out; + + out = strdup(input); + while ((tmp = strchr(out, chr1)) != NULL) + out[ strlen(input) - strlen(tmp) ] = chr2; + + return out; +} static int networkBuildDnsmasqArgv(virNetworkObjPtr network, @@ -497,6 +510,21 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (network->def->forwardType == VIR_NETWORK_FORWARD_NONE) virCommandAddArg(cmd, "--dhcp-option=3"); + if (ipdef->dns != NULL) { + int i; + + for (i = 0; i < ipdef->dns->ntxtrecords; i++) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "%s,%s", + replace_all(ipdef->dns->txtrecords[i].name, ' ', '_'), + replace_all(ipdef->dns->txtrecords[i].value, ' ', '_')); + + virCommandAddArgPair(cmd, "--txt-record", virBufferContentAndReset(&buf)); + VIR_FREE(buf); + } + } + /* * --interface does not actually work with dnsmasq < 2.47, * due to DAD for ipv6 addresses on the interface. -- 1.7.3.2

4 21

[libvirt] [PATCH] do not send monitor command after monitor met error
by Wen Congyang 30 Mar '11

30 Mar '11

If the monitor met a error, and we will call qemuProcessHandleMonitorEOF(). But we may try to send monitor command after qemuProcessHandleMonitorEOF() returned. Then libvirtd will be blocked in qemuMonitorSend(). Steps to reproduce this bug: 1. use gdb to attach libvirtd, and set a breakpoint in the function qemuConnectMonitor() 2. start a vm 3. let the libvirtd to run until qemuMonitorOpen() returns. 4. kill the qemu process 5. continue running libvirtd Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_monitor.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 800f744..eed83f4 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -572,6 +572,13 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) { mon->msg->lastErrno = EIO; virCondSignal(&mon->notify); } + /* If qemu quited unexpectedly, and we may try to send monitor + * command later. But we have no chance to wake up it. So set + * mon->lastErrno to EIO, and check it before sending monitor + * command. + */ + if (!mon->lastErrno) + mon->lastErrno = EIO; quit = 1; } else if (events) { VIR_ERROR(_("unhandled fd event %d for monitor fd %d"), @@ -725,6 +732,12 @@ int qemuMonitorSend(qemuMonitorPtr mon, { int ret = -1; + /* Check whether qemu quited unexpectedly */ + if (mon->lastErrno) { + msg->lastErrno = mon->lastErrno; + return -1; + } + mon->msg = msg; qemuMonitorUpdateWatch(mon); -- 1.7.1

3 6

[libvirt] cont command failing via JSON monitor on restore
by Jim Fehlig 29 Mar '11

29 Mar '11

libvirt 0.8.7 qemu 0.13 I'm looking into a problem with qemu save/restore via JSON monitor. On restore, the vm is left in a paused state with following error returned for 'cont' command An incoming migration is expected before this command can be executed I was trying to debug the issue in gdb, but stepping through the code introduces enough delay between qemudStartVMDaemon() and doStartCPUs() that the latter succeeds. Any suggestions on how to determine when it is safe to call doStartCPUs() to prevent the above error? I don't see this issue with the text monitor btw. Thanks, Jim

4 11

[libvirt] [RFC] Add persistent XML for cpu tunables
by Osier Yang 29 Mar '11

29 Mar '11

Example of cputune XML: <cputune> <shares>2048</shares> <vcpupin vcpu='0' cpuset='0-4,^1'/> <vcpupin vcpu='1' cpuset='1,3'/> <vcpupin vcpu='2' cpuset='0,2'/> </cputune> "shares" is to define the the proportional weighted cpu share for the domain. "vcpupin" is to define the cpu affinities of vcpus, it will not be displayed if one doesn't specify it explicitly in XML or set the cpu affinites for vcpu via "vcpupin", means there will be no vcpupin element in domain XML by default, and the constraints are: - Error if one specify entries more than the count of maxvcpus. - Error when one specify entries for same vcpu. - Error if value of attribute "vcpu" is more than count of "maxvcpus - 1". Attribute "cpuset" works same as "cpuset" of element "vcpu", reuse the codes for parsing and formating value of "cpuset" of element "vcpu". NB, the idea to add persistent XML for "cpushares" is from "Nikunj A. Dadhania": https://www.redhat.com/archives/libvir-list/2011-January/msg01183.html I rebased it and include it together in this patch series. [PATCH 1/8] cputune: Add xml schema for cputune xml [PATCH 2/8] cputune: Add document for cputune xml [PATCH 3/8] cputune: Add data structures presenting cputune xml [PATCH 4/8] cputune: implementations of parsing and formating cputune xml [PATCH 5/8] cputune: support cputune for qemu driver [PATCH 6/8] cputune: support cputune for lxc driver [PATCH 7/8] cputune: support cputune for xend driver [PATCH 8/8] cputune: new tests for testing cputune xml

4 29

[libvirt] [PATCH] qemu: fix regression with fd labeling on migration
by Eric Blake 29 Mar '11

29 Mar '11

My earlier testing for commit 34fa0de0 was done while starting just-built libvirt from an unconfined_t shell, where the fds happened to work when transferring to qemu. But when installed and run under virtd_t, failure to label the raw file (with no compression) or the pipe (with compression) triggers SELinux failures when passing fds over SCM_RIGHTS to svirt_t qemu. * src/qemu/qemu_migration.c (qemuMigrationToFile): When passing FDs, make sure they are labeled. --- This copies the fd-labeling approach added in commit 34a19dda1. With this patch, I tested both unconfined_t and virtd_t SELinux process labels for libvirtd (shell start vs. init start). virsh managedsave dom/virsh start dom works for both raw and compressed save_image_format, both contexts virsh save dom file/virsh restore file works for raw save_image_format, both contexts works for compressed with virtd_t context save fails for compressed with unconfined_t context, with the failure looking identical to the previously-reported failure for restore in the same settings (https://bugzilla.redhat.com/show_bug.cgi?id=691499) So I'm reasonably confident that this is a good patch. src/qemu/qemu_migration.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 98b9d01..43741e1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1304,8 +1304,12 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, if (qemuCaps && qemuCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && (!compressor || pipe(pipeFD) == 0)) { /* All right! We can use fd migration, which means that qemu - * doesn't have to open() the file, so we don't have to futz - * around with granting access or revoking it later. */ + * doesn't have to open() the file, so while we still have to + * grant SELinux access, we can do it on fd and avoid cleanup + * later, as well as skip futzing with cgroup. */ + if (virSecurityManagerSetFDLabel(driver->securityManager, vm, + compressor ? pipeFD[1] : fd) < 0) + goto cleanup; is_reg = true; bypassSecurityDriver = true; } else { -- 1.7.4

2 2

[libvirt] [PATCH] qemu: improve error message on failed fd transfer
by Eric Blake 29 Mar '11

29 Mar '11

First fallout of fd: migration - it looks like SELinux enforcing _does_ require fd labeling (running uninstalled libvirtd from an unconstrained shell had no problems, but once faked out by doing chcon `stat -c %C /usr/sbin/libvirtd` daemon/libvirtd run_init $PWD/daemon/libvirtd to run it with the same context as an init script service, and with SELinux enforcing, I got a rather confusing failure: error: Failed to save domain fedora_12 to fed12.img error: internal error unable to send TAP file handle: No file descriptor supplied via SCM_RIGHTS This fixes the error message, then I need to figure out a subsequent patch that does the fsetfilecon() necessary to keep things happy. It also appears that libvirtd hangs on a failed fd transfer; I don't know if that needs an independent fix. * src/qemu/qemu_monitor_text.c (qemuMonitorTextSendFileHandle): Improve message, since TAP is no longer only client. --- src/qemu/qemu_monitor_text.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 75b2995..5b1290b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1679,0 +1679,0 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, if (STRNEQ(reply, "")) { qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to send TAP file handle: %s"), - reply); + _("unable to send file handle '%s': %s"), + fdname, reply); goto cleanup; } -- 1.7.4

2 2

[libvirt] [PATCHv2 0/8] Additional functionality for libxl driver
by Markus Groß 29 Mar '11

29 Mar '11

This series of patches adds new functionality to the libxl driver. V2: - Incorporated review from Jim Fehlig - Allow domainGetSchedulerType only on active domains - Fix warnings about virDomainObjUnref Markus Groß (8): Ignore return value of virDomainObjUnref Add event callbacks to libxl driver List authors in copyright headers Add vcpu functions to libxl driver Add domainXMLFromNative/domainXMLToNative to libxl driver Add domainGetSchedulerType to libxl driver Add domainGetOSType to libxl driver Add domainSuspend/Resume to libxl driver configure.ac | 2 + daemon/Makefile.am | 3 + src/Makefile.am | 8 +- src/libxl/libxl_conf.c | 3 + src/libxl/libxl_conf.h | 11 +- src/libxl/libxl_driver.c | 823 +++++++++++++++++++++++++++++++++++++++++++++- src/libxl/libxl_driver.h | 3 + 7 files changed, 832 insertions(+), 21 deletions(-) -- 1.7.4.1

3 19

[libvirt] [PATCH] maint: ignore new built file
by Eric Blake 29 Mar '11

29 Mar '11

* .gitignore: Exclude libvirt_iohelper. --- Pushing under the trivial rule. .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e8c907e..ba4d351 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ /mkinstalldirs /po/ /proxy/ +/src/libvirt_iohelper /tests/*.log /tests/cputest /tests/nwfilterxml2xmltest -- 1.7.4

1 0

Re: [libvirt] Entering 0.9.0 freeze week, RC1 version to test
by Justin Clift 29 Mar '11

29 Mar '11

Hey all, virsh in 0.9.0 RC1 doesn't work properly. There's a hang at start up: $ virsh <waits forever> Control-C breaks out ok, dropping back to bash prompt. The pieces compiled in were: $ virsh -V Virsh command line tool of libvirt 0.9.0 See web site at http://libvirt.org/ Compiled with support for: Hypervisors: OpenVZ VirtualBox ESX Test Networking: Remote Daemon Storage: Dir SCSI Miscellaneous: Secrets Debug Readline This is definitely something new. With 0.8.8, virsh starts ok: $ virsh Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # ^D $ Compiled with the same options: $ virsh -V Virsh command line tool of libvirt 0.8.8 See web site at http://libvirt.org/ Compiled with support for: Hypervisors: OpenVZ VirtualBox ESX Test Networking: Remote Daemon Storage: Dir SCSI Miscellaneous: Secrets Debug Readline Haven't looked into this in more detail yet, but might get time to today/tomorrow. Kind of wondering if it's related to the win32 prob Matthias mentioned. Regards and best wishes, Justin Clift

1 1

[libvirt] [PATCH] Add missing checks for QEMU domain state in tunables APIs
by Daniel P. Berrange 29 Mar '11

29 Mar '11

The methods qemuDomain{Get,Set}{Memory,Blkio,Scheduler}Parameters all forgot to do a check on virDomainIsActive(), resulting in bogus error messages from later parts of their impl * src/qemu/qemu_driver.c: Add missing checks on virDomainIsActive() --- src/qemu/qemu_driver.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e97c1d9..f54e41c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4245,6 +4245,12 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom, goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find cgroup for domain %s"), vm->def->name); @@ -4321,6 +4327,12 @@ static int qemuDomainGetBlkioParameters(virDomainPtr dom, goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if ((*nparams) == 0) { /* Current number of blkio parameters supported by cgroups */ *nparams = QEMU_NB_BLKIO_PARAM; @@ -4405,6 +4417,12 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find cgroup for domain %s"), vm->def->name); @@ -4508,6 +4526,12 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if ((*nparams) == 0) { /* Current number of memory parameters supported by cgroups */ *nparams = QEMU_NB_MEM_PARAM; @@ -4621,6 +4645,12 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find cgroup for domain %s"), vm->def->name); @@ -4692,6 +4722,12 @@ static int qemuGetSchedulerParameters(virDomainPtr dom, goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find cgroup for domain %s"), vm->def->name); @@ -4751,7 +4787,7 @@ qemudDomainBlockStats (virDomainPtr dom, if (qemuDomainObjBeginJob(vm) < 0) goto cleanup; - if (!virDomainObjIsActive (vm)) { + if (!virDomainObjIsActive(vm)) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; -- 1.7.4

2 1

[libvirt] [PATCH 0/8] pending patch queue
by Eric Blake 29 Mar '11

29 Mar '11

All of these have been posted before (sometimes buried as replies in another thread), but I'm reposting to make it easier to get feedback in one place. My upcoming fd: migration v5 series was tested with all of these applied, and while I can probably rebase things to skip any or all of these patches, it would be nicer to get them in to 0.9.0. Eric Blake (8): remote: fix memory leak qemu: don't restore state label twice docs: document recent hook additions tests: don't alter state in $HOME virsh: optimize creation of default connection maint: use space, not tab, in remote_protocol-structs logging: always NUL-terminate circular buffer build: fix driver module build docs/hooks.html.in | 23 +- src/Makefile.am | 13 +- src/libvirt_private.syms | 20 + src/libvirt_xenxs.syms | 22 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_process.c | 4 +- src/remote/remote_driver.c | 120 ++-- src/remote_protocol-structs | 1489 ++++++++++++++++++++++--------------------- src/util/logging.c | 8 +- tests/Makefile.am | 30 +- tests/int-overflow | 4 +- tools/virsh.c | 423 +++++++----- 12 files changed, 1152 insertions(+), 1005 deletions(-) create mode 100644 src/libvirt_xenxs.syms -- 1.7.4

4 21

[libvirt] [PATCH] Update event loop example programs to demonstrate best practice
by Daniel P. Berrange 29 Mar '11

29 Mar '11

The example C event loop code is a nasty hack and not compliant with the require API semantics. Delete this, so that developers don't mistakenly copy it. Instead call the new public event loop APIs. Update the python event loop example, so that it can optionally use the public event APIs, as an alternative to the pure python code. The pure python event code is a good working example, so don't delete it. * examples/domain-events/events-c/event-test.c: Replace event loop code with use of public APIs * examples/domain-events/events-python/event-test.py: Allow optional use of new public event APIs --- examples/domain-events/events-c/event-test.c | 163 +------------------ examples/domain-events/events-python/event-test.py | 29 ++++- 2 files changed, 36 insertions(+), 156 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 6e3a160..ee68bb1 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -5,10 +5,8 @@ #include <string.h> #include <signal.h> -#if HAVE_SYS_POLL_H -# include <sys/types.h> -# include <sys/poll.h> # include <libvirt/libvirt.h> +# include <libvirt/virterror.h> # define VIR_DEBUG0(fmt) printf("%s:%d :: " fmt "\n", \ __func__, __LINE__) @@ -20,22 +18,6 @@ # define ATTRIBUTE_UNUSED __attribute__((__unused__)) # endif -/* handle globals */ -int h_fd = 0; -virEventHandleType h_event = 0; -virEventHandleCallback h_cb = NULL; -virFreeCallback h_ff = NULL; -void *h_opaque = NULL; - -/* timeout globals */ -# define TIMEOUT_MS 1000 -int t_active = 0; -int t_timeout = -1; -virEventTimeoutCallback t_cb = NULL; -virFreeCallback t_ff = NULL; -void *t_opaque = NULL; - - /* Prototypes */ const char *eventToString(int event); int myEventAddHandleFunc (int fd, int event, @@ -266,94 +248,6 @@ static void myFreeFunc(void *opaque) } -/* EventImpl Functions */ -int myEventHandleTypeToPollEvent(virEventHandleType events) -{ - int ret = 0; - if(events & VIR_EVENT_HANDLE_READABLE) - ret |= POLLIN; - if(events & VIR_EVENT_HANDLE_WRITABLE) - ret |= POLLOUT; - if(events & VIR_EVENT_HANDLE_ERROR) - ret |= POLLERR; - if(events & VIR_EVENT_HANDLE_HANGUP) - ret |= POLLHUP; - return ret; -} - -virEventHandleType myPollEventToEventHandleType(int events) -{ - virEventHandleType ret = 0; - if(events & POLLIN) - ret |= VIR_EVENT_HANDLE_READABLE; - if(events & POLLOUT) - ret |= VIR_EVENT_HANDLE_WRITABLE; - if(events & POLLERR) - ret |= VIR_EVENT_HANDLE_ERROR; - if(events & POLLHUP) - ret |= VIR_EVENT_HANDLE_HANGUP; - return ret; -} - -int myEventAddHandleFunc(int fd, int event, - virEventHandleCallback cb, - void *opaque, - virFreeCallback ff) -{ - VIR_DEBUG("Add handle %d %d %p %p", fd, event, cb, opaque); - h_fd = fd; - h_event = myEventHandleTypeToPollEvent(event); - h_cb = cb; - h_ff = ff; - h_opaque = opaque; - return 0; -} - -void myEventUpdateHandleFunc(int fd, int event) -{ - VIR_DEBUG("Updated Handle %d %d", fd, event); - h_event = myEventHandleTypeToPollEvent(event); - return; -} - -int myEventRemoveHandleFunc(int fd) -{ - VIR_DEBUG("Removed Handle %d", fd); - h_fd = 0; - if (h_ff) - (h_ff)(h_opaque); - return 0; -} - -int myEventAddTimeoutFunc(int timeout, - virEventTimeoutCallback cb, - void *opaque, - virFreeCallback ff) -{ - VIR_DEBUG("Adding Timeout %d %p %p", timeout, cb, opaque); - t_active = 1; - t_timeout = timeout; - t_cb = cb; - t_ff = ff; - t_opaque = opaque; - return 0; -} - -void myEventUpdateTimeoutFunc(int timer ATTRIBUTE_UNUSED, int timeout) -{ - /*VIR_DEBUG("Timeout updated %d %d", timer, timeout);*/ - t_timeout = timeout; -} - -int myEventRemoveTimeoutFunc(int timer) -{ - VIR_DEBUG("Timeout removed %d", timer); - t_active = 0; - if (t_ff) - (t_ff)(t_opaque); - return 0; -} - /* main test functions */ void usage(const char *pname) @@ -372,7 +266,6 @@ static void stop(int sig) int main(int argc, char **argv) { - int sts; int callback1ret = -1; int callback2ret = -1; int callback3ret = -1; @@ -386,17 +279,12 @@ int main(int argc, char **argv) action_stop.sa_handler = stop; - if(argc > 1 && STREQ(argv[1],"--help")) { + if (argc > 1 && STREQ(argv[1],"--help")) { usage(argv[0]); return -1; } - virEventRegisterImpl( myEventAddHandleFunc, - myEventUpdateHandleFunc, - myEventRemoveHandleFunc, - myEventAddTimeoutFunc, - myEventUpdateTimeoutFunc, - myEventRemoveTimeoutFunc); + virEventRegisterDefaultImpl(); virConnectPtr dconn = NULL; dconn = virConnectOpenReadOnly (argv[1] ? argv[1] : NULL); @@ -451,38 +339,12 @@ int main(int argc, char **argv) (callback5ret != -1) && (callback6ret != -1) && (callback7ret != -1)) { - while(run) { - struct pollfd pfd = { .fd = h_fd, - .events = h_event, - .revents = 0}; - - sts = poll(&pfd, 1, TIMEOUT_MS); - - /* if t_timeout < 0 then t_cb must not be called */ - if (t_cb && t_active && t_timeout >= 0) { - t_cb(t_timeout,t_opaque); - } - - if (sts == 0) { - /* VIR_DEBUG0("Poll timeout"); */ - continue; - } - if (sts < 0 ) { - VIR_DEBUG0("Poll failed"); - continue; - } - if ( pfd.revents & POLLHUP ) { - VIR_DEBUG0("Reset by peer"); - return -1; + while (run) { + if (virEventRunDefaultImpl() < 0) { + virErrorPtr err = virGetLastError(); + fprintf(stderr, "Failed to run event loop: %s\n", + err && err->message ? err->message : "Unknown error"); } - - if(h_cb) { - h_cb(0, - h_fd, - myPollEventToEventHandleType(pfd.revents & h_event), - h_opaque); - } - } VIR_DEBUG0("Deregistering event handlers"); @@ -496,17 +358,10 @@ int main(int argc, char **argv) } VIR_DEBUG0("Closing connection"); - if( dconn && virConnectClose(dconn)<0 ) { + if (dconn && virConnectClose(dconn) < 0) { printf("error closing\n"); } printf("done\n"); return 0; } - -#else -int main(void) { - printf("event-test program not available without sys/poll.h support\n"); - return 1; -} -#endif diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index c149ed9..df75dce 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -15,6 +15,17 @@ import errno import time import threading +# For the sake of demonstration, this example program includes +# an implementation of a pure python event loop. Most applications +# would be better off just using the default libvirt event loop +# APIs, instead of implementing this in python. The exception is +# where an application wants to integrate with an existing 3rd +# party event loop impl +# +# Change this to 'False' to make the demo use the native +# libvirt event loop impl +use_pure_python_event_loop = True + do_debug = False def debug(msg): global do_debug @@ -392,6 +403,10 @@ def virEventLoopPureRun(): global eventLoop eventLoop.run_loop() +def virEventLoopNativeRun(): + while True: + libvirt.virEventRunDefaultImpl() + # Spawn a background thread to run the event loop def virEventLoopPureStart(): global eventLoopThread @@ -400,6 +415,13 @@ def virEventLoopPureStart(): eventLoopThread.setDaemon(True) eventLoopThread.start() +def virEventLoopNativeStart(): + global eventLoopThread + libvirt.virEventRegisterDefaultImpl() + eventLoopThread = threading.Thread(target=virEventLoopNativeRun, name="libvirtEventLoop") + eventLoopThread.setDaemon(True) + eventLoopThread.start() + ########################################################################## # Everything that now follows is a simple demo of domain lifecycle events @@ -474,9 +496,12 @@ def main(): print "Using uri:" + uri # Run a background thread with the event loop - virEventLoopPureStart() + if use_pure_python_event_loop: + virEventLoopPureStart() + else: + virEventLoopNativeStart() - vc = libvirt.open(uri) + vc = libvirt.openReadOnly(uri) # Close connection on exit (to test cleanup paths) old_exitfunc = getattr(sys, 'exitfunc', None) -- 1.7.4

2 2

[libvirt] Update on the goal page, patch and discussion
by Daniel Veillard 29 Mar '11

29 Mar '11

It is a patch but beyond the unevitable spelling errors it contains I would appreciate some feedback on the content, which also defines the limits of the project. Some significant things to note in the diff below: - we do extend libvirt scope beyond purely managing domains, there is already a number of blocks which are here as helpr functions to manage the resources on the host. - we are expanding in the direction of libvirt being sufficient to do most of the management on the Host (but within the limits of the need for virtualization, e.g. managing users on the host is out of scope) - we don't require anymore APIs to be supported by multiple hypervisors to get in, it's already the case in practice, but we should still make sure the semantic of those APIs are clear. We added quite a bit for QEmu, but for example I saw on IRC that VBox could emulate a network unplug/replug on a domain interface, and that would be a good addition even if a priori no other hypervisor supports it. - Make clear that all libvirt APIs are available remotely, which is key to use libvirt for building management tools. - link the goal page from the project main page As for libvirt project directions, I think it just reflects the natural evolution in the last couple of years. We are less hypervisor agnostic and extending in the Host management. Clearly there is interest in making sure libvirt is complete in term of features for the hypervisors supported, especially the ones like KVM or LXC which don't really have integrated management library. Maybe I should have added a bit more about the security aspect, as integration of security context and making sure remote access are secured are very important additions to the library. Wording and content comments welcome, I guess we are all agreeing but the goals of the project as written are certainly up for discussion :-) Daniel diff --git a/docs/goals.html.in b/docs/goals.html.in index 8f0d075..6394709 100644 --- a/docs/goals.html.in +++ b/docs/goals.html.in @@ -16,20 +16,32 @@ <p class="image"> <img alt="Hypervisor and domains running on a node" src="node.gif"/> </p> - <p>Now we can define the goal of libvirt: to provide a common generic - and stable layer to securely manage domains on a node. The node may be - distant and libvirt should provide all APIs needed to provision, create, - modify, monitor, control, migrate and stop the domains, within the limits - of the support of the hypervisor for those operations. Multiple nodes may - be accessed with libvirt simultaneously but the APIs are limited to - single node operations.</p> + <p>Now we can define the goal of libvirt: <b> to provide a common and + stable layer sufficient to securely manage domains on a node, possibly + distant</b>.</p> + <p> As a result, libvirt should provide all APIs needed to do the + management like: provision, create, modify, monitor, control, migrate + and stop the domains - within the limits of the support of the hypervisor + for those operations. Some operations which may be hypervisor specific, + if needed for domain management should be provided too. Multiple nodes + may be accessed with libvirt simultaneously but the APIs are limited to + single node operations. Node ressource operations which are needed + for the management and provisioning of domains are also in the scope of + the libvirt API, like interface setup, firewall rules, storage management + and in general provisioning APIs. Libvirt will also provide the state + monitoring APIs needed to implement management policies, obviously + checking domain state but also expose local node resources consumption. + </p> <p>This implies the following sub-goals:</p> <ul> - <li>the API should not be targeted to a single virtualization environment - which also means that some very specific capabilities which are not generic - enough may not be provided as libvirt APIs</li> + <li>All API can be carried remotely though secure APIs</li> + <li>While most API will be generic in term of hypervisor or Host OS, + some API may be targeted to a single virtualization environment + as long as the semantic for the operations from a domain management + perspective is clear</li> <li>the API should allow to do efficiently and cleanly all the operations - needed to manage domains on a node</li> + needed to manage domains on a node including resource provisioning and + setup</li> <li>the API will not try to provide high level virtualization policies or multi-nodes management features like load balancing, but the API should be sufficient so they can be implemented on top of libvirt</li> diff --git a/docs/index.html.in b/docs/index.html.in index d40f652..64eb84d 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -8,7 +8,8 @@ <ul> <li> A toolkit to interact with the virtualization capabilities - of recent versions of Linux (and other OSes). + of recent versions of Linux (and other OSes), see our + <a href="goals.html">project goals</a> for details. </li> <li> Free software available under the -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [Patch v7 1/4] libvirt/qemu - persistent modification of domain.
by KAMEZAWA Hiroyuki 29 Mar '11

29 Mar '11

This is v7. Dropped patches for Nics and added 2 sanity checks and show correct error messages. = >From 948597237bd9ecfc5c7343fd30efdca37733274e Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Fri, 25 Mar 2011 16:59:55 +0900 Subject: [PATCHv7 1/4] libvirt/qemu - persistent modification of devices. Now, qemudDomainAttachDeviceFlags() and qemudDomainDetachDeviceFlags() doesn't support VIR_DOMAIN_DEVICE_MODIFY_CONFIG. By this, virsh's at(de)tatch-device --persistent cannot modify qemu config. (Xen allows it.) This patch is a base patch for adding support of devices in step by step manner. Following patches will add some device support. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> --- src/qemu/qemu_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 125 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af897ad..a4fb1cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4144,16 +4144,125 @@ cleanup: return ret; } -static int qemudDomainAttachDeviceFlags(virDomainPtr dom, - const char *xml, - unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); +/* + * Attach a device given by XML, the change will be persistent + * and domain XML definition file is updated. + */ +static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr newdev) +{ + + switch(newdev->type) { + default: + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sorry, the device is not supported for now")); + return -1; + } + + return 0; +} + +static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr device) +{ + switch(device->type) { + default: + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sorry, the device is not supported for now")); return -1; } + return 0; +} + +static int qemuDomainModifyDevicePersistent(virDomainPtr dom, + const char *xml, + unsigned int attach, + unsigned int flags) +{ + struct qemud_driver *driver; + virDomainDeviceDefPtr device; + virDomainDefPtr vmdef; + virDomainObjPtr vm; + int ret = -1; + + /* + * When both of MODIFY_CONFIG and MODIFY_LIVE is specified at the same, + * time return error for now. We should support this later. + */ + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Now, cannot modify alive domain and its definition " + "at the same time.")); + return -1; + } + + driver = dom->conn->privateData; + qemuDriverLock(driver); + vm = virDomainFindByName(&driver->domains, dom->name); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, _("no domain with name : '%s'"), + dom->name); + goto unlock_out; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) + goto unlock_out; + + if (virDomainObjIsActive(vm)) { + /* + * For now, just allow updating inactive domains. Further development + * will allow updating both active domain and its config file at + * the same time. + */ + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unsupported to update active domain's definition.")); + goto endjob; + } + + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); - return qemudDomainAttachDevice(dom, xml); + if (!vmdef) + goto endjob; + + device = virDomainDeviceDefParse(driver->caps, + vmdef, xml, VIR_DOMAIN_XML_INACTIVE); + if (!device) + goto endjob; + + if (attach) + ret = qemuDomainAttachDevicePersistent(vmdef, device); + else + ret = qemuDomainDetachDevicePersistent(vmdef, device); + + if (!ret) /* save the result */ + ret = virDomainSaveConfig(driver->configDir, vmdef); + + virDomainDeviceDefFree(device); + +endjob: + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; +unlock_out: + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + return ret; +} + +static int qemudDomainAttachDeviceFlags(virDomainPtr dom, + const char *xml, + unsigned int flags) +{ + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 1, flags); + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainAttachDevice(dom, xml); + + qemuReportError(VIR_ERR_INVALID_ARG, + _("bad flag: %x not supported"), flags); + + return -1; } @@ -4368,13 +4477,16 @@ cleanup: static int qemudDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); - return -1; - } - return qemudDomainDetachDevice(dom, xml); + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 0, flags); + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainDetachDevice(dom, xml); + + qemuReportError(VIR_ERR_INVALID_ARG, + _("bad flag: %x not supported now"), flags); + return -1; } static int qemudDomainGetAutostart(virDomainPtr dom, -- 1.7.4.1

3 16

[libvirt] [PATCH] qemu: Only restore security label when saving is successfull.
by Osier Yang 29 Mar '11

29 Mar '11

"qemudDomainSaveFlag" trys to restore security label even if the saving fails, a useless warning will be thowed then, e.g. if "doStopVcpus" fails. * src/qemu/qemu_driver.c --- src/qemu/qemu_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af897ad..1baee58 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1823,6 +1823,7 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, int is_reg = 0; unsigned long long offset; virCgroupPtr cgroup = NULL; + bool saved = false; memset(&header, 0, sizeof(header)); memcpy(header.magic, QEMUD_SAVE_MAGIC, sizeof(header.magic)); @@ -2040,6 +2041,8 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, if (rc < 0) goto endjob; + saved = true; + if ((!bypassSecurityDriver) && virSecurityManagerRestoreSavedStateLabel(driver->securityManager, vm, path) < 0) @@ -2087,7 +2090,7 @@ endjob: path, vm->def->name, rc); } - if ((!bypassSecurityDriver) && + if ((!bypassSecurityDriver) && saved && virSecurityManagerRestoreSavedStateLabel(driver->securityManager, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); -- 1.7.4

2 4

[libvirt] [PATCHv5 00/13] outgoing fd: migration and virFileOpenAs
by Eric Blake 29 Mar '11

29 Mar '11

This addresses the comments raised during v4: https://www.redhat.com/archives/libvir-list/2011-March/msg00421.html More comments in individual patches. It could still use a bit more testing with root-squash NFS, and I'm also hitting a problem where if I run daemon/libvirtd myself, I get a SELinux error: error: unable to set security context 'system_u:object_r:svirt_image_t:s0:c80,c237' on fd 23: Permission denied but if I run the system service libvirtd or SELinux permissive, things work. Somehow, the attempt to set the fd SELinux label on a pipe is not working when libvirt is started as an unconfined process (that is, the fd has label unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023) but when started as a daemon, SELinux is happy to allow the transition. I suspect that this is a bug in SELinux, since my understanding is that it should always be possible to go from unconfined to something more restrictive, but we already proved that SELinux fd labelling is relatively unused and untested back when we first added it in commit 34a19dda. If possible, I'd like to get this in before the 0.9.0 freeze, and we can fix any fallout from testing during the freeze week. Eric Blake (13): util: allow clearing cloexec bit qemu: fix restoring a compressed save image qemu: allow simple domain save to use fd: protocol util: use SCM_RIGHTS in virFileOperation when needed qemu: simplify domain save fd handling storage: simplify fd handling util: rename virFileOperation to virFileOpenAs util: adjust indentation in previous patch qemu, storage: improve type safety qemu: use common API for reading difficult files qemu: consolidate migration to file code qemu: skip granting access during fd migration qemu: support fd: migration with compression src/libvirt_private.syms | 3 +- src/qemu/qemu_command.c | 16 ++ src/qemu/qemu_driver.c | 500 +++++++++-------------------------------- src/qemu/qemu_migration.c | 139 ++++++++++++ src/qemu/qemu_migration.h | 8 + src/storage/storage_backend.c | 78 ++++--- src/util/util.c | 176 ++++++++++----- src/util/util.h | 16 +- tests/qemuxml2argvtest.c | 2 +- 9 files changed, 448 insertions(+), 490 deletions(-) -- 1.7.4

2 16

[libvirt] [PATCH 0/8] Additional functionality for libxl driver
by Markus Groß 29 Mar '11

29 Mar '11

This series of patches adds new functionality to the libxl driver. Some code is derived from the qemu driver. Therefore I added Daniel to the author list of libxl_driver.c too. Markus Groß (8): Add event callbacks to libxl driver Get cpu time and current memory balloon from libxl Add vcpu functions to libxl driver Add memory functions to libxl driver Add domainXMLFromNative/domainXMLToNative to libxl driver Add domainGetSchedulerType to libxl driver Add domainGetOSType to libxl driver Add domainSuspend/Resume to libxl driver configure.ac | 2 + daemon/Makefile.am | 3 + src/Makefile.am | 8 +- src/libxl/libxl_conf.h | 8 +- src/libxl/libxl_driver.c | 1108 +++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 1021 insertions(+), 108 deletions(-) -- 1.7.4.1

4 28

[libvirt] [PATCH] build: fix compilation on mingw
by Eric Blake 28 Mar '11

28 Mar '11

* src/util/command.c (virCommandAbort) [WIN32]: Provide stub. Reported by Daniel P. Berrange's autobuilder. --- Pushing this under the build-breaker rule, as it was caught by Daniel's autobuilder. src/util/command.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 905256e..2e475a0 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1291,6 +1291,7 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) } +#ifndef WIN32 /* * Abort an async command if it is running, without issuing * any errors or affecting errno. Designed for error paths @@ -1349,6 +1350,15 @@ cleanup: cmd->reap = false; errno = saved_errno; } +#else /* WIN32 */ +void +virCommandAbort(virCommandPtr cmd ATTRIBUTE_UNUSED) +{ + /* Mingw lacks WNOHANG and kill(). But since we haven't ported + * virExecWithHook to mingw yet, there's no process to be killed, + * making this implementation trivially correct for now :) */ +} +#endif /* * Release all resources -- 1.7.4

1 0

[libvirt] access with VNC and graphic interface
by Kenneth Nagin 28 Mar '11

28 Mar '11

libvirt provides vnc to access the VMs under its control. However, I can not get applications with graphical interface to run when I use vnc to access a VM. The same applications will display properly if I ssh -X to the VM. Is there anyway to overcome this problem? Best Regards, Kenneth Nagin

3 2

[libvirt] [PATCH] Reserve first 3 PCI slots for hardcoded devices
by Philipp Hahn 28 Mar '11

28 Mar '11

If a domain is initially created without a <vidoe> device but with other devices (like <interface>), PCI device slots normally reserved for hardcoded devices (host bridge, IDE controller, video) get assigned to these. If than later on a <video> device is added without removing the already assigned <addresse>s, the re-definition fails in qemuAssignDevicePCISlots() with the error message "Primary video card must have PCI address 0:0:2.0" To simplify editing existing domains just reserve the first three slots for internal usage by setting qemuDomainPCIAddressSet.nextslot = 3. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_command.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c63de09..c359fd0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -733,6 +733,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def) if (!(addrs = qemuDomainPCIAddressSetCreate(def))) goto cleanup; + /* reserve first 3 slots for hardcoded devices */ + addrs->nextslot = 3; + if (qemuAssignDevicePCISlots(def, addrs) < 0) goto cleanup; } -- 1.7.1

2 1

[libvirt] [PATCH RFC] Remove the Open Nebula driver
by Daniel P. Berrange 28 Mar '11

28 Mar '11

The Open Nebula driver has been unmaintained since it was first introduced. The only commits have been for tree-wide cleanups. It also has a major design flaw, in that it only knows about guests that it has created itself, which makes it of very limited use. Discussions wrt evolution of the VMWare ESX driver, concluded that it should limit itself to single-node ESX operation and not try to manage the multi-node architecture of VirtualCenter. Open Nebula is a cluster like Virtual Center, not a single node system, so reasoning applies. The DeltaCloud project includes an Open Nebula driver and is a much better fit architecturally, since it is explicitly targetting the distributed multihost cluster scenario. Thus this patch deletes the libvirt Open Nebula driver with the recommendation that people use DeltaCloud for managing it instead. * configure.ac: Remove probe for xmlrpc & --with-one arg * daemon/Makefile.am, daemon/libvirtd.c, src/Makefile.am: Remove ONE driver build * src/opennebula/one_client.c, src/opennebula/one_client.h, src/opennebula/one_conf.c, src/opennebula/one_conf.h, src/opennebula/one_driver.c, src/opennebula/one_driver.c: Delete files * autobuild.sh, libvirt.spec.in, mingw32-libvirt.spec.in: Remove build rules for Open Nebula * docs/drivers.html.in, docs/sitemap.html.in: Remove reference to OpenNebula * docs/drvone.html.in: Delete file --- autobuild.sh | 1 - configure.ac | 41 -- daemon/Makefile.am | 4 - daemon/libvirtd.c | 7 - docs/drivers.html.in | 1 - docs/drvone.html.in | 108 ------ docs/sitemap.html.in | 4 - libvirt.spec.in | 12 +- mingw32-libvirt.spec.in | 1 - src/Makefile.am | 29 -- src/README | 5 +- src/opennebula/one_client.c | 207 ----------- src/opennebula/one_client.h | 62 ---- src/opennebula/one_conf.c | 285 --------------- src/opennebula/one_conf.h | 54 --- src/opennebula/one_driver.c | 850 ------------------------------------------- src/opennebula/one_driver.h | 30 -- 17 files changed, 3 insertions(+), 1698 deletions(-) delete mode 100644 docs/drvone.html.in delete mode 100644 src/opennebula/one_client.c delete mode 100644 src/opennebula/one_client.h delete mode 100644 src/opennebula/one_conf.c delete mode 100644 src/opennebula/one_conf.h delete mode 100644 src/opennebula/one_driver.c delete mode 100644 src/opennebula/one_driver.h diff --git a/autobuild.sh b/autobuild.sh index 54fb273..491f1b8 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -81,7 +81,6 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --without-uml \ --without-vbox \ --without-openvz \ - --without-one \ --without-phyp \ --without-netcf \ --without-audit \ diff --git a/configure.ac b/configure.ac index 12bf0f6..dd15962 100644 --- a/configure.ac +++ b/configure.ac @@ -271,8 +271,6 @@ AC_ARG_WITH([vbox], [with_vbox=yes]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) -AC_ARG_WITH([one], - AC_HELP_STRING([--with-one], [add ONE support @<:@default=check@:>@]),[],[with_one=check]) AC_ARG_WITH([esx], AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check]) AC_ARG_WITH([test], @@ -440,11 +438,6 @@ if test "$with_qemu" = "yes" ; then fi AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) -if test "$with_one" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_ONE],1,[whether ONE driver is enabled]) -fi -AM_CONDITIONAL([WITH_ONE],[test "$with_one" = "yes"]) - if test "$with_test" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) fi @@ -725,34 +718,6 @@ fi dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG -dnl OpenNebula driver Compilation setting -dnl - -if test "$with_libvirtd" = "no" ; then - with_one=no -fi -XMLRPC_CFLAGS= -XMLRPC_LIBS= -if test "x$with_one" = "xyes" || test "x$with_one" = "xcheck"; then - PKG_CHECK_MODULES(XMLRPC, xmlrpc_client >= $XMLRPC_REQUIRED, - [with_one=yes], [ - if test "x$with_one" = "xcheck" ; then - with_one=no - else - AC_MSG_ERROR( - [You must install XMLRPC-C >= $XMLRPC_REQUIRED to compile libvirt ONE driver]) - fi - ]) - if test "x$with_one" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_XMLRPC], 1, - [whether One is used to broadcast server presence]) - fi -fi -AM_CONDITIONAL([HAVE_XMLRPC], [test "x$with_one" = "xyes"]) -AM_CONDITIONAL([WITH_ONE], [test "x$with_one" = "xyes"]) -AC_SUBST([XMLRPC_CFLAGS]) -AC_SUBST([XMLRPC_LIBS]) - dnl ========================================================================== dnl find libxml2 library, borrowed from xmlsec @@ -2415,7 +2380,6 @@ AC_MSG_NOTICE([ XenAPI: $with_xenapi]) AC_MSG_NOTICE([xenlight: $with_libxl]) AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ PHYP: $with_phyp]) -AC_MSG_NOTICE([ ONE: $with_one]) AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) @@ -2542,11 +2506,6 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else AC_MSG_NOTICE([ netcf: no]) fi -if test "$with_one" = "yes" ; then -AC_MSG_NOTICE([ xmlrpc: $XMLRPC_CFLAGS $XMLRPC_LIBS]) -else -AC_MSG_NOTICE([ xmlrpc: no]) -fi if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 9e3a557..0fde04c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -114,10 +114,6 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif -if WITH_ONE - libvirtd_LDADD += ../src/libvirt_driver_one.la -endif - if WITH_STORAGE_DIR libvirtd_LDADD += ../src/libvirt_driver_storage.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 7818316..024f56f 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -87,9 +87,6 @@ # ifdef WITH_UML # include "uml/uml_driver.h" # endif -# ifdef WITH_ONE -# include "opennebula/one_driver.h" -# endif # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif @@ -925,7 +922,6 @@ static struct qemud_server *qemudInitialize(void) { virDriverLoadModule("qemu"); virDriverLoadModule("lxc"); virDriverLoadModule("uml"); - virDriverLoadModule("one"); virDriverLoadModule("nwfilter"); #else # ifdef WITH_NETWORK @@ -958,9 +954,6 @@ static struct qemud_server *qemudInitialize(void) { # ifdef WITH_UML umlRegister(); # endif -# ifdef WITH_ONE - oneRegister(); -# endif #endif return server; diff --git a/docs/drivers.html.in b/docs/drivers.html.in index ecad03a..0428870 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -20,7 +20,6 @@ <ul> <li><strong><a href="drvlxc.html">LXC</a></strong> - Linux Containers</li> - <li><strong><a href="drvone.html">OpenNebula</a></strong></li> <li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li> <li><strong><a href="drvqemu.html">QEMU</a></strong></li> <li><strong><a href="drvtest.html">Test</a></strong> - Used for testing</li> diff --git a/docs/drvone.html.in b/docs/drvone.html.in deleted file mode 100644 index 036c0c7..0000000 --- a/docs/drvone.html.in +++ /dev/null @@ -1,108 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> -<meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8"> -<title></title> -<meta name="GENERATOR" content="OpenOffice.org 3.0 (Linux)"> -<meta name="CREATED" content="0;0"> -<meta name="CHANGED" content="20090701;13170700"> -</head> -<body lang="en-US" dir="LTR"> -<h1>OpenNebula Virtual Infrastructure Manager driver</h1> -<p><a name="toc"></a><a href="http://opennebula.org/">OpenNebula</a> -is a Virtual Infrastructure Manager that controls Virtual Machines (VM) in a pool of distributed resources -by orchestrating network, storage and virtualization technologies. The OpenNebula driver lets you manage your private or hybrid (<a href="http://aws.amazon.com/ec2/">Amazon EC2</a> or <a href="http://www.elastichosts.com/">Elastic Hosts</a> based) cloud using a standard libvirt interface, including the API as well as the related -tools and VM description files.</p> -<h2> -<a name="prereq"></a>Deployment pre-requisites</h2> -<ul> -<li> -<p style="margin-bottom: 0in">A working OpenNebula installation, - version 1.2 or higher. - </p> - </li> -</ul> -<h2> -<a name="uris"></a>Connections to OpenNebula driver</h2> -<p>The Uri of the driver protocol is "one". Some example -connection Uris for the driver are: -</p> -<pre> -one:/// (local access) -one+unix:/// (local access) -one://example.com/ (remote access) -one+tcp://example.com/ (remote access, SASl/Kerberos) -one+ssh://user@example.com/ (remote access, SSH tunnelled) -</pre> -<h2> -<a name="xmlconfig"></a>Example domain XML config</h2> -<p>There are some limitations on the XML attributes that may be -specified when interfacing OpenNebula. The following xml example -details the attributes and options supported by the OpenNebula -driver:</p> - -<h3>Paravirtualized guest direct kernel boot -</h3> -<pre> -<domain type='one'> - <name>vm01</name> - <memory>32768</memory> - <vcpu>1</vcpu> - - <os> - <type>linux</type> - <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> - <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> - <cmdline></cmdline> - <root>sda1</root> - </os> - - <devices> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/disk.img'/> - <target dev='sda1'/> - </disk> - - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/swap.img'/> - <target dev='sda2'/> - </disk> - - <disk type='file' device='cdrom'> - <source file='/images/iso/cdrom.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> - - -  - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - </interface> - -  - <interface type='network'> - <source network='onenetwork'/> - </interface> - </devices> -</domain> -</pre> -<p> -<b>Note:</b> The "<interface type='network'>" will -attach the interface to a previously configured network (named -<tt>onenetwork</tt>) within the <a href="http://opennebula.org/">OpenNebula</a> system, typically with the -<tt>onevnet</tt> CLI command.</p> - -<p><b>Note</b>: OpenNebula supports the simultaneous use of different hypervisors, so you can specify any os type (linux or hvm) supported by your cluster. -</p> - -<h2>Links</h2> -<ul> -<li><a href="http://www.opennebula.org/doku.php?id=documentation">OpenNebula Documentation</a> -</li> -<li><a href="http://www.opennebula.org/doku.php?id=documentation:rel1.2:ug">OpenNebula User Guide</a> -</li> -</ul> -</body> -</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index ac0af71..5650fee 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -191,10 +191,6 @@ <span>Driver for VirtualBox</span> </li> <li> - <a href="drvone.html">OpenNebula</a> - <span>Driver for OpenNebula</span> - </li> - <li> <a href="drvesx.html">VMware ESX</a> <span>Driver for VMware ESX</span> </li> diff --git a/libvirt.spec.in b/libvirt.spec.in index 4a62c80..2a84c26 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -46,8 +46,6 @@ %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_xenapi 0%{!?_without_xenapi:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} -# XXX this shouldn't be here, but it mistakenly links into libvirtd -%define with_one 0%{!?_without_one:%{server_drivers}} # Then the hypervisor drivers that talk a native remote protocol %define with_phyp 0%{!?_without_phyp:1} @@ -96,13 +94,12 @@ %define with_numactl 0 %endif -# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor, +# RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor, # VMWare, libxenserver (xenapi), or libxenlight (Xen 4.1 and newer) %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 %define with_uml 0 -%define with_one 0 %define with_phyp 0 %define with_vmware 0 %define with_xenapi 0 @@ -306,9 +303,6 @@ Requires: libcgroup %if %{with_xen} BuildRequires: xen-devel %endif -%if %{with_one} -BuildRequires: xmlrpc-c-devel >= 1.14.0 -%endif BuildRequires: libxml2-devel BuildRequires: xhtml1-dtds BuildRequires: readline-devel @@ -540,10 +534,6 @@ of recent versions of Linux (and other OSes). %define _without_uml --without-uml %endif -%if ! %{with_one} -%define _without_one --without-one -%endif - %if %{with_rhel5} %define _with_rhel5_api --with-rhel5-api %endif diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 0841dc0..27c75c1 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -54,7 +54,6 @@ MinGW Windows libvirt virtualization library. --without-uml \ --without-vbox \ --without-openvz \ - --without-one \ --without-phyp \ --without-netcf \ --without-audit \ diff --git a/src/Makefile.am b/src/Makefile.am index c3729a6..cacfc49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -306,14 +306,6 @@ UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ uml/uml_driver.c uml/uml_driver.h -ONE_DRIVER_SOURCES = \ - ./opennebula/one_conf.c \ - ./opennebula/one_conf.h \ - ./opennebula/one_driver.c \ - ./opennebula/one_driver.h \ - ./opennebula/one_client.c \ - ./opennebula/one_client.h - ESX_DRIVER_SOURCES = \ esx/esx_private.h \ esx/esx_driver.c esx/esx_driver.h \ @@ -794,26 +786,6 @@ endif libvirt_driver_uml_la_SOURCES = $(UML_DRIVER_SOURCES) endif -if WITH_ONE -if WITH_DRIVER_MODULES -mod_LTLIBRARIES += libvirt_driver_one.la -else -noinst_LTLIBRARIES += libvirt_driver_one.la -# Stateful, so linked to daemon instead -#libvirt_la_BUILT_LIBADD += libvirt_driver_one.la -endif -libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS) \ - -I@top_srcdir@/src/conf $(AM_CFLAGS) -libvirt_driver_one_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_one_la_LIBADD = $(XMLRPC_LIBS) -#libvirt_driver_one_la_CFLAGS = "-DWITH_ONE" -if WITH_DRIVER_MODULES -libvirt_driver_one_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_one_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_one_la_SOURCES = $(ONE_DRIVER_SOURCES) -endif - BUILT_SOURCES += $(ESX_DRIVER_GENERATED) @@ -1023,7 +995,6 @@ EXTRA_DIST += \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(UML_DRIVER_SOURCES) \ - $(ONE_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ diff --git a/src/README b/src/README index ad171a5..f95a8b7 100644 --- a/src/README +++ b/src/README @@ -27,7 +27,6 @@ Then there are the hypervisor implementations: * esx/ - VMware ESX and GSX support using vSphere API over SOAP * lxc/ - Linux Native Containers - * opennebula/ - Open Nebula using XMLRPC * openvz/ - OpenVZ containers using cli tools * phyp/ - IBM Power Hypervisor using CLI tools over SSH * qemu/ - QEMU / KVM using qemu CLI/monitor @@ -42,8 +41,8 @@ Then there are the hypervisor implementations: Finally some secondary drivers that are shared for several HVs. Currently these are used by LXC, OpenVZ, QEMU, UML and Xen drivers. -The ESX, OpenNebula, Power Hypervisor, Remote, Test & VirtualBox -drivers all implement the secondary drivers directly +The ESX, Power Hypervisor, Remote, Test & VirtualBox drivers all +implement the secondary drivers directly * cpu/ - CPU feature management * interface/ - Host network interface management diff --git a/src/opennebula/one_client.c b/src/opennebula/one_client.c deleted file mode 100644 index da806fc..0000000 --- a/src/opennebula/one_client.c +++ /dev/null @@ -1,207 +0,0 @@ -/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * 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 <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <unistd.h> -#include "one_client.h" -#include "datatypes.h" -#include "util.h" -#include "memory.h" - -oneClient one_client; - -void c_oneStart() -{ - xmlrpc_env_init(&one_client.env); - xmlrpc_client_init2(&one_client.env, XMLRPC_CLIENT_NO_FLAGS, - "OpenNebula API Client", "1.2", NULL, 0); - - one_client.error = 0; - one_client.url = "http://localhost:2633/RPC2"; - one_client.session = "one-session"; -}; - - -int c_oneReturnCode(xmlrpc_value *resultP); - -int c_oneReturnCode(xmlrpc_value *resultP) -{ - int return_code; - char *return_string; - - xmlrpc_decompose_value(&one_client.env, resultP, "(bs)", - &return_code, &return_string); - - if( return_code ) - { - xmlrpc_DECREF(resultP); - VIR_FREE(return_string); - return 0; - } - else - { - VIR_FREE(one_client.error); - - one_client.error=return_string; - return -1; - } -} - -int c_oneDeploy(int vmid, int hid) -{ - xmlrpc_value *resultP; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmdeploy", "(sii)", one_client.session, (xmlrpc_int32)vmid, - (xmlrpc_int32)hid); - - return c_oneReturnCode(resultP); -} - -int c_oneMigrate(int vmid, int hid, int flag) -{ - xmlrpc_value *resultP; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmmigrate", "(siib)", one_client.session, (xmlrpc_int32)vmid, - (xmlrpc_int32)hid, - (xmlrpc_bool)flag); - - return c_oneReturnCode(resultP); -} - -int c_oneAllocateTemplate(char* vm_template) -{ - xmlrpc_value *resultP; - xmlrpc_value *valueP; - int return_code; - char *return_string; - int vmid; - - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmallocate", "(ss)", one_client.session, vm_template); - - xmlrpc_array_read_item(&one_client.env, resultP, 0, &valueP); - xmlrpc_read_bool(&one_client.env, valueP, &return_code); - - if( return_code ) - { - xmlrpc_DECREF(valueP); - xmlrpc_array_read_item(&one_client.env, resultP, 1, &valueP); - xmlrpc_read_int(&one_client.env, valueP, &vmid); - - xmlrpc_DECREF(valueP); - xmlrpc_DECREF(resultP); - - return vmid; - } - else - { - xmlrpc_DECREF(valueP); - xmlrpc_array_read_item(&one_client.env, resultP, 1, &valueP); - xmlrpc_read_string(&one_client.env, valueP, - (const char **)&return_string); - - xmlrpc_DECREF(valueP); - xmlrpc_DECREF(resultP); - - VIR_FREE(one_client.error); - - one_client.error=return_string; - return -1; - } -} - -int c_oneAction(int vmid, char* action) -{ - xmlrpc_value *resultP; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmaction", "(ssi)", one_client.session, action, - (xmlrpc_int32)vmid); - - return c_oneReturnCode(resultP); -} - -int c_oneShutdown(int vmid) -{ - return c_oneAction(vmid, (char *)"shutdown"); -} - -int c_oneSuspend(int vmid) -{ - return c_oneAction(vmid, (char *)"suspend"); -} - -int c_oneStop(int vmid) -{ - return c_oneAction(vmid, (char *)"stop"); -} - -int c_oneResume(int vmid) -{ - return c_oneAction(vmid, (char *)"resume"); -} - -int c_oneCancel(int vmid) -{ - return c_oneAction(vmid, (char *)"cancel"); -} - -int c_oneFinalize(int vmid) -{ - return c_oneAction(vmid, (char *)"finalize"); -} - -int c_oneVmInfo(int vmid, char* ret_info, int length) -{ - xmlrpc_value *resultP; - int return_code; - char *return_string; - int retval = -1; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmget_info", "(si)", one_client.session, vmid); - - xmlrpc_decompose_value(&one_client.env, resultP, "(bs)", - &return_code, &return_string); - - if( return_code ) - { - if (virStrncpy(ret_info, return_string, length-1, length) != NULL) - /* Only set the return value to 0 if we succeeded */ - retval = 0; - } - - xmlrpc_DECREF(resultP); - VIR_FREE(return_string); - - return retval; -} - -void c_oneFree() -{ - xmlrpc_env_clean(&one_client.env); - xmlrpc_client_cleanup(); -} diff --git a/src/opennebula/one_client.h b/src/opennebula/one_client.h deleted file mode 100644 index e94956d..0000000 --- a/src/opennebula/one_client.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * 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 ONE_CLIENT_H_ -# define ONE_CLIENT_H_ - -# include <xmlrpc-c/base.h> -# include <xmlrpc-c/client.h> - -struct _oneClient { - xmlrpc_env env; - const char *url; - const char *session; - char *error; -}; - -typedef struct _oneClient oneClient; -typedef oneClient *oneClientPtr; - -void c_oneStart(void); - -int c_oneDeploy(int vmid, int hid); - -int c_oneMigrate(int vmid, int hid, int flag); - -int c_oneAllocateTemplate(char* vm_template); - -int c_oneAction(int vmid,char* action); - -int c_oneShutdown(int vmid); - -int c_oneSuspend(int vmid); - -int c_oneStop(int vmid); - -int c_oneResume(int vmid); - -int c_oneCancel(int vmid); - -int c_oneFinalize(int vmid); - -int c_oneVmInfo(int vmid, char* ret_info,int leng); - -void c_oneFree(void); - - -#endif /* ONE_CLIENT_H_ */ diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c deleted file mode 100644 index 9f0ed26..0000000 --- a/src/opennebula/one_conf.c +++ /dev/null @@ -1,285 +0,0 @@ -/*----------------------------------------------------------------------------------*/ -/* - * Copyright (C) 2010 Red Hat, Inc. - * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * 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 "virterror_internal.h" -#include "one_conf.h" -#include "buf.h" -#include "memory.h" -#include "util.h" - -#define VIR_FROM_THIS VIR_FROM_ONE -/* --------------------------------------------------------------------------------- */ - -/** - * oneCapsInit initialize the driver capabilities - * @return a pointer to the driver capabilities NULL in case of error - */ - -virCapsPtr oneCapsInit(void) -{ - struct utsname utsname; - virCapsPtr caps; - virCapsGuestPtr guest; - - uname(&utsname); - - if ((caps = virCapabilitiesNew(utsname.machine,0,0)) == NULL) - { - goto no_memory; - } - - virCapabilitiesSetMacPrefix(caps,(unsigned char[]){ 0x52, 0x54, 0x00 }); - - if ((guest = virCapabilitiesAddGuest(caps, - "hvm", - "i686", - 32, - NULL, - NULL, - 0, - NULL)) == NULL) - { - goto no_memory; - } - - if (virCapabilitiesAddGuestDomain(guest, - "one", - NULL, - NULL, - 0, - NULL) == NULL) - { - goto no_memory; - } - - - if ((guest = virCapabilitiesAddGuest(caps, - "hvm", - "x86_64", - 64, - NULL, - NULL, - 0, - NULL)) == NULL) - { - goto no_memory; - } - - if (virCapabilitiesAddGuestDomain(guest, - "one", - NULL, - NULL, - 0, - NULL) == NULL) - { - goto no_memory; - } - if ((guest = virCapabilitiesAddGuest(caps, - "xen", - "i686", - 32, - NULL, - NULL, - 0, - NULL)) == NULL) - { - goto no_memory; - } - if (virCapabilitiesAddGuestDomain(guest, - "one", - NULL, - NULL, - 0, - NULL) == NULL) - { - goto no_memory; - } - - return caps; - -no_memory: - - virCapabilitiesFree(caps); - return NULL; -} - -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ - - -/** - * oneSubmitVM generates an OpenNebula description file and submits the new VM - * @param driver the OpenNebula driver - * @param vm the virtual machine pointer - * @return the OpenNebula ID for the new VM or -1 in case of error - */ - -int oneSubmitVM(one_driver_t* driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm) -{ - char* templ; - int oneid; - - if ((templ = xmlOneTemplate(vm->def)) == NULL) - return -1; - - if ((oneid = c_oneAllocateTemplate(templ)) < 0) { - oneError(VIR_ERR_OPERATION_FAILED, "%s", - _("Error submitting virtual machine to OpenNebula")); - VIR_FREE(templ); - return -1; - } - - VIR_FREE(templ); - return oneid; -} -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ - -/** - * xmlOneTemplate Generate an OpenNebula template to deploy a VM from libvirt - * internal Domain definition. - * @param def Internal libvirt Domain definition - * @return OpenNebula VM template. - */ - -char* xmlOneTemplate(virDomainDefPtr def) -{ - int i; - virBuffer buf= VIR_BUFFER_INITIALIZER; - virBufferVSprintf(&buf,"#OpenNebula Template automatically generated " - "by libvirt\nNAME = %s\nCPU = %d\nMEMORY = %ld\n", - def->name, - def->maxvcpus, - VIR_DIV_UP(def->mem.max_balloon, 1024)); - - /*Optional Booting OpenNebula Information:*/ - if (def->os.kernel) { - virBufferVSprintf(&buf,"OS=[ kernel = \"%s\"",def->os.kernel); - if (def->os.initrd) - virBufferVSprintf(&buf,",\n initrd = \"%s\"",def->os.initrd); - if (def->os.cmdline) - virBufferVSprintf(&buf,",\n kernel_cmd = \"%s\"",def->os.cmdline); - if (def->os.root) - virBufferVSprintf(&buf,",\n root = \"%s\"",def->os.root); - - virBufferAddLit(&buf," ]\n"); - } - /* set Disks & NICS */ - for (i=0 ; i < def->ndisks ; i++) { - /* missing source is only allowed at cdrom and floppy */ - if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { - virBufferVSprintf(&buf, "DISK=[ type = disk,\n" - "\tsource = \"%s\",\n", - def->disks[i]->src); - } - else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - virBufferAddLit(&buf, "DISK=[ type = cdrom,\n"); - if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src); - } - else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - virBufferAddLit(&buf, "DISK=[ type = floppy,\n"); - if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src); - } - - virBufferVSprintf(&buf, "\ttarget = \"%s\",\n" - "\treadonly =", - def->disks[i]->dst); - - if (def->disks[i]->readonly) - virBufferAddLit(&buf,"\"yes\"]\n"); - else - virBufferAddLit(&buf,"\"no\"]\n"); - } - - for (i=0 ; i< def->nnets ; i++) - { - if (!def->nets[i]) { - continue; - } - - switch(def->nets[i]->type) - { - case VIR_DOMAIN_NET_TYPE_BRIDGE: - virBufferVSprintf(&buf,"NIC=[ bridge =\"%s\",\n",def->nets[i]->data.bridge.brname); - - if (def->nets[i]->ifname) - virBufferVSprintf(&buf," target =\"%s\",\n",def->nets[i]->ifname); - - virBufferVSprintf(&buf," mac =\"%02x:%02x:%02x:%02x:%02x:%02x\" ]\n", - def->nets[i]->mac[0],def->nets[i]->mac[1], - def->nets[i]->mac[2],def->nets[i]->mac[3], - def->nets[i]->mac[4],def->nets[i]->mac[5]); - break; - - case VIR_DOMAIN_NET_TYPE_NETWORK: - virBufferVSprintf(&buf,"NIC=[ network=\"%s\"",def->nets[i]->data.network.name); - if (def->nets[i]->ifname) - virBufferVSprintf(&buf,",\n target =\"%s\"",def->nets[i]->ifname); - virBufferAddLit(&buf," ]\n"); - break; - - default: break; - } - } - - for(i=0;i<def->ngraphics;i++) { - if (def->graphics[i] == NULL) - continue; - - if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virBufferAddLit(&buf,"GRAPHICS = [\n type = \"vnc\""); - - if (def->graphics[i]->data.vnc.listenAddr != NULL) - virBufferVSprintf(&buf,",\n listen = \"%s\"", - def->graphics[i]->data.vnc.listenAddr); - - if (def->graphics[i]->data.vnc.autoport == 0) - virBufferVSprintf(&buf,",\n port = \"%d\"", - def->graphics[i]->data.vnc.port); - - if (def->graphics[i]->data.vnc.auth.passwd != NULL) - virBufferVSprintf(&buf,",\n passwd = \"%s\"", - def->graphics[i]->data.vnc.auth.passwd); - - virBufferAddLit(&buf," ]\n"); - - } - else /* graphics.type==VIR_DOMAIN_GRAPHICS_TYPE_SDL */ - virBufferAddLit(&buf,"GRAPHICS = [\n type = \"sdl\" ]\n"); - - } - if (virBufferError(&buf)) - goto no_memory; - - return virBufferContentAndReset(&buf); - -no_memory: - virReportOOMError(); - virBufferFreeAndReset(&buf); - return NULL; -}; diff --git a/src/opennebula/one_conf.h b/src/opennebula/one_conf.h deleted file mode 100644 index c53090c..0000000 --- a/src/opennebula/one_conf.h +++ /dev/null @@ -1,54 +0,0 @@ -/*----------------------------------------------------------------------------------*/ -/* - * Copyright (C) 2010 Red Hat, Inc. - * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * 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 ONE_CONF_H -# define ONE_CONF_H - -# include <config.h> - -# include "internal.h" -# include "domain_conf.h" -# include "capabilities.h" -# include "threads.h" -# include "one_client.h" - -struct one_driver{ - virMutex lock; - - virCapsPtr caps; - virDomainObjList domains; - int nextid; -}; - -typedef struct one_driver one_driver_t; - -virCapsPtr oneCapsInit(void); - -int oneSubmitVM(one_driver_t* driver, virDomainObjPtr vm); - -char* xmlOneTemplate(virDomainDefPtr def); - -# define oneError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ONE, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) - -#endif /* ONE_CONF_H */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c deleted file mode 100644 index 3146589..0000000 --- a/src/opennebula/one_driver.c +++ /dev/null @@ -1,850 +0,0 @@ -/*---------------------------------------------------------------------------*/ -/* - * Copyright (C) 2010-2011 Red Hat, Inc. - * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * 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 <fcntl.h> -#include <sched.h> -#include <sys/utsname.h> -#include <string.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <sys/poll.h> -#include <unistd.h> -#include <wait.h> -#include <sys/time.h> - -#include "virterror_internal.h" -#include "logging.h" -#include "datatypes.h" -#include "one_conf.h" -#include "one_driver.h" -#include "memory.h" -#include "util.h" -#include "bridge.h" - -#define VIR_FROM_THIS VIR_FROM_ONE - -static int oneStartup(int privileged); -static int oneShutdown(void); -static int oneActive(void); - -static void oneDriverLock(one_driver_t* driver) -{ - virMutexLock(&driver->lock); -} - -static void oneDriverUnlock(one_driver_t* driver) -{ - virMutexUnlock(&driver->lock); -} - -static one_driver_t *one_driver =NULL; - - -static virDrvOpenStatus oneOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED) -{ - /* Verify uri was specified */ - if (conn->uri == NULL) { - conn->uri = xmlParseURI("one:///"); - if (!conn->uri) { - virReportOOMError(); - return VIR_DRV_OPEN_ERROR; - } - } else if (conn->uri->scheme == NULL || - STRNEQ(conn->uri->scheme, "one")) { - goto declineConnection; - } - conn->privateData = one_driver; - - return VIR_DRV_OPEN_SUCCESS; - -declineConnection: - return VIR_DRV_OPEN_DECLINED; -} - -static int oneClose(virConnectPtr conn) -{ - conn->privateData = NULL; - return 0; -} - - -static int oneIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - /* Not encrypted because it uses HTTP, not HTTPs */ - return 0; -} - - -static int oneIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - /* Not secure because it uses HTTP, not HTTPs */ - return 0; -} - -static int oneIsUpdated(virDomainPtr conn ATTRIBUTE_UNUSED) -{ - return 0; -} - -static virDomainPtr oneDomainLookupByID(virConnectPtr conn, - int id) -{ - one_driver_t *driver = conn->privateData; - virDomainPtr dom = NULL; - virDomainObjPtr vm = NULL; - - oneDriverLock(driver); - vm = virDomainFindByID(&driver->domains, id); - oneDriverUnlock(driver); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, NULL); - goto return_point; - } - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - -return_point: - if(vm) { - virDomainObjUnlock(vm); - } - - return dom; -} - -static virDomainPtr oneDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) -{ - one_driver_t *driver = conn->privateData; - virDomainPtr dom = NULL; - virDomainObjPtr vm = NULL; - - oneDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, uuid); - oneDriverUnlock(driver); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, NULL); - goto return_point; - } - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - -return_point: - if(vm) { - virDomainObjUnlock(vm); - } - - return dom; -} - -static virDomainPtr oneDomainLookupByName(virConnectPtr conn, - const char *name) -{ - one_driver_t *driver = conn->privateData; - virDomainObjPtr vm = NULL; - virDomainPtr dom=NULL; - - oneDriverLock(driver); - vm = virDomainFindByName(&driver->domains, name); - oneDriverUnlock(driver); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, NULL); - goto return_point; - } - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } -return_point: - if(vm) { - virDomainObjUnlock(vm); - } - - return dom; -} - -static int oneListDomains(virConnectPtr conn, int *ids, int nids) -{ - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); - oneDriverUnlock(driver); - - return n; -} - -static int oneNumDomains(virConnectPtr conn) -{ - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListNumOfDomains(&driver->domains, 1); - oneDriverUnlock(driver); - - return n; -} - -static int oneListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); - oneDriverUnlock(driver); - - return n; -} - -static int oneNumDefinedDomains(virConnectPtr conn) -{ - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListNumOfDomains(&driver->domains, 0); - oneDriverUnlock(driver); - - return n; -} - -static virDomainPtr oneDomainDefine(virConnectPtr conn, const char *xml) -{ - one_driver_t *driver = conn->privateData; - virDomainDefPtr def; - virDomainObjPtr vm; - virDomainPtr dom=NULL; - - oneDriverLock(driver); - if (!(def = virDomainDefParseString(driver->caps, xml, - VIR_DOMAIN_XML_INACTIVE))) - goto return_point; - - if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def, false))) { - virDomainDefFree(def); - goto return_point; - } - - vm->def->id = -1; - vm->persistent = 1; - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - virDomainObjUnlock(vm); - -return_point: - oneDriverUnlock(driver); - return dom; -} - - -static int oneDomainUndefine(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm = NULL; - int ret=-1; - - oneDriverLock(driver); - vm =virDomainFindByUUID(&driver->domains, dom->uuid); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - goto return_point; - } - - if (!vm->persistent) { - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot undefine transient domain")); - goto return_point; - } - virDomainRemoveInactive(&driver->domains, vm); - ret=0; - -return_point: - if (vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - return ret; -} - -static int oneDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) -{ - one_driver_t *driver = dom->conn->privateData; - struct timeval tv; - virDomainObjPtr vm; - oneDriverLock(driver); - vm= virDomainFindByUUID(&driver->domains, dom->uuid); - oneDriverUnlock(driver); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - return -1; - } - - if(gettimeofday(&tv,NULL)<0) { - oneError(VIR_ERR_INTERNAL_ERROR, "%s", - _("getting time of day")); - virDomainObjUnlock(vm); - return -1; - } - - if (!virDomainObjIsActive(vm)) { - info->cpuTime = 0; - } else { - char vm_info[257]; - c_oneVmInfo(vm->pid,vm_info,256); - /* State: */ - char* cptr = strstr(vm_info,"STATE"); - cptr = index(cptr, ':'); - cptr++; - int one_state=atoi(cptr); - - switch(one_state) { - case 3: /** running */ - if (vm->state!=VIR_DOMAIN_SHUTDOWN) - vm->state=VIR_DOMAIN_RUNNING; - break; - case 5: /** pause */ - vm->state=VIR_DOMAIN_PAUSED; - break; - case 6: /** done */ - vm->state=VIR_DOMAIN_SHUTOFF; - vm->def->id=-1; - break; - case 7: /** error */ - vm->state=VIR_DOMAIN_CRASHED; - break; - default: - break; - }; - /* Memory: */ - cptr=strstr(vm_info,"MEMORY"); - cptr=index(cptr,':'); - cptr++; - vm->def->mem.cur_balloon = atoi(cptr); - - /* run time: */ - cptr=strstr(vm_info,"START TIME"); - cptr=index(cptr,':'); - cptr++; - long starttime = atol(cptr); - info->cpuTime = (tv.tv_sec - starttime) *1000ll *1000ll *1000ll; - - } - - info->state = vm->state; - info->maxMem = vm->def->mem.max_balloon; - info->memory = vm->def->mem.cur_balloon; - info->nrVirtCpu = vm->def->vcpus; - - virDomainObjUnlock(vm); - return 0; -} - -static char *oneGetOSType(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm = NULL; - char *ret = NULL; - - oneDriverLock(driver); - vm =virDomainFindByUUID(&driver->domains, dom->uuid); - oneDriverUnlock(driver); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - goto cleanup; - } - - ret = strdup(vm->def->os.type); - if (!ret) - virReportOOMError(); - -cleanup: - if (vm) - virDomainObjUnlock(vm); - return ret; -} - -static int oneDomainStartWithFlags(virDomainPtr dom, unsigned int flags) -{ - virConnectPtr conn = dom->conn; - one_driver_t *driver = conn->privateData; - virDomainObjPtr vm; - int ret = -1; - int oneid; - - virCheckFlags(0, -1); - - oneDriverLock(driver); - vm = virDomainFindByName(&driver->domains, dom->name); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain named %s"), dom->name); - goto return_point; - } - if((oneid = oneSubmitVM(driver, vm)) < 0) { - goto return_point; - } - vm->pid=oneid; - vm->def->id=driver->nextid++; - vm->state=VIR_DOMAIN_BLOCKED; - ret=0; - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -} - -static int oneDomainStart(virDomainPtr dom) -{ - return oneDomainStartWithFlags(dom, 0); -} - -static virDomainPtr -oneDomainCreateAndStart(virConnectPtr conn, - const char *xml, - unsigned int flags) { - one_driver_t *driver = conn->privateData; - virDomainObjPtr vm = NULL; - virDomainDefPtr def; - virDomainPtr dom = NULL; - int oneid; - - virCheckFlags(0, NULL); - - oneDriverLock(driver); - if (!(def = virDomainDefParseString(driver->caps, xml, - VIR_DOMAIN_XML_INACTIVE))) - goto return_point; - - vm = virDomainFindByName(&driver->domains, def->name); - if (vm) { - oneError(VIR_ERR_OPERATION_FAILED, - _("Already an OpenNebula VM active with the name: '%s' id: %d "), - def->name,def->id); - goto return_point; - } - - if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def, false))) { - virDomainDefFree(def); - goto return_point; - } - if ((oneid = oneSubmitVM(driver, vm)) < 0) { - virDomainRemoveInactive(&driver->domains, vm); - vm=NULL; - goto return_point; - } - - vm->def->id=driver->nextid++; - vm->persistent=0; - vm->pid=oneid; - vm->state=VIR_DOMAIN_BLOCKED; - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return dom; -} - -static int oneDomainShutdown(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - if (!(vm=virDomainFindByID(&driver->domains, dom->id))) { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with id %d"), dom->id); - goto return_point; - } - - if (c_oneShutdown(vm->pid)) { - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - vm->state=VIR_DOMAIN_SHUTDOWN; - ret= 0; - - if (!vm->persistent) { - virDomainRemoveInactive(&driver->domains, vm); - vm = NULL; - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -} - -static int oneDomainDestroy(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - vm= virDomainFindByID(&driver->domains, dom->id); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with id %d"), dom->id); - goto return_point; - } - if(c_oneCancel(vm->pid)) { - /* VM not running, delete the instance at ONE DB */ - if(c_oneFinalize(vm->pid)){ - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - } - if(!vm->persistent) { - virDomainRemoveInactive(&driver->domains,vm); - vm=NULL; - } - ret=0; - -return_point: - if(vm) - virDomainObjUnlock(vm); - - oneDriverUnlock(driver); - - return ret; -} - -static int oneDomainSuspend(virDomainPtr dom) -{ - one_driver_t* driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - if ((vm=virDomainFindByID(&driver->domains,dom->id))){ - - if (vm->state == VIR_DOMAIN_RUNNING) { - if( !(c_oneSuspend(vm->pid)) ) { - vm->state=VIR_DOMAIN_PAUSED; - ret=0; - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - } else { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), dom->id); - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -}; - -static int oneDomainResume(virDomainPtr dom) -{ - one_driver_t* driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - if ((vm=virDomainFindByID(&driver->domains,dom->id))) { - if (vm->state == VIR_DOMAIN_PAUSED) { - if( !(c_oneResume(vm->pid)) ) { - vm->state=VIR_DOMAIN_RUNNING; - ret=0; - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not paused")); - } else { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), dom->id); - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -}; - -static int oneStartup(int privileged ATTRIBUTE_UNUSED){ - - if (VIR_ALLOC(one_driver) < 0) { - return -1; - } - - if(virMutexInit(&one_driver->lock)<0){ - VIR_FREE(one_driver); - return -1; - } - - c_oneStart(); - oneDriverLock(one_driver); - - if (virDomainObjListInit(&one_driver->domains) < 0) { - goto error; - } - - one_driver->nextid=1; - if ((one_driver->caps = oneCapsInit()) == NULL) { - virReportOOMError(); - goto error; - } - oneDriverUnlock(one_driver); - - return 0; - -error: - oneDriverUnlock(one_driver); - oneShutdown(); - return -1; -} - -static int oneShutdown(void){ - if (one_driver == NULL) - return(-1); - - oneDriverLock(one_driver); - virDomainObjListDeinit(&one_driver->domains); - - virCapabilitiesFree(one_driver->caps); - oneDriverUnlock(one_driver); - virMutexDestroy(&one_driver->lock); - VIR_FREE(one_driver); - one_driver = NULL; - c_oneFree(); - return 0; -} - -static int oneActive(void){ - int active = 0; - - if (one_driver == NULL) - return(0); - - oneDriverLock(one_driver); - active = virDomainObjListNumOfDomains(&one_driver->domains, 1); - oneDriverUnlock(one_driver); - - return active; - -} - -static int oneVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer) -{ - *hvVer = 1; - return 0; -} - - -static int oneGetAutostart(virDomainPtr domain ATTRIBUTE_UNUSED, int *autostart) -{ - autostart=0; - return 0; -} - -static char* oneGetCapabilities(virConnectPtr conn){ - one_driver_t* privconn = conn->privateData; - char *xml; - oneDriverLock(privconn); - if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) - virReportOOMError(); - oneDriverUnlock(privconn); - return xml; -} -/* Function Tables */ -static virDriver oneDriver = { - VIR_DRV_ONE, /* the number virDrvNo */ - "one", /* the name of the driver */ - oneOpen, /* open */ - oneClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - oneVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - oneGetCapabilities, /* getCapabilities */ - oneListDomains, /* listDomains */ - oneNumDomains, /* numOfDomains */ - oneDomainCreateAndStart, /* domainCreateXML */ - oneDomainLookupByID, /* domainLookupByID */ - oneDomainLookupByUUID, /* domainLookupByUUID */ - oneDomainLookupByName, /* domainLookupByName */ - oneDomainSuspend, /* domainSuspend */ - oneDomainResume, /* domainResume */ - oneDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ - oneDomainDestroy, /* domainDestroy */ - oneGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - oneDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - NULL, /* domainDumpXML */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - oneListDefinedDomains, /* listDefinedDomains */ - oneNumDefinedDomains, /* numOfDefinedDomains */ - oneDomainStart, /* domainCreate */ - oneDomainStartWithFlags, /* domainCreateWithFlags */ - oneDomainDefine, /* domainDefineXML */ - oneDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - oneGetAutostart, /* 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 */ - oneIsEncrypted, /* isEncrypted */ - oneIsSecure, /* isSecure */ - NULL, /* domainIsActive */ - NULL, /* domainIsPersistent */ - oneIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - 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, /* domainOpenConsole */ -}; - -static virStateDriver oneStateDriver = { - .name = "OpenNebula", - .initialize = oneStartup, - .cleanup = oneShutdown, - .active = oneActive, -}; - - -int oneRegister(void) -{ - virRegisterDriver(&oneDriver); - virRegisterStateDriver(&oneStateDriver); - return 0; -} diff --git a/src/opennebula/one_driver.h b/src/opennebula/one_driver.h deleted file mode 100644 index 6cc1f46..0000000 --- a/src/opennebula/one_driver.h +++ /dev/null @@ -1,30 +0,0 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * 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 ONE_DRIVER_H -# define ONE_DRIVER_H - -# include <config.h> -# include "one_client.h" - -int oneRegister(void); - -#endif /* ONE_DRIVER_H */ -- 1.7.4

5 8

[libvirt] [libvirt-php PATCH v2 0/4] new API for storage
by Lyre 28 Mar '11

28 Mar '11

Hi all: Those patches fixed some minor mistakes, and added 3 functions for storage. Lyre (4): Comment: fix typo Storagepool: make flag for pool refresh optional Volume: add "clone" support Storage: add lookup functions src/libvirt-php.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 3 + 2 files changed, 111 insertions(+), 2 deletions(-) -- 1.7.3.4

2 5

[libvirt] [libvirt-php] Add volume clone support
by Lyre 28 Mar '11

28 Mar '11

New API: libvirt_storagevolume_create_xml_from () --- src/libvirt-php.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 1 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 890b447..3179271 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -109,6 +109,7 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_storagevolume_get_info,NULL) PHP_FE(libvirt_storagevolume_get_xml_desc,NULL) PHP_FE(libvirt_storagevolume_create_xml,NULL) + PHP_FE(libvirt_storagevolume_create_xml_from,NULL) PHP_FE(libvirt_storagepool_get_uuid_string, NULL) PHP_FE(libvirt_storagepool_get_name, NULL) PHP_FE(libvirt_storagepool_lookup_by_uuid_string, NULL) @@ -1904,7 +1905,16 @@ PHP_FUNCTION(libvirt_domain_memory_stats) int retval; long flags=0; int i; - struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR]; + + struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR] = + { + {VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 0}, + {VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 0}, + {VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 0}, + {VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 0}, + {VIR_DOMAIN_MEMORY_STAT_UNUSED, 0}, + {VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 0}, + }; GET_DOMAIN_FROM_ARGS("r|l",&zdomain,&flags); @@ -2804,6 +2814,51 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml) } /* + Function name: libvirt_storagevolume_create_xml_from + Since version: 0.4.1(-2) + Description: Function is used to clone the new storage volume into pool from the orignial volume + Arguments: @pool [resource]: libvirt storagepool resource + @xml [string]: XML string to create the storage volume in the storage pool + @original_volume [resource]: libvirt storagevolume resource + Returns: libvirt storagevolume resource +*/ +PHP_FUNCTION(libvirt_storagevolume_create_xml_from) +{ + php_libvirt_volume *res_volume=NULL; + php_libvirt_storagepool *pool=NULL; + zval *zpool; + + php_libvirt_volume *pl_volume=NULL; + zval *zvolume; + + virStorageVolPtr volume=NULL; + char *xml; + int xml_len; + + if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "rsr", &zpool, &xml, &xml_len, &zvolume) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE (pool, php_libvirt_storagepool*, &zpool, -1, PHP_LIBVIRT_STORAGEPOOL_RES_NAME, le_libvirt_storagepool); + if ((pool==NULL)||(pool->pool==NULL))RETURN_FALSE; + ZEND_FETCH_RESOURCE (pl_volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); + if ((pl_volume==NULL)||(pl_volume->volume==NULL))RETURN_FALSE; + + volume=virStorageVolCreateXMLFrom(pool->pool,xml, pl_volume->volume, 0); + if (volume==NULL) + { + set_error ("Cannot create new volume" TSRMLS_CC); + RETURN_FALSE; + } + + res_volume= emalloc(sizeof(php_libvirt_volume)); + res_volume->volume = volume; + + ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); +} + +/* Function name: libvirt_storagepool_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get storage pool by UUID string @@ -3058,7 +3113,7 @@ PHP_FUNCTION(libvirt_storagepool_refresh) zval *zpool; unsigned long flags = 0; - GET_STORAGEPOOL_FROM_ARGS ("rl", &zpool, &flags); + GET_STORAGEPOOL_FROM_ARGS ("r|l", &zpool, &flags); if (virStoragePoolRefresh (pool->pool, flags) < 0) { diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 816175d..b49355f 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -173,6 +173,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_path); PHP_FUNCTION(libvirt_storagevolume_get_info); PHP_FUNCTION(libvirt_storagevolume_get_xml_desc); PHP_FUNCTION(libvirt_storagevolume_create_xml); +PHP_FUNCTION(libvirt_storagevolume_create_xml_from); PHP_FUNCTION(libvirt_storagepool_get_uuid_string); PHP_FUNCTION(libvirt_storagepool_get_name); PHP_FUNCTION(libvirt_storagepool_lookup_by_uuid_string); -- 1.7.3.4 m

2 3

[libvirt] [libvirt-php] Add lookup function for pool & volume
by Lyre 28 Mar '11

28 Mar '11

--- src/libvirt-php.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt-php.h | 2 + 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 3179271..5737163 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -102,8 +102,10 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_snapshot_lookup_by_name, NULL) /* Storagepool functions */ PHP_FE(libvirt_storagepool_lookup_by_name,NULL) + PHP_FE(libvirt_storagepool_lookup_by_volume,NULL) PHP_FE(libvirt_storagepool_get_info,NULL) PHP_FE(libvirt_storagevolume_lookup_by_name,NULL) + PHP_FE(libvirt_storagevolume_lookup_by_path,NULL) PHP_FE(libvirt_storagevolume_get_name,NULL) PHP_FE(libvirt_storagevolume_get_path,NULL) PHP_FE(libvirt_storagevolume_get_info,NULL) @@ -2600,6 +2602,37 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_name) ZEND_REGISTER_RESOURCE(return_value, res_pool, le_libvirt_storagepool); } +/* Storagepool functions */ + +/* + Function name: libvirt_storagepool_lookup_by_volume + Since version: 0.4.1(-1) + Description: Function is used to lookup for storage pool by a volume + Arguments: @res [volume]: volume resource of storage pool + Returns: libvirt storagepool resource +*/ +PHP_FUNCTION(libvirt_storagepool_lookup_by_volume) +{ + php_libvirt_volume *volume; + zval *zvolume; + virStoragePoolPtr pool=NULL; + php_libvirt_storagepool *res_pool; + + GET_VOLUME_FROM_ARGS ("r", &zvolume); + + pool = virStoragePoolLookupByVolume (volume->volume); + if (pool == NULL) + { + set_error ("Cannot find storage pool" TSRMLS_CC); + RETURN_FALSE; + } + + res_pool = emalloc(sizeof(php_libvirt_storagepool)); + res_pool->pool = pool; + + ZEND_REGISTER_RESOURCE(return_value, res_pool, le_libvirt_storagepool); +} + /* Function name: libvirt_storagepool_list_volumes Since version: 0.4.1(-1) @@ -2693,6 +2726,39 @@ PHP_FUNCTION(libvirt_storagevolume_lookup_by_name) } /* + Function name: libvirt_storagevolume_lookup_by_path + Since version: 0.4.1(-2) + Description: Function is used to lookup for storage volume by it's path + Arguments: @res [resource]: libvirt connection resource + @path [string]: path of the storage volume to look for + Returns: libvirt storagevolume resource +*/ +PHP_FUNCTION(libvirt_storagevolume_lookup_by_path) +{ + php_libvirt_connection *conn=NULL; + php_libvirt_volume *res_volume; + zval *zconn; + int name_len; + char *name=NULL; + virStorageVolPtr volume=NULL; + + GET_CONNECTION_FROM_ARGS("rs",&zconn,&name,&name_len); + if ( (name == NULL) || (name_len<1)) RETURN_FALSE; + + volume=virStorageVolLookupByPath (conn->conn,name); + if (volume==NULL) + { + set_error ("Cannot find volume"); + RETURN_FALSE; + } + + res_volume = emalloc(sizeof(php_libvirt_volume)); + res_volume->volume = volume; + + ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); +} + +/* Function name: libvirt_storagevolume_get_name Since version: 0.4.1(-2) Description: Function is used to get the storage volume name diff --git a/src/libvirt-php.h b/src/libvirt-php.h index b49355f..4646c64 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -165,9 +165,11 @@ PHP_FUNCTION(libvirt_domain_snapshot_revert); PHP_FUNCTION(libvirt_domain_snapshot_delete); /* Storagepool functions */ PHP_FUNCTION(libvirt_storagepool_lookup_by_name); +PHP_FUNCTION(libvirt_storagepool_lookup_by_volume); PHP_FUNCTION(libvirt_storagepool_list_volumes); PHP_FUNCTION(libvirt_storagepool_get_info); PHP_FUNCTION(libvirt_storagevolume_lookup_by_name); +PHP_FUNCTION(libvirt_storagevolume_lookup_by_path); PHP_FUNCTION(libvirt_storagevolume_get_name); PHP_FUNCTION(libvirt_storagevolume_get_path); PHP_FUNCTION(libvirt_storagevolume_get_info); -- 1.7.3.4 o

2 1

[libvirt] [PATCH] Don't allow two or more disks to be mapped to the same image file
by Hu Tao 28 Mar '11

28 Mar '11

If two or more disks are mapped to the same image file, operating on these disks at the same time may corrupt data stored in the image file. --- src/conf/domain_conf.c | 22 ++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 6 ++++++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1b02c25..93a081d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5455,6 +5455,14 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (!disk) goto error; + if (virDomainDiskConflict(disk, def)) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s %s %s", + _("source"), + disk->src, + _("is already mapped to another device, " + "skip this device.")); + continue; + } def->disks[def->ndisks++] = disk; } VIR_FREE(nodes); @@ -9088,3 +9096,17 @@ cleanup: return ret; } + +bool virDomainDiskConflict(virDomainDiskDefPtr disk, virDomainDefPtr def) +{ + int i; + + if (!disk->src) + return false; + + for (i = 0; i < def->ndisks; i++) { + if (STREQ(disk->src, def->disks[i]->src)) + return true; + } + return false; +} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9f595d6..78b2f95 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1350,6 +1350,8 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, bool ignoreOpenFailure, virDomainDiskDefPathIterator iter, void *opaque); +bool virDomainDiskConflict(virDomainDiskDefPtr disk, + virDomainDefPtr def); typedef const char* (*virLifecycleToStringFunc)(int type); typedef int (*virLifecycleFromStringFunc)(const char *type); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b4b6c63..17e2ec4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -237,6 +237,7 @@ virDomainDeviceTypeToString; virDomainDiskBusTypeToString; virDomainDiskCacheTypeFromString; virDomainDiskCacheTypeToString; +virDomainDiskConflict; virDomainDiskDefAssignAddress; virDomainDiskDefForeachPath; virDomainDiskDefFree; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6f296c9..6de08d3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4058,6 +4058,12 @@ static int qemudDomainAttachDevice(virDomainPtr dom, break; case VIR_DOMAIN_DISK_DEVICE_DISK: + if (virDomainDiskConflict(dev->data.disk, vm->def)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s %s %s", + _("source"), dev->data.disk->src, + _("is already mapped to another device.")); + break; + } if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) { ret = qemuDomainAttachUsbMassstorageDevice(driver, vm, dev->data.disk, qemuCaps); -- 1.7.3.1

6 12

[libvirt] [PATCH] remote: Don't leak gnutls session on negotiation error
by Matthias Bolte 26 Mar '11

26 Mar '11

--- Found while trying to reproduce another reported memory leak in doRemoteOpen. This leaked 10kb per failing call to negotiate_gnutls_on_connection. src/remote/remote_driver.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b05bbcb..0915548 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1331,8 +1331,9 @@ negotiate_gnutls_on_connection (virConnectPtr conn, GNUTLS_CRT_OPENPGP, 0 }; + bool success = false; int err; - gnutls_session_t session; + gnutls_session_t session = NULL; /* Initialize TLS session */ @@ -1341,7 +1342,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to initialize TLS client: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } /* Use default priorities */ @@ -1350,7 +1351,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to set TLS algorithm priority: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } err = gnutls_certificate_type_set_priority (session, @@ -1359,7 +1360,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to set certificate priority: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } /* put the x509 credentials to the current session @@ -1369,7 +1370,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to set session credentials: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } gnutls_transport_set_ptr (session, @@ -1391,13 +1392,14 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to complete TLS handshake: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } /* Verify certificate. */ if (verify_certificate (conn, priv, session) == -1) { VIR_DEBUG0("failed to verify peer's certificate"); - if (!no_verify) return NULL; + if (!no_verify) + goto cleanup; } /* At this point, the server is verifying _our_ certificate, IP address, @@ -1413,13 +1415,13 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to complete TLS initialization: %s"), gnutls_strerror (len)); - return NULL; + goto cleanup; } if (len != 1 || buf[0] != '\1') { remoteError(VIR_ERR_RPC, "%s", _("server verification (of our certificate or IP " "address) failed")); - return NULL; + goto cleanup; } #if 0 @@ -1427,6 +1429,14 @@ negotiate_gnutls_on_connection (virConnectPtr conn, print_info (session); #endif + success = true; + +cleanup: + if (!success) { + gnutls_deinit(session); + session = NULL; + } + return session; } -- 1.7.0.4

2 2

[libvirt] [RFC: PATCHv4 00/15] outgoing migration via fd: rather than exec:
by Eric Blake 26 Mar '11

26 Mar '11

v3 has not had complete reviews yet, located at: https://www.redhat.com/archives/libvir-list/2011-March/msg00132.html I'm posting v4 rebased on the latest tree, to get more feedback and possibly ACKs for the earlier half of the series. Differences in v4 (still incomplete): rearrange some of the earlier patches, incorporate Paolo's feedback Currently well-tested through patch 11. Remaining patches (12-15) are compiling but not yet tested, but should form the basis for doing compressed migration. Also available via: git fetch git://repo.or.cz/libvirt/ericb.git fd-migration Still to go - I really hate that doCoreDump can't use fd-migration until I make it compute qemuCaps; really, we should be computing caps once at vm startup, and remembering it elsewhere doCoreDump only works to regular files and fails on root-squash NFS, it should be possible to fix that I really need to write virCommandKill, which silently kills an async child process (if one is running) without overwriting any error messages Needs more testing - especially on root-squash NFS Eric Blake (15): qemu: use lighter-weight fd:n on incoming tunneled migration qemu: consolidate duplicated monitor migration code qemu: improve efficiency of dd during snapshots qemu: support migration to fd util: use SCM_RIGHTS in virFileOperation when needed qemu: allow simple domain save to use fd: protocol qemu: simplify domain save fd handling storage: simplify fd handling util: rename virFileOperation to virFileOpenAs util: adjust indentation in previous patch qemu, storage: improve type safety qemu: use common API for reading difficult files qemu: consolidate migration to file code qemu: skip granting access during fd migration qemu: support fd: migration with compression src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 626 ++++++++++++++++------------------------- src/qemu/qemu_migration.c | 45 +-- src/qemu/qemu_monitor.c | 124 ++++++++- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 125 +-------- src/qemu/qemu_monitor_json.h | 23 +-- src/qemu/qemu_monitor_text.c | 123 +-------- src/qemu/qemu_monitor_text.h | 23 +-- src/storage/storage_backend.c | 80 +++--- src/util/util.c | 161 ++++++++---- src/util/util.h | 15 +- 12 files changed, 544 insertions(+), 807 deletions(-) -- 1.7.4

6 55

[libvirt] [PATCH] network driver: log error and abort network startup when radvd isn't found
by Laine Stump 25 Mar '11

25 Mar '11

This is detailed in: https://bugzilla.redhat.com/show_bug.cgi?id=688957 Since radvd is executed by daemonizing it, the attempt to exec the radvd binary doesn't happen until after libvirtd has already received an exit code from the intermediate forked process, so no error is detected or logged by __virExec(). We can't require radvd as a prerequisit for the libvirt package (many installations don't use IPv6, so they don't need it), so instead we add in a check to verify there is an executable radvd binary prior to trying to exec it. --- src/network/bridge_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6a02df1..c30620a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -689,6 +689,14 @@ networkStartRadvd(virNetworkObjPtr network) network->radvdPid = -1; + if (access(RADVD, X_OK) < 0) { + virReportSystemError(errno, + _("Cannot find %s - " + "Possibly the package isn't installed"), + RADVD); + goto cleanup; + } + if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { virReportSystemError(err, _("cannot create directory %s"), -- 1.7.3.4

3 12

[libvirt] [PATCH] remote: fix memory leak
by Eric Blake 25 Mar '11

25 Mar '11

Detected in this valgrind run: https://bugzilla.redhat.com/show_bug.cgi?id=690734 ==13864== 10 bytes in 1 blocks are definitely lost in loss record 10 of 34 ==13864== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==13864== by 0x308587FD91: strdup (in /lib64/libc-2.12.so) ==13864== by 0x3BB68BA0A3: doRemoteOpen (remote_driver.c:451) ==13864== by 0x3BB68BCFCF: remoteOpen (remote_driver.c:1111) ==13864== by 0x3BB689A0FF: do_open (libvirt.c:1290) ==13864== by 0x3BB689ADD5: virConnectOpenAuth (libvirt.c:1545) ==13864== by 0x41F659: main (virsh.c:11613) * src/remote/remote_driver.c (doRemoteClose): Move up. (remoteOpenSecondaryDriver, remoteOpen): Avoid leak on failure. --- src/remote/remote_driver.c | 120 +++++++++++++++++++++++--------------------- 1 files changed, 62 insertions(+), 58 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b05bbcb..4c7df17 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -998,6 +998,64 @@ retry: goto cleanup; } +static int +doRemoteClose (virConnectPtr conn, struct private_data *priv) +{ + if (priv->eventFlushTimer >= 0) { + /* Remove timeout */ + virEventRemoveTimeout(priv->eventFlushTimer); + /* Remove handle for remote events */ + virEventRemoveHandle(priv->watch); + priv->watch = -1; + } + + if (call (conn, priv, 0, REMOTE_PROC_CLOSE, + (xdrproc_t) xdr_void, (char *) NULL, + (xdrproc_t) xdr_void, (char *) NULL) == -1) + return -1; + + /* Close socket. */ + if (priv->uses_tls && priv->session) { + gnutls_bye (priv->session, GNUTLS_SHUT_RDWR); + gnutls_deinit (priv->session); + } +#if HAVE_SASL + if (priv->saslconn) + sasl_dispose (&priv->saslconn); +#endif + VIR_FORCE_CLOSE(priv->sock); + VIR_FORCE_CLOSE(priv->errfd); + +#ifndef WIN32 + if (priv->pid > 0) { + pid_t reap; + do { +retry: + reap = waitpid(priv->pid, NULL, 0); + if (reap == -1 && errno == EINTR) + goto retry; + } while (reap != -1 && reap != priv->pid); + } +#endif + VIR_FORCE_CLOSE(priv->wakeupReadFD); + VIR_FORCE_CLOSE(priv->wakeupSendFD); + + + /* Free hostname copy */ + VIR_FREE(priv->hostname); + + /* See comment for remoteType. */ + VIR_FREE(priv->type); + + /* Free callback list */ + virDomainEventCallbackListFree(priv->callbackList); + + /* Free queued events */ + virDomainEventQueueFree(priv->domainEvents); + + return 0; +} + static struct private_data * remoteAllocPrivateData(void) { @@ -1039,7 +1097,9 @@ remoteOpenSecondaryDriver(virConnectPtr conn, ret = doRemoteOpen(conn, *priv, auth, rflags); if (ret != VIR_DRV_OPEN_SUCCESS) { + doRemoteClose(conn, *priv); remoteDriverUnlock(*priv); + virMutexDestroy(&(*priv)->lock); VIR_FREE(*priv); } else { (*priv)->localUses = 1; @@ -1111,7 +1171,9 @@ remoteOpen (virConnectPtr conn, ret = doRemoteOpen(conn, priv, auth, rflags); if (ret != VIR_DRV_OPEN_SUCCESS) { conn->privateData = NULL; + doRemoteClose(conn, priv); remoteDriverUnlock(priv); + virMutexDestroy(&priv->lock); VIR_FREE(priv); } else { conn->privateData = priv; @@ -1538,64 +1600,6 @@ verify_certificate (virConnectPtr conn ATTRIBUTE_UNUSED, static int -doRemoteClose (virConnectPtr conn, struct private_data *priv) -{ - if (priv->eventFlushTimer >= 0) { - /* Remove timeout */ - virEventRemoveTimeout(priv->eventFlushTimer); - /* Remove handle for remote events */ - virEventRemoveHandle(priv->watch); - priv->watch = -1; - } - - if (call (conn, priv, 0, REMOTE_PROC_CLOSE, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) - return -1; - - /* Close socket. */ - if (priv->uses_tls && priv->session) { - gnutls_bye (priv->session, GNUTLS_SHUT_RDWR); - gnutls_deinit (priv->session); - } -#if HAVE_SASL - if (priv->saslconn) - sasl_dispose (&priv->saslconn); -#endif - VIR_FORCE_CLOSE(priv->sock); - VIR_FORCE_CLOSE(priv->errfd); - -#ifndef WIN32 - if (priv->pid > 0) { - pid_t reap; - do { -retry: - reap = waitpid(priv->pid, NULL, 0); - if (reap == -1 && errno == EINTR) - goto retry; - } while (reap != -1 && reap != priv->pid); - } -#endif - VIR_FORCE_CLOSE(priv->wakeupReadFD); - VIR_FORCE_CLOSE(priv->wakeupSendFD); - - - /* Free hostname copy */ - VIR_FREE(priv->hostname); - - /* See comment for remoteType. */ - VIR_FREE(priv->type); - - /* Free callback list */ - virDomainEventCallbackListFree(priv->callbackList); - - /* Free queued events */ - virDomainEventQueueFree(priv->domainEvents); - - return 0; -} - -static int remoteClose (virConnectPtr conn) { int ret = 0; -- 1.7.4

1 0

[libvirt] [PATCH V5] Add libxenlight driver
by Jim Fehlig 25 Mar '11

25 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. V5: - Ensure events are unregistered when domain private data is destroyed. Discovered and fixed by Markus Gross. 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 | 1420 +++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.h | 27 + src/util/virterror.c | 3 + 18 files changed, 2602 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 15e8129..9e3a557 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -106,6 +106,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 9a5a53e..c7fcb46 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 645119e..c3729a6 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 @@ -1005,6 +1028,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) \ @@ -1259,6 +1283,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" @@ -1296,6 +1324,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..7559949 --- /dev/null +++ b/src/libxl/libxl_driver.c @@ -0,0 +1,1420 @@ +/*---------------------------------------------------------------------------*/ +/* 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->eventHdl >= 0) + virEventRemoveHandle(priv->eventHdl); + + if (priv->dWaiter) { + libxl_stop_waiting(&priv->ctx, 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->eventHdl >= 0) { + virEventRemoveHandle(priv->eventHdl); + priv->eventHdl = -1; + } + + if (priv->dWaiter) { + libxl_stop_waiting(&priv->ctx, 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); + priv->eventHdl = -1; + 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); + priv->eventHdl = -1; + 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; + + 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); + priv->eventHdl = -1; + 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 f136054..39f0788 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

6 12

[libvirt] [PATCH] Add missing { for qemudDomainInterfaceStats
by Philipp Hahn 25 Mar '11

25 Mar '11

Add missing open curly brace between function declaration of non-linux variant of qemudDomainInterfaceStats() and its body. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dac2bf2..4481261 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5118,6 +5118,7 @@ static int qemudDomainInterfaceStats (virDomainPtr dom, const char *path ATTRIBUTE_UNUSED, struct _virDomainInterfaceStats *stats ATTRIBUTE_UNUSED) +{ qemuReportError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__); return -1; -- 1.7.1

2 1

[libvirt] [PATCH] daemon: Avoid resetting errors before they are reported
by Jiri Denemark 25 Mar '11

25 Mar '11

Commit f44bfb7 was supposed to make sure no additional libvirt API (esp. *Free) is called before remoteDispatchConnError() is called on error. However, the patch missed two instances. --- daemon/remote.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 7520df3..7d0016c 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -5105,12 +5105,13 @@ remoteDispatchStoragePoolListVolumes (struct qemud_server *server ATTRIBUTE_UNUS ret->names.names_len = virStoragePoolListVolumes (pool, ret->names.names_val, args->maxnames); - virStoragePoolFree(pool); if (ret->names.names_len == -1) { VIR_FREE(ret->names.names_val); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } + virStoragePoolFree(pool); return 0; } @@ -5134,11 +5135,12 @@ remoteDispatchStoragePoolNumOfVolumes (struct qemud_server *server ATTRIBUTE_UNU } ret->num = virStoragePoolNumOfVolumes (pool); - virStoragePoolFree(pool); if (ret->num == -1) { remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } + virStoragePoolFree(pool); return 0; } -- 1.7.4.1

2 2

[libvirt] CPU compare and baseline
by Edouard Thuleau 25 Mar '11

25 Mar '11

Hi, I try to understand the compare and baseline CPU commands with libvirt. This functions are useful for the migration ? Before migrate a domain to other host, libvirt verifies the CPU compatibility, that's right ? I've got two 64bits hosts, one with an Intel CPU : > *<cpu>* * **<arch>x86_64</arch>* * **<model>Penryn</model>* * **<vendor>Intel</vendor>* * **<topology sockets='1' cores='2' threads='1'/>* * **<feature name='xtpr'/>* * **<feature name='tm2'/>* * **<feature name='est'/>* * **<feature name='vmx'/>* * **<feature name='ds_cpl'/>* * **<feature name='monitor'/>* * **<feature name='pbe'/>* * **<feature name='tm'/>* * **<feature name='ht'/>* * **<feature name='ss'/>* * **<feature name='acpi'/>* * **<feature name='ds'/>* * **<feature name='vme'/>* *</cpu>* and one with an AMD CPU > *<cpu>* * **<arch>x86_64</arch>* * **<model>Opteron_G2</model>* * **<vendor>AMD</vendor>* * **<topology sockets='1' cores='2' threads='1'/>* * **<feature name='3dnowprefetch'/>* * **<feature name='cr8legacy'/>* * **<feature name='extapic'/>* * **<feature name='cmp_legacy'/>* * **<feature name='3dnow'/>* * **<feature name='3dnowext'/>* * **<feature name='fxsr_opt'/>* * **<feature name='mmxext'/>* * **<feature name='ht'/>* * **<feature name='vme'/>* *</cpu>* Baseline output : AMD to intel: > *$ virsh cpu-baseline cpu_gargamel.xml * *<cpu match='exact'>* * <model>Opteron_G2</model>* * <vendor>AMD</vendor>* * <feature policy='require' name='3dnowprefetch'/>* * <feature policy='require' name='cr8legacy'/>* * <feature policy='require' name='extapic'/>* * <feature policy='require' name='cmp_legacy'/>* * <feature policy='require' name='3dnow'/>* * <feature policy='require' name='3dnowext'/>* * <feature policy='require' name='fxsr_opt'/>* * <feature policy='require' name='mmxext'/>* * <feature policy='require' name='ht'/>* * <feature policy='require' name='vme'/>* *</cpu>* Intel to AMD: > *$ virsh cpu-baseline cpu_azrael.xml * *<cpu match='exact'>* * <model>Penryn</model>* * <vendor>Intel</vendor>* * <feature policy='require' name='xtpr'/>* * <feature policy='require' name='tm2'/>* * <feature policy='require' name='est'/>* * <feature policy='require' name='vmx'/>* * <feature policy='require' name='ds_cpl'/>* * <feature policy='require' name='monitor'/>* * <feature policy='require' name='pbe'/>* * <feature policy='require' name='tm'/>* * <feature policy='require' name='ht'/>* * <feature policy='require' name='ss'/>* * <feature policy='require' name='acpi'/>* * <feature policy='require' name='ds'/>* * <feature policy='require' name='vme'/>* *</cpu>* But if I try to migrate a domain from a host to another, the CPU compare says there are incompatible. I don't understand, I've done live migration manually (*migrate -d tcp: 192.168.1.10:4444*) with KVM and it's works nicely. Why it's not possible trough libvirt ? I use libvirt 0.7.5 with KVM on an Ubuntu LTS 10.04. Regards, Doude.

3 4

[libvirt] [PATCH] command: properly diagnose process exit via signal
by Eric Blake 25 Mar '11

25 Mar '11

Child processes don't always reach _exit(); if they die from a signal, then any messages should still be accurate. Most users either expect a 0 status (thankfully, if status==0, then WIFEXITED(status) is true and WEXITSTATUS(status)==0 for all known platforms) or were filtering on WIFEXITED before printing a status, but a few were missing this check. Additionally, nwfilter_ebiptables_driver was making an assumption that works on Linux (where WEXITSTATUS shifts and WTERMSIG just masks) but fails on other platforms (where WEXITSTATUS just masks and WTERMSIG shifts). * src/util/command.h (virCommandTranslateStatus): New helper. * src/libvirt_private.syms (command.h): Export it. * src/util/command.c (virCommandTranslateStatus): New function. (virCommandWait): Use it to also diagnose status from signals. * src/security/security_apparmor.c (load_profile): Likewise. * src/storage/storage_backend.c (virStorageBackendQEMUImgBackingFormat): Likewise. * src/util/util.c (virExecDaemonize, virRunWithHook) (virFileOperation, virDirCreate): Likewise. * daemon/remote.c (remoteDispatchAuthPolkit): Likewise. * src/nwfilter/nwfilter_ebiptables_driver.c (ebiptablesExecCLI): Likewise. --- In response to my finding here: https://www.redhat.com/archives/libvir-list/2011-March/msg01029.html > status includes normal exit and signals. This should probably use > WIFEXITED and WEXITSTATUS to avoid printing values shifted by 8. For > that matter, I just noticed that virCommandWait should probably be more > careful in how it interprets status. daemon/remote.c | 11 +++++++- src/libvirt_private.syms | 1 + src/nwfilter/nwfilter_ebiptables_driver.c | 16 ++++++++++--- src/security/security_apparmor.c | 22 ++++++++++++------ src/storage/storage_backend.c | 18 ++++++--------- src/util/command.c | 34 ++++++++++++++++++++++++++-- src/util/command.h | 7 +++++- src/util/util.c | 27 ++++++++++------------ 8 files changed, 92 insertions(+), 44 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index f410982..2c54721 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -60,6 +60,7 @@ #include "uuid.h" #include "network.h" #include "libvirt/libvirt-qemu.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_REMOTE #define REMOTE_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) @@ -4363,8 +4364,14 @@ remoteDispatchAuthPolkit (struct qemud_server *server, goto authfail; } if (status != 0) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d"), - action, callerPid, callerUid, status); + char *tmp = virCommandTranslateStatus(status); + if (!tmp) { + virReportOOMError(); + goto authfail; + } + VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d: %s"), + action, callerPid, callerUid, tmp); + VIR_FREE(tmp); goto authdeny; } PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 55be36e..d2f98fc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -123,6 +123,7 @@ virCommandSetPreExecHook; virCommandSetWorkingDirectory; virCommandToString; virCommandTransferFD; +virCommandTranslateStatus; virCommandWait; virCommandWriteArgLog; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 2ec5b02..75fddfb 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1,6 +1,7 @@ /* * nwfilter_ebiptables_driver.c: driver for ebtables/iptables on tap devices * + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2010 IBM Corp. * Copyright (C) 2010 Stefan Berger * @@ -2558,7 +2559,7 @@ err_exit: * ebiptablesExecCLI: * @buf : pointer to virBuffer containing the string with the commands to * execute. - * @status: Pointer to an integer for returning the status of the + * @status: Pointer to an integer for returning the WEXITSTATUS of the * commands executed via the script the was run. * * Returns 0 in case of success, != 0 in case of an error. The returned @@ -2587,7 +2588,7 @@ ebiptablesExecCLI(virBufferPtr buf, cmds = virBufferContentAndReset(buf); - VIR_DEBUG("%s", cmds); + VIR_DEBUG("%s", NULLSTR(cmds)); if (!cmds) return 0; @@ -2606,9 +2607,16 @@ ebiptablesExecCLI(virBufferPtr buf, virMutexUnlock(&execCLIMutex); - *status >>= 8; + if (rc == 0) { + if (WIFEXITED(*status)) { + *status = WEXITSTATUS(*status); + } else { + rc = -1; + *status = 1; + } + } - VIR_DEBUG("rc = %d, status = %d",rc, *status); + VIR_DEBUG("rc = %d, status = %d", rc, *status); unlink(filename); diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index deb4181..3edc680 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1,5 +1,6 @@ /* * AppArmor security driver for libvirt + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2009-2010 Canonical Ltd. * * This library is free software; you can redistribute it and/or @@ -36,6 +37,7 @@ #include "hostusb.h" #include "files.h" #include "configmake.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_SECURITY #define SECURITY_APPARMOR_VOID_DOI "0" @@ -217,15 +219,19 @@ load_profile(virSecurityManagerPtr mgr, VIR_FORCE_CLOSE(pipefd[1]); rc = 0; - rewait: - if (waitpid(child, &status, 0) != child) { - if (errno == EINTR) - goto rewait; - + while ((ret = waitpid(child, &status, 0)) < 0 && errno == EINTR); + if (ret < 0) { + virReportSystemError(errno, + _("Failed to reap virt-aa-helper pid %lu"), + (unsigned long)child); + rc = -1; + } else if (status) { + char *str = virCommandTranslateStatus(status); virSecurityReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected exit status from virt-aa-helper " - "%d pid %lu"), - WEXITSTATUS(status), (unsigned long)child); + _("Unexpected status from virt-aa-helper " + "pid %lu: %s"), + (unsigned long)child, NULLSTR(str)); + VIR_FREE(str); rc = -1; } diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index fc08c68..c6c16c8 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -56,6 +56,7 @@ #include "storage_backend.h" #include "logging.h" #include "files.h" +#include "command.h" #if WITH_STORAGE_LVM # include "storage_backend_logical.h" @@ -631,18 +632,13 @@ static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) cleanup: VIR_FREE(help); VIR_FORCE_CLOSE(newstdout); -rewait: if (child) { - if (waitpid(child, &status, 0) != child) { - if (errno == EINTR) - goto rewait; - - VIR_ERROR(_("Unexpected exit status from qemu %d pid %lu"), - WEXITSTATUS(status), (unsigned long)child); - } - if (WEXITSTATUS(status) != 0) { - VIR_WARN("Unexpected exit status '%d', qemu probably failed", - WEXITSTATUS(status)); + while (waitpid(child, &status, 0) == -1 && errno == EINTR); + if (status) { + tmp = virCommandTranslateStatus(status); + VIR_WARN("Unexpected status, qemu probably failed: %s", + NULLSTR(tmp)); + VIR_FREE(tmp); } } diff --git a/src/util/command.c b/src/util/command.c index 22f350b..89f82c7 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -798,6 +798,26 @@ virCommandToString(virCommandPtr cmd) /* + * Translate an exit status into a malloc'd string. Generic helper + * for virCommandRun and virCommandWait status argument, as well as + * raw waitpid and older virRun status. + */ +char * +virCommandTranslateStatus(int status) +{ + char *buf; + if (WIFEXITED(status)) { + virAsprintf(&buf, _("exit status %d"), WEXITSTATUS(status)); + } else if (WIFSIGNALED(status)) { + virAsprintf(&buf, _("fatal signal %d"), WTERMSIG(status)); + } else { + virAsprintf(&buf, _("invalid value %d"), status); + } + return buf; +} + + +/* * Manage input and output to the child process. */ static int @@ -958,6 +978,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) struct stat st; bool string_io; bool async_io = false; + char *str; if (!cmd ||cmd->has_error == ENOMEM) { virReportOOMError(); @@ -1048,9 +1069,14 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) if (virCommandWait(cmd, exitstatus) < 0) ret = -1; - VIR_DEBUG("Result stdout: '%s' stderr: '%s'", + str = (exitstatus ? virCommandTranslateStatus(*exitstatus) + : (char *) "status 0"); + VIR_DEBUG("Result %s, stdout: '%s' stderr: '%s'", + NULLSTR(str), cmd->outbuf ? NULLSTR(*cmd->outbuf) : "(null)", cmd->errbuf ? NULLSTR(*cmd->errbuf) : "(null)"); + if (exitstatus) + VIR_FREE(str); /* Reset any capturing, in case caller runs * this identical command again */ @@ -1226,10 +1252,12 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) if (exitstatus == NULL) { if (status != 0) { char *str = virCommandToString(cmd); + char *st = virCommandTranslateStatus(status); virCommandError(VIR_ERR_INTERNAL_ERROR, - _("Child process (%s) exited with status %d."), - str ? str : cmd->args[0], WEXITSTATUS(status)); + _("Child process (%s) status unexpected: %s"), + str ? str : cmd->args[0], NULLSTR(st)); VIR_FREE(str); + VIR_FREE(st); return -1; } } else { diff --git a/src/util/command.h b/src/util/command.h index 59d0ee3..0e890d0 100644 --- a/src/util/command.h +++ b/src/util/command.h @@ -1,7 +1,7 @@ /* * command.h: Child command execution * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -273,5 +273,10 @@ int virCommandWait(virCommandPtr cmd, */ void virCommandFree(virCommandPtr cmd); +/* + * Translate an exit status into a malloc'd string. + */ +char *virCommandTranslateStatus(int exitstatus) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_COMMAND_H__ */ diff --git a/src/util/util.c b/src/util/util.c index 1e4e2ab..4301b00 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -76,6 +76,7 @@ #include "threads.h" #include "verify.h" #include "files.h" +#include "command.h" #ifndef NSIG # define NSIG 32 @@ -832,9 +833,11 @@ int virExecDaemonize(const char *const*argv, errno == EINTR); if (childstat != 0) { + char *str = virCommandTranslateStatus(childstat); virUtilError(VIR_ERR_INTERNAL_ERROR, - _("Intermediate daemon process exited with status %d."), - WEXITSTATUS(childstat)); + _("Intermediate daemon process status unexpected: %s"), + NULLSTR(str)); + VIR_FREE(str); ret = -2; } @@ -903,13 +906,12 @@ virRunWithHook(const char *const*argv, if (status == NULL) { errno = EINVAL; - if (WIFEXITED(exitstatus) && WEXITSTATUS(exitstatus) != 0) { + if (exitstatus) { + char *str = virCommandTranslateStatus(exitstatus); virUtilError(VIR_ERR_INTERNAL_ERROR, - _("'%s' exited with non-zero status %d and " - "signal %d: %s"), argv_str, - WIFEXITED(exitstatus) ? WEXITSTATUS(exitstatus) : 0, - WIFSIGNALED(exitstatus) ? WTERMSIG(exitstatus) : 0, - (errbuf ? errbuf : "")); + _("'%s' exited unexpectedly: %s"), + argv_str, NULLSTR(str)); + VIR_FREE(str); goto error; } } else { @@ -1510,8 +1512,7 @@ int virFileOperation(const char *path, int openflags, mode_t mode, path); goto parenterror; } - ret = -WEXITSTATUS(status); - if (!WIFEXITED(status) || (ret == -EACCES)) { + if (!WIFEXITED(status) || (ret = -WEXITSTATUS(status)) == -EACCES) { /* fall back to the simpler method, which works better in * some cases */ return virFileOperationNoFork(path, openflags, mode, uid, gid, @@ -1630,15 +1631,11 @@ int virDirCreate(const char *path, mode_t mode, path); goto parenterror; } - ret = -WEXITSTATUS(status); - if (!WIFEXITED(status) || (ret == -EACCES)) { + if (!WIFEXITED(status) || (ret = -WEXITSTATUS(status)) == -EACCES) { /* fall back to the simpler method, which works better in * some cases */ return virDirCreateNoFork(path, mode, uid, gid, flags); } - if (ret < 0) { - goto parenterror; - } parenterror: return ret; } -- 1.7.4

3 17

[libvirt] About to enter freeze for 0.9.0, on Monday
by Daniel Veillard 25 Mar '11

25 Mar '11

As posted previously I was thinking of entering freeze today, but we have a number of patchsets which are relatively advanced but don't have a final version, like Dan's patches and support of persistent device by Kame. So I suggest to extend the development Friday and over the week-end if needed but we will enter Freeze Monday morning. Then depending on feedback on release candidate, I will either push 0.9.0 on the 1st April or following Monday, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] fix the check of the output of monitor command 'device_add'
by Wen Congyang 25 Mar '11

25 Mar '11

Hotpluging host usb device by text mode will fail, because the monitor command 'device_add' outputs 'husb: using...' if it succeeds, but we think the command should not output anything. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_monitor_text.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 91ecc8b..75b2995 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2283,7 +2283,15 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon, goto cleanup; } - /* If the command succeeds, no output is sent. So + /* If the host device is hotpluged first time, qemu will output + * husb: using %s file-system with %s if the command succeeds. + */ + if (STRPREFIX(reply, "husb: using")) { + ret = 0; + goto cleanup; + } + + /* Otherwise, if the command succeeds, no output is sent. So * any non-empty string shows an error */ if (STRNEQ(reply, "")) { qemuReportError(VIR_ERR_OPERATION_FAILED, -- 1.7.1

2 2

[libvirt] cgroup memoryinfo handling
by Zvi Dubitzky 24 Mar '11

24 Mar '11

Hi 1) Daniel Smith of IBM wrote (2008) code for implementing 'virsh schedinfo' in src/util/cgroup.c He also added some code for cgroup memory subsystem (util/cgroup.c/ virCgroupSetMemoryHardLimit () etc.), I see also src/qemu_driver.c/qemuDomainSetMemoryParameters() But that seems not being invoked . I am looking at libvirt-0.8.8 2) Is anybody handling/completing this piece of code and are you libvirt guys interested in us completing it because we might find usage for that kind of 'virsh meminfo' command using cgroups . thanks Zvi Dubitzky Email:dubi@il.ibm.com

2 3

[libvirt] [PATCH] unlock the monitor when unwatching the monitor
by Wen Congyang 24 Mar '11

24 Mar '11

Steps to reproduce this bug: # virsh qemu-monitor-command domain 'cpu_set 2 online' --hmp The domain has 2 cpus, and we try to set the third cpu online. The qemu crashes, and this command will hang. The reason is that the refs is not 1 when we unwatch the monitor. We lock the monitor, but we do not unlock it. So virCondWait() will be blocked. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_monitor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index da38096..dc08594 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -239,7 +239,8 @@ qemuMonitorUnwatch(void *monitor) qemuMonitorPtr mon = monitor; qemuMonitorLock(mon); - qemuMonitorUnref(mon); + if (qemuMonitorUnref(mon) > 0) + qemuMonitorUnlock(mon); } static int -- 1.7.1

5 8

[libvirt] ANNOUNCE: virt-manager 0.8.7 and virtinst 0.500.6 released
by Cole Robinson 24 Mar '11

24 Mar '11

I'm happy to announce two new releases: virt-manager 0.8.7: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.500.6: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.8.7.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.500.6.tar.gz Here are the highlights for the past 2 releases (since I neglected to send out a release announcement for the previous round :) ) The virt-manager release includes: virt-manager 0.8.7: - Allow renaming an offline VM - Spice password support (Marc-André Lureau) - Allow editting NIC <virtualport> settings (Gerhard Stenzel) - Allow enabling/disabling individual CPU features - Allow easily changing graphics type between VNC and SPICE for existing VM - Allow easily changing network source device for existing VM virt-manager 0.8.6: - SPICE support (requires spice-gtk) (Marc-André Lureau) - Option to configure CPU model - Option to configure CPU topology - Save and migration cancellation (Wen Congyang) - Save and migration progress reporting - Option to enable bios boot menu - Option to configure direct kernel/initrd boot virtinst 0.500.6: - virt-install: --graphics spice now enables spicevmc and qxl - virt-install: New --disk parameter io=native|threads virtinst 0.500.5: - New virt-install --cpu option for configuring CPU model/features - virt-install --vcpus option can not specify topology and maxvcpus - New virt-install --graphics option to unify --vnc, --sdl, spice config - New virt-install --print-xml option to skip install and print XML Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCHv6 1/3] libvirt/qemu - support persistent modification of devices.
by KAMEZAWA Hiroyuki 24 Mar '11

24 Mar '11

Thank you for comments. This is a rebased/fixed one. = >From 5858b9d6b33a9d917576f6179be13a306272ff45 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Wed, 23 Mar 2011 17:45:12 +0900 Subject: [PATCHv6 1/3] libvirt/qemu - support persistent modification of devices. Now, qemudDomainAttachDeviceFlags() and qemudDomainDetachDeviceFlags() doesn't support VIR_DOMAIN_DEVICE_MODIFY_CONFIG. By this, virsh's at(de)tatch-device --persistent cannot modify qemu config. (Xen allows it.) This patch is a base patch for adding support of devices in step by step manner. Following patches will add some device support. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Changelog v5->v6 - fixed Indentation - clean up. Changelog v4->v5: - fixed error codes at reporting Error. - fixed unlock code after calling qemuDomainObjBeginJobWithDriver() - fixed virDomainFindByUUID() to be virDomainFindByName() - fixed spelling, indent, etc.. - removed unnecessary checks. --- src/qemu/qemu_driver.c | 137 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 124 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6f296c9..468361b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4140,16 +4140,124 @@ cleanup: return ret; } -static int qemudDomainAttachDeviceFlags(virDomainPtr dom, - const char *xml, - unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); +/* + * Attach a device given by XML, the change will be persistent + * and domain XML definition file is updated. + */ +static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr newdev) +{ + + switch(newdev->type) { + default: + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sorry, the device is not supported for now")); + return -1; + } + + return 0; +} + +static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr device) +{ + switch(device->type) { + default: + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sorry, the device is not supported for now")); return -1; } + return 0; +} + +static int qemuDomainModifyDevicePersistent(virDomainPtr dom, + const char *xml, + unsigned int attach, unsigned int flags) +{ + struct qemud_driver *driver; + virDomainDeviceDefPtr device; + virDomainDefPtr vmdef; + virDomainObjPtr vm; + int ret = -1; + + /* + * When both of MODIFY_CONFIG and MODIFY_LIVE is specified at the same time, + * return error for now. We should support this later. + */ + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Now, cannot modify alive domain and its definition " + "at the same time.")); + return -1; + } + + driver = dom->conn->privateData; + qemuDriverLock(driver); + vm = virDomainFindByName(&driver->domains, dom->name); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, _("no domain with name : '%s'"), + dom->name); + goto unlock_out; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) + goto unlock_out; + + if (virDomainObjIsActive(vm)) { + /* + * For now, just allow updating inactive domains. Further development + * will allow updating both active domain and its config file at + * the same time. + */ + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unsupported to update active domain's definition.")); + goto endjob; + } + + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); - return qemudDomainAttachDevice(dom, xml); + if (!vmdef) + goto endjob; + + device = virDomainDeviceDefParse(driver->caps, + vmdef, xml, VIR_DOMAIN_XML_INACTIVE); + if (!device) + goto endjob; + + if (attach) + ret = qemuDomainAttachDevicePersistent(vmdef, device); + else + ret = qemuDomainDetachDevicePersistent(vmdef, device); + + if (!ret) /* save the result */ + ret = virDomainSaveConfig(driver->configDir, vmdef); + + virDomainDeviceDefFree(device); + +endjob: + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; +unlock_out: + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + return ret; +} + +static int qemudDomainAttachDeviceFlags(virDomainPtr dom, + const char *xml, + unsigned int flags) +{ + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 1, flags); + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainAttachDevice(dom, xml); + + qemuReportError(VIR_ERR_INVALID_ARG, + _("bad flag: %x not supported"), flags); + + return -1; } @@ -4364,13 +4472,16 @@ cleanup: static int qemudDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); - return -1; - } - return qemudDomainDetachDevice(dom, xml); + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 0, flags); + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainDetachDevice(dom, xml); + + qemuReportError(VIR_ERR_INVALID_ARG, + _("bad flag: %x not supported now"), flags); + return -1; } static int qemudDomainGetAutostart(virDomainPtr dom, -- 1.7.4.1

2 8

[libvirt] [PATCH] update domain status forcibly even if attach a device failed
by Wen Congyang 24 Mar '11

24 Mar '11

Steps to reproduce this bug: 1. virsh attach-disk domain --source diskimage --target sdb --sourcetype file --driver qemu --subdriver qcow2 error: Failed to attach disk error: operation failed: adding scsi-disk,bus=scsi0.0,scsi-id=1,drive=drive-scsi0-0-1,id=scsi0-0-1 device failed: Property 'scsi-disk.drive' can't find value 'drive-scsi0-0-1' 2. service libvirtd restart Stopping libvirtd daemon: [ OK ] Starting libvirtd daemon: [ OK ] 3. virsh attach-disk domain --source diskimage --target sdb --sourcetype file --driver qemu --subdriver raw error: Failed to attach disk error: operation failed: adding lsi,id=scsi0,bus=pci.0,addr=0x6 device failed: Duplicate ID 'scsi0' for device The reason is that we create a new scsi controller but we do not update /var/run/libvirt/qemu/domain.xml. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 82a2210..5dff64a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6638,7 +6638,11 @@ static int qemudDomainAttachDevice(virDomainPtr dom, goto endjob; } - if (!ret && virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) + /* update domain status forcibly because the domain status may be changed + * even if we attach the device failed. For example, a new controller may + * be created. + */ + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) ret = -1; endjob: -- 1.7.1

2 6

[libvirt] [PATCH] build: nuke all .x-sc* files
by Eric Blake 23 Mar '11

23 Mar '11

Not every day you see a patch that nukes 27 files! * .gnulib: Update to latest, for maint.mk improvements * bootstrap: Resync to gnulib. * bootstrap.conf (ACLOCAL): Swap the secondary aclocal include directory, now that bootstrap picks up gnulib/m4 instead of m4. * Makefile.am (syntax_check_exceptions, EXTRA_DIST): No longer worry about nuked files. * cfg.mk (sc_x_sc_dist_check): Delete dead rule. (VC_LIST_ALWAYS_EXCLUDE_REGEX): Add HACKING. (exclude_file_name_regexp--sc_*): Inline and simplify contents... * .x-sc_*: ...from here, then delete the files. --- * .gnulib c2090a8...0baae9c (28): > maint.mk: allow fine-grained syntax-check exclusion via Make variables > ignore-value tests: Avoid warnings. > passfd: Fix link error on Solaris. > passfd: Fix link error on AIX 5.2. > passfd: Work around bug with CMSG_FIRSTHDR on FreeBSD 6.4. > passfd: Fix compilation error on OpenBSD. > passfd test: Fix warnings. > passfd test: Fix warnings. > passfd module, part 4, tweaks. > passfd module, part 4. > Makefile: rely on GNU make; derive syntax-check rule names > passfd module, part 3. > passfd module, part 2, tweaks. > passfd module, part 2. > wcswidth, mbswidth: Avoid integer overflow. > Oops, fix last commit. > futimens, utimensat: Avoid endless recursion on Solaris 10. > maint.mk: relax a regexp to accommodate other formatting styles > maint.mk: suppress a syntax check false positive > wchar: add explicit dependencies, for Tru64 > passfd module, part 1, tweaks. > passfd module, part 1. > regex-quote: New API. > regex-quote: Fix creation of POSIX extended regular expressions. > doc: Improve doc regarding autopoint vs. gnulib. > Update AC_OPENMP macro for Lahey compiler on GNU/Linux. > parse-duration: remove xalloc.h dependency > bootstrap: honor m4_base when running aclocal .gnulib | 2 +- .x-sc_avoid_ctype_macros | 1 - .x-sc_avoid_if_before_free | 1 - .x-sc_avoid_write | 9 ---- .x-sc_bindtextdomain | 2 - .x-sc_m4_quote_check | 1 - .x-sc_po_check | 1 - .x-sc_prohibit_HAVE_MBRTOWC | 1 - .x-sc_prohibit_VIR_ERR_NO_MEMORY | 5 -- .x-sc_prohibit_always_true_header_tests | 4 -- .x-sc_prohibit_asprintf | 5 -- .x-sc_prohibit_close | 9 ---- .x-sc_prohibit_empty_lines_at_EOF | 5 -- .x-sc_prohibit_fork_wrappers | 8 ---- .x-sc_prohibit_gethostby | 2 - .x-sc_prohibit_gethostname | 2 - .x-sc_prohibit_gettext_noop | 2 - .x-sc_prohibit_have_config_h | 1 - .x-sc_prohibit_nonreentrant | 10 ----- .x-sc_prohibit_readlink | 2 - .x-sc_prohibit_sprintf | 4 -- .x-sc_prohibit_strncpy | 2 - .x-sc_prohibit_test_minus_ao | 1 - .x-sc_prohibit_xmlGetProp | 1 - .x-sc_require_config_h | 4 -- .x-sc_require_config_h_first | 1 - .x-sc_trailing_blank | 7 --- .x-sc_unmarked_diagnostics | 2 - Makefile.am | 30 ------------- bootstrap | 6 +- bootstrap.conf | 2 +- cfg.mk | 68 ++++++++++++++++++++++++------ 32 files changed, 59 insertions(+), 142 deletions(-) delete mode 100644 .x-sc_avoid_ctype_macros delete mode 100644 .x-sc_avoid_if_before_free delete mode 100644 .x-sc_avoid_write delete mode 100644 .x-sc_bindtextdomain delete mode 100644 .x-sc_m4_quote_check delete mode 100644 .x-sc_po_check delete mode 100644 .x-sc_prohibit_HAVE_MBRTOWC delete mode 100644 .x-sc_prohibit_VIR_ERR_NO_MEMORY delete mode 100644 .x-sc_prohibit_always_true_header_tests delete mode 100644 .x-sc_prohibit_asprintf delete mode 100644 .x-sc_prohibit_close delete mode 100644 .x-sc_prohibit_empty_lines_at_EOF delete mode 100644 .x-sc_prohibit_fork_wrappers delete mode 100644 .x-sc_prohibit_gethostby delete mode 100644 .x-sc_prohibit_gethostname delete mode 100644 .x-sc_prohibit_gettext_noop delete mode 100644 .x-sc_prohibit_have_config_h delete mode 100644 .x-sc_prohibit_nonreentrant delete mode 100644 .x-sc_prohibit_readlink delete mode 100644 .x-sc_prohibit_sprintf delete mode 100644 .x-sc_prohibit_strncpy delete mode 100644 .x-sc_prohibit_test_minus_ao delete mode 100644 .x-sc_prohibit_xmlGetProp delete mode 100644 .x-sc_require_config_h delete mode 100644 .x-sc_require_config_h_first delete mode 100644 .x-sc_trailing_blank delete mode 100644 .x-sc_unmarked_diagnostics diff --git a/.gnulib b/.gnulib index c2090a8..0baae9c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c2090a84dc3997acada3166772afac94f2d3a25c +Subproject commit 0baae9cadd08c9704e3c704dd69fb75640293e9d diff --git a/.x-sc_avoid_ctype_macros b/.x-sc_avoid_ctype_macros deleted file mode 100644 index 06e95c1..0000000 --- a/.x-sc_avoid_ctype_macros +++ /dev/null @@ -1 +0,0 @@ -^gnulib/.* diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free deleted file mode 100644 index 7e6ce62..0000000 --- a/.x-sc_avoid_if_before_free +++ /dev/null @@ -1 +0,0 @@ -^ChangeLog diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write deleted file mode 100644 index f6fc1b2..0000000 --- a/.x-sc_avoid_write +++ /dev/null @@ -1,9 +0,0 @@ -^src/libvirt\.c$ -^src/fdstream\.c$ -^src/qemu/qemu_monitor\.c$ -^src/util/command\.c$ -^src/util/util\.c$ -^src/xen/xend_internal\.c$ -^daemon/libvirtd.c$ -^gnulib/ -^tools/console.c$ diff --git a/.x-sc_bindtextdomain b/.x-sc_bindtextdomain deleted file mode 100644 index 08acb01..0000000 --- a/.x-sc_bindtextdomain +++ /dev/null @@ -1,2 +0,0 @@ -^tests/.* -^examples/.* diff --git a/.x-sc_m4_quote_check b/.x-sc_m4_quote_check deleted file mode 100644 index 10dfa97..0000000 --- a/.x-sc_m4_quote_check +++ /dev/null @@ -1 +0,0 @@ -^gnulib/m4/intl\.m4$ diff --git a/.x-sc_po_check b/.x-sc_po_check deleted file mode 100644 index d2fc2f2..0000000 --- a/.x-sc_po_check +++ /dev/null @@ -1 +0,0 @@ -^docs/ diff --git a/.x-sc_prohibit_HAVE_MBRTOWC b/.x-sc_prohibit_HAVE_MBRTOWC deleted file mode 100644 index 36775da..0000000 --- a/.x-sc_prohibit_HAVE_MBRTOWC +++ /dev/null @@ -1 +0,0 @@ -gnulib/.* diff --git a/.x-sc_prohibit_VIR_ERR_NO_MEMORY b/.x-sc_prohibit_VIR_ERR_NO_MEMORY deleted file mode 100644 index 5c96e83..0000000 --- a/.x-sc_prohibit_VIR_ERR_NO_MEMORY +++ /dev/null @@ -1,5 +0,0 @@ -^ChangeLog$ -^ChangeLog-old$ -^include/libvirt/virterror\.h$ -^daemon/dispatch\.c$ -^src/util/virterror\.c$ diff --git a/.x-sc_prohibit_always_true_header_tests b/.x-sc_prohibit_always_true_header_tests deleted file mode 100644 index ff753ce..0000000 --- a/.x-sc_prohibit_always_true_header_tests +++ /dev/null @@ -1,4 +0,0 @@ -ChangeLog* -docs/news.html.in -python/libvirt-override.c -python/typewrappers.c diff --git a/.x-sc_prohibit_asprintf b/.x-sc_prohibit_asprintf deleted file mode 100644 index d03b947..0000000 --- a/.x-sc_prohibit_asprintf +++ /dev/null @@ -1,5 +0,0 @@ -ChangeLog -^bootstrap.conf$ -^gnulib/ -^po/ -^src/util/util.c$ diff --git a/.x-sc_prohibit_close b/.x-sc_prohibit_close deleted file mode 100644 index ab14617..0000000 --- a/.x-sc_prohibit_close +++ /dev/null @@ -1,9 +0,0 @@ -# Non-C files: -^docs/.* -^ChangeLog* -^HACKING$ -*\.py$ -# Wrapper implementation: -^src/util/files\.c$ -# Only uses close in documentation comments: -^src/libvirt\.c$ diff --git a/.x-sc_prohibit_empty_lines_at_EOF b/.x-sc_prohibit_empty_lines_at_EOF deleted file mode 100644 index 2e9aa63..0000000 --- a/.x-sc_prohibit_empty_lines_at_EOF +++ /dev/null @@ -1,5 +0,0 @@ -^docs/api_extension/.* -^tests/qemuhelpdata/.* -*.gif$ -*.ico$ -*.png$ diff --git a/.x-sc_prohibit_fork_wrappers b/.x-sc_prohibit_fork_wrappers deleted file mode 100644 index 7f8fc6c..0000000 --- a/.x-sc_prohibit_fork_wrappers +++ /dev/null @@ -1,8 +0,0 @@ -^docs/.* -^HACKING$ -^src/util/util\.c$ -^tests/testutils\.c$ -# Files that we may want to convert over to virCommand someday... -^daemon/libvirtd\.c$ -^src/libvirt\.c$ -^src/lxc/lxc_controller\.c$ diff --git a/.x-sc_prohibit_gethostby b/.x-sc_prohibit_gethostby deleted file mode 100644 index 7c052f4..0000000 --- a/.x-sc_prohibit_gethostby +++ /dev/null @@ -1,2 +0,0 @@ -^gnulib/lib/getaddrinfo\.c$ -^gnulib/m4/ diff --git a/.x-sc_prohibit_gethostname b/.x-sc_prohibit_gethostname deleted file mode 100644 index e7acb03..0000000 --- a/.x-sc_prohibit_gethostname +++ /dev/null @@ -1,2 +0,0 @@ -^src/util/util\.c$ -^ChangeLog-old$ diff --git a/.x-sc_prohibit_gettext_noop b/.x-sc_prohibit_gettext_noop deleted file mode 100644 index c40474e..0000000 --- a/.x-sc_prohibit_gettext_noop +++ /dev/null @@ -1,2 +0,0 @@ -ChangeLog* -docs/news.html.in diff --git a/.x-sc_prohibit_have_config_h b/.x-sc_prohibit_have_config_h deleted file mode 100644 index f106267..0000000 --- a/.x-sc_prohibit_have_config_h +++ /dev/null @@ -1 +0,0 @@ -^gnulib/lib/strsep\.c$ diff --git a/.x-sc_prohibit_nonreentrant b/.x-sc_prohibit_nonreentrant deleted file mode 100644 index 0ab2f5d..0000000 --- a/.x-sc_prohibit_nonreentrant +++ /dev/null @@ -1,10 +0,0 @@ -^gnulib/ -^po/ -^ChangeLog$ -^ChangeLog-old$ -^Makefile* -^docs/ -^tests/ -^tools/virsh\.c$ -^tools/console\.c$ -^build-aux/ diff --git a/.x-sc_prohibit_readlink b/.x-sc_prohibit_readlink deleted file mode 100644 index e7acb03..0000000 --- a/.x-sc_prohibit_readlink +++ /dev/null @@ -1,2 +0,0 @@ -^src/util/util\.c$ -^ChangeLog-old$ diff --git a/.x-sc_prohibit_sprintf b/.x-sc_prohibit_sprintf deleted file mode 100644 index a67f51c..0000000 --- a/.x-sc_prohibit_sprintf +++ /dev/null @@ -1,4 +0,0 @@ -^docs/ -^po/ -^ChangeLog -^HACKING diff --git a/.x-sc_prohibit_strncpy b/.x-sc_prohibit_strncpy deleted file mode 100644 index 173d233..0000000 --- a/.x-sc_prohibit_strncpy +++ /dev/null @@ -1,2 +0,0 @@ -^src/util/util\.c$ -^tools/virsh\.c$ diff --git a/.x-sc_prohibit_test_minus_ao b/.x-sc_prohibit_test_minus_ao deleted file mode 100644 index 3939616..0000000 --- a/.x-sc_prohibit_test_minus_ao +++ /dev/null @@ -1 +0,0 @@ -docs/news.html.in diff --git a/.x-sc_prohibit_xmlGetProp b/.x-sc_prohibit_xmlGetProp deleted file mode 100644 index f6d7ee2..0000000 --- a/.x-sc_prohibit_xmlGetProp +++ /dev/null @@ -1 +0,0 @@ -^src/util/xml.c$ diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h deleted file mode 100644 index a530ae0..0000000 --- a/.x-sc_require_config_h +++ /dev/null @@ -1,4 +0,0 @@ -^examples/ -^gnulib/lib/dummy\.c$ -^gnulib/tests/dummy\.c$ -^ChangeLog$ diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first deleted file mode 100644 index 0390cd4..0000000 --- a/.x-sc_require_config_h_first +++ /dev/null @@ -1 +0,0 @@ -^examples/ diff --git a/.x-sc_trailing_blank b/.x-sc_trailing_blank deleted file mode 100644 index de3369e..0000000 --- a/.x-sc_trailing_blank +++ /dev/null @@ -1,7 +0,0 @@ -\.fig$ -\.gif$ -\.ico$ -\.png$ -^ChangeLog$ -^NEWS$ -^docs/.* diff --git a/.x-sc_unmarked_diagnostics b/.x-sc_unmarked_diagnostics deleted file mode 100644 index 4135cc7..0000000 --- a/.x-sc_unmarked_diagnostics +++ /dev/null @@ -1,2 +0,0 @@ -docs/apibuild.py -tests/virt-aa-helper-test diff --git a/Makefile.am b/Makefile.am index 882e676..0b4ae9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,35 +14,6 @@ XML_EXAMPLES = \ $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \ test/*.xml storage/*.xml))) -syntax_check_exceptions = \ - .x-sc_avoid_ctype_macros \ - .x-sc_avoid_if_before_free \ - .x-sc_avoid_write \ - .x-sc_bindtextdomain \ - .x-sc_m4_quote_check \ - .x-sc_po_check \ - .x-sc_prohibit_always_true_header_tests \ - .x-sc_prohibit_asprintf \ - .x-sc_prohibit_close \ - .x-sc_prohibit_empty_lines_at_EOF \ - .x-sc_prohibit_fork_wrappers \ - .x-sc_prohibit_gethostby \ - .x-sc_prohibit_gethostname \ - .x-sc_prohibit_gettext_noop \ - .x-sc_prohibit_have_config_h \ - .x-sc_prohibit_HAVE_MBRTOWC \ - .x-sc_prohibit_nonreentrant \ - .x-sc_prohibit_readlink \ - .x-sc_prohibit_sprintf \ - .x-sc_prohibit_strncpy \ - .x-sc_prohibit_test_minus_ao \ - .x-sc_prohibit_VIR_ERR_NO_MEMORY \ - .x-sc_prohibit_xmlGetProp \ - .x-sc_require_config_h \ - .x-sc_require_config_h_first \ - .x-sc_trailing_blank \ - .x-sc_unmarked_diagnostics - EXTRA_DIST = \ ChangeLog-old \ libvirt.spec libvirt.spec.in \ @@ -53,7 +24,6 @@ EXTRA_DIST = \ autogen.sh \ cfg.mk \ examples/domain-events/events-python \ - $(syntax_check_exceptions) \ $(XML_EXAMPLES) pkgconfigdir = $(libdir)/pkgconfig diff --git a/bootstrap b/bootstrap index e9ec11e..f004ad3 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-01-21.16; # UTC +scriptversion=2011-03-03.12; # UTC # Bootstrap this package from checked-out sources. @@ -874,7 +874,7 @@ grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null || for command in \ libtool \ - "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \ + "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \ "${AUTOCONF-autoconf} --force" \ "${AUTOHEADER-autoheader} --force" \ "${AUTOMAKE-automake} --add-missing --copy --force-missing" @@ -885,7 +885,7 @@ do command="${LIBTOOLIZE-libtoolize} -c -f" fi echo "$0: $command ..." - $command || exit + eval "$command" || exit done diff --git a/bootstrap.conf b/bootstrap.conf index a9d4ba4..6070204 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -145,7 +145,7 @@ gnulib_tool_option_extras="\ # Convince bootstrap to use multiple m4 directories. : ${ACLOCAL=aclocal} -ACLOCAL="$ACLOCAL -I gnulib/m4" +ACLOCAL="$ACLOCAL -I m4" export ACLOCAL # Build prerequisites diff --git a/cfg.mk b/cfg.mk index c12f199..f5c7ed0 100644 --- a/cfg.mk +++ b/cfg.mk @@ -66,7 +66,7 @@ local-checks-to-skip = \ sc_useless_cpp_parens # Files that should never cause syntax check failures. -VC_LIST_ALWAYS_EXCLUDE_REGEX = ^docs/news.html.in$$ +VC_LIST_ALWAYS_EXCLUDE_REGEX = ^(HACKING|docs/news\.html\.in)$$ # Functions like free() that are no-ops on NULL arguments. useless_free_options = \ @@ -481,19 +481,6 @@ sc_prohibit_gettext_markup: halt='do not mark these strings for translation' \ $(_sc_search_regexp) -# Ensure that the syntax_check_exceptions file list in Makefile.am -# stays in sync with corresponding files in the repository. -sce = syntax_check_exceptions -sc_x_sc_dist_check: - @test "$$( ($(VC_LIST) | sed -n '/\.x-sc_/p' \ - | sed 's|^$(_dot_escaped_srcdir)/||'; \ - sed -n '/^$(sce) =[ ]*\\$$/,/[^\]$$/p' \ - $(srcdir)/Makefile.am \ - | sed 's/^ *//;/^$(sce) =/d' \ - | tr -s '\012\\' ' ' | fmt -1 \ - ) | sort | uniq -u)" \ - && { echo 'Makefile.am: $(sce) mismatch' >&2; exit 1; } || :; - # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -550,3 +537,56 @@ _makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/' # regenerate HACKING as part of the syntax-check syntax-check: $(top_srcdir)/HACKING + +# List all syntax-check exemptions: +_src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal +exclude_file_name_regexp--sc_avoid_write = \ + ^(src/($(_src1))|daemon/libvirtd|tools/console)\.c$$ + +exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/ + +exclude_file_name_regexp--sc_po_check = ^docs/ + +exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \ + ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$ + +exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ + (^docs|^python/(libvirt-override|typewrappers)\.c$$) + +exclude_file_name_regexp--sc_prohibit_asprintf = \ + ^(bootstrap.conf$$|po/|src/util/util\.c$$) + +exclude_file_name_regexp--sc_prohibit_close = \ + (\.py$$|^docs/|(src/util/files\.c|src/libvirt\.c)$$) + +exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ + (^docs/api_extension/|^tests/qemuhelpdata/|\.(gif|ico|png)$$) + +_src2=src/(util/util|libvirt|lxc/lxc_controller) +exclude_file_name_regexp--sc_prohibit_fork_wrappers = \ + (^docs|^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$) + +exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$ + +exclude_file_name_regexp--sc_prohibit_gettext_noop = ^docs/ + +exclude_file_name_regexp--sc_prohibit_nonreentrant = \ + ^((po|docs|tests)/|tools/(virsh|console)\.c$$) + +exclude_file_name_regexp--sc_prohibit_readlink = ^src/util/util\.c$$ + +exclude_file_name_regexp--sc_prohibit_sprintf = ^(docs/|HACKING$$) + +exclude_file_name_regexp--sc_prohibit_strncpy = \ + ^(src/util/util|tools/virsh)\.c$$ + +exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$ + +exclude_file_name_regexp--sc_require_config_h = ^examples/ + +exclude_file_name_regexp--sc_require_config_h_first = ^examples/ + +exclude_file_name_regexp--sc_trailing_blank = (^docs/|\.(fig|gif|ico|png)$$) + +exclude_file_name_regexp--sc_unmarked_diagnostics = \ + ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ -- 1.7.4

2 3

[libvirt] [PATCH] qemu: add two hook script events "prepare" and "release"
by Thibault VINCENT 23 Mar '11

23 Mar '11

>From 827261dbe2ab8f1cfd8c84df14bb42fd04df2307 Mon Sep 17 00:00:00 2001 From: Thibault VINCENT <thibault.vincent(a)smartjog.com> Date: Mon, 21 Mar 2011 10:18:06 +0100 Subject: [PATCH] qemu: add two hook script events "prepare" and "release" * Fix for bug #618970 * The "prepare" hook is called very early in the VM statup process before device labeling, so that it can allocate ressources not managed by libvirt, such as DRBD, or for instance create missing bridges and vlan interfaces. * To shutdown these devices, the "release" hook is also required at the very end of the VM destruction. Signed-off-by: Thibault VINCENT <thibault.vincent(a)smartjog.com> --- src/qemu/qemu_process.c | 26 ++++++++++++++++++++++++++ src/util/hooks.c | 4 +++- src/util/hooks.h | 2 ++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 793a43c..7831c3b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1927,6 +1927,22 @@ int qemuProcessStart(virConnectPtr conn, vm->def->id = driver->nextvmid++; + /* Run a early hook to set-up missing devices */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + char *xml = virDomainDefFormat(vm->def, 0); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_PREPARE, VIR_HOOK_SUBOP_BEGIN, NULL, xml); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto cleanup; + } + /* Must be run before security labelling */ VIR_DEBUG0("Preparing host devices"); if (qemuPrepareHostDevices(driver, vm->def) < 0) @@ -2419,6 +2435,16 @@ retry: VIR_FREE(priv->vcpupids); priv->nvcpupids = 0; + /* The "release" hook cleans up additional ressources */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + char *xml = virDomainDefFormat(vm->def, 0); + + /* we can't stop the operation even if the script raised an error */ + virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_RELEASE, VIR_HOOK_SUBOP_END, NULL, xml); + VIR_FREE(xml); + } + if (vm->newDef) { virDomainDefFree(vm->def); vm->def = vm->newDef; diff --git a/src/util/hooks.c b/src/util/hooks.c index 5ba2036..c258318 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -70,8 +70,10 @@ VIR_ENUM_IMPL(virHookSubop, VIR_HOOK_SUBOP_LAST, "end") VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST, + "prepare", "start", - "stopped") + "stopped", + "release") VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST, "start", diff --git a/src/util/hooks.h b/src/util/hooks.h index f311ed1..66b378a 100644 --- a/src/util/hooks.h +++ b/src/util/hooks.h @@ -52,8 +52,10 @@ enum virHookSubopType { }; enum virHookQemuOpType { + VIR_HOOK_QEMU_OP_PREPARE, /* domain startup initiated */ VIR_HOOK_QEMU_OP_START, /* domain is about to start */ VIR_HOOK_QEMU_OP_STOPPED, /* domain has stopped */ + VIR_HOOK_QEMU_OP_RELEASE, /* domain destruction is over */ VIR_HOOK_QEMU_OP_LAST, }; -- 1.7.2.3

3 4

[libvirt] int-overflow test fails if /root is not writable and /root/.virsh does not exist yet
by Diego Elio Pettenò 23 Mar '11

23 Mar '11

--- err 2011-03-18 00:07:36.000000000 +0100 +++ exp 2011-03-18 00:07:36.000000000 +0100 @@ -1,2 +1 @@ error: failed to get domain '4294967298' -error: Failed to create '/root/.virsh': Permission denied FAIL: int-overflow This has been reported in Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=359307 I guess it is worth looking at and fix it not to fail in this case? Thanks, -- Diego Elio Pettenò — Flameeyes http://blog.flameeyes.eu/

2 2

[libvirt] [libvirt-snmp][PATCH v3 0/3] Add SNMP trap/notification support
by Michal Privoznik 23 Mar '11

23 Mar '11

The third version with micro-version number change. Finally, we have a proof-of-concept implementation of SNMP trap. Two new files were first generated using mib2c then edited, so be careful when re-generating them. Destination of traps is defined in snmpd.conf (trap2sink), and to receive them snmptrapd must be configured and up. The idea behind is - create a thread in which we poll for domain events. Once we receive event notification, we just fire up trap sending. Michal Privoznik (3): Add notification-type object to libvirt MIB Create functions to fill in and send notification packets. Add SNMP trap/notification support. INSTALL.1st | 9 +- configure.ac | 9 ++- libvirt-snmp.spec.in | 5 +- src/LIBVIRT-MIB.txt | 9 ++ src/Makefile.am | 3 + src/README.txt | 9 +- src/libvirtNotifications.c | 121 +++++++++++++++++++ src/libvirtNotifications.h | 33 +++++ src/libvirtSnmp.c | 277 +++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 464 insertions(+), 11 deletions(-) create mode 100644 src/libvirtNotifications.c create mode 100644 src/libvirtNotifications.h -- 1.7.4

3 7

[libvirt] [PATCH] logging: fix off-by-one bug
by Eric Blake 23 Mar '11

23 Mar '11

Valgrind caught that our log wrap-around was going 1 past the end. Regression introduced in commit b16f47a; previously the buffer was static and size+1 bytes, but now it is dynamic and exactly size bytes. * src/util/logging.c (virLogStr): Don't write past end of log. --- An alternative would be to malloc one larger; but since the log is likely to be a page size multiple and large enough to be worth malloc using mmap, going one larger is likely to waste the bulk of a page. Also, I like always NUL-terminating the current end of the log (without including that NUL in the log length). src/util/logging.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/logging.c b/src/util/logging.c index b972f8a..f4910ad 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -326,7 +326,7 @@ static void virLogStr(const char *str, int len) { return; if (len <= 0) len = strlen(str); - if (len > virLogSize) + if (len >= virLogSize) return; virLogLock(); @@ -336,13 +336,13 @@ static void virLogStr(const char *str, int len) { if (virLogEnd + len >= virLogSize) { tmp = virLogSize - virLogEnd; memcpy(&virLogBuffer[virLogEnd], str, tmp); - virLogBuffer[virLogSize] = 0; memcpy(&virLogBuffer[0], &str[tmp], len - tmp); virLogEnd = len - tmp; } else { memcpy(&virLogBuffer[virLogEnd], str, len); virLogEnd += len; } + virLogBuffer[virLogEnd] = 0; /* * Update the log length, and if full move the start index */ -- 1.7.4

2 4

[libvirt] [PATCH] rpm: require radvd when building network support
by Eric Blake 23 Mar '11

23 Mar '11

Otherwise, if the build machine doesn't have radvd, then the configure test won't wire in anything for the radvd executable, and attempts to use that rpm for ipv6 will fail even on machines where radvd is present. error: Failed to start network ipv6net error: Cannot find radvd - Possibly the package isn't installed: No such file or directory Note that this is a build requirement; the runtime requirement is still optional, and the above failure is still expected for an rpm built with radvd but installed on a non-ipv6 machine. * libvirt.spec.in (with_network): Add BuildRequires for radvd. --- .gnulib | 2 +- libvirt.spec.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index c2090a8..a01e7c4 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c2090a84dc3997acada3166772afac94f2d3a25c +Subproject commit a01e7c4c58d3c6cad50974367ec60139cc919973 diff --git a/libvirt.spec.in b/libvirt.spec.in index 4a62c80..1e6b5b5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -78,6 +78,7 @@ %define with_audit 0%{!?_without_audit:0} %define with_dtrace 0%{!?_without_dtrace:0} %define with_cgconfig 0%{!?_without_cgconfig:0} +%define with_ipv6 0%{!?_without_ipv6:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -339,6 +340,7 @@ BuildRequires: libselinux-devel %endif %if %{with_network} BuildRequires: dnsmasq >= 2.41 +BuildRequires: radvd %endif BuildRequires: bridge-utils %if %{with_sasl} -- 1.7.4

2 10

[libvirt] [PATCH] domain_conf: drop unused ref-count in snapshot object
by Eric Blake 23 Mar '11

23 Mar '11

The ref count was assigned to 1 at creation, then never modified again until it was decremented just before freeing the object. * src/conf/domain_conf.h (_virDomainSnapshotObj): Delete unused field. (virDomainSnapshotObjUnref): Delete unused prototype. * src/libvirt_private.syms: Likewise. * src/conf/domain_conf.c (virDomainSnapshotObjNew) (virDomainSnapshotObjListDataFree): Update users. (virDomainSnapshotObjUnref): Delete. --- I was about to add ATTRIBUTE_RETURN_CHECK to all Unref methods, when I discovered that this method is (currently) worthless. If we ever change things in the future to have multiple threads referring to snapshot objects and need a reference counter, we can use Wen's proposed new base-class object to do that in a saner manner. In the meantime, let's just delete the bloat. src/conf/domain_conf.c | 15 +-------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - 3 files changed, 1 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c637300..1b02c25 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8722,8 +8722,6 @@ static virDomainSnapshotObjPtr virDomainSnapshotObjNew(void) return NULL; } - snapshot->refs = 1; - VIR_DEBUG("obj=%p", snapshot); return snapshot; @@ -8740,17 +8738,6 @@ static void virDomainSnapshotObjFree(virDomainSnapshotObjPtr snapshot) VIR_FREE(snapshot); } -int virDomainSnapshotObjUnref(virDomainSnapshotObjPtr snapshot) -{ - snapshot->refs--; - VIR_DEBUG("obj=%p refs=%d", snapshot, snapshot->refs); - if (snapshot->refs == 0) { - virDomainSnapshotObjFree(snapshot); - return 0; - } - return snapshot->refs; -} - virDomainSnapshotObjPtr virDomainSnapshotAssignDef(virDomainSnapshotObjListPtr snapshots, const virDomainSnapshotDefPtr def) { @@ -8782,7 +8769,7 @@ virDomainSnapshotObjListDataFree(void *payload, { virDomainSnapshotObjPtr obj = payload; - virDomainSnapshotObjUnref(obj); + virDomainSnapshotObjFree(obj); } int virDomainSnapshotObjListInit(virDomainSnapshotObjListPtr snapshots) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cbd0f98..9f595d6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -998,8 +998,6 @@ struct _virDomainSnapshotDef { typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; struct _virDomainSnapshotObj { - int refs; - virDomainSnapshotDefPtr def; }; @@ -1028,7 +1026,6 @@ virDomainSnapshotObjPtr virDomainSnapshotFindByName(const virDomainSnapshotObjLi const char *name); void virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots, virDomainSnapshotObjPtr snapshot); -int virDomainSnapshotObjUnref(virDomainSnapshotObjPtr snapshot); int virDomainSnapshotHasChildren(virDomainSnapshotObjPtr snap, virDomainSnapshotObjListPtr snapshots); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 55be36e..b4b6c63 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -305,7 +305,6 @@ virDomainSnapshotHasChildren; virDomainSnapshotObjListGetNames; virDomainSnapshotObjListNum; virDomainSnapshotObjListRemove; -virDomainSnapshotObjUnref; virDomainSoundDefFree; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; -- 1.7.4

2 2

[libvirt] [PATCH] util: Fix return value for virJSONValueFromString if it fails
by Osier Yang 23 Mar '11

23 Mar '11

Problem: "parser.head" is not NULL even if it's free'ed by "virJSONValueFree", returning "parser.head" when "virJSONValueFromString" fails will cause unexpected errors (libvirtd will crash sometimes), e.g. In function "qemuMonitorJSONArbitraryCommand": if (!(cmd = virJSONValueFromString(cmd_str))) goto cleanup; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; ...... cleanup: virJSONValueFree(cmd); It will continues to send command to monitor even if "virJSONValueFromString" is failed, and more worse, it trys to free "cmd" again. Crash example: {"error":{"class":"QMPBadInputObject","desc":"Expected 'execute' in QMP input","data":{"expected":"execute"}}} {"error":{"class":"QMPBadInputObject","desc":"Expected 'execute' in QMP input","data":{"expected":"execute"}}} error: server closed connection: error: unable to connect to '/var/run/libvirt/libvirt-sock', libvirtd may need to be started: Connection refused error: failed to connect to the hypervisor This fix is to: 1) return NULL for failure of "virJSONValueFromString", 2) and it seems "virJSONValueFree" uses incorrect loop index for type of "VIR_JSON_TYPE_OBJECT", fix it together. * src/util/json.c --- src/util/json.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/json.c b/src/util/json.c index f90594c..be47f64 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -65,7 +65,7 @@ void virJSONValueFree(virJSONValuePtr value) switch (value->type) { case VIR_JSON_TYPE_OBJECT: - for (i = 0 ; i < value->data.array.nvalues ; i++) { + for (i = 0 ; i < value->data.object.npairs; i++) { VIR_FREE(value->data.object.pairs[i].key); virJSONValueFree(value->data.object.pairs[i].value); } @@ -897,6 +897,7 @@ virJSONValuePtr virJSONValueFromString(const char *jsonstring) yajl_parser_config cfg = { 1, 1 }; yajl_handle hand; virJSONParser parser = { NULL, NULL, 0 }; + virJSONValuePtr ret = NULL; VIR_DEBUG("string=%s", jsonstring); @@ -917,6 +918,8 @@ virJSONValuePtr virJSONValueFromString(const char *jsonstring) goto cleanup; } + ret = parser.head; + cleanup: yajl_free(hand); @@ -930,7 +933,7 @@ cleanup: VIR_DEBUG("result=%p", parser.head); - return parser.head; + return ret; } -- 1.7.4

2 2

[libvirt] [PATCH] Initialization error of qemuCgroupData in Qemu host usb hotplug
by Wen Congyang 23 Mar '11

23 Mar '11

Steps to reproduce this bug: # cat usb.xml <hostdev mode='subsystem' type='usb'> <source> <address bus='0x001' device='0x003'/> </source> </hostdev> # virsh attach-device vm1 usb.xml error: Failed to attach device from usb.xml error: server closed connection: The reason of this bug is that we set data.cgroup to NULL, and this will cause libvirtd crashed. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_hotplug.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 36b343d..9082515 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -860,7 +860,7 @@ int qemuDomainAttachHostUsbDevice(struct qemud_driver *driver, if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_DEVICES)) { virCgroupPtr cgroup = NULL; usbDevice *usb; - qemuCgroupData data = { vm, cgroup }; + qemuCgroupData data; if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) !=0 ) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -873,6 +873,8 @@ int qemuDomainAttachHostUsbDevice(struct qemud_driver *driver, hostdev->source.subsys.u.usb.device)) == NULL) goto error; + data.vm = vm; + data.cgroup = cgroup; if (usbDeviceFileIterate(usb, qemuSetupHostUsbDeviceCgroup, &data) < 0) goto error; } -- 1.7.1

3 2

[libvirt] [PATCH 0/2] improve driver module building
by Eric Blake 23 Mar '11

23 Mar '11

This comment: https://www.redhat.com/archives/libvir-list/2011-March/msg00899.html > > No change to src/libvirt_private.syms to list all these new functions? > Nothing required this (yet) made me double check behavior of ./autogen.sh --with-driver-modules, and sure enough, things were broken. Patch 1 fixes the breakage, and patch 2 tries to improve automation to make it easier to prevent (or detect sooner) in the future. Eric Blake (2): build: fix driver module build build: let autobuild check module build autobuild.sh | 10 ++++++++++ src/Makefile.am | 9 +++++++-- src/libvirt_private.syms | 20 ++++++++++++++++++++ src/libvirt_xenxs.syms | 22 ++++++++++++++++++++++ tests/Makefile.am | 30 +++++++++++++++++------------- 5 files changed, 76 insertions(+), 15 deletions(-) create mode 100644 src/libvirt_xenxs.syms -- 1.7.4

2 3

[libvirt] [PATCHv5 1/3] libivrt/qemu - support persistent modification of devices
by KAMEZAWA Hiroyuki 23 Mar '11

23 Mar '11

Thank you for review and feedbacks. This is v5 onto the latest git tree. Any comments are welcome. == >From ef85d268a0b553cdb784a1d1916ff8cf171adace Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Wed, 16 Mar 2011 11:35:41 +0900 Subject: [PATCHv5 1/3] libivrt/qemu - support persistent modification of devices. Now, qemudDomainAttachDeviceFlags() and qemudDomainDetachDeviceFlags() doesn't support VIR_DOMAIN_DEVICE_MODIFY_CONFIG. By this, virsh's at(de)tatch-device --persistent cannot modify qemu config. (Xen allows it.) This patch is a base patch for adding support of devices in step by step manner. Following patches will add some device support. Changelog v4->v5: - fixed error codes at reporting Error. - fixed unlock code after calling qemuDomainObjBeginJobWithDriver() - fixed virDomainFindByUUID() to be virDomainFindByName() - fixed spelling, indent, etc.. - removed unnecessary checks. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> --- src/qemu/qemu_driver.c | 141 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 129 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dac2bf2..dbd5bd3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4130,16 +4130,129 @@ cleanup: return ret; } -static int qemudDomainAttachDeviceFlags(virDomainPtr dom, +/* + * Attach a device given by XML, the change will be persistent + * and domain XML definition file is updated. + */ +static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr newdev) +{ + + switch(newdev->type) { + default: + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sorry, the device is not supported for now")); + return -1; + } + + return 0; +} + +static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr device) +{ + switch(device->type) { + default: + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sorry, the device is not supported for now")); + return -1; + } + return 0; +} + +static int qemuDomainModifyDevicePersistent(virDomainPtr dom, const char *xml, - unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); + unsigned int attach, unsigned int flags) +{ + struct qemud_driver *driver; + virDomainDeviceDefPtr device; + virDomainDefPtr vmdef; + virDomainObjPtr vm; + int ret = -1; + + if (!xml) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("internal error")); return -1; } + /* + * When both of MODIFY_CONFIG and MODIFY_LIVE is specified at the same time, + * return error for now. We should support this later. + */ + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Now, cannot modify alive domain and its definition " + "at the same time.")); + return -1; + } + + driver = dom->conn->privateData; + qemuDriverLock(driver); + vm = virDomainFindByName(&driver->domains, dom->name); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, _("no domain with name : '%s'"), + dom->name); + goto unlock_out; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) + goto unlock_out; + + if (virDomainObjIsActive(vm)) { + /* + * For now, just allow updating inactive domains. Further development + * will allow updating both active domain and its config file at + * the same time. + */ + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Now, it's unsupported to update active domain's definition.")); + goto endjob; + } + + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + + if (!vmdef) + goto endjob; + + device = virDomainDeviceDefParse(driver->caps, + vmdef, xml, VIR_DOMAIN_XML_INACTIVE); + if (!device) + goto endjob; + + if (attach) + ret = qemuDomainAttachDevicePersistent(vmdef, device); + else + ret = qemuDomainDetachDevicePersistent(vmdef, device); + + if (!ret) /* save the result */ + ret = virDomainSaveConfig(driver->configDir, vmdef); + + virDomainDeviceDefFree(device); + +endjob: + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; +unlock_out: + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + return ret; +} + +static int qemudDomainAttachDeviceFlags(virDomainPtr dom, + const char *xml, + unsigned int flags) +{ + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 1, flags); + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainAttachDevice(dom, xml); + + qemuReportError(VIR_ERR_INVALID_ARG, + _("bad flag: %x only MODIFY_LIVE, MODIFY_CONFIG are supported now"), + flags); - return qemudDomainAttachDevice(dom, xml); + return -1; } @@ -4354,13 +4467,17 @@ cleanup: static int qemudDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); - return -1; - } - return qemudDomainDetachDevice(dom, xml); + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 0, flags); + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainDetachDevice(dom, xml); + + qemuReportError(VIR_ERR_INVALID_ARG, + _("bad flag: %x only MODIFY_LIVE, MODIFY_CONFIG are supported now"), + flags); + return -1; } static int qemudDomainGetAutostart(virDomainPtr dom, -- 1.7.4.1

3 16

[libvirt] [PATCH v2 0/3] qemu: fallback to HMP drive_add/drive_del
by Jiri Denemark 23 Mar '11

23 Mar '11

Version 2: - provide nicer errors when human-monitor-command is not available Hu Tao (1): qemu: fallback to HMP drive_add/drive_del Jiri Denemark (2): qemu: Detect support for HMP passthrough qemu: Only use HMP passthrough if it is supported src/qemu/qemu_monitor.c | 22 +++++++++- src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 98 ++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_monitor_json.h | 2 + 4 files changed, 104 insertions(+), 20 deletions(-) -- 1.7.4.1

3 8

[libvirt] [PATCH] build: fix missing initializer
by Eric Blake 22 Mar '11

22 Mar '11

Commit cb4aba9b6 forgot xenapi. * src/xenapi/xenapi_driver.c (xenapiDriver): Adjust to recent API. --- Pushing under the build-breaker rule. src/xenapi/xenapi_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index e2d4dd3..27206a0 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1868,6 +1868,7 @@ static virDriver xenapiDriver = { NULL, /* domainGetJobInfo */ NULL, /* domainAbortJob */ NULL, /* domainMigrateSetMaxDowntime */ + NULL, /* domainMigrateSetMaxSpeed */ NULL, /* domainEventRegisterAny */ NULL, /* domainEventDeregisterAny */ NULL, /* domainManagedSave */ -- 1.7.4

1 0

[libvirt] [PATCH] 8021Qbh: use preassociate-rr during the migration prepare stage
by Roopa Prabhu 22 Mar '11

22 Mar '11

From: Roopa Prabhu <roprabhu(a)cisco.com> This patch introduces PREASSOCIATE-RR during incoming VM migration on the destination host. This is similar to the usage of PREASSOCIATE during migration in 8021qbg libvirt code today. PREASSOCIATE-RR is a VDP operation. With the latest at IEEE, 8021qbh will need to support VDP operations. A corresponding enic driver patch to support PREASSOCIATE-RR for 8021qbh will be posted for net-next-2.6 inclusion soon. Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Signed-off-by: David Wang <dwang2(a)cisco.com> Signed-off-by: Christian Benvenuti <benve(a)cisco.com> --- src/util/macvtap.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 2d3ff87..346eaf6 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -87,6 +87,7 @@ enum virVirtualPortOp { ASSOCIATE = 0x1, DISASSOCIATE = 0x2, PREASSOCIATE = 0x3, + PREASSOCIATE_RR = 0x4, }; @@ -1452,6 +1453,7 @@ doPortProfileOp8021Qbh(const char *ifname, } switch (virtPortOp) { + case PREASSOCIATE_RR: case ASSOCIATE: rc = virGetHostUUID(hostuuid); if (rc) @@ -1465,7 +1467,9 @@ doPortProfileOp8021Qbh(const char *ifname, vm_uuid, hostuuid, vf, - PORT_REQUEST_ASSOCIATE); + (virtPortOp == PREASSOCIATE_RR) ? + PORT_REQUEST_PREASSOCIATE_RR + : PORT_REQUEST_ASSOCIATE); if (rc == -ETIMEDOUT) /* Association timed out, disassociate */ doPortProfileOpCommon(nltarget_kernel, NULL, ifindex, @@ -1553,10 +1557,11 @@ vpAssociatePortProfileId(const char *macvtap_ifname, break; case VIR_VIRTUALPORT_8021QBH: - /* avoid associating twice */ - if (vmOp != VIR_VM_OP_MIGRATE_IN_FINISH) - rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, - virtPort, vmuuid, ASSOCIATE); + rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, + virtPort, vmuuid, + (vmOp == VIR_VM_OP_MIGRATE_IN_START) + ? PREASSOCIATE_RR + : ASSOCIATE); if (vmOp != VIR_VM_OP_MIGRATE_IN_START && !rc) ifaceUp(linkdev); break;

2 2

[libvirt] [PATCH 0/6] v2: Allow data upload/download to/from storage volumes
by Daniel P. Berrange 22 Mar '11

22 Mar '11

An update of http://www.redhat.com/archives/libvir-list/2011-March/msg00655.html Addressing all the feedback from v1 series. The most notable change is that 'iohelper' now takes an explicit flags+mode parameter, instead of the operation name.

2 20

[libvirt] [PATCH] Fix uninitialized variable & error reporting in LXC veth setup
by Daniel P. Berrange 22 Mar '11

22 Mar '11

THe veth setup in LXC had a couple of flaws, first brInit did not report any error when it failed. Second vethCreate() did not correctly initialize the variable containing the return code, so could report failure even when it succeeded. * src/lxc/lxc_driver.c: Report error when brInit fails * src/lxc/veth.c: Fix uninitialized variable --- src/lxc/lxc_driver.c | 8 ++++++-- src/lxc/veth.c | 17 +++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 79b6879..9b131cc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1024,9 +1024,13 @@ static int lxcSetupInterfaces(virConnectPtr conn, int rc = -1, i; char *bridge = NULL; brControl *brctl = NULL; + int ret; - if (brInit(&brctl) != 0) + if ((ret = brInit(&brctl)) != 0) { + virReportSystemError(ret, "%s", + _("Unable to initialize bridging")); return -1; + } for (i = 0 ; i < def->nnets ; i++) { char *parentVeth; @@ -1095,7 +1099,7 @@ static int lxcSetupInterfaces(virConnectPtr conn, goto error_exit; } - if (0 != (rc = brAddInterface(brctl, bridge, parentVeth))) { + if ((ret = brAddInterface(brctl, bridge, parentVeth)) != 0) { virReportSystemError(rc, _("Failed to add %s device to %s"), parentVeth, bridge); diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 0fa76cf..deca26d 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -90,7 +90,7 @@ static int getFreeVethName(char **veth, int startDev) */ int vethCreate(char** veth1, char** veth2) { - int rc; + int rc = -1; const char *argv[] = { "ip", "link", "add", NULL, "type", "veth", "peer", "name", NULL, NULL }; @@ -100,9 +100,8 @@ int vethCreate(char** veth1, char** veth2) VIR_DEBUG("veth1: %s veth2: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { - vethDev = getFreeVethName(veth1, vethDev); - if (vethDev < 0) - return vethDev; + if ((vethDev = getFreeVethName(veth1, vethDev)) < 0) + goto cleanup; VIR_DEBUG("Assigned veth1: %s", *veth1); veth1_alloc = true; } @@ -110,11 +109,10 @@ int vethCreate(char** veth1, char** veth2) while (*veth2 == NULL || STREQ(*veth1, *veth2)) { VIR_FREE(*veth2); - vethDev = getFreeVethName(veth2, vethDev + 1); - if (vethDev < 0) { + if ((vethDev = getFreeVethName(veth2, vethDev + 1)) < 0) { if (veth1_alloc) VIR_FREE(*veth1); - return vethDev; + goto cleanup; } VIR_DEBUG("Assigned veth2: %s", *veth2); } @@ -125,9 +123,12 @@ int vethCreate(char** veth1, char** veth2) if (veth1_alloc) VIR_FREE(*veth1); VIR_FREE(*veth2); - rc = -1; + goto cleanup; } + rc = 0; + +cleanup: return rc; } -- 1.7.1

3 3

[libvirt] [PATCH 0/3] Allow on-the-fly migration speed changes
by Daniel P. Berrange 22 Mar '11

22 Mar '11

Currently the migration bandwidth cap must be set at the time migration is initiated. This series allows it to be optionally change on the fly too, allowing mgmt apps to adapt to changing conditions

3 10

[libvirt] [libvirt-php] add get name and path for storage volume
by Lyre 22 Mar '11

22 Mar '11

--- src/libvirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_php.h | 2 ++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 1608774..3678974 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -90,6 +90,8 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_storagepool_lookup_by_name,NULL) PHP_FE(libvirt_storagepool_get_info,NULL) PHP_FE(libvirt_storagevolume_lookup_by_name,NULL) + PHP_FE(libvirt_storagevolume_get_name,NULL) + PHP_FE(libvirt_storagevolume_get_path,NULL) PHP_FE(libvirt_storagevolume_get_info,NULL) PHP_FE(libvirt_storagevolume_get_xml_desc,NULL) PHP_FE(libvirt_storagevolume_create_xml,NULL) @@ -2644,6 +2646,48 @@ PHP_FUNCTION(libvirt_storagevolume_lookup_by_name) } /* + Function name: libvirt_storagevolume_get_name + Since version: 0.4.1(-1) + Description: Function is used to get the storage volume name + Arguments: @res [resource]: libvirt storagevolume resource + Returns: storagevolume name +*/ +PHP_FUNCTION(libvirt_storagevolume_get_name) +{ + php_libvirt_volume *volume = NULL; + zval *zvolume; + const char *val; + + GET_VOLUME_FROM_ARGS ("r", &zvolume); + + val = virStorageVolGetName (volume->volume); + if (val == NULL) RETURN_FALSE; + + RETURN_STRING (val, 1); +} + +/* + Function name: libvirt_storagevolume_path + Since version: 0.4.1(-1) + Description: Function is used to get the storage volume path + Arguments: @res [resource]: libvirt storagevolume resource + Returns: storagevolume path +*/ +PHP_FUNCTION(libvirt_storagevolume_get_path) +{ + php_libvirt_volume *volume = NULL; + zval *zvolume; + char *val; + + GET_VOLUME_FROM_ARGS ("r", &zvolume); + + val = virStorageVolGetPath (volume->volume); + if (val == NULL) RETURN_FALSE; + + RETURN_STRING (val, 1); +} + +/* Function name: libvirt_storagevolume_get_info Since version: 0.4.1(-1) Description: Function is used to get the storage volume information diff --git a/src/libvirt_php.h b/src/libvirt_php.h index 3367943..60203de 100644 --- a/src/libvirt_php.h +++ b/src/libvirt_php.h @@ -154,6 +154,8 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_name); PHP_FUNCTION(libvirt_storagepool_list_volumes); PHP_FUNCTION(libvirt_storagepool_get_info); PHP_FUNCTION(libvirt_storagevolume_lookup_by_name); +PHP_FUNCTION(libvirt_storagevolume_get_name); +PHP_FUNCTION(libvirt_storagevolume_get_path); PHP_FUNCTION(libvirt_storagevolume_get_info); PHP_FUNCTION(libvirt_storagevolume_get_xml_desc); PHP_FUNCTION(libvirt_storagevolume_create_xml); -- 1.7.3.4

2 1

[libvirt] [PATCH 0/5] RFC: configure inactive domains' maximum memory size
by Taku Izumi 22 Mar '11

22 Mar '11

Hi all, This patchset enables us to configure inactive domain's maximum memory size. The basic technique is the same as that of "virsh setmem" command. => http://www.redhat.com/archives/libvir-list/2011-March/msg00013.html *[PATCH 1/5] [RESEND] setmaxmem: remove the code to invoke virDomainSetMemory in cmdSetmaxmem => http://www.redhat.com/archives/libvir-list/2011-March/msg00747.html *[PATCH 2/5] setmaxmem: introduce a new libvirt API (virDomainSetMaxMemoryFlags) *[PATCH 3/5] setmaxmem: implement the code to address the new API in the qemu driver *[PATCH 4/5] setmaxmem: implement the remote protocol to address the new API *[PATCH 5/5] setmaxmem: add the new options to "virsh setmaxmem" command Best regards, Taku Izumi

4 11

[libvirt] [PATCH] v2: Fix uninitialized variable & error reporting in LXC veth setup
by Daniel P. Berrange 21 Mar '11

21 Mar '11

THe veth setup in LXC had a couple of flaws, first brInit did not report any error when it failed. Second vethCreate() did not correctly initialize the variable containing the return code, so could report failure even when it succeeded. * src/lxc/lxc_driver.c: Report error when brInit fails * src/lxc/veth.c: Fix uninitialized variable --- src/lxc/lxc_driver.c | 8 ++++++-- src/lxc/veth.c | 33 ++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 79b6879..9b131cc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1024,9 +1024,13 @@ static int lxcSetupInterfaces(virConnectPtr conn, int rc = -1, i; char *bridge = NULL; brControl *brctl = NULL; + int ret; - if (brInit(&brctl) != 0) + if ((ret = brInit(&brctl)) != 0) { + virReportSystemError(ret, "%s", + _("Unable to initialize bridging")); return -1; + } for (i = 0 ; i < def->nnets ; i++) { char *parentVeth; @@ -1095,7 +1099,7 @@ static int lxcSetupInterfaces(virConnectPtr conn, goto error_exit; } - if (0 != (rc = brAddInterface(brctl, bridge, parentVeth))) { + if ((ret = brAddInterface(brctl, bridge, parentVeth)) != 0) { virReportSystemError(rc, _("Failed to add %s device to %s"), parentVeth, bridge); diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 0fa76cf..26bf4ff 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -90,33 +90,40 @@ static int getFreeVethName(char **veth, int startDev) */ int vethCreate(char** veth1, char** veth2) { - int rc; + int rc = -1; const char *argv[] = { "ip", "link", "add", NULL, "type", "veth", "peer", "name", NULL, NULL }; int vethDev = 0; bool veth1_alloc = false; + bool veth2_alloc = false; VIR_DEBUG("veth1: %s veth2: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { - vethDev = getFreeVethName(veth1, vethDev); - if (vethDev < 0) - return vethDev; + if ((vethDev = getFreeVethName(veth1, vethDev)) < 0) + goto cleanup; VIR_DEBUG("Assigned veth1: %s", *veth1); veth1_alloc = true; } argv[3] = *veth1; - while (*veth2 == NULL || STREQ(*veth1, *veth2)) { - VIR_FREE(*veth2); - vethDev = getFreeVethName(veth2, vethDev + 1); - if (vethDev < 0) { + while (*veth2 == NULL) { + if ((vethDev = getFreeVethName(veth2, vethDev + 1)) < 0) { if (veth1_alloc) VIR_FREE(*veth1); - return vethDev; + goto cleanup; + } + + /* Just make sure they didn't accidentally get same name */ + if (STREQ(*veth1, *veth2)) { + vethDev++; + VIR_FREE(*veth2); + continue; } + VIR_DEBUG("Assigned veth2: %s", *veth2); + veth2_alloc = true; } argv[8] = *veth2; @@ -124,10 +131,14 @@ int vethCreate(char** veth1, char** veth2) if (virRun(argv, NULL) < 0) { if (veth1_alloc) VIR_FREE(*veth1); - VIR_FREE(*veth2); - rc = -1; + if (veth2_alloc) + VIR_FREE(*veth2); + goto cleanup; } + rc = 0; + +cleanup: return rc; } -- 1.7.1

2 1

[libvirt] [PATCH] udev: fix regression with qemu:///session
by Eric Blake 21 Mar '11

21 Mar '11

https://bugzilla.redhat.com/show_bug.cgi?id=684655 points out a regression introduced in commit 2215050edd - non-root users can't connect to qemu:///session because libvirtd dies when it can't use pciaccess initialization. * src/node_device/node_device_udev.c (udevDeviceMonitorStartup): Don't abort udev driver (and libvirtd overall) if non-root user can't use pciaccess. --- src/node_device/node_device_udev.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index be6a371..44df16e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1,7 +1,7 @@ /* * node_device_udev.c: node device enumeration - libudev implementation * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1589,7 +1589,7 @@ out: return ret; } -static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) +static int udevDeviceMonitorStartup(int privileged) { udevPrivate *priv = NULL; struct udev *udev = NULL; @@ -1597,11 +1597,16 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) int pciret; if ((pciret = pci_system_init()) != 0) { - char ebuf[256]; - VIR_ERROR(_("Failed to initialize libpciaccess: %s"), - virStrerror(pciret, ebuf, sizeof ebuf)); - ret = -1; - goto out; + /* Ignore failure as non-root; udev is not as helpful in that + * situation, but a non-privileged user won't benefit much + * from udev in the first place. */ + if (privileged || errno != EACCES) { + char ebuf[256]; + VIR_ERROR(_("Failed to initialize libpciaccess: %s"), + virStrerror(pciret, ebuf, sizeof ebuf)); + ret = -1; + goto out; + } } if (VIR_ALLOC(priv) < 0) { -- 1.7.4

2 2

[libvirt] [PATCHv2 0/3] simplify monitor fd handling
by Eric Blake 21 Mar '11

21 Mar '11

Suggested by Daniel P. Berrange: https://www.redhat.com/archives/libvir-list/2011-March/msg00476.html with an improvement by Chris Wright: https://www.redhat.com/archives/libvir-list/2011-March/msg00715.html Supercedes https://www.redhat.com/archives/libvir-list/2011-March/msg00714.html Eric Blake (3): qemu: simplify monitor fd error handling qemu: simplify PCI configfd handling in monitor qemu: simplify interface fd handling in monitor src/qemu/qemu_hotplug.c | 84 +++++------------------------------------ src/qemu/qemu_monitor.c | 96 +++++++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_monitor.h | 13 +++++- 3 files changed, 105 insertions(+), 88 deletions(-) -- 1.7.4

2 7

[libvirt] [PATCH] do not report OOM error when prepareCall() failed
by Wen Congyang 21 Mar '11

21 Mar '11

We have reported error in the function prepareCall(), and the error is not only OOM error. So we should not report OOM error in the function call() when prepareCall() failed. --- src/remote/remote_driver.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b844d9a..5f3e288 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -10832,7 +10832,6 @@ call (virConnectPtr conn, struct private_data *priv, ret_filter, ret); if (!thiscall) { - virReportOOMError(); return -1; } -- 1.7.1

2 1

[libvirt] [RFC PATCH 0/2] virObject for reference-counting
by Hu Tao 21 Mar '11

21 Mar '11

virObject is a base struct that manages reference-counting. structs that need the ability of reference-counting can inherit from virObject and implement ref/unref interface easily. The goal of this series is to make reference-counting easy to use, and improve the current libvir reference-counting mechanism. The plan is to update all existing structs that use reference-counting to use virObject if virObject is acceptable. Patch 1 implements virObject, patch 2 is an illstration of usage of virObject. This series is in draft stage, any comments are welcome. Hu Tao (2): Add virObject. qemu: use virObject to manages reference-counting for qemu monitor src/Makefile.am | 1 + src/libvirt_private.syms | 5 ++ src/qemu/qemu_domain.c | 26 +---------- src/qemu/qemu_monitor.c | 106 ++++++++++++++++++++++++++-------------------- src/qemu/qemu_monitor.h | 4 +- src/util/object.c | 55 ++++++++++++++++++++++++ src/util/object.h | 39 +++++++++++++++++ 7 files changed, 164 insertions(+), 72 deletions(-) create mode 100644 src/util/object.c create mode 100644 src/util/object.h -- 1.7.3.1 -- Thanks, Hu Tao

2 9

[libvirt] Question about virConnectDomainXMLToNative
by Michal Novotny 21 Mar '11

21 Mar '11

Hi, I've been investigating the virConnectDomainXMLToNative() format option and I found out the virConnectDomainXMLToNative() calls the conn->driver->domainXMLToNative() function and passes the format to the driver function where the check whether format is valid or not is being performed. Unfortunately I was unable to get the list of supported format strings (like "qemu-argv"/"xen-xm"/"xen-sexpr" etc.) so I'd like to ask whether there is some API to get all the formats supported by the driver or not. If not, wouldn't it be worth it to add some API like virConnectGetDomainNativeFormats() or something to return the format option for the connection? I guess many people would be having issues with that and although it's documented in the virsh man pages what if somebody will be using some other application than virsh or you add some formatting option however you forget to add it to the man page? I think it's worth it to consider adding conn->driver->domainNativeFormats() to the driver and placing it nearby the conn->driver->domainXMLToNative() function in the driver (like right above qemuDomainXMLToNative() etc.). Or is there some API way to get the domain format strings that I'm not aware of, i.e. that I didn't find by my investigation? Thanks, Michal -- Michal Novotny<minovotn(a)redhat.com>, RHCE Virtualization Team (xen userspace), Red Hat

3 3

[libvirt] [PATCH 0/2] qemu: fallback to HMP drive_add/drive_del
by Jiri Denemark 21 Mar '11

21 Mar '11

Hu Tao (1): qemu: fallback to HMP drive_add/drive_del Jiri Denemark (1): qemu: Detect support for HMP passthrough src/qemu/qemu_monitor.c | 14 ++++++- src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 80 ++++++++++++++++++++++++++++++++++------- src/qemu/qemu_monitor_json.h | 2 + 4 files changed, 82 insertions(+), 16 deletions(-) -- 1.7.4.1

2 5

[libvirt] One week left before entering the 0.9.0 freeze week
by Daniel Veillard 21 Mar '11

21 Mar '11

Gentle reminder that for feature to go into 0.9.0, your patches should get reviewed and commited in the next week. In case you're the owner of a "forgotten patch" needing review, please raise it again so it doesn't get lost :-) Jim, I assume that's enough to finish your libxenlight patch set, right ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH] doc: Add schema definition for imagelabel
by Osier Yang 21 Mar '11

21 Mar '11

--- docs/schemas/domain.rng | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 21c4380..30f673f 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -64,6 +64,9 @@ <element name="label"> <text/> </element> + <element name="imagelabel"> + <text/> + </element> </element> </define> <define name="hvs"> -- 1.7.4

2 2

[libvirt] [PATCH V6] Add libxenlight driver
by Jim Fehlig 21 Mar '11

21 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 and runs privileged only. Like the existing xen-unified driver, the libxenlight driver is accessed with xen:// URI. Driver selection is based on the status of xend. If xend is running, the libxenlight driver will not load and xen:// connections are handled by xen-unified. If xend is not running *and* the libxenlight driver is available, xen:// connections are deferred to the libxenlight driver. V6: - Address several code style issues noted by Daniel Veillard - Make drive work with xen:/// URI - Hold domain object reference while domain is injected in libvirt event loop. Race found and fixed by Markus Groß. V5: - Ensure events are unregistered when domain private data is destroyed. Discovered and fixed by Markus Groß. 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 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 15 +- po/POTFILES.in | 2 + src/Makefile.am | 32 + src/driver.h | 3 +- src/libvirt.c | 4 + src/libxl/libxl_conf.c | 898 ++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 91 +++ src/libxl/libxl_driver.c | 1457 +++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.h | 27 + src/util/virterror.c | 3 + src/xen/xen_driver.c | 28 + 16 files changed, 2618 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index c12f199..2076173 100644 --- a/cfg.mk +++ b/cfg.mk @@ -403,6 +403,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 e2b2b24..9d8862c 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([xenlight: $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 15e8129..9e3a557 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -106,6 +106,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 dc6fab4..7818316 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 @@ -943,6 +946,9 @@ static struct qemud_server *qemudInitialize(void) { # ifdef WITH_NWFILTER nwfilterRegister(); # endif +# ifdef WITH_LIBXL + libxlRegister(); +# endif # ifdef WITH_QEMU qemuRegister(); # endif 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/libvirt.spec.in b/libvirt.spec.in index 1946a15..988ea4e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -45,6 +45,7 @@ %define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_xenapi 0%{!?_without_xenapi:%{server_drivers}} +%define with_libxl 0%{!?_without_libxl:%{server_drivers}} # XXX this shouldn't be here, but it mistakenly links into libvirtd %define with_one 0%{!?_without_one:%{server_drivers}} @@ -96,7 +97,7 @@ %endif # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor, -# VMWare, or libxenserver (xenapi) +# VMWare, libxenserver (xenapi), or libxenlight (Xen 4.1 and newer) %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 @@ -105,6 +106,7 @@ %define with_phyp 0 %define with_vmware 0 %define with_xenapi 0 +%define with_libxl 0 %endif # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC @@ -493,6 +495,10 @@ of recent versions of Linux (and other OSes). %define _without_xenapi --without-xenapi %endif +%if ! %{with_libxl} +%define _without_libxl --without-libxl +%endif + %if ! %{with_sasl} %define _without_sasl --without-sasl %endif @@ -872,6 +878,9 @@ fi %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ +%if %{with_libxl} +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ +%endif %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %if %{with_qemu} @@ -912,6 +921,10 @@ fi %dir %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %endif +%if %{with_libxl} +%dir %{_localstatedir}/run/libvirt/libxl/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ +%endif %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ 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 645119e..c3729a6 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 @@ -1005,6 +1028,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) \ @@ -1259,6 +1283,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" @@ -1296,6 +1324,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 6a83325..f03d290 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 0ecff74..33bb17c 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, "xenlight")) + *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..9dc35fc --- /dev/null +++ b/src/libxl/libxl_conf.c @@ -0,0 +1,898 @@ +/*---------------------------------------------------------------------------*/ +/* 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 + +/* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */ +#define LIBXL_X86_FEATURE_PAE_MASK 0x40 + + +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)); + + /* hw_caps is an array of 32-bit words whose meaning is listed in + * xen-unstable.hg/xen/include/asm-x86/cpufeature.h. Each feature + * is defined in the form X*32+Y, corresponding to the Y'th bit in + * the X'th 32-bit word of hw_cap. + */ + host_pae = phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; + + /* 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; + } + } + } + + 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..38bfca8 --- /dev/null +++ b/src/libxl/libxl_driver.c @@ -0,0 +1,1457 @@ +/*---------------------------------------------------------------------------*/ +/* 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 "command.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->eventHdl >= 0) + virEventRemoveHandle(priv->eventHdl); + + if (priv->dWaiter) { + libxl_stop_waiting(&priv->ctx, priv->dWaiter); + libxl_free_waiter(priv->dWaiter); + VIR_FREE(priv->dWaiter); + } + + libxl_ctx_free(&priv->ctx); + VIR_FREE(priv); +} + +/* + * Remove reference to domain object. + */ +static void +libxlDomainObjUnref(void *data) +{ + virDomainObjPtr vm = data; + + virDomainObjUnref(vm); +} + +/* + * 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->eventHdl >= 0) { + virEventRemoveHandle(priv->eventHdl); + priv->eventHdl = -1; + } + + if (priv->dWaiter) { + libxl_stop_waiting(&priv->ctx, 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); + priv->eventHdl = -1; + 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); + priv->eventHdl = -1; + 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; + + 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; + /* Add a reference to the domain object while it is injected in + * the event loop. + */ + virDomainObjRef(vm); + if ((priv->eventHdl = virEventAddHandle( + fd, + VIR_EVENT_HANDLE_READABLE | VIR_EVENT_HANDLE_ERROR, + libxlEventHandler, + vm, libxlDomainObjUnref)) < 0) { + virDomainObjUnref(vm); + goto error; + } + + return 0; + +error: + libxl_free_waiter(priv->dWaiter); + VIR_FREE(priv->dWaiter); + priv->eventHdl = -1; + 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; + virCommandPtr cmd = NULL; + int status; + + /* Disable libxl driver if non-root */ + if (!privileged) { + VIR_INFO0("Not running privileged, disabling libxenlight driver"); + return 0; + } + + /* Disable driver if legacy xen toolstack (xend) is in use */ + if ((cmd = virCommandNew("/usr/sbin/xend")) != NULL) { + virCommandAddArg(cmd, "status"); + if (virCommandRun(cmd, &status) == 0) { + if (status == 0) { + VIR_INFO0("Legacy xen tool stack seems to be in use, disabling " + "libxenlight driver."); + virCommandFree(cmd); + return 0; + } + } + virCommandFree(cmd); + } + + 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 */ + + 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: autostart domains */ + + 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("xen:///"); + if (!conn->uri) { + virReportOOMError(); + return VIR_DRV_OPEN_ERROR; + } + } else { + /* Only xen scheme */ + if (conn->uri->scheme == NULL || STRNEQ(conn->uri->scheme, "xen")) + return VIR_DRV_OPEN_DECLINED; + + /* If server name is given, its for remote driver */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + /* Error if xen or libxl scheme specified but driver not started. */ + if (libxl_driver == NULL) { + 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 xen:///"), + 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 "xenlight"; +} + +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, + "xenlight", + 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 */ + NULL, /* domainSetMemoryFlags */ + NULL, /* domainSetMemoryParameters */ + NULL, /* domainGetMemoryParameters */ + NULL, /* domainSetBlkioParameters */ + NULL, /* domainGetBlkioParameters */ + 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, /* 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 8553913..160c953 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 = "xenlight "; + break; case VIR_FROM_XML: dom = "XML "; break; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 7d08df3..bec9577 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -50,6 +50,7 @@ #include "uuid.h" #include "fdstream.h" #include "files.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_XEN @@ -229,6 +230,26 @@ xenUnifiedProbe (void) return 0; } +#ifdef WITH_LIBXL +static int +xenUnifiedXendProbe (void) +{ + virCommandPtr cmd; + int status; + int ret = 0; + + if ((cmd = virCommandNew("/usr/sbin/xend")) != NULL) { + virCommandAddArg(cmd, "status"); + if (virCommandRun(cmd, &status) == 0) { + if (status == 0) + ret = 1; + } + virCommandFree(cmd); + } + return ret; +} +#endif + static virDrvOpenStatus xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) { @@ -292,6 +313,13 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) } } +#ifdef WITH_LIBXL + /* Decline xen:// URI if xend is not running and libxenlight + * driver is potentially available. */ + if (!xenUnifiedXendProbe()) + return VIR_DRV_OPEN_DECLINED; +#endif + /* We now know the URI is definitely for this driver, so beyond * here, don't return DECLINED, always use ERROR */ -- 1.7.3.1

3 3

[libvirt] [PATCH] update virGetVersion description
by Tiziano Mueller 19 Mar '11

19 Mar '11

The current description suggests that you always have to provide a valid typeVer pointer. But if you want only the libvirt version it's also possible to set type and typeVer to NULL to skip the hypervisor part. --- src/libvirt.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e4b451e..a8b48ea 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -863,11 +863,12 @@ int virStateActive(void) { * @type: the type of connection/driver looked at * @typeVer: return value for the version of the hypervisor (OUT) * - * Provides two information back, @libVer is the version of the library - * while @typeVer will be the version of the hypervisor type @type against - * which the library was compiled. If @type is NULL, "Xen" is assumed, if - * @type is unknown or not available, an error code will be returned and - * @typeVer will be 0. + * Provides two information back: @libVer is the version of the library + * and will always be set unless an error occurs, in which case an error + * code will be returned. If @typeVer is not NULL it will be set to the + * version of the hypervisor @type against which the library was compiled. + * If @type is NULL, "Xen" is assumed, if @type is unknown or not + * available, an error code will be returned and @typeVer will be 0. * * Returns -1 in case of failure, 0 otherwise, and values for @libVer and * @typeVer have the format major * 1,000,000 + minor * 1,000 + release. -- 1.7.4.1

2 1

[libvirt] [PATCH 1/2] Gives a warning when unable to create cgroup for qemu.
by Hu Tao 19 Mar '11

19 Mar '11

Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c9095bb..a54bfc5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -520,7 +520,7 @@ qemudStartup(int privileged) { rc = virCgroupForDriver("qemu", &qemu_driver->cgroup, privileged, 1); if (rc < 0) { char buf[1024]; - VIR_INFO("Unable to create cgroup for driver: %s", + VIR_WARN("Unable to create cgroup for driver: %s", virStrerror(-rc, buf, sizeof(buf))); } -- 1.7.3.1

3 5

[libvirt] [PATCH] Don't build libxenlight driver for Xen 4.0
by Jim Fehlig 18 Mar '11

18 Mar '11

The libxenlight driver does not build against the tech preview version of libxenlight in Xen 4.0. Only enable building the driver against more complete libxenlight found in Xen 4.1. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 9d8862c..12bf0f6 100644 --- a/configure.ac +++ b/configure.ac @@ -512,7 +512,7 @@ if test "$with_libxl" != "no" ; then fi CFLAGS="$CFLAGS $LIBXL_CFLAGS" LIBS="$LIBS $LIBXL_LIBS" - AC_CHECK_LIB([xenlight], [libxl_ctx_init], [ + AC_CHECK_LIB([xenlight], [libxl_domain_create_new], [ with_libxl=yes LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenstore -lxenctrl -lxenguest -luuid -lutil -lblktapctl" ],[ -- 1.7.3.1

2 2

[libvirt] [PATCH] qemu: respect locking rules
by Eric Blake 18 Mar '11

18 Mar '11

THREADS.txt states that the contents of vm should not be read or modified while the vm lock is not held, but that the lock must not be held while performing a monitor command. This fixes all the offenders that I could find. * src/qemu/qemu_process.c (qemuProcessStartCPUs) (qemuProcessInitPasswords, qemuProcessStart): Don't modify or refer to vm state outside lock. * src/qemu/qemu_driver.c (qemudDomainHotplugVcpus): Likewise. * src/qemu/qemu_hotplug.c (qemuDomainChangeGraphicsPasswords): Likewise. --- Most of these just move the vm manipulation outside the monitor lock. qemu_hotplug is a case of checking if the vm is active in between two monitor commands while the monitor lock was not dropped. Technically, this was wasted - the qemu process might have stopped (independently, such as from a guest shutdown), but as long as we hold the monitor lock, the monitor object will react correctly even if the underlying qemu process goes away in between the two monitor commands. The alternative would have been to drop monitor lock, regain vm lock, keep the check that vm is still active but now under the correct lock, then regain monitor lock and drop vm lock. My only question is whether qemuProcessStartCPUs needs to be careful to check if the VM is still active when it regains the vm lock, since it is possible that the guest shutdown in the window between the monitor command resuming the CPUs and when the vm lock is regained - that is, blindly setting vm->state to VIR_DOMAIN_RUNNING seems fishy if the vm went away during the window. However, when I tested this under gdb, by setting a breakpoint in that window and causing the guest to shutdown, it looked like everything recovered gracefully. And if we do start checking after a monitor exit that the vm is still active before changing state of the vm object, then we should probably adopt that convention everywhere. src/qemu/qemu_driver.c | 12 +++++++----- src/qemu/qemu_hotplug.c | 7 ------- src/qemu/qemu_process.c | 18 +++++++++++------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dac2bf2..c8870b1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2553,14 +2553,15 @@ static int qemudDomainHotplugVcpus(virDomainObjPtr vm, unsigned int nvcpus) int i, rc = 1; int ret = -1; int oldvcpus = vm->def->vcpus; + int vcpus = oldvcpus; qemuDomainObjEnterMonitor(vm); /* We need different branches here, because we want to offline * in reverse order to onlining, so any partial fail leaves us in a * reasonably sensible state */ - if (nvcpus > vm->def->vcpus) { - for (i = vm->def->vcpus ; i < nvcpus ; i++) { + if (nvcpus > vcpus) { + for (i = vcpus ; i < nvcpus ; i++) { /* Online new CPU */ rc = qemuMonitorSetCPU(priv->mon, i, 1); if (rc == 0) @@ -2568,10 +2569,10 @@ static int qemudDomainHotplugVcpus(virDomainObjPtr vm, unsigned int nvcpus) if (rc < 0) goto cleanup; - vm->def->vcpus++; + vcpus++; } } else { - for (i = vm->def->vcpus - 1 ; i >= nvcpus ; i--) { + for (i = vcpus - 1 ; i >= nvcpus ; i--) { /* Offline old CPU */ rc = qemuMonitorSetCPU(priv->mon, i, 0); if (rc == 0) @@ -2579,7 +2580,7 @@ static int qemudDomainHotplugVcpus(virDomainObjPtr vm, unsigned int nvcpus) if (rc < 0) goto cleanup; - vm->def->vcpus--; + vcpus--; } } @@ -2587,6 +2588,7 @@ static int qemudDomainHotplugVcpus(virDomainObjPtr vm, unsigned int nvcpus) cleanup: qemuDomainObjExitMonitor(vm); + vm->def->vcpus = vcpus; qemuAuditVcpu(vm, oldvcpus, nvcpus, "update", rc == 1); return ret; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e4ba526..e1d9d29 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1836,13 +1836,6 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, if (ret != 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - ret = -1; - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest unexpectedly quit")); - goto cleanup; - } - if (auth->expires) { time_t lifetime = auth->validTo - now; if (lifetime <= 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 740684a..793a43c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1008,8 +1008,8 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, if (paths == NULL) goto cleanup; - qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorGetPtyPaths(priv->mon, paths); qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -1175,6 +1175,7 @@ qemuProcessInitPasswords(virConnectPtr conn, for (i = 0 ; i < vm->def->ndisks ; i++) { char *secret; size_t secretLen; + const char *alias; if (!vm->def->disks[i]->encryption || !vm->def->disks[i]->src) @@ -1185,10 +1186,9 @@ qemuProcessInitPasswords(virConnectPtr conn, &secret, &secretLen) < 0) goto cleanup; + alias = vm->def->disks[i]->info.alias; qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorSetDrivePassphrase(priv->mon, - vm->def->disks[i]->info.alias, - secret); + ret = qemuMonitorSetDrivePassphrase(priv->mon, alias, secret); VIR_FREE(secret); qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0) @@ -1727,17 +1727,19 @@ qemuProcessPrepareMonitorChr(struct qemud_driver *driver, } -int qemuProcessStartCPUs(struct qemud_driver *driver, virDomainObjPtr vm, virConnectPtr conn) +int +qemuProcessStartCPUs(struct qemud_driver *driver, virDomainObjPtr vm, + virConnectPtr conn) { int ret; qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorStartCPUs(priv->mon, conn); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret == 0) { vm->state = VIR_DOMAIN_RUNNING; } - qemuDomainObjExitMonitorWithDriver(driver, vm); return ret; } @@ -1901,6 +1903,7 @@ int qemuProcessStart(virConnectPtr conn, qemuDomainObjPrivatePtr priv = vm->privateData; virCommandPtr cmd = NULL; struct qemuProcessHookData hookData; + unsigned long cur_balloon; hookData.conn = conn; hookData.vm = vm; @@ -2210,8 +2213,9 @@ int qemuProcessStart(virConnectPtr conn, } VIR_DEBUG0("Setting initial memory amount"); + cur_balloon = vm->def->mem.cur_balloon; qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorSetBalloon(priv->mon, vm->def->mem.cur_balloon) < 0) { + if (qemuMonitorSetBalloon(priv->mon, cur_balloon) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); goto cleanup; } -- 1.7.4

2 2

[libvirt] [PATCH 00/10] New internal infrastructure for RPC
by Daniel P. Berrange 18 Mar '11

18 Mar '11

This is an update of the series posted http://www.redhat.com/archives/libvir-list/2010-December/msg00616.html Since that time - Soooooooooo many bug fixes and much testing - Addition of mDNS APIs for the server - Integration of streams support in client The actual conversion of the remote driver + libvirtd has been removed from this series. I would like to get the infrastructure all reviewed & merged, then will repost the actual conversions.

2 16

[libvirt] [PATCH] Disable libxl build in RPM on Fedora < 16
by Daniel P. Berrange 18 Mar '11

18 Mar '11

The xen RPM in Fedora isn't new enough to support libxl builds yet. Disable it until Fedora 16 Q: What actually is the min required Xen ? Is xen 4.0.1 in fact sufficient ? If so I'll change this to s/16/15/ * libvirt.spec.in: Disable libxl on Fedora < 16 --- libvirt.spec.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 988ea4e..4a62c80 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -133,6 +133,11 @@ %endif %endif +# Fedora doesn't have new enough Xen for libxl until F16 +%if 0%{?fedora} < 16 +%define with_libxl 0 +%endif + # PolicyKit was introduced in Fedora 8 / RHEL-6 or newer %if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 %define with_polkit 0%{!?_without_polkit:1} -- 1.7.4

3 4

[libvirt] [PATCH 0/5] Improve detach-device intelligence for net interfaces
by Michal Privoznik 18 Mar '11

18 Mar '11

Until now it was possible to device-detach network device by mac address only. This patch improves libvirt user-friendliness so it is possible to detach also via PCI address, and in case when there is exactly one network interface even without specifying redundant addresses (MAC/PCI). Michal Privoznik (5): conf: Change statically allocated MAC to dynamic DomainXMLFlags: Introduce flag allowing suppress of generation of additional items virDomainNetDefParseXML: suppress generation of MAC when VIR_DOMAIN_PARSE_NO_GENERATE is set qemu: Allow network device-detach by PCI address and/or MAC xen: Allow network device-detach by PCI address and/or MAC include/libvirt/libvirt.h.in | 7 ++-- src/conf/domain_conf.c | 9 +++++- src/conf/domain_conf.h | 2 +- src/openvz/openvz_conf.c | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_hotplug.c | 46 +++++++++++++++++++++------- src/vbox/vbox_tmpl.c | 4 ++- src/vmx/vmx.c | 3 +- src/xen/xm_internal.c | 66 +++++++++++++++++++++++++++++++++-------- src/xenxs/xen_sxpr.c | 3 +- src/xenxs/xen_xm.c | 3 +- 12 files changed, 115 insertions(+), 37 deletions(-) -- 1.7.4

5 12

[libvirt] [PATCH 0/5] REPOST: Allow data upload/download to/from storage volumes
by Daniel P. Berrange 18 Mar '11

18 Mar '11

This is a repost of http://www.redhat.com/archives/libvir-list/2011-February/msg00967.html No changes since the last posting, except for re-basing to latest GIT

2 15

[libvirt] [PATCH] Fix make syntax-check from commit fba550f6
by Jim Fehlig 18 Mar '11

18 Mar '11

Add src/util/hash.c to po/POTFILES.in since it now has translatable strings. --- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4bd2b13..805e5ca 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -91,6 +91,7 @@ src/util/command.c src/util/conf.c src/util/dnsmasq.c src/util/event_poll.c +src/util/hash.c src/util/hooks.c src/util/hostusb.c src/util/interface.c -- 1.7.3.1

2 1

[libvirt] [PATCH] openvz: fix a simple bug in openvzListDefinedDomains()
by Jean-Baptiste Rouault 18 Mar '11

18 Mar '11

This patch adds missing curly brackets to an if statement in openvzListDefinedDomains() --- src/openvz/openvz_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 0d64e19..7792136 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1444,9 +1444,10 @@ static int openvzListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, continue; } snprintf(vpsname, sizeof(vpsname), "%d", veid); - if (!(names[got] = strdup(vpsname))) + if (!(names[got] = strdup(vpsname))) { virReportOOMError(); goto out; + } got ++; } waitpid(pid, NULL, 0); -- 1.7.0.4

2 1

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

18 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 | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/util/hash.c b/src/util/hash.c index 2a9a9cf..48a94ad 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -35,6 +35,12 @@ /* #define DEBUG_GROW */ +#define virHashIterationError(ret) \ + do { \ + VIR_ERROR0(_("Hash operation not allowed during iteration")); \ + return ret; \ + } while (0) + /* * A single entry in the hash table */ @@ -54,6 +60,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; @@ -316,6 +326,9 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, if ((table == NULL) || (name == NULL)) return (-1); + if (table->iterating) + virHashIterationError(-1); + /* * Check for duplicate and insertion location. */ @@ -513,6 +526,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) + virHashIterationError(-1); if (table->dataFree && (entry->payload != NULL)) table->dataFree(entry->payload, entry->name); entry->payload = NULL; @@ -548,28 +563,38 @@ 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) return (-1); + if (table->iterating) + virHashIterationError(-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); } @@ -593,6 +618,11 @@ int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, const void *da if (table == NULL || iter == NULL) return (-1); + if (table->iterating) + virHashIterationError(-1); + + table->iterating = true; + table->current = NULL; for (i = 0 ; i < table->size ; i++) { virHashEntryPtr prev = NULL; virHashEntryPtr entry = &(table->table[i]); @@ -629,6 +659,8 @@ int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, const void *da } } } + table->iterating = false; + return (count); } @@ -649,15 +681,24 @@ void *virHashSearch(virHashTablePtr table, virHashSearcher iter, const void *dat if (table == NULL || iter == NULL) return (NULL); + if (table->iterating) + virHashIterationError(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

2 3

[libvirt] [PATCH] Add PCI sysfs reset access
by Alex Williamson 18 Mar '11

18 Mar '11

I'm proposing we make use of $PCIDIR/reset in qemu-kvm to reset devices on VM reset. We need to add it to libvirt's list of files that get ownership for device assignment. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- src/util/pci.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 095ad3f..8d2dbb0 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1349,11 +1349,13 @@ int pciDeviceFileIterate(pciDevice *dev, while ((ent = readdir(dir)) != NULL) { /* Device assignment requires: - * $PCIDIR/config, $PCIDIR/resource, $PCIDIR/resourceNNN, $PCIDIR/rom + * $PCIDIR/config, $PCIDIR/resource, $PCIDIR/resourceNNN, + * $PCIDIR/rom, $PCIDIR/reset */ if (STREQ(ent->d_name, "config") || STRPREFIX(ent->d_name, "resource") || - STREQ(ent->d_name, "rom")) { + STREQ(ent->d_name, "rom") || + STREQ(ent->d_name, "reset")) { if (virAsprintf(&file, "%s/%s", pcidir, ent->d_name) < 0) { virReportOOMError(); goto cleanup;

3 4

[libvirt] [PATCH 0/2] Last debug buffer patches: locking and docs
by Daniel Veillard 18 Mar '11

18 Mar '11

That's the remaining changes left for the debug buffer. The first patch is the one removing locking in the signal error handler. As discussed it's better to have a risk of slightly corrupted output in the log dump than have a risk crashing due to the unsafe locking operations in the signal handler. The second patch documents the debug buffer changes and improve the logging page to add more structure, and more examples. Daniel

2 6

[libvirt] [PATCH] do not unref obj in qemuDomainObjExitMonitorWithDriver
by Wen Congyang 18 Mar '11

18 Mar '11

Steps to reproduce this bug: # cat test.sh #! /bin/bash -x virsh start domain sleep 5 virsh qemu-monitor-command domain 'cpu_set 2 online' --hmp # while true; do ./test.sh ; done Then libvirtd will crash. The reason is that: we add a reference of obj when we open the monitor. We will reduce this reference when we free the monitor. If the reference of monitor is 0, we will free monitor automatically and the reference of obj is reduced. But in the function qemuDomainObjExitMonitorWithDriver(), we reduce this reference again when the reference of monitor is 0. It will cause the obj be freed in the function qemuDomainObjEndJob(). Then we start the domain again, and libvirtd will crash in the function virDomainObjListSearchName(), because we pass a null pointer(obj->def->name) to strcmp(). Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_domain.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8a2b9cc..ae28b1c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -634,7 +634,6 @@ void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virDomainObjLock(obj); if (refs == 0) { - virDomainObjUnref(obj); priv->mon = NULL; } } -- 1.7.1

3 3

[libvirt] [PATCH] check driver name while attaching disk
by Wen Congyang 18 Mar '11

18 Mar '11

This bug was reported by Shi Jin(jinzishuai(a)gmail.com): ============= # virsh attach-disk RHEL6RC /var/lib/libvirt/images/test3.img vdb --driver file --subdriver qcow2 Disk attached successfully # virsh save RHEL6RC /var/lib/libvirt/images/memory.save Domain RHEL6RC saved to /var/lib/libvirt/images/memory.save # virsh restore /var/lib/libvirt/images/memory.save error: Failed to restore domain from /var/lib/libvirt/images/memory.save error: internal error unsupported driver name 'file' for disk '/var/lib/libvirt/images/test3.img' ============= We have checked the driver name when we start or restore VM, but we do not check it while attaching a disk. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2892dfe..e94080d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3994,6 +3994,14 @@ static int qemudDomainAttachDevice(virDomainPtr dom, goto endjob; if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (dev->data.disk->driverName != NULL && + !STREQ(dev->data.disk->driverName, "qemu")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported driver name '%s' for disk '%s'"), + dev->data.disk->driverName, dev->data.disk->src); + goto endjob; + } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_DEVICES)) { if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) !=0 ) { qemuReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.1

4 6

[libvirt] xen:/// vs. xen://FQDN/ vs xen+unix:/// discrepancy
by Philipp Hahn 18 Mar '11

18 Mar '11

Hello, I regularly observe the problem, that depending on the libvirt-URL I get different information: root@xen4# virsh -c xen://xen4.domain.name/ list Id Name State ---------------------------------- root@xen4# virsh -c xen:/// list Id Name State ---------------------------------- 0 Domain-0 running 1 dos4 idle root@xen4# virsh -c xen+unix:/// list Id Name State ---------------------------------- root@xen4# xm li Name ID Mem VCPUs State Time(s) Domain-0 0 2044 2 r----- 419.7 dos4 1 4 1 -b---- 33.4 Has somebody observed the same problem and/or can give me any advise on where to look for the problem? I'm running a Debian-Lenny based OS with libvirt-0.8.2 on Xen-3.4.3 with a 2.6.32 kernel. Sincerely Philipp Hahn -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 28359 Bremen fax: +49 421 22 232-99 http://www.univention.de

3 5

[libvirt] [PATCH] Add vim configuration that makes vim auto-indent code
by Hu Tao 18 Mar '11

18 Mar '11

--- .lvimrc | 10 ++++++++++ HACKING | 5 +++++ 2 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 .lvimrc diff --git a/.lvimrc b/.lvimrc new file mode 100644 index 0000000..3a732ce --- /dev/null +++ b/.lvimrc @@ -0,0 +1,10 @@ +set nocompatible +filetype on +set autoindent +set smartindent +set cindent +set tabstop=4 +set shiftwidth=4 +set expandtab +set cinoptions=(0,:0,l1,t0 +filetype plugin indent on diff --git a/HACKING b/HACKING index 4a71b37..adfb7ae 100644 --- a/HACKING +++ b/HACKING @@ -87,6 +87,11 @@ If you use Emacs, add the following to one of one of your start-up files '(lambda () (if (string-match "/libvirt" (buffer-file-name)) (libvirt-c-mode)))) +If you use vim, install vim script at this page: +http://www.vim.org/scripts/script.php?script_id=1408 +it will auto load .lvimrc at the root of libvirt source only when you're +editing libvirt's code. Or you can append the contents of .lvimrc to you +.vimrc file. Code formatting (especially for new code) ========================================= -- 1.7.3.1

4 9

[libvirt] [PATCH] virsh: fix memtune's help message for swap_hard_limit
by KAMEZAWA Hiroyuki 18 Mar '11

18 Mar '11

I found this when I used virsh memtune... BTW, how to fix http://libvirt.org/formatdomain.html 's memtune description ? == >From 541ae04430f376e8168b413a20b35dce49779816 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Thu, 3 Mar 2011 14:24:45 +0900 Subject: [PATCH 6/6] fix virsh commands' message for memtune'swap_hard_limit. cgroup's /cgroup/memory/memory.memsw.limit_in_bytes is not for limitinit 'swap' but for 'memory+swap' (then, it's memsw) (So, this number cannot be smaller than memory.limit_in_bytes) Note: If other hypervisors than Linux support this and meaning is not same as memory+swap, the name swap_hard_limit will have confusion. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 62fca17..3a8fdaa 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3033,7 +3033,7 @@ static const vshCmdOptDef opts_memtune[] = { {"soft-limit", VSH_OT_INT, VSH_OFLAG_NONE, N_("Memory during contention in kilobytes")}, {"swap-hard-limit", VSH_OT_INT, VSH_OFLAG_NONE, - N_("Max swap in kilobytes")}, + N_("Max memory+swap in kilobytes")}, {"min-guarantee", VSH_OT_INT, VSH_OFLAG_NONE, N_("Min guaranteed memory in kilobytes")}, {NULL, 0, 0, NULL} -- 1.7.4.1

5 14

[libvirt] [PATCH] Make virDomainObjParseNode() static
by Hu Tao 18 Mar '11

18 Mar '11

Make virDomainObjParseNode() static since it is called only in one file. --- src/conf/domain_conf.c | 38 ++++++++++++++++++++------------------ src/conf/domain_conf.h | 3 --- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 16e1291..c637300 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6081,24 +6081,10 @@ cleanup: } -virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, - const char *filename) -{ - xmlDocPtr xml; - virDomainObjPtr obj = NULL; - - if ((xml = virXMLParseFile(filename))) { - obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml)); - xmlFreeDoc(xml); - } - - return obj; -} - - -virDomainObjPtr virDomainObjParseNode(virCapsPtr caps, - xmlDocPtr xml, - xmlNodePtr root) +static virDomainObjPtr +virDomainObjParseNode(virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root) { xmlXPathContextPtr ctxt = NULL; virDomainObjPtr obj = NULL; @@ -6123,6 +6109,22 @@ cleanup: return obj; } + +virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, + const char *filename) +{ + xmlDocPtr xml; + virDomainObjPtr obj = NULL; + + if ((xml = virXMLParseFile(filename))) { + obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml)); + xmlFreeDoc(xml); + } + + return obj; +} + + static int virDomainDefMaybeAddController(virDomainDefPtr def, int type, int idx) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 30aeccc..cbd0f98 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1246,9 +1246,6 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps, virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, const char *filename); -virDomainObjPtr virDomainObjParseNode(virCapsPtr caps, - xmlDocPtr xml, - xmlNodePtr root); int virDomainDefAddImplicitControllers(virDomainDefPtr def); -- 1.7.3.1

2 1

Re: [libvirt] [PATCH] device-assignment: Reset device on system reset
by Chris Wright 17 Mar '11

17 Mar '11

* Alex Williamson (alex.williamson(a)redhat.com) wrote: > static void reset_assigned_device(DeviceState *dev) > { > - PCIDevice *d = DO_UPCAST(PCIDevice, qdev, dev); > + PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, dev); > + AssignedDevice *adev = DO_UPCAST(AssignedDevice, dev, pci_dev); > + char reset_file[64]; > + const char reset[] = "1"; > + int fd, ret; > + > + snprintf(reset_file, sizeof(reset_file), > + "/sys/bus/pci/devices/0000:%02x:%02x.%01x/reset", > + adev->host.bus, adev->host.dev, adev->host.func); need to consider segment: %04x:..., adev->host.seg, ... > + /* > + * Issue a device reset via pci-sysfs. Note that we use write(2) here > + * and ignore the return value because some kernels have a bug that > + * returns 0 rather than bytes written on success, sending us into an > + * infinite retry loop using other write mechanisms. > + */ > + fd = open(reset_file, O_WRONLY); > + if (fd != -1) { > + ret = write(fd, reset, strlen(reset)); > + close(fd); > + } This will probably fail when it's managed by libvirt. I expect it will need some file ownership and security label mgmt added to device assignement path I expect.

2 2

[libvirt] [PATCH] Support Xen sysctl v8, domctl v7
by Jim Fehlig 17 Mar '11

17 Mar '11

xen-unstable c/s 21118:28e5409e3fb3 bumped sysctl version to 8. xen-unstable c/s 21212:de94884a669c introduced CPU pools feature, adding another member to xen_domctl_getdomaininfo struct. Add a corresponding domctl v7 struct in xen hypervisor sub-driver and detect sysctl v8 during initialization. --- src/xen/xen_hypervisor.c | 125 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 93 insertions(+), 32 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 9cb8e8c..47355ce 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -223,11 +223,28 @@ struct xen_v2d6_getdomaininfo { }; typedef struct xen_v2d6_getdomaininfo xen_v2d6_getdomaininfo; +struct xen_v2d7_getdomaininfo { + domid_t domain; /* the domain number */ + uint32_t flags; /* flags, see before */ + uint64_t tot_pages ALIGN_64; /* total number of pages used */ + uint64_t max_pages ALIGN_64; /* maximum number of pages allowed */ + uint64_t shr_pages ALIGN_64; /* number of shared pages */ + uint64_t shared_info_frame ALIGN_64; /* MFN of shared_info struct */ + uint64_t cpu_time ALIGN_64; /* CPU time used */ + uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ + uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ + uint32_t ssidref; + xen_domain_handle_t handle; + uint32_t cpupool; +}; +typedef struct xen_v2d7_getdomaininfo xen_v2d7_getdomaininfo; + union xen_getdomaininfo { struct xen_v0_getdomaininfo v0; struct xen_v2_getdomaininfo v2; struct xen_v2d5_getdomaininfo v2d5; struct xen_v2d6_getdomaininfo v2d6; + struct xen_v2d7_getdomaininfo v2d7; }; typedef union xen_getdomaininfo xen_getdomaininfo; @@ -236,6 +253,7 @@ union xen_getdomaininfolist { struct xen_v2_getdomaininfo *v2; struct xen_v2d5_getdomaininfo *v2d5; struct xen_v2d6_getdomaininfo *v2d6; + struct xen_v2d7_getdomaininfo *v2d7; }; typedef union xen_getdomaininfolist xen_getdomaininfolist; @@ -273,147 +291,179 @@ typedef struct xen_v2s5_availheap xen_v2s5_availheap; #define XEN_GETDOMAININFOLIST_ALLOC(domlist, size) \ (hypervisor_version < 2 ? \ (VIR_ALLOC_N(domlist.v0, (size)) == 0) : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + (VIR_ALLOC_N(domlist.v2d7, (size)) == 0) : \ + (dom_interface_version == 6 ? \ (VIR_ALLOC_N(domlist.v2d6, (size)) == 0) : \ (dom_interface_version == 5 ? \ (VIR_ALLOC_N(domlist.v2d5, (size)) == 0) : \ - (VIR_ALLOC_N(domlist.v2, (size)) == 0)))) + (VIR_ALLOC_N(domlist.v2, (size)) == 0))))) #define XEN_GETDOMAININFOLIST_FREE(domlist) \ (hypervisor_version < 2 ? \ VIR_FREE(domlist.v0) : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + VIR_FREE(domlist.v2d7) : \ + (dom_interface_version == 6 ? \ VIR_FREE(domlist.v2d6) : \ (dom_interface_version == 5 ? \ VIR_FREE(domlist.v2d5) : \ - VIR_FREE(domlist.v2)))) + VIR_FREE(domlist.v2))))) #define XEN_GETDOMAININFOLIST_CLEAR(domlist, size) \ (hypervisor_version < 2 ? \ memset(domlist.v0, 0, sizeof(*domlist.v0) * size) : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + memset(domlist.v2d7, 0, sizeof(*domlist.v2d7) * size) : \ + (dom_interface_version == 6 ? \ memset(domlist.v2d6, 0, sizeof(*domlist.v2d6) * size) : \ (dom_interface_version == 5 ? \ memset(domlist.v2d5, 0, sizeof(*domlist.v2d5) * size) : \ - memset(domlist.v2, 0, sizeof(*domlist.v2) * size)))) + memset(domlist.v2, 0, sizeof(*domlist.v2) * size))))) #define XEN_GETDOMAININFOLIST_DOMAIN(domlist, n) \ (hypervisor_version < 2 ? \ domlist.v0[n].domain : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + domlist.v2d7[n].domain : \ + (dom_interface_version == 6 ? \ domlist.v2d6[n].domain : \ (dom_interface_version == 5 ? \ domlist.v2d5[n].domain : \ - domlist.v2[n].domain))) + domlist.v2[n].domain)))) #define XEN_GETDOMAININFOLIST_UUID(domlist, n) \ (hypervisor_version < 2 ? \ domlist.v0[n].handle : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + domlist.v2d7[n].handle : \ + (dom_interface_version == 6 ? \ domlist.v2d6[n].handle : \ (dom_interface_version == 5 ? \ domlist.v2d5[n].handle : \ - domlist.v2[n].handle))) + domlist.v2[n].handle)))) #define XEN_GETDOMAININFOLIST_DATA(domlist) \ (hypervisor_version < 2 ? \ (void*)(domlist->v0) : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + (void*)(domlist->v2d7) : \ + (dom_interface_version == 6 ? \ (void*)(domlist->v2d6) : \ (dom_interface_version == 5 ? \ (void*)(domlist->v2d5) : \ - (void*)(domlist->v2)))) + (void*)(domlist->v2))))) #define XEN_GETDOMAININFO_SIZE \ (hypervisor_version < 2 ? \ sizeof(xen_v0_getdomaininfo) : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + sizeof(xen_v2d7_getdomaininfo) : \ + (dom_interface_version == 6 ? \ sizeof(xen_v2d6_getdomaininfo) : \ (dom_interface_version == 5 ? \ sizeof(xen_v2d5_getdomaininfo) : \ - sizeof(xen_v2_getdomaininfo)))) + sizeof(xen_v2_getdomaininfo))))) #define XEN_GETDOMAININFO_CLEAR(dominfo) \ (hypervisor_version < 2 ? \ memset(&(dominfo.v0), 0, sizeof(xen_v0_getdomaininfo)) : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + memset(&(dominfo.v2d7), 0, sizeof(xen_v2d7_getdomaininfo)) : \ + (dom_interface_version == 6 ? \ memset(&(dominfo.v2d6), 0, sizeof(xen_v2d6_getdomaininfo)) : \ (dom_interface_version == 5 ? \ memset(&(dominfo.v2d5), 0, sizeof(xen_v2d5_getdomaininfo)) : \ - memset(&(dominfo.v2), 0, sizeof(xen_v2_getdomaininfo))))) + memset(&(dominfo.v2), 0, sizeof(xen_v2_getdomaininfo)))))) #define XEN_GETDOMAININFO_DOMAIN(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.domain : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.domain : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.domain : \ (dom_interface_version == 5 ? \ dominfo.v2d5.domain : \ - dominfo.v2.domain))) + dominfo.v2.domain)))) #define XEN_GETDOMAININFO_CPUTIME(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.cpu_time : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.cpu_time : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.cpu_time : \ (dom_interface_version == 5 ? \ dominfo.v2d5.cpu_time : \ - dominfo.v2.cpu_time))) + dominfo.v2.cpu_time)))) #define XEN_GETDOMAININFO_CPUCOUNT(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.nr_online_vcpus : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.nr_online_vcpus : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.nr_online_vcpus : \ (dom_interface_version == 5 ? \ dominfo.v2d5.nr_online_vcpus : \ - dominfo.v2.nr_online_vcpus))) + dominfo.v2.nr_online_vcpus)))) #define XEN_GETDOMAININFO_MAXCPUID(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.max_vcpu_id : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.max_vcpu_id : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.max_vcpu_id : \ (dom_interface_version == 5 ? \ dominfo.v2d5.max_vcpu_id : \ - dominfo.v2.max_vcpu_id))) + dominfo.v2.max_vcpu_id)))) #define XEN_GETDOMAININFO_FLAGS(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.flags : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.flags : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.flags : \ (dom_interface_version == 5 ? \ dominfo.v2d5.flags : \ - dominfo.v2.flags))) + dominfo.v2.flags)))) #define XEN_GETDOMAININFO_TOT_PAGES(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.tot_pages : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.tot_pages : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.tot_pages : \ (dom_interface_version == 5 ? \ dominfo.v2d5.tot_pages : \ - dominfo.v2.tot_pages))) + dominfo.v2.tot_pages)))) #define XEN_GETDOMAININFO_MAX_PAGES(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.max_pages : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.max_pages : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.max_pages : \ (dom_interface_version == 5 ? \ dominfo.v2d5.max_pages : \ - dominfo.v2.max_pages))) + dominfo.v2.max_pages)))) #define XEN_GETDOMAININFO_UUID(dominfo) \ (hypervisor_version < 2 ? \ dominfo.v0.handle : \ - (dom_interface_version >= 6 ? \ + (dom_interface_version >= 7 ? \ + dominfo.v2d7.handle : \ + (dom_interface_version == 6 ? \ dominfo.v2d6.handle : \ (dom_interface_version == 5 ? \ dominfo.v2d5.handle : \ - dominfo.v2.handle))) + dominfo.v2.handle)))) static int @@ -2091,6 +2141,17 @@ xenHypervisorInit(void) goto done; } + /* Xen 4.1 + * sysctl version 8 -> xen-unstable c/s 21118:28e5409e3fb3 + * domctl version 7 -> xen-unstable c/s 21212:de94884a669c + */ + sys_interface_version = 8; /* XEN_SYSCTL_INTERFACE_VERSION */ + if (virXen_getdomaininfo(fd, 0, &info) == 1) { + dom_interface_version = 7; /* XEN_DOMCTL_INTERFACE_VERSION */ + VIR_DEBUG0("Using hypervisor call v2, sys ver8 dom ver7\n"); + goto done; + } + hypervisor_version = 1; sys_interface_version = -1; if (virXen_getdomaininfo(fd, 0, &info) == 1) { -- 1.7.3.1

2 2

[libvirt] [PATCH] Fix delayed event delivery when SASL is active
by Daniel P. Berrange 17 Mar '11

17 Mar '11

When SASL is active, it was possible that we read and decoded more data off the wire than we initially wanted. The loop processing this data terminated after only one message to avoid delaying the calling thread, but this could delay event delivery. As long as there is decoded SASL data in memory, we must process it, before returning to the poll() event loop. This is a counterpart to the same kind of issue solved in commit 68d2c3482fa16801f8e6ca5c42698319bb87f385 in a different area of the code * src/remote/remote_driver.c: Process all pending SASL data --- src/remote/remote_driver.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 064fc8b..4245fee 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -10426,12 +10426,27 @@ remoteIOHandleInput(virConnectPtr conn, struct private_data *priv, ret = processCallDispatch(conn, priv, flags); priv->bufferOffset = priv->bufferLength = 0; /* - * We've completed one call, so return even - * though there might still be more data on - * the wire. We need to actually let the caller - * deal with this arrived message to keep good - * response, and also to correctly handle EOF. + * We've completed one call, but we don't want to + * spin around the loop forever if there are many + * incoming async events, or replies for other + * thread's RPC calls. We want to get out & let + * any other thread take over as soon as we've + * got our reply. When SASL is active though, we + * may have read more data off the wire than we + * initially wanted & cached it in memory. In this + * case, poll() would not detect that there is more + * ready todo. + * + * So if SASL is active *and* some SASL data is + * already cached, then we'll process that now, + * before returning. */ +#if HAVE_SASL + if (ret == 0 && + priv->saslconn && + priv->saslDecoded) + continue; +#endif return ret; } } -- 1.7.4

2 1

[libvirt] [PATCH] remote: Add missing virCondDestroy calls
by Matthias Bolte 17 Mar '11

17 Mar '11

The virCond of the remote_thread_call struct was leaked in some places. This results in leaking the underlying mutex. Which in turn leaks a handle on Windows. Reported by Aliaksandr Chabatar and Ihar Smertsin. --- See https://www.redhat.com/archives/libvir-list/2011-March/msg00789.html for the report. src/remote/remote_driver.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 82e094b..8aa8801 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8609,6 +8609,7 @@ remoteStreamPacket(virStreamPtr st, xdr_destroy (&xdr); ret = remoteIO(st->conn, priv, 0, thiscall); + ignore_value(virCondDestroy(&thiscall->cond)); VIR_FREE(thiscall); if (ret < 0) return -1; @@ -8617,6 +8618,7 @@ remoteStreamPacket(virStreamPtr st, error: xdr_destroy (&xdr); + ignore_value(virCondDestroy(&thiscall->cond)); VIR_FREE(thiscall); return -1; } @@ -8746,6 +8748,7 @@ remoteStreamRecv(virStreamPtr st, } ret = remoteIO(st->conn, priv, 0, thiscall); + ignore_value(virCondDestroy(&thiscall->cond)); VIR_FREE(thiscall); if (ret < 0) goto cleanup; @@ -9719,6 +9722,7 @@ prepareCall(struct private_data *priv, error: xdr_destroy (&xdr); + ignore_value(virCondDestroy(&rv->cond)); VIR_FREE(rv); return NULL; } @@ -10818,6 +10822,7 @@ call (virConnectPtr conn, struct private_data *priv, } rv = remoteIO(conn, priv, flags, thiscall); + ignore_value(virCondDestroy(&thiscall->cond)); VIR_FREE(thiscall); return rv; } -- 1.7.0.4

3 3

[libvirt] FW: Using dlls for Windows provided in http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe
by Aliaksandr Chabatar 17 Mar '11

17 Mar '11

Hello libvirt-list, We have a problem. It concerns CPU usage of libvirt library in Windows. It's not a problem in Linux. See attach. At the moment we have a workaround for item 1 - we just calculate the number of handles which are leaked and restart our service if the number exceeds 10.000 As for item 2 - we have no real workaround. In 99.99% it should not happen, but there is still 0.01% In libvirt.log you can find more info as suggested by Daniel. ================================================================ In the attached file, you will find detailed information regarding the case 100 percent CPU usage. Our test was performed on the following system: Windows XP SP3; Libvirt-0.8.8; Run the following command: virsh -c qemu+tcp: / /172.17.46.88:135/system Port 135 was one of the ports on which our service is trying to connect. ================================================================ Could you help us here? Thanks Alexander -----Original Message----- From: Aliaksandr Chabatar Sent: Tuesday, March 15, 2011 3:52 PM To: Ihar Smertsin Subject: FW: [libvirt] Using dlls for Windows provided in http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe Hi Ihar, Could you provide more information (log files, see below) so we could address this issue to libvir-list(a)redhat.com ? Mfg Alexander -----Original Message----- From: Daniel P. Berrange [mailto:berrange@redhat.com] Sent: Tuesday, March 15, 2011 3:08 PM To: Aliaksandr Chabatar Cc: Hempfer, Siegfried; Boehme, Alfred; Schnizer, Monika Subject: Re: [libvirt] Using dlls for Windows provided in http://libvirt.org/sources/win32_experimental/Libvirt-0.8.7-2.exe On Tue, Mar 15, 2011 at 04:01:31PM +0200, Aliaksandr Chabatar wrote: > Dear Daniel, > > I have another question. It concerns CPU usage of libvirt library > in Windows. It's not a problem in Linux. See attach. > > At the moment we have a workaround for item 1 - we just calculate > the number of handles which are leaked and restart our service if > the number exceeds 10.000 It sounds like we have some crazy resource leak in a piece of code. I'm not too familiar with Windows, but if you re-send this mail of yours to libvir-list(a)redhat.com, I expect one of the community members who knows Windows will be able to advise. > As for item 2 - we have no real workaround. In 99.99% it should > not happen, but there is still 0.01% Yeah, that sounds like some piece of code is missing correct error checking. It would be useful to try and obtain a couple of stack traces when it is showing 100% cpu usage. Or capture a libvirt debug log, eg by setting an environment variable in your client application LIBVIRT_LOG_FILTERS="1:libvirt 1:util 1:remote" LIBVIRT_LOG_OUTPUTS="1:file:libvirt.log" Again, sending this log + the info from your mail to the libvir-list would be best. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH] docs: Document first release with spice and qxl
by Cole Robinson 17 Mar '11

17 Mar '11

--- docs/formatdomain.html.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0c7c965..0835472 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1566,6 +1566,7 @@ qemu-kvm -net nic,model=? /dev/null to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. NB, this may not be supported by all hypervisors. + <span class="since">"spice" since 0.8.6</span>. </p> <p> When SPICE has both a normal and TLS secured TCP port configured, it @@ -1632,8 +1633,9 @@ qemu-kvm -net nic,model=? /dev/null <dt><code>model</code></dt> <dd> The <code>model</code> element has a mandatory <code>type</code> - attribute which takes the value "vga", "cirrus", "vmvga", "qxl", - "xen" or "vbox", depending on the hypervisor features available. + attribute which takes the value "vga", "cirrus", "vmvga", "xen", + "vbox", or "qxl" (<span class="since">since 0.8.6</span>) + depending on the hypervisor features available. You can also provide the amount of video memory in kilobytes using <code>vram</code> and the number of screen with <code>heads</code>. </dd> -- 1.7.4

2 1

[libvirt] [PATCH] qemu: Fix copy&paste error messages in text monitor
by Jiri Denemark 17 Mar '11

17 Mar '11

--- src/qemu/qemu_monitor_text.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 5df7933..91ecc8b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2055,7 +2055,7 @@ try_command: if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + _("failed to attach drive '%s'"), drivestr); goto cleanup; } @@ -2324,7 +2324,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + _("failed to add drive '%s'"), drivestr); goto cleanup; } @@ -2425,8 +2425,8 @@ int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - qemuReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("failed to set disk password")); goto cleanup; } -- 1.7.4.1

2 1

[libvirt] [PATCH] do not return -1 when human-monitor-command is not supported
by Wen Congyang 17 Mar '11

17 Mar '11

It is not a fatal error if some monitor command is not supported. So we should not return -1 when human-monitor-command is not supported. Set reply_str to "unknown command: 'human-monitor-command'", and the caller can deal this error the same as the command that we want to run by human-monitor-command. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_monitor_json.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 13d12c8..7ec4ce7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -694,6 +694,16 @@ qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, if (!cmd || qemuMonitorJSONCommandWithFd(mon, cmd, scm_fd, &reply) < 0) goto cleanup; + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + *reply_str = strdup("unknown command: 'human-monitor-command'"); + if (!*reply_str) { + virReportOOMError(); + goto cleanup; + } + ret = 0; + goto cleanup; + } + if (qemuMonitorJSONCheckError(cmd, reply)) goto cleanup; -- 1.7.1

2 1

[libvirt] [PATCH] spec: Guess rhel/fedora macros from dist
by Jiri Denemark 17 Mar '11

17 Mar '11

--- If anyone knows how to make rpm to evaluate %(...) immediately and not at every appearance of rhel/fedora, that would be really cool. libvirt.spec.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 02be928..bfc9206 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1,5 +1,11 @@ # -*- rpm-spec -*- +# if neither fedora nor rhel was defined, try to guess them from %{dist} +%if !0%{?rhel} && !0%{?fedora} +%define rhel %(echo "%{?dist}" | sed -ne 's/^\\.el\$[0-9]\\+\$.*/\\1/p') +%define fedora %(echo "%{?dist}" | sed -ne 's/^\\.fc\\?\$[0-9]\\+\$.*/\\1/p') +%endif + # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd # Default to a full server + client build -- 1.7.4.1

3 10

[libvirt] /sys/devices/system/cpu/cpu0/topology/physical_package_id: No such file or directory (was: Re: Need help with virt_install)
by Richard W.M. Jones 17 Mar '11

17 Mar '11

On Wed, Mar 16, 2011 at 12:12:24PM -0700, JD wrote: > /virt-install \ > --connect qemu:///system \ > --name Fedora_14_i386 \ > --ram 500 \ > --disk path=/dev/sdc \ > --network network:default \ > --arch i386 \ > --os-variant fedora14 \ > --vnc \ > --location > http://mirrors.kernel.org/fedora/releases/14/Fedora/i386/os/ > > Starting install.../ / > Retrieving file .treeinfo... | 2.4 kB > 00:00 ... > Retrieving file vmlinuz... | 7.1 MB > 00:05 ... > Retrieving file initrd.img... | 60 MB > 00:45 ... > ERROR internal error Process exited while reading console log output: > libvir: error : cannot open > /sys/devices/system/cpu/cpu0/topology/physical_package_id: No such file > or directory > > Domain installation does not appear to have been > successful. If it was, you can restart your domain > by running 'virsh start Fedora_14_i386'; otherwise, please > restart your installation./ > > > is the missing /sys/devices/system/cpu/cpu0/topology/physical_package_id > caused by kernel configuration settings? > > > The relevant installed packages are: > > libguestfs-tools-1.6.2-1.fc13.4.i686 > python-virtinst-0.500.4-1.fc13.noarch > python-virtinst-0.500.4-1.fc13.noarch > virt-ctrl-1.0.1-4.fc12.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > virt-mem-0.3.1-9.fc12.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > virt-mem-0.3.1-9.fc12.i686 > python-virtinst-0.500.4-1.fc13.noarch > libguestfs-tools-1.6.2-1.fc13.4.i686 > python-virtinst-0.500.4-1.fc13.noarch > libguestfs-tools-1.6.2-1.fc13.4.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > virt-manager-0.8.5-1.fc13.noarch > virt-mem-0.3.1-9.fc12.i686 > libvirt-client-0.8.2-2.fc13.i686 > virt-mem-0.3.1-9.fc12.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > virt-top-1.0.4-3.fc13.i686 > virt-mem-0.3.1-9.fc12.i686 > virt-viewer-0.2.1-1.fc13.i686 > libguestfs-tools-1.6.2-1.fc13.4.i686 > libvirt-client-0.8.2-2.fc13.i686 (CCing libvir-list) I would say that this is a bug in libvirt. Since you are using quite an old version, can you try upgrading to the new libvirt in Fedora 14/15 and see if that fixes it? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

1 0