- Devel - libvirt List Archives

[libvirt] [PATCH] docs: fix a typo in formatdomain.html
by Chen Fan 21 Nov '14

21 Nov '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9364eb5..6a15074 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3413,7 +3413,7 @@ setting for the attribute is <code>no</code> for security reasons and support depends on the guest network device model as well as the type of connection on the host - currently it is - only supported for the virtio ddevice model and for macvtap + only supported for the virtio device model and for macvtap connections on the host. -- 1.9.3

2 1

[libvirt] [PATCH] storage: qemu: Fix security labelling of new image chain elements
by Peter Krempa 21 Nov '14

21 Nov '14

When creating a disk image snapshot the libvirt code would blindly copy the parents label to the newly created image. This runs into problems when you start a VM from an image hosted on NFS (or other storage system that doesn't support selinux labels) and the snapshot destination is on a storage system that does support selinux labels. Libvirt's code in that case generates a different security label for the image hosted on NFS. This label is valid only for NFS images and doesn't allow access in case of a locally stored image. To fix this issue libvirt needs to refrain from copying security information in cases where the default domain seclabel is a better choice. This patch repurposes the now unused @force argument of virStorageSourceInitChainElement to denote whether a copy of the security labelling stuff should be attempted or not. This allows to fine-control the copy operation for cases where we need to keep the label of the old disk vs. the cases where we need to keep the label unset to use the default domain imagelabel. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1151718 --- Note: I've opted not to change to use the default label when doing a block-copy via the old API as there is no way to specify a new label all other options now allow to provide a different label via the XML that was provided by the user. src/qemu/qemu_driver.c | 14 ++++++++------ src/qemu/qemu_process.c | 2 +- src/util/virstoragefile.c | 16 +++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 74d1bdc..0343713 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15861,7 +15861,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, unsigned long long bandwidth, unsigned int granularity, unsigned long long buf_size, - unsigned int flags) + unsigned int flags, + bool keepParentLabel) { virQEMUDriverPtr driver = conn->privateData; qemuDomainObjPrivatePtr priv; @@ -15992,7 +15993,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (mirror->format > 0) format = virStorageFileFormatTypeToString(mirror->format); - if (virStorageSourceInitChainElement(mirror, disk->src, false) < 0) + if (virStorageSourceInitChainElement(mirror, disk->src, + keepParentLabel) < 0) goto endjob; if (qemuDomainPrepareDiskChainElement(driver, vm, mirror, @@ -16104,7 +16106,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, flags &= (VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT); ret = qemuDomainBlockCopyCommon(vm, dom->conn, path, dest, - bandwidth, 0, 0, flags); + bandwidth, 0, 0, flags, true); vm = NULL; dest = NULL; @@ -16177,8 +16179,8 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, - bandwidth, granularity, buf_size, flags); + ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, bandwidth, + granularity, buf_size, flags, false); vm = NULL; cleanup: @@ -16353,7 +16355,7 @@ qemuDomainBlockCommit(virDomainPtr dom, goto endjob; if (virStorageSourceInitChainElement(mirror, disk->src, - false) < 0) + true) < 0) goto endjob; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b782984..1f22bd0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1064,7 +1064,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, copy = virStorageSourceCopy(disk->mirror, false); if (virStorageSourceInitChainElement(copy, persistDisk->src, - false) < 0) { + true) < 0) { VIR_WARN("Unable to update persistent definition " "on vm %s after block job", vm->def->name); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index aa97f75..5287c51 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1900,28 +1900,26 @@ virStorageSourceCopy(const virStorageSource *src, * virStorageSourceInitChainElement: * @newelem: New backing chain element disk source * @old: Existing top level disk source - * @force: Force-copy the information + * @transferLabels: Transfer security lables. * * Transfers relevant information from the existing disk source to the new * backing chain element if they weren't supplied so that labelling info * and possibly other stuff is correct. * - * If @force is true, user-supplied information for the new backing store - * element is overwritten from @old instead of keeping it. + * If @transferLabels is true, security labels from the existing disk are copied + * to the new disk. Otherwise the default domain imagelabel label will be used. * * Returns 0 on success, -1 on error. */ int virStorageSourceInitChainElement(virStorageSourcePtr newelem, virStorageSourcePtr old, - bool force) + bool transferLables) { int ret = -1; - if (force) - virStorageSourceSeclabelsClear(newelem); - - if (!newelem->seclabels && + if (transferLables && + !newelem->seclabels && virStorageSourceSeclabelsCopy(newelem, old) < 0) goto cleanup; @@ -2367,7 +2365,7 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent) } /* copy parent's labelling and other top level stuff */ - if (virStorageSourceInitChainElement(ret, parent, false) < 0) + if (virStorageSourceInitChainElement(ret, parent, true) < 0) goto error; } -- 2.1.0

2 2

[libvirt] [PATCH v2 0/5] Guest filesystem information API
by Tomoki Sekiyama 21 Nov '14

21 Nov '14

Hi, This is v2 of patchset to add virDomainGetFSInfo API. * changes in v1->v2: -[all] removed redundant NULL element at the last of returned info array -[3/5] make error messages in qemu_agent.c consistent with other commands -[4/5] added a test case for 2 items in info->devAliases -[5/5] added a pod document for virsh domfsinfo command (v1: http://www.redhat.com/archives/libvir-list/2014-October/msg00001.html ) * summary This series implements a new virDomainGetFSInfo API, that returns a list of mounted filesystems information in the guest, collected via the guest agent. The returned info contains mountpoints and disk device alias named in libvirt, so we can know which mountpoints should be frozen by virDomainFSFreeze to take snapshots of a part of disks. --- Tomoki Sekiyama (5): Implement public API for virDomainGetFSInfo remote: Implement the remote protocol for virDomainGetFSInfo qemu: Implement the qemu driver for virDomainGetFSInfo qemu: add test for qemuAgentGetFSInfo virsh: expose virDomainGetFSInfo daemon/remote.c | 117 ++++++++++++++++++++ include/libvirt/libvirt-domain.h | 21 ++++ src/conf/domain_conf.c | 71 ++++++++++++ src/conf/domain_conf.h | 6 + src/driver-hypervisor.h | 6 + src/libvirt.c | 66 +++++++++++ src/libvirt_private.syms | 1 src/libvirt_public.syms | 6 + src/qemu/qemu_agent.c | 178 ++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 src/qemu/qemu_driver.c | 48 ++++++++ src/remote/remote_driver.c | 92 ++++++++++++++++ src/remote/remote_protocol.x | 32 +++++ src/remote_protocol-structs | 21 ++++ src/rpc/gendispatch.pl | 1 tests/Makefile.am | 1 tests/qemuagentdata/qemuagent-fsinfo.xml | 39 +++++++ tests/qemuagenttest.c | 143 ++++++++++++++++++++++++ tools/virsh-domain.c | 74 ++++++++++++ tools/virsh.pod | 9 ++ 20 files changed, 933 insertions(+), 1 deletion(-) create mode 100644 tests/qemuagentdata/qemuagent-fsinfo.xml -- Tomoki Sekiyama

5 29

[libvirt] [PATCH] build: avoid 32-bit failure on older gcc
by Eric Blake 20 Nov '14

20 Nov '14

On 32-bit platforms with old gcc (hello RHEL 5 gcc 4.1.2), the build fails with: virsh-domain.c: In function 'cmdBlockCopy': virsh-domain.c:2172: warning: comparison is always false due to limited range of data type Adjust the code to silence the warning. * tools/virsh-domain.c (cmdBlockCopy): Pacify RHEL 5 gcc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/virsh-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7184784..cf45a88 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2169,7 +2169,8 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) if (bandwidth) { /* bandwidth is ulong MiB/s, but the typed parameter is * ullong bytes/s; make sure we don't overflow */ - if (bandwidth + 0ULL > ULLONG_MAX >> 20) { + unsigned long long limit = MIN(ULONG_MAX, ULLONG_MAX >> 20); + if (bandwidth > limit) { virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), ULLONG_MAX >> 20); -- 1.9.3

1 0

[libvirt] [PATCH] build: fix build when not using dbus
by Eric Blake 20 Nov '14

20 Nov '14

Commit c0e7022 breaks on a machine that lacks dbus headers: In file included from util/virdbus.c:24:0: util/virdbuspriv.h:31:3: error: unknown type name 'dbus_int16_t' * src/util/virdbuspriv.h (DBusBasicValue): Only provide fallback when dbus is compiled. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule (I feel like I'm in whack-a-mole mode right now, where my fix for one problem causes a failure in another environment. Sorry for the churn) src/util/virdbuspriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index 4247746..74b395f 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -24,7 +24,7 @@ # include "virdbus.h" -# if !HAVE_DBUSBASICVALUE +# if defined(WITH_DBUS) && !HAVE_DBUSBASICVALUE /* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */ typedef union { -- 1.9.3

1 0

[libvirt] [PATCH] drvbhyve: Automatically tear down guest domains on shutdown
by Conrad Meyer 20 Nov '14

20 Nov '14

Reboot requires more sophistication and is left as a future work item -- but at least part of the plumbing is in place. --- src/Makefile.am | 2 + src/bhyve/bhyve_monitor.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_monitor.h | 36 +++++++++ src/bhyve/bhyve_process.c | 14 +++- 4 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 src/bhyve/bhyve_monitor.c create mode 100644 src/bhyve/bhyve_monitor.h diff --git a/src/Makefile.am b/src/Makefile.am index d8fe624..b6c1701 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -833,6 +833,8 @@ BHYVE_DRIVER_SOURCES = \ bhyve/bhyve_domain.h \ bhyve/bhyve_driver.h \ bhyve/bhyve_driver.c \ + bhyve/bhyve_monitor.c \ + bhyve/bhyve_monitor.h \ bhyve/bhyve_process.c \ bhyve/bhyve_process.h \ bhyve/bhyve_utils.h \ diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c new file mode 100644 index 0000000..cd3cf6e --- /dev/null +++ b/src/bhyve/bhyve_monitor.c @@ -0,0 +1,184 @@ +/* + * bhyve_monitor.c: Tear-down or reboot bhyve domains on guest shutdown + * + * Copyright (C) 2014 Conrad Meyer + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Author: Conrad Meyer <cse.cem(a)gmail.com> + */ + +#include <config.h> + +#include <sys/types.h> +#include <sys/event.h> +#include <sys/time.h> +#include <sys/wait.h> + +#include "bhyve_monitor.h" +#include "bhyve_process.h" +#include "viralloc.h" +#include "virerror.h" +#include "virfile.h" +#include "virlog.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +VIR_LOG_INIT("bhyve.bhyve_monitor"); + +struct _bhyveMonitor { + int kq; + int watch; + virDomainObjPtr vm; + bhyveConnPtr driver; +}; + +static void +bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) +{ + const struct timespec zerowait = {}; + bhyveMonitorPtr mon = opaque; + struct kevent kev; + int rc, status; + + if (watch != mon->watch || kq != mon->kq) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("event from unexpected fd %d!=%d / watch %d!=%d"), + mon->kq, kq, mon->watch, watch); + return; + } + + rc = kevent(kq, NULL, 0, &kev, 1, &zerowait); + if (rc < 0) { + virReportSystemError(errno, "%s", _("Unable to query kqueue")); + return; + } + + if (rc == 0) + return; + + if ((kev.flags & EV_ERROR) != 0) { + virReportSystemError(kev.data, "%s", _("Unable to query kqueue")); + return; + } + + if (kev.filter == EVFILT_PROC && (kev.fflags & NOTE_EXIT) != 0) { + if ((pid_t)kev.ident != mon->vm->pid) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("event from unexpected proc %ju!=%ju"), + (uintmax_t)mon->vm->pid, (uintmax_t)kev.ident); + return; + } + + status = kev.data; + if (WIFSIGNALED(status) && WCOREDUMP(status)) { + VIR_ERROR("Guest %s got signal %d and crashed", mon->vm->def->name, + WTERMSIG(status)); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_CRASHED); + } else if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == 0) { + /* 0 - reboot */ + /* TODO: Implementing reboot is a little more complicated. */ + VIR_INFO("Guest %s rebooted; destroying domain.", + mon->vm->def->name); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + } else if (WEXITSTATUS(status) < 3) { + /* 1 - shutdown, 2 - halt, 3 - triple fault. others - error */ + VIR_INFO("Guest %s shut itself down; destroying domain.", + mon->vm->def->name); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + } else { + VIR_INFO("Guest %s had an error and exited with status %d; destroying domain.", + mon->vm->def->name, WEXITSTATUS(status)); + virBhyveProcessStop(mon->driver, mon->vm, + VIR_DOMAIN_SHUTOFF_UNKNOWN); + } + } + } +} + +static void +bhyveMonitorRelease(void *opaque) +{ + bhyveMonitorPtr mon = opaque; + + VIR_FORCE_CLOSE(mon->kq); + virObjectUnref(mon->vm); + VIR_FREE(mon); +} + +bhyveMonitorPtr +bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver) +{ + bhyveMonitorPtr mon; + struct kevent kev; + int rc; + + if (VIR_ALLOC(mon) < 0) + return NULL; + + mon->vm = virObjectRef(vm); + mon->driver = driver; + + mon->kq = kqueue(); + if (mon->kq < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Unable to create kqueue")); + goto cleanup; + } + + EV_SET(&kev, vm->pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, mon); + rc = kevent(mon->kq, &kev, 1, NULL, 0, NULL); + if (rc < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Unable to register process kevent")); + goto cleanup; + } + + mon->watch = virEventAddHandle(mon->kq, + VIR_EVENT_HANDLE_READABLE | + VIR_EVENT_HANDLE_ERROR | + VIR_EVENT_HANDLE_HANGUP, + bhyveMonitorIO, + mon, + bhyveMonitorRelease); + if (mon->watch < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unable to register monitor events")); + goto cleanup; + } + + return mon; + + cleanup: + bhyveMonitorRelease(mon); + return NULL; +} + +void +bhyveMonitorClose(bhyveMonitorPtr mon) +{ + + if (mon == NULL) + return; + + if (mon->watch > 0) + virEventRemoveHandle(mon->watch); + else + bhyveMonitorRelease(mon); +} diff --git a/src/bhyve/bhyve_monitor.h b/src/bhyve/bhyve_monitor.h new file mode 100644 index 0000000..226d878 --- /dev/null +++ b/src/bhyve/bhyve_monitor.h @@ -0,0 +1,36 @@ +/* + * bhyve_monitor.h: Tear-down or reboot bhyve domains on guest shutdown + * + * Copyright (C) 2014 Conrad Meyer + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Author: Conrad Meyer <cse.cem(a)gmail.com> + */ + +#ifndef BHYVE_MONITOR_H +# define BHYVE_MONITOR_H + +# include "internal.h" +# include "domain_conf.h" +# include "bhyve_utils.h" + +typedef struct _bhyveMonitor bhyveMonitor; +typedef bhyveMonitor *bhyveMonitorPtr; + +bhyveMonitorPtr bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver); +void bhyveMonitorClose(bhyveMonitorPtr mon); + +#endif /* BHYVE_MONITOR_H */ diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a30e36a..284641a 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -32,8 +32,9 @@ #include <net/if_tap.h> #include "bhyve_device.h" -#include "bhyve_process.h" #include "bhyve_command.h" +#include "bhyve_monitor.h" +#include "bhyve_process.h" #include "datatypes.h" #include "virerror.h" #include "virlog.h" @@ -209,6 +210,7 @@ virBhyveProcessStart(virConnectPtr conn, vm->def->id = vm->pid; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); + vm->privateData = bhyveMonitorOpen(vm, driver); if (virDomainSaveStatus(driver->xmlopt, BHYVE_STATE_DIR, @@ -268,6 +270,9 @@ virBhyveProcessStop(bhyveConnPtr driver, return -1; } + if (vm->privateData != NULL) + bhyveMonitorClose((bhyveMonitorPtr)vm->privateData); + /* First, try to kill 'bhyve' process */ if (virProcessKillPainfully(vm->pid, true) != 0) VIR_WARN("Failed to gracefully stop bhyve VM '%s' (pid: %d)", @@ -371,9 +376,12 @@ virBhyveProcessReconnect(virDomainObjPtr vm, goto cleanup; proc_argv = kvm_getargv(data->kd, kp, 0); - if (proc_argv && proc_argv[0]) - if (STREQ(expected_proctitle, proc_argv[0])) + if (proc_argv && proc_argv[0]) { + if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; + vm->privateData = bhyveMonitorOpen(vm, data->driver); + } + } cleanup: if (ret < 0) { -- 1.9.3

1 0

[libvirt] [PATCH 0/2] Fix fc_host SCSI pool refresh issues
by John Ferlan 20 Nov '14

20 Nov '14

https://bugzilla.redhat.com/show_bug.cgi?id=1152382 Fix a couple of fc_host SCSI refresh pool issues. The first patch I found while working on the second. It turns out the existing logic to handle 'retval' wasn't correct. Using a default of zero, resulted in a couple of cases where success was returned when it shouldn't have been. The one that caused the issues was when the search of the /sys/bus/scsi/devices/ tree found a new vHBA related device and then "assumed" that the 'block' device would be found in the directory. That assumption resulted in a 10 second pause in virStorageBackendStablePath failing to find a stable path to the device "/dev/(null)" because the getBlockDevice returned zero and a NULL block_device and the processLU code only failed when the return was < 0. The processLU code had similar issues with retval processing which are also fixed. The second patch provides a mechanism to attempt to fill the pool of a libvirt created VPORT_CREATE'd vHBA. The creation takes some time for the udev callback mechanism to find and configure. By adding a thread to attempt to retry to find the LU's (with any luck) after the udev processing has had time to do something means a subsequent 'vol-list' on the pool may actually find a volume without needing to attempt a 'pool-refresh' again. It's too bad the udev mechanism didn't provide a way to indicate it has completed setting up a specific device. John Ferlan (2): storage: Fix issue finding LU's when block doesn't exist storage: Add thread to refresh for createVport src/storage/storage_backend_scsi.c | 147 ++++++++++++++++++++++++++++++++----- 1 file changed, 128 insertions(+), 19 deletions(-) -- 1.9.3

2 6

[libvirt] [PATCH] Fix API docs for header file re-organization
by Daniel P. Berrange 20 Nov '14

20 Nov '14

The API docs generators were broken by the header file re-organization. Specifically * html/libvirt-libvirt.html was empty (and should be deleted) * Makefile.am didn't install html/libvirt-libvirt-*.html * hvsupport.html was mostly empty * sitemap.html.in didn't list the new html/*.html files --- docs/Makefile.am | 17 +++++++-- docs/apibuild.py | 1 - docs/hvsupport.pl | 101 +++++++++++++++++++++++++++++---------------------- docs/sitemap.html.in | 48 ++++++++++++++++++++++-- 4 files changed, 115 insertions(+), 52 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9de3406..910bfef 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -25,9 +25,20 @@ DOC_SOURCE_DIR=../src DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt -apihtml = \ - html/index.html \ - html/libvirt-libvirt.html \ +apihtml = \ + html/index.html \ + html/libvirt-libvirt-domain.html \ + html/libvirt-libvirt-domain-snapshot.html \ + html/libvirt-libvirt-event.html \ + html/libvirt-libvirt-host.html \ + html/libvirt-libvirt.html \ + html/libvirt-libvirt-interface.html \ + html/libvirt-libvirt-network.html \ + html/libvirt-libvirt-nodedev.html \ + html/libvirt-libvirt-nwfilter.html \ + html/libvirt-libvirt-secret.html \ + html/libvirt-libvirt-storage.html \ + html/libvirt-libvirt-stream.html \ html/libvirt-virterror.html apipng = \ diff --git a/docs/apibuild.py b/docs/apibuild.py index 797a7a5..7549a63 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -21,7 +21,6 @@ debugsym=None # C parser analysis code # included_files = { - "libvirt.h": "header with general libvirt API definitions", "libvirt-domain.h": "header with general libvirt API definitions", "libvirt-domain-snapshot.h": "header with general libvirt API definitions", "libvirt-event.h": "header with general libvirt API definitions", diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index 6d8ed9c..96720eb 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -12,7 +12,17 @@ my $srcdir = shift @ARGV; my $symslibvirt = "$srcdir/libvirt_public.syms"; my $symsqemu = "$srcdir/libvirt_qemu.syms"; my $symslxc = "$srcdir/libvirt_lxc.syms"; -my $drivertable = "$srcdir/driver.h"; +my @drivertable = ( + "$srcdir/driver-hypervisor.h", + "$srcdir/driver-interface.h", + "$srcdir/driver-network.h", + "$srcdir/driver-nodedev.h", + "$srcdir/driver-nwfilter.h", + "$srcdir/driver-secret.h", + "$srcdir/driver-state.h", + "$srcdir/driver-storage.h", + "$srcdir/driver-stream.h", + ); my %groupheaders = ( "virHypervisorDriver" => "Hypervisor APIs", @@ -182,41 +192,44 @@ $apis{virDomainMigrateConfirm3Params} = "1.1.0"; # and driver struct fields. This lets us later match # update the driver impls with the public APis. -open FILE, "<$drivertable" - or die "cannot read $drivertable: $!"; - # Group name -> hash of APIs { fields -> api name } my %groups; my $ingrp; -while (defined($line = <FILE>)) { - if ($line =~ /struct _(vir\w*Driver)/) { - my $grp = $1; - if ($grp ne "virStateDriver" && - $grp ne "virStreamDriver") { - $ingrp = $grp; - $groups{$ingrp} = { apis => {}, drivers => {} }; - } - } elsif ($ingrp) { - if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) { - my $field = $2; - my $name = $1; - - my $api; - if (exists $apis{"vir$name"}) { - $api = "vir$name"; - } elsif ($name =~ /\w+(Open|Close)/) { - next; - } else { - die "driver $name does not have a public API"; +foreach my $drivertable (@drivertable) { + open FILE, "<$drivertable" + or die "cannot read $drivertable: $!"; + + while (defined($line = <FILE>)) { + if ($line =~ /struct _(vir\w*Driver)/) { + my $grp = $1; + if ($grp ne "virStateDriver" && + $grp ne "virStreamDriver") { + $ingrp = $grp; + warn "[$ingrp]"; + $groups{$ingrp} = { apis => {}, drivers => {} }; + } + } elsif ($ingrp) { + if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) { + my $field = $2; + my $name = $1; + + my $api; + if (exists $apis{"vir$name"}) { + $api = "vir$name"; + } elsif ($name =~ /\w+(Open|Close)/) { + next; + } else { + die "driver $name does not have a public API"; + } + $groups{$ingrp}->{apis}->{$field} = $api; + } elsif ($line =~ /};/) { + $ingrp = undef; } - $groups{$ingrp}->{apis}->{$field} = $api; - } elsif ($line =~ /};/) { - $ingrp = undef; } } -} -close FILE; + close FILE; +} # Finally, we read all the primary driver files and extract @@ -290,43 +303,43 @@ foreach my $src (@srcs) { # have a bit of manual fixup todo with the per-driver versioning # and support matrix -$groups{virDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth"; -$groups{virDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly"; -$groups{virDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate"; +$groups{virHypervisorDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth"; +$groups{virHypervisorDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly"; +$groups{virHypervisorDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate"; my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0; -foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { - my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"}; +foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { + my $openVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}; my $openVers; if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; } # virConnectOpenReadOnly always matches virConnectOpen version - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} = - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"}; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} = + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"}; # virConnectOpenAuth is always 0.4.0 if the driver existed # before this time, otherwise it matches the version of # the driver's virConnectOpen entry if ($openVersStr eq "Y" || $openVers >= $openAuthVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0"; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0"; } } # Another special case for the virDomainCreateLinux which was replaced # with virDomainCreateXML -$groups{virDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux"; +$groups{virHypervisorDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux"; my $createAPIVers = (0 * 1000 * 1000) + (0 * 1000) + 3; -foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { - my $createVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateXML"}; +foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) { + my $createVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateXML"}; next unless defined $createVersStr; my $createVers; if ($createVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { @@ -338,9 +351,9 @@ foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { # the driver's virCreateXML entry if ($createVersStr eq "Y" || $createVers >= $createAPIVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; + $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; } } @@ -367,7 +380,7 @@ in. EOF -foreach my $grp (sort { $a cmp $b } keys %groups) { + foreach my $grp (sort { $a cmp $b } keys %groups) { print "<h2><a name=\"$grp\">", $groupheaders{$grp}, "</a></h2>\n"; print <<EOF; <table class="top_table"> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 1e91869..fad5358 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -291,12 +291,52 @@ --> <ul> <li> - <a href="html/libvirt-libvirt.html">libvirt</a> - core interfaces for the libvirt library + <a href="html/libvirt-libvirt-domain.html">Domain</a> + domain APIs for the libvirt library </li> <li> - <a href="html/libvirt-virterror.html">virterror</a> - error handling interfaces for the libvirt library + <a href="html/libvirt-libvirt-domain-snapshot.html">Domain snapshot</a> + domain snapshot APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-virterror.html">Error</a> + error handling APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-event.html">Event</a> + event APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-host.html">Host</a> + host APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-interface.html">Interface</a> + interface APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-network.html">Network</a> + network APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-nodedev.html">Node device</a> + node device APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-nwfilter.html">Network filter</a> + network filter APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-secret.html">Secret</a> + secret APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-storage.html">Storage</a> + storage APIs for the libvirt library + </li> + <li> + <a href="html/libvirt-libvirt-stream.html">Stream</a> + stream APIs for the libvirt library </li> <li> <a href="hvsupport.html">Driver support</a> -- 2.1.0

3 3

[libvirt] [PATCH] build: fix build with older dbus headers
by Eric Blake 20 Nov '14

20 Nov '14

Compilation on a RHEL 5 host failed, due to the older dbus headers present on that machine, and triggered by commit 2aa167ca: util/virdbus.c: In function 'virDBusMessageIterDecode': util/virdbus.c:952: error: 'DBusBasicValue' undeclared (first use in this function) * m4/virt-dbus.m4 (LIBVIRT_CHECK_DBUS): Check for DBusBasicValue. * src/util/virdbuspriv.h (DBusBasicValue): Provide fallback. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. m4/virt-dbus.m4 | 3 ++- src/util/virdbuspriv.h | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 4ef0c82..3f9b306 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -1,6 +1,6 @@ dnl The libdbus.so library dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. +dnl Copyright (C) 2012-2014 Red Hat, Inc. dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,7 @@ AC_DEFUN([LIBVIRT_CHECK_DBUS],[ CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS" AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) + AC_CHECK_TYPES([DBusBasicValue], [], [], [[#include <dbus/dbus.h>]]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index d45fb25..4247746 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -1,7 +1,7 @@ /* * virdbuspriv.h: internal APIs for testing DBus code * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 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 @@ -24,6 +24,21 @@ # include "virdbus.h" +# if !HAVE_DBUSBASICVALUE +/* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */ +typedef union +{ + dbus_int16_t i16; /**< as int16 */ + dbus_uint16_t u16; /**< as int16 */ + dbus_int32_t i32; /**< as int32 */ + dbus_uint32_t u32; /**< as int32 */ + dbus_bool_t bool_val; /**< as boolean */ + dbus_int64_t i64; /**< as int64 */ + dbus_uint64_t u64; /**< as int64 */ + double dbl; /**< as double */ + unsigned char byt; /**< as byte */ +} DBusBasicValue; +# endif int virDBusMessageEncodeArgs(DBusMessage* msg, const char *types, -- 1.9.3

1 0

[libvirt] [libvirt PATCH] rpc: do not fail if the pid of the connecting process is not set
by Giuseppe Scrivano 20 Nov '14

20 Nov '14

getsockopt(sock->fd, SOL_SOCKET, SO_PEERCRED, ...) sets the pid to 0 when the process that opens the connection is in another container. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/rpc/virnetsocket.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 882fbec..6b019cc 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1251,10 +1251,14 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, goto cleanup; } - if (virProcessGetStartTime(cr.pid, timestamp) < 0) + *timestamp = -1; + if (cr.pid && virProcessGetStartTime(cr.pid, timestamp) < 0) goto cleanup; - *pid = cr.pid; + if (cr.pid) + *pid = cr.pid; + else + *pid = -1; *uid = cr.uid; *gid = cr.gid; -- 1.9.3

2 2