- Devel - libvirt List Archives

[libvirt] Join
by Tim Streit 31 Mar '16

31 Mar '16

Im having problems with my install. Debian Jessie (8.3), but using libvirt and kernel from back ports (for enhanced vt-d support, passing through a USB card). Guest is a windows xp sp3 box. Initially I had hardware time set to UTC, and I set the RealTimeIsUtc=1 in the registry. But it would periodically reset itself ahead 6 hours (CST), and since we just changed day light savings time now its jumping 5 hours. Every morning. I have a similarly configured system running a win7 guest, time works fine. Someone on #kvm suggested that maybe I need to set my hwclock to local time, and so I went through all that - changed it, appended LOCAL to /etc/adjtime etc. I then changed the RealTimeIsUtc=0, and for the first boot it seemed okay. Now, whenever I boot, it is constantly 5 hours ahead. I can reset it but when you reboot, its back. Im stumped. Help...

2 1

Re: [libvirt] [PATCH V4 4/6] libxl: support creating domain with VF assignment from a pool
by Jim Fehlig 31 Mar '16

31 Mar '16

On 03/30/2016 03:38 AM, Chun Yan Liu wrote: > >>>> On 3/29/2016 at 08:05 AM, in message <56F9C6D0.5000702(a)suse.com>, Jim Fehlig > <jfehlig(a)suse.com> wrote: >> On 03/21/2016 02:11 AM, Chunyan Liu wrote: >>> Add codes to support creating domain with network defition of assigning >>> SRIOV VF from a pool. >>> >>> Signed-off-by: Chunyan Liu <cyliu(a)suse.com> >>> --- >>> src/libxl/libxl_domain.c | 50 >> ++++++++++++++++++++++++++++++++++++++++++++++++ >>> tests/Makefile.am | 3 +++ >>> 2 files changed, 53 insertions(+) >>> >>> diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c >>> index c8d09b1..d11bf3a 100644 >>> --- a/src/libxl/libxl_domain.c >>> +++ b/src/libxl/libxl_domain.c >>> @@ -36,6 +36,7 @@ >>> #include "virtime.h" >>> #include "locking/domain_lock.h" >>> #include "xen_common.h" >>> +#include "network/bridge_driver.h" >>> >>> #define VIR_FROM_THIS VIR_FROM_LIBXL >>> >>> @@ -764,6 +765,10 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, >>> if (net->ifname && >>> STRPREFIX(net->ifname, LIBXL_GENERATED_PREFIX_XEN)) >>> VIR_FREE(net->ifname); >>> + >>> + /* cleanup actual device */ >>> + virDomainNetRemoveHostdev(vm->def, net); >>> + networkReleaseActualDevice(vm->def, net); >>> } >>> } >>> >>> @@ -960,6 +965,48 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, >> libxl_domain_config *d_config) >>> } >>> } >>> >>> +static int >>> +libxlNetworkPrepareDevices(virDomainDefPtr def) >>> +{ >>> + int ret = -1; >>> + size_t i; >>> + >>> + for (i = 0; i < def->nnets; i++) { >>> + virDomainNetDefPtr net = def->nets[i]; >>> + int actualType; >>> + >>> + /* If appropriate, grab a physical device from the configured >>> + * network's pool of devices, or resolve bridge device name >>> + * to the one defined in the network definition. >>> + */ >>> + if (networkAllocateActualDevice(def, net) < 0) >>> + goto cleanup; >>> + >>> + actualType = virDomainNetGetActualType(net); >>> + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV && >>> + net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { >>> + /* Each type='hostdev' network device must also have a >>> + * corresponding entry in the hostdevs array. For netdevs >>> + * that are hardcoded as type='hostdev', this is already >>> + * done by the parser, but for those allocated from a >>> + * network / determined at runtime, we need to do it >>> + * separately. >>> + */ >>> + virDomainHostdevDefPtr hostdev = >> virDomainNetGetActualHostdev(net); >>> + virDomainHostdevSubsysPCIPtr pcisrc = >> &hostdev->source.subsys.u.pci; >>> + >>> + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && >>> + hostdev->source.subsys.type == >> VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) >>> + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; >>> + >>> + if (virDomainHostdevInsert(def, hostdev) < 0) >>> + goto cleanup; >>> + } >>> + } >>> + ret = 0; >>> + cleanup: >>> + return ret; >> >> Nothing to cleanup here. I think we should just return -1 on failure paths >> and 0 >> on success. >> >>> +} >>> >>> /* >>> * Start a domain through libxenlight. >>> @@ -1036,6 +1083,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, >> virDomainObjPtr vm, >>> vm, true) < 0) >>> goto cleanup; >>> >>> + if (libxlNetworkPrepareDevices(vm->def) < 0) >>> + goto cleanup; >> >> I accessed a machine to test this series and have found a few problems. >> >> 1. When attaching an SR-IOV vf from a pool, the attach appears successful. >> I see that xen's pciback driver is bound to the device in the host. I >> didn't see the device in the guest (could be a guest problem), > For pv guest, from testing, it is shown in guest. For HVM, seems > xl pci-attach has the same result. Yes, I'm seeing the same thing. Looks like a bug in libxl or qemu. >> nor in >> dumpxml or /var/run/libvirt/libxl/<dom-name>.xml. > Ah, there is a mistake during a review change to original patch 1/6. > Didn't notice that earlier. > > In libxlDomainAttachNetDevice: > The if (!ret) is needed, maybe cleanup is not proper. > Since for actual type is hostdev case, after a successful > libxlDomainAttachHostDevice, we need to > update vm->def->nets too. > > cleanup: > libxl_device_nic_dispose(&nic); > - out: > - if (!ret) > + if (!ret) { > vm->def->nets[vm->def->nnets++] = net; > + } else { > + virDomainNetRemoveHostdev(vm->def, net); > + networkReleaseActualDevice(vm->def, net); > + } > > Similar for libxDomainDetachNetDevice cleanup: > Original is still needed. > > cleanup: > libxl_device_nic_dispose(&nic); > - if (!ret) > + if (!ret) { > + networkReleaseActualDevice(vm->def, detach); > virDomainNetRemove(vm->def, detachidx); > + } Yikes! I should have looked at the code closer before making those changes - lesson learned. I sent a small series to fix it https://www.redhat.com/archives/libvir-list/2016-March/msg01470.html >> Not surprisingly, >> this causes problems with device-detach >> >> # virsh detach-device dom sriov-pool-vif.xml >> error: Failed to detach device from sriov-pool-vif.xml >> error: operation failed: no device matching mac address 00:16:3e:7a:35:df >> found >> >> 2. After starting a domain containing an interface from sr-iov vf pool, the >> interface xml is changed from type='network' to type='hostdev'. E.g. >> before creating domain >> >> <interface type='network'> >> <source network='passthrough'/> >> <mac address='00:16:3e:7a:35:df'/> >> </interface> >> >> after creating domain >> >> <interface type='hostdev' managed='yes'> >> <mac address='00:16:3e:7a:35:df'/> >> <driver name='xen'/> >> <source> >> <address type='pci' domain='0x0000' bus='0x0a' slot='0x11' >> function='0x1'/> >> </source> >> </interface> >> >> Maybe this is intended behavior, but it seems odd. > This is intended. > >> >> 3. I started a domain containing an interface from sr-iov vf pool. Looks >> good. I then tried 'virsh detach-device ...', which never returned >> until keepalive timeout. The device was removed from the guest, but >> libvirtd got hung up in the process. Oddly, I wasn't able to interrupt >> libvirtd with gdb to see what its threads were doing. > This is libxl problem. With xl pci-detach, it has the same issue. Yep, another bug in xen-unstable libxl. With the small fixes in the series I mentioned above, this patch looks and tests good :-). Since it has been around for quite some time, I've asked for permission to commit it even though we are in 1.3.3 freeze. Regards, Jim

1 0

[libvirt] [PATCH 0/3] qemu: fix automatic NUMA pinning with memory hotplug
by Peter Krempa 30 Mar '16

30 Mar '16

We forgot to propagate the automatic nodeset and reported non-ideal errors. Peter Krempa (3): qemu: command: Pass numad nodeset when formatting memory devices at boot qemu: command: Split up formatting of -numa and memory devices qemu: hotplug: Improve error when hotpluging memory with auto-placement src/conf/numa_conf.c | 20 +++++++++++++++++--- src/conf/numa_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 27 ++++++++++++++------------- src/qemu/qemu_hotplug.c | 7 +++++++ 5 files changed, 40 insertions(+), 16 deletions(-) -- 2.7.3

2 5

[libvirt] [PATCH v7 0/4] ARM: add query-gic-capabilities QMP command
by Peter Xu 30 Mar '16

30 Mar '16

v7 changes: - patch 1 - add more to commit log, about how to use the results [Markus] - change interface from dict back to array [Markus, Eric] - patch 2 - kvm_arm_create_scratch_host_vcpu should raise error when init non-zero, but failed to find a good CPU model [Sergey] - patch 3 - rename function to kvm_device_supported [Sergey] - patch 4 - comment line from "FIXME" to "TODO" [Sergey] - make kvm-related part another function [Sergey] - change result to array to follow patch 1's change v6 changes: - patch 1 (squashed into patch 2) - explain more about the following in commit message: why we need this command, and what does the entries mean [Markus] - explain what GIC is [Eric] - squash this patch into patch 2 [Eric] - patch 2 (new patch 1) - fix "does not implement" english error [Eric] - remove useless headers in target-arm/monitor.c [Markus] - remove this command from whitelist [Markus, Eric] - return dict rather than array, with single key points to the original array results [Markus, Eric] - patch 5 (new patch 4) - tiny change in implementation to suite the new interface. v5 changes: - patch 2: moved to target-arm/monitor.c (from target-arm/machine.c) [Peter] - patch 3: splitted into three patches: [all from Peter's comments] - patch 3 (new): leverage kvm_arm_create_scratch_host_vcpu(), tiny enhancement of old one to suite our need - patch 4: introduce kvm_support_device() in kvm-all.c - patch 5: do the implementation. v4 changes: - all: rename query-gic-capability to query-gic-capabilities [Andrea] - patch 3: rename helper function to kvm_support_device, make it inline and lighter. [Drew] v3 changes: - patch 2: remove func declaration, add qmp header [Drew] - patch 3: being able to detect KVM GIC capabilities even without kvm enabled [Andrea]: this is a little bit hacky, need some more review on this. v2 changes: - result layout change: use array and dict for the capability bits rather than a single array of strings [Andrea/Markus] - spelling out what GIC is in doc [Eric] This patch is to add ARM-specific command "query-gic-capability". The new command can report which kind of GIC device the host/QEMU support. The returned result is in the form of array. Sample command and output: {"execute": "query-gic-capability"} {"return": [{"emulated": false, "version": 3, "kernel": false}, {"emulated": true, "version": 2, "kernel": true}]} Testing: Smoke tests on both x86 (emulated) and another moonshot ARM server. Peter Xu (4): arm: qmp: add query-gic-capabilities interface arm: enhance kvm_arm_create_scratch_host_vcpu kvm: add kvm_device_supported() helper function arm: implement query-gic-capabilities include/sysemu/kvm.h | 9 ++++++ kvm-all.c | 15 +++++++++ monitor.c | 8 +++++ qapi-schema.json | 36 +++++++++++++++++++++ qmp-commands.hx | 27 ++++++++++++++++ target-arm/Makefile.objs | 2 +- target-arm/kvm.c | 14 +++++++- target-arm/kvm_arm.h | 6 ++-- target-arm/monitor.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 target-arm/monitor.c -- 2.4.3

5 12

[libvirt] [PATCH] docs: Don't use bold text in headers and menu items
by Andrea Bolognani 30 Mar '16

30 Mar '16

Now that headers and menu items are using a bigger font and more generous spacing, they don't really need to be bold to stand out. --- This applies on top of Cole's series https://www.redhat.com/archives/libvir-list/2016-March/msg00323.html docs/apps.html.in | 2 +- docs/generic.css | 2 +- docs/libvirt.css | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 39fb78d..b8337b9 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <h1>Applications using <strong>libvirt</strong></h1> + <h1>Applications using libvirt</h1> <p> This page provides an illustration of the wide variety of diff --git a/docs/generic.css b/docs/generic.css index e862fe0..94b9612 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -45,7 +45,7 @@ dl dd { h1, h2, h3, h4, h5, h6 { - font-weight: bold; + font-weight: normal; margin: 0px; padding: 0px; margin-top: 0.5em; diff --git a/docs/libvirt.css b/docs/libvirt.css index 17ecbb4..3b65f4c 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -1,12 +1,4 @@ -h1 { - font-weight: normal; - color: #3c857c; -} -h1 strong { - font-weight: bold; -} - -h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5, h6 { color: #3c857c; } @@ -55,7 +47,6 @@ h2, h3, h4, h5, h6 { padding: 0px; margin: 0px; border: 0px; - font-weight: bold; font-size: 1.2em; } -- 2.5.0

2 2

[libvirt] [PATCH v4 0/2] qemu: Support for QXL heads
by Martin Kletzander 30 Mar '16

30 Mar '16

v4: - Added test case without "heads=" - Don't consolidate 'size_t i, j' declarations v3: - https://www.redhat.com/archives/libvir-list/2016-March/msg01198.html - rebase on top of current master in order to cleanly apply v2: - don't change heads when migrating - https://www.redhat.com/archives/libvir-list/2016-March/msg00811.html v1: - https://www.redhat.com/archives/libvir-list/2016-March/msg00410.html Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Martin Kletzander (2): qemu: Check for qxl's max_outputs parameter qemu: Add support to QXL's max_outputs parameter src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 8 +++ src/qemu/qemu_migration.c | 64 ++++++++++++++++++++-- .../qemuhotplug-agent-nopath.xml | 5 ++ .../qemuhotplug-hotplug-base+agent-nopath.xml | 58 ++++++++++++++++++++ .../qemuxml2argv-video-qxl-heads.args | 28 ++++++++++ .../qemuxml2argv-video-qxl-heads.xml | 47 ++++++++++++++++ .../qemuxml2argv-video-qxl-noheads.args | 24 ++++++++ .../qemuxml2argv-video-qxl-noheads.xml | 39 +++++++++++++ tests/qemuxml2argvtest.c | 16 ++++++ .../qemuxml2xmlout-video-qxl-heads.xml | 47 ++++++++++++++++ .../qemuxml2xmlout-video-qxl-noheads.xml | 39 +++++++++++++ tests/qemuxml2xmltest.c | 3 + 14 files changed, 379 insertions(+), 5 deletions(-) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-agent-nopath.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+agent-nopath.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml -- 2.8.0

1 3

[libvirt] [PATCH 0/3] some additional hyper-v features fixes
by Pavel Hrdina 30 Mar '16

30 Mar '16

Pavel Hrdina (3): docs: fix qemu version for hyperv features qemu_process: skip only cpu features qemu_process: add check for hyperv features docs/formatdomain.html.in | 4 ++-- src/cpu/cpu_x86.c | 8 +++++++ src/cpu/cpu_x86_data.h | 8 +++++++ src/qemu/qemu_process.c | 57 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 61 insertions(+), 16 deletions(-) -- 2.7.4

4 12

[libvirt] [PATCH V4 0/6] libxl: support assign VF to guest from SRIOV pool
by Chunyan Liu 30 Mar '16

30 Mar '16

This patch series is to support assign VF to guest from SRIOV pool, including fixes to network attach/detach and fix to libxlDomainstart. Chunyan Liu (6): libxlDomainAttachNetDevice: release actual deivce and remove hostdev when fail libxlDomainDetachNetDevice: cleanup codes libxlDomainDetachDeviceLive: handle hostdev parent is network device libxl: support creating domain with VF assignment from a pool libxl: fix hot add/remove VF from a pool libxlDomainStart: correct cleanup after failure src/libxl/libxl_domain.c | 85 +++++++++++++++++++++++++++++++++++++++--------- src/libxl/libxl_driver.c | 52 ++++++++++++++++++++--------- tests/Makefile.am | 3 ++ 3 files changed, 108 insertions(+), 32 deletions(-) -- 2.1.4

3 15

[libvirt] [PATCH] host-validate: Fix suggestion for missing cpu cgroup
by Andrea Bolognani 30 Mar '16

30 Mar '16

If the cpu cgroup is not found when validating an host for LXC support, virt-host-validate will suggest to enable the CONFIG_CGROUP_SCHED kconfig option. The appropriate option is really CONFIG_CGROUP_CPU. The QEMU checks already get that right, so no changes needed. --- tools/virt-host-validate-lxc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c index 89a6388..2b906cc 100644 --- a/tools/virt-host-validate-lxc.c +++ b/tools/virt-host-validate-lxc.c @@ -70,7 +70,7 @@ int virHostValidateLXC(void) if (virHostValidateCGroupController("LXC", "cpu", VIR_HOST_VALIDATE_FAIL, - "CGROUP_SCHED") < 0) + "CGROUP_CPU") < 0) ret = -1; if (virHostValidateCGroupController("LXC", "cpuacct", -- 2.5.5

2 2

[libvirt] [PATCH v2] nss: FreeBSD support
by Roman Bogorodskiy 30 Mar '16

30 Mar '16

* tools/nss/libvirt_nss.[ch]: add BSD-comptabile wrappers and register via the nss_module_register() interface * m4/virt-nss.m4: add checks if we're building NSS for FreeBSD * tools/Makefile.am: handle target library name differences, as Linux needs libnss_libvirt.so.2 and FreeBSD needs nss_libvirt.so.1. Also, different syms files have to be used as Linux needs to export all the methods while FreeBSD only needs to have nss_module_register() * tests/nsstest.c, tests/nssmock.c: s/__linux__/NSS/ * libvirt_nss_bsd.syms: FreeBSD syms file --- m4/virt-nss.m4 | 18 +++++- tests/nssmock.c | 6 +- tests/nsstest.c | 2 +- tools/Makefile.am | 16 ++++- tools/nss/libvirt_nss.c | 139 +++++++++++++++++++++++++++++++++++++++-- tools/nss/libvirt_nss.h | 9 +++ tools/nss/libvirt_nss_bsd.syms | 9 +++ 7 files changed, 189 insertions(+), 10 deletions(-) create mode 100644 tools/nss/libvirt_nss_bsd.syms diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 index 3fa4ad3..3d6e8f4 100644 --- a/m4/virt-nss.m4 +++ b/m4/virt-nss.m4 @@ -23,6 +23,7 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[ [enable Name Servie Switch plugin for resolving guest IP addresses])], [], [with_nss_plugin=check]) + bsd_nss=no fail=0 if test "x$with_nss_plugin" != "xno" ; then AC_CHECK_HEADERS([nss.h], [ @@ -39,11 +40,26 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[ if test "x$with_nss_plugin" = "xyes" ; then AC_DEFINE_UNQUOTED([NSS], 1, [whether nss plugin is enabled]) + + AC_CHECK_TYPE([struct gaih_addrtuple], + [AC_DEFINE([HAVE_STRUCT_GAIH_ADDRTUPLE], [1], + [Defined if struct gaih_addrtuple exists in nss.h])], + [], [[#include <nss.h> + ]]) + + AC_CHECK_TYPES([ns_mtab, nss_module_unregister_fn], + [AC_DEFINE([HAVE_BSD_NSS], + [1], + [whether using BSD style NSS]) + bsd_nss=yes + ], + [], + [#include <nsswitch.h>]) fi fi AM_CONDITIONAL(WITH_NSS, [test "x$with_nss_plugin" = "xyes"]) - + AM_CONDITIONAL(WITH_BSD_NSS, [test "x$bsd_nss" = "xyes"]) ]) AC_DEFUN([LIBVIRT_RESULT_NSS],[ diff --git a/tests/nssmock.c b/tests/nssmock.c index b4a4260..31b1177 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -20,7 +20,7 @@ #include <config.h> -#ifdef __linux__ +#ifdef NSS # include <stdio.h> # include <stdlib.h> # include <dlfcn.h> @@ -107,7 +107,7 @@ open(const char *path, int flags, ...) va_list ap; mode_t mode; va_start(ap, flags); - mode = va_arg(ap, mode_t); + mode = va_arg(ap, int); va_end(ap); ret = realopen(newpath ? newpath : path, flags, mode); } else { @@ -136,5 +136,5 @@ opendir(const char *path) return ret; } #else -/* Nothing to override on non-__linux__ platforms */ +/* Nothing to override if NSS plugin is not enabled */ #endif diff --git a/tests/nsstest.c b/tests/nsstest.c index 7399d9a..63c7162 100644 --- a/tests/nsstest.c +++ b/tests/nsstest.c @@ -22,7 +22,7 @@ #include "testutils.h" -#ifdef __linux__ +#ifdef NSS # include <stdbool.h> # include <arpa/inet.h> diff --git a/tools/Makefile.am b/tools/Makefile.am index 4320040..6005b8b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -417,8 +417,22 @@ CLEANFILES += wireshark/src/plugin.c endif WITH_WIRESHARK_DISSECTOR +if WITH_BSD_NSS +LIBVIRT_NSS_SYMBOL_FILE = \ + $(srcdir)/nss/libvirt_nss_bsd.syms +NSS_SO_VER = 1 + +install-exec-hook: + cd $(DESTDIR)$(libdir) && \ + $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) + +uninstall-local: + rm $(DESTDIR)$(libdir)/libnss_libvirt.so.$(NSS_SO_VER) +else ! WITH_BSD_NSS LIBVIRT_NSS_SYMBOL_FILE = \ $(srcdir)/nss/libvirt_nss.syms +NSS_SO_VER = 2 +endif ! WITH_BSD_NSS LIBVIRT_NSS_SOURCES = \ nss/libvirt_nss.c \ @@ -449,7 +463,7 @@ nss_libnss_libvirt_la_LDFLAGS = \ -export-dynamic \ -avoid-version \ -shared \ - -shrext .so.2 + -shrext .so.$(NSS_SO_VER) nss_libnss_libvirt_la_LIBADD = \ nss/libnss_libvirt_impl.la diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 218c62a..de34baf 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -29,11 +29,16 @@ #include "libvirt_nss.h" +#include <netinet/in.h> #include <resolv.h> #include <sys/types.h> #include <dirent.h> #include <arpa/inet.h> +#if defined(HAVE_BSD_NSS) +# include <nsswitch.h> +#endif + #include "virlease.h" #include "viralloc.h" #include "virfile.h" @@ -65,7 +70,7 @@ do { \ #define LEASEDIR LOCALSTATEDIR "/lib/libvirt/dnsmasq/" -#define ALIGN(x) (((x) + __SIZEOF_POINTER__ - 1) & ~(__SIZEOF_POINTER__ - 1)) +#define LIBVIRT_ALIGN(x) (((x) + __SIZEOF_POINTER__ - 1) & ~(__SIZEOF_POINTER__ - 1)) #define FAMILY_ADDRESS_SIZE(family) ((family) == AF_INET6 ? 16 : 4) typedef struct { @@ -256,7 +261,7 @@ static inline void * move_and_align(void *buf, size_t len, size_t *idx) { char *buffer = buf; - size_t move = ALIGN(len); + size_t move = LIBVIRT_ALIGN(len); if (!idx) return buffer + move; @@ -321,7 +326,7 @@ _nss_libvirt_gethostbyname3_r(const char *name, int af, struct hostent *result, * b) alias * c) addresses * d) NULL stem */ - need = ALIGN(nameLen + 1) + naddr * ALIGN(alen) + (naddr + 2) * sizeof(char*); + need = LIBVIRT_ALIGN(nameLen + 1) + naddr * LIBVIRT_ALIGN(alen) + (naddr + 2) * sizeof(char*); if (buflen < need) { *errnop = ENOMEM; @@ -383,6 +388,7 @@ _nss_libvirt_gethostbyname3_r(const char *name, int af, struct hostent *result, return ret; } +#ifdef HAVE_STRUCT_GAIH_ADDRTUPLE enum nss_status _nss_libvirt_gethostbyname4_r(const char *name, struct gaih_addrtuple **pat, char *buffer, size_t buflen, int *errnop, @@ -426,7 +432,7 @@ _nss_libvirt_gethostbyname4_r(const char *name, struct gaih_addrtuple **pat, /* We need space for: * a) name * b) addresses */ - need = ALIGN(nameLen + 1) + naddr * ALIGN(sizeof(struct gaih_addrtuple)); + need = LIBVIRT_ALIGN(nameLen + 1) + naddr * LIBVIRT_ALIGN(sizeof(struct gaih_addrtuple)); if (buflen < need) { *errnop = ENOMEM; @@ -474,3 +480,128 @@ _nss_libvirt_gethostbyname4_r(const char *name, struct gaih_addrtuple **pat, cleanup: return ret; } +#endif /* HAVE_STRUCT_GAIH_ADDRTUPLE */ + +#if defined(HAVE_BSD_NSS) +NSS_METHOD_PROTOTYPE(_nss_compat_getaddrinfo); +NSS_METHOD_PROTOTYPE(_nss_compat_gethostbyname2_r); + +ns_mtab methods[] = { + { NSDB_HOSTS, "getaddrinfo", _nss_compat_getaddrinfo, NULL }, + { NSDB_HOSTS, "gethostbyname", _nss_compat_gethostbyname2_r, NULL }, + { NSDB_HOSTS, "gethostbyname2_r", _nss_compat_gethostbyname2_r, NULL }, +}; + +static void +aiforaf(const char *name, int af, struct addrinfo *pai, struct addrinfo **aip) +{ + int ret; + struct hostent resolved; + char buf[1024] = { 0 }; + int err, herr; + struct addrinfo hints, *res0, *res; + char **addrList; + + if ((ret = _nss_libvirt_gethostbyname2_r(name, af, &resolved, + buf, sizeof(buf), + &err, &herr)) != NS_SUCCESS) + return; + + addrList = resolved.h_addr_list; + while (*addrList) { + virSocketAddr sa; + char *ipAddr = NULL; + void *address = *addrList; + + memset(&sa, 0, sizeof(sa)); + if (resolved.h_addrtype == AF_INET) { + virSocketAddrSetIPv4AddrNetOrder(&sa, *((uint32_t *) address)); + } else { + virSocketAddrSetIPv6AddrNetOrder(&sa, address); + } + + ipAddr = virSocketAddrFormat(&sa); + + hints = *pai; + hints.ai_flags = AI_NUMERICHOST; + hints.ai_family = af; + + if (getaddrinfo(ipAddr, NULL, &hints, &res0)) { + addrList++; + continue; + } + + for (res = res0; res; res = res->ai_next) + res->ai_flags = pai->ai_flags; + + (*aip)->ai_next = res0; + while ((*aip)->ai_next) + *aip = (*aip)->ai_next; + + addrList++; + } +} + +int +_nss_compat_getaddrinfo(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list ap) +{ + struct addrinfo sentinel, *cur, *ai; + const char *name; + + name = va_arg(ap, char *); + ai = va_arg(ap, struct addrinfo *); + + memset(&sentinel, 0, sizeof(sentinel)); + cur = &sentinel; + + if ((ai->ai_family == AF_UNSPEC) || (ai->ai_family == AF_INET6)) + aiforaf(name, AF_INET6, ai, &cur); + if ((ai->ai_family == AF_UNSPEC) || (ai->ai_family == AF_INET)) + aiforaf(name, AF_INET, ai, &cur); + + if (sentinel.ai_next == NULL) { + h_errno = HOST_NOT_FOUND; + return NS_NOTFOUND; + } + *((struct addrinfo **)retval) = sentinel.ai_next; + + return NS_SUCCESS; +} + +int +_nss_compat_gethostbyname2_r(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list ap) +{ + int ret; + + const char *name; + int af; + struct hostent *result; + char *buffer; + size_t buflen; + int *errnop; + int *herrnop; + + name = va_arg(ap, const char *); + af = va_arg(ap, int); + result = va_arg(ap, struct hostent *); + buffer = va_arg(ap, char *); + buflen = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + herrnop = va_arg(ap, int *); + + ret = _nss_libvirt_gethostbyname2_r( + name, af, result, buffer, buflen, errnop, herrnop); + *(struct hostent **)retval = (ret == NS_SUCCESS) ? result : NULL; + + return ret; +} + +ns_mtab* +nss_module_register(const char *name ATTRIBUTE_UNUSED, unsigned int *size, + nss_module_unregister_fn *unregister) +{ + *size = sizeof(methods) / sizeof(methods[0]); + *unregister = NULL; + return methods; +} +#endif /* HAVE_BSD_NSS */ diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h index 589c1e6..e025e63 100644 --- a/tools/nss/libvirt_nss.h +++ b/tools/nss/libvirt_nss.h @@ -45,8 +45,17 @@ enum nss_status _nss_libvirt_gethostbyname3_r(const char *name, int af, struct hostent *result, char *buffer, size_t buflen, int *errnop, int *herrnop, int32_t *ttlp, char **canonp); +# ifdef HAVE_STRUCT_GAIH_ADDRTUPLE enum nss_status _nss_libvirt_gethostbyname4_r(const char *name, struct gaih_addrtuple **pat, char *buffer, size_t buflen, int *errnop, int *herrnop, int32_t *ttlp); +# endif /* HAVE_STRUCT_GAIH_ADDRTUPLE */ + +# if defined(HAVE_BSD_NSS) +ns_mtab* +nss_module_register(const char *name, unsigned int *size, + nss_module_unregister_fn *unregister); +# endif /* HAVE_BSD_NSS */ + #endif /* __LIBVIRT_NSS_H__ */ diff --git a/tools/nss/libvirt_nss_bsd.syms b/tools/nss/libvirt_nss_bsd.syms new file mode 100644 index 0000000..7da3926 --- /dev/null +++ b/tools/nss/libvirt_nss_bsd.syms @@ -0,0 +1,9 @@ +# +# Officially exported symbols. +# + +{ +global: + nss_module_register; +local: *; +}; -- 2.7.2

2 4