- Devel - libvirt List Archives

[libvirt] [PATCH] build: fix build --without-remote
by Eric Blake 04 Oct '13

04 Oct '13

I tried to test ./configure --without-lxc --without-remote. First, the build failed with some odd errors, such as an inability to build xen, or link failures for virNetTLSInit. But when you think about it, once there is no remote code, all of libvirtd is useless, any stateful driver that depends on libvirtd is also not worth compiling, and any libraries used only by RPC code are not needed. So I patched configure.ac to make for some saner defaults when an explicit disable is attempted. Similarly, since we have migrated virnetdevbridge into generic code, the workaround for Linux kernel stupidity must not depend on stateful drivers being in use. Then there's 'make check' that needs segragation. Wow - quite a bit of cleanup to make --without-remote useful :) * configure.ac: Let --without-remote toggle defaults on stateful drivers and other libraries. Pick up Linux kernel workarounds even when qemu and lxc are not being compiled. * tests/Makefile.am (test_programs): Factor out programs that require remote. * src/libvirt_private.syms (rpc/virnet*.h): Move... * src/libvirt_remote.syms: ...into new file. * src/Makefile.am (SYM_FILES): Ship new syms file. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Looks big, but most of it is motion of text from splitting a file. It fixes a build failure, but --enable-remote is not a regression for this particular release (it's been broken for a while), so I'll wait for a review even if it misses 1.1.3. configure.ac | 16 +++- src/Makefile.am | 6 ++ src/libvirt_private.syms | 199 -------------------------------------------- src/libvirt_remote.syms | 210 +++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 19 +++-- 5 files changed, 243 insertions(+), 207 deletions(-) create mode 100644 src/libvirt_remote.syms diff --git a/configure.ac b/configure.ac index 553015a..b82dc8b 100644 --- a/configure.ac +++ b/configure.ac @@ -198,8 +198,22 @@ fi AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) +# The daemon requires remote support. Likewise, if we are not using +# RPC, we don't need several libraries. +if test "$with_remote" = "no" ; then + with_libvirtd=no + with_gnutls=no + with_ssh2=no + with_sasl=no +fi +# Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" = "no" ; then with_qemu=no + with_xen=no + with_lxc=no + with_libxl=no + with_uml=no + with_vbox=no fi # Check for compiler and library settings. @@ -1053,7 +1067,6 @@ dnl dnl check for kernel headers required by src/bridge.c dnl if test "$with_linux" = "yes"; then - if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then # Various kernel versions have headers that are not self-standing, but # yet are incompatible with the corresponding glibc headers. In order # to guarantee compilation across a wide range of versions (from RHEL 5 @@ -1087,7 +1100,6 @@ if test "$with_linux" = "yes"; then #endif #include <linux/in6.h> ]]) - fi fi diff --git a/src/Makefile.am b/src/Makefile.am index 8632b18..201c268 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1756,6 +1756,12 @@ else ! WITH_LIBVIRTD SYM_FILES += $(srcdir)/libvirt_daemon.syms endif ! WITH_LIBVIRTD +if WITH_REMOTE +USED_SYM_FILES += $(srcdir)/libvirt_remote.syms +else ! WITH_REMOTE +SYM_FILES += $(srcdir)/libvirt_remote.syms +endif ! WITH_REMOTE + if WITH_OPENVZ USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms else ! WITH_OPENVZ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 48e4b04..62aab9b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -831,205 +831,6 @@ nodeGetMemoryStats; nodeSetMemoryParameters; -# rpc/virnetclient.h -virNetClientAddProgram; -virNetClientAddStream; -virNetClientClose; -virNetClientDupFD; -virNetClientGetFD; -virNetClientHasPassFD; -virNetClientIsEncrypted; -virNetClientIsOpen; -virNetClientKeepAliveIsSupported; -virNetClientKeepAliveStart; -virNetClientKeepAliveStop; -virNetClientLocalAddrString; -virNetClientNewExternal; -virNetClientNewLibSSH2; -virNetClientNewSSH; -virNetClientNewTCP; -virNetClientNewUNIX; -virNetClientRegisterAsyncIO; -virNetClientRegisterKeepAlive; -virNetClientRemoteAddrString; -virNetClientRemoveStream; -virNetClientSendNonBlock; -virNetClientSendNoReply; -virNetClientSendWithReply; -virNetClientSendWithReplyStream; -virNetClientSetCloseCallback; - - -# rpc/virnetclientprogram.h -virNetClientProgramCall; -virNetClientProgramDispatch; -virNetClientProgramGetProgram; -virNetClientProgramGetVersion; -virNetClientProgramMatches; -virNetClientProgramNew; - - -# rpc/virnetclientstream.h -virNetClientStreamEOF; -virNetClientStreamEventAddCallback; -virNetClientStreamEventRemoveCallback; -virNetClientStreamEventUpdateCallback; -virNetClientStreamMatches; -virNetClientStreamNew; -virNetClientStreamQueuePacket; -virNetClientStreamRaiseError; -virNetClientStreamRecvPacket; -virNetClientStreamSendPacket; -virNetClientStreamSetError; - - -# rpc/virnetmessage.h -virNetMessageClear; -virNetMessageDecodeHeader; -virNetMessageDecodeLength; -virNetMessageDecodeNumFDs; -virNetMessageDecodePayload; -virNetMessageDupFD; -virNetMessageEncodeHeader; -virNetMessageEncodeNumFDs; -virNetMessageEncodePayload; -virNetMessageEncodePayloadRaw; -virNetMessageFree; -virNetMessageNew; -virNetMessageQueuePush; -virNetMessageQueueServe; -virNetMessageSaveError; -xdr_virNetMessageError; - - -# rpc/virnetserver.h -virNetServerAddProgram; -virNetServerAddService; -virNetServerAddShutdownInhibition; -virNetServerAddSignalHandler; -virNetServerAutoShutdown; -virNetServerClose; -virNetServerIsPrivileged; -virNetServerKeepAliveRequired; -virNetServerNew; -virNetServerNewPostExecRestart; -virNetServerPreExecRestart; -virNetServerQuit; -virNetServerRemoveShutdownInhibition; -virNetServerRun; -virNetServerUpdateServices; - - -# rpc/virnetserverclient.h -virNetServerClientAddFilter; -virNetServerClientClose; -virNetServerClientDelayedClose; -virNetServerClientGetAuth; -virNetServerClientGetFD; -virNetServerClientGetIdentity; -virNetServerClientGetPrivateData; -virNetServerClientGetReadonly; -virNetServerClientGetSELinuxContext; -virNetServerClientGetUNIXIdentity; -virNetServerClientImmediateClose; -virNetServerClientInit; -virNetServerClientInitKeepAlive; -virNetServerClientIsClosed; -virNetServerClientIsLocal; -virNetServerClientIsSecure; -virNetServerClientLocalAddrString; -virNetServerClientNeedAuth; -virNetServerClientNew; -virNetServerClientNewPostExecRestart; -virNetServerClientPreExecRestart; -virNetServerClientRemoteAddrString; -virNetServerClientRemoveFilter; -virNetServerClientSendMessage; -virNetServerClientSetAuth; -virNetServerClientSetCloseHook; -virNetServerClientSetDispatcher; -virNetServerClientStartKeepAlive; -virNetServerClientWantClose; - - -# rpc/virnetservermdns.h -virNetServerMDNSAddEntry; -virNetServerMDNSAddGroup; -virNetServerMDNSEntryFree; -virNetServerMDNSFree; -virNetServerMDNSGroupFree; -virNetServerMDNSNew; -virNetServerMDNSRemoveEntry; -virNetServerMDNSRemoveGroup; -virNetServerMDNSStart; -virNetServerMDNSStop; - - -# rpc/virnetserverprogram.h -virNetServerProgramDispatch; -virNetServerProgramGetID; -virNetServerProgramGetPriority; -virNetServerProgramGetVersion; -virNetServerProgramMatches; -virNetServerProgramNew; -virNetServerProgramSendReplyError; -virNetServerProgramSendStreamData; -virNetServerProgramSendStreamError; -virNetServerProgramUnknownError; - - -# rpc/virnetserverservice.h -virNetServerServiceClose; -virNetServerServiceGetAuth; -virNetServerServiceGetMaxRequests; -virNetServerServiceGetPort; -virNetServerServiceIsReadonly; -virNetServerServiceNewFD; -virNetServerServiceNewPostExecRestart; -virNetServerServiceNewTCP; -virNetServerServiceNewUNIX; -virNetServerServicePreExecRestart; -virNetServerServiceSetDispatcher; -virNetServerServiceToggle; - - -# rpc/virnetsocket.h -virNetSocketAccept; -virNetSocketAddIOCallback; -virNetSocketClose; -virNetSocketDupFD; -virNetSocketGetFD; -virNetSocketGetPort; -virNetSocketGetSELinuxContext; -virNetSocketGetUNIXIdentity; -virNetSocketHasCachedData; -virNetSocketHasPassFD; -virNetSocketHasPendingData; -virNetSocketIsLocal; -virNetSocketListen; -virNetSocketLocalAddrString; -virNetSocketNewConnectCommand; -virNetSocketNewConnectExternal; -virNetSocketNewConnectLibSSH2; -virNetSocketNewConnectSockFD; -virNetSocketNewConnectSSH; -virNetSocketNewConnectTCP; -virNetSocketNewConnectUNIX; -virNetSocketNewListenFD; -virNetSocketNewListenTCP; -virNetSocketNewListenUNIX; -virNetSocketNewPostExecRestart; -virNetSocketPreExecRestart; -virNetSocketRead; -virNetSocketRecvFD; -virNetSocketRemoteAddrString; -virNetSocketRemoveIOCallback; -virNetSocketSendFD; -virNetSocketSetBlocking; -virNetSocketUpdateIOCallback; -virNetSocketWrite; - - # security/security_driver.h virSecurityDriverLookup; diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms new file mode 100644 index 0000000..d482a55 --- /dev/null +++ b/src/libvirt_remote.syms @@ -0,0 +1,210 @@ +# +# Private symbols used in RPC operations. Add symbols here, and see +# Makefile.am for more details. +# +# Keep this file sorted by header name, then by symbols with each header. +# + +# rpc/virnetclient.h +virNetClientAddProgram; +virNetClientAddStream; +virNetClientClose; +virNetClientDupFD; +virNetClientGetFD; +virNetClientHasPassFD; +virNetClientIsEncrypted; +virNetClientIsOpen; +virNetClientKeepAliveIsSupported; +virNetClientKeepAliveStart; +virNetClientKeepAliveStop; +virNetClientLocalAddrString; +virNetClientNewExternal; +virNetClientNewLibSSH2; +virNetClientNewSSH; +virNetClientNewTCP; +virNetClientNewUNIX; +virNetClientRegisterAsyncIO; +virNetClientRegisterKeepAlive; +virNetClientRemoteAddrString; +virNetClientRemoveStream; +virNetClientSendNonBlock; +virNetClientSendNoReply; +virNetClientSendWithReply; +virNetClientSendWithReplyStream; +virNetClientSetCloseCallback; + + +# rpc/virnetclientprogram.h +virNetClientProgramCall; +virNetClientProgramDispatch; +virNetClientProgramGetProgram; +virNetClientProgramGetVersion; +virNetClientProgramMatches; +virNetClientProgramNew; + + +# rpc/virnetclientstream.h +virNetClientStreamEOF; +virNetClientStreamEventAddCallback; +virNetClientStreamEventRemoveCallback; +virNetClientStreamEventUpdateCallback; +virNetClientStreamMatches; +virNetClientStreamNew; +virNetClientStreamQueuePacket; +virNetClientStreamRaiseError; +virNetClientStreamRecvPacket; +virNetClientStreamSendPacket; +virNetClientStreamSetError; + + +# rpc/virnetmessage.h +virNetMessageClear; +virNetMessageDecodeHeader; +virNetMessageDecodeLength; +virNetMessageDecodeNumFDs; +virNetMessageDecodePayload; +virNetMessageDupFD; +virNetMessageEncodeHeader; +virNetMessageEncodeNumFDs; +virNetMessageEncodePayload; +virNetMessageEncodePayloadRaw; +virNetMessageFree; +virNetMessageNew; +virNetMessageQueuePush; +virNetMessageQueueServe; +virNetMessageSaveError; +xdr_virNetMessageError; + + +# rpc/virnetserver.h +virNetServerAddProgram; +virNetServerAddService; +virNetServerAddShutdownInhibition; +virNetServerAddSignalHandler; +virNetServerAutoShutdown; +virNetServerClose; +virNetServerIsPrivileged; +virNetServerKeepAliveRequired; +virNetServerNew; +virNetServerNewPostExecRestart; +virNetServerPreExecRestart; +virNetServerQuit; +virNetServerRemoveShutdownInhibition; +virNetServerRun; +virNetServerUpdateServices; + + +# rpc/virnetserverclient.h +virNetServerClientAddFilter; +virNetServerClientClose; +virNetServerClientDelayedClose; +virNetServerClientGetAuth; +virNetServerClientGetFD; +virNetServerClientGetIdentity; +virNetServerClientGetPrivateData; +virNetServerClientGetReadonly; +virNetServerClientGetSELinuxContext; +virNetServerClientGetUNIXIdentity; +virNetServerClientImmediateClose; +virNetServerClientInit; +virNetServerClientInitKeepAlive; +virNetServerClientIsClosed; +virNetServerClientIsLocal; +virNetServerClientIsSecure; +virNetServerClientLocalAddrString; +virNetServerClientNeedAuth; +virNetServerClientNew; +virNetServerClientNewPostExecRestart; +virNetServerClientPreExecRestart; +virNetServerClientRemoteAddrString; +virNetServerClientRemoveFilter; +virNetServerClientSendMessage; +virNetServerClientSetAuth; +virNetServerClientSetCloseHook; +virNetServerClientSetDispatcher; +virNetServerClientStartKeepAlive; +virNetServerClientWantClose; + + +# rpc/virnetservermdns.h +virNetServerMDNSAddEntry; +virNetServerMDNSAddGroup; +virNetServerMDNSEntryFree; +virNetServerMDNSFree; +virNetServerMDNSGroupFree; +virNetServerMDNSNew; +virNetServerMDNSRemoveEntry; +virNetServerMDNSRemoveGroup; +virNetServerMDNSStart; +virNetServerMDNSStop; + + +# rpc/virnetserverprogram.h +virNetServerProgramDispatch; +virNetServerProgramGetID; +virNetServerProgramGetPriority; +virNetServerProgramGetVersion; +virNetServerProgramMatches; +virNetServerProgramNew; +virNetServerProgramSendReplyError; +virNetServerProgramSendStreamData; +virNetServerProgramSendStreamError; +virNetServerProgramUnknownError; + + +# rpc/virnetserverservice.h +virNetServerServiceClose; +virNetServerServiceGetAuth; +virNetServerServiceGetMaxRequests; +virNetServerServiceGetPort; +virNetServerServiceIsReadonly; +virNetServerServiceNewFD; +virNetServerServiceNewPostExecRestart; +virNetServerServiceNewTCP; +virNetServerServiceNewUNIX; +virNetServerServicePreExecRestart; +virNetServerServiceSetDispatcher; +virNetServerServiceToggle; + + +# rpc/virnetsocket.h +virNetSocketAccept; +virNetSocketAddIOCallback; +virNetSocketClose; +virNetSocketDupFD; +virNetSocketGetFD; +virNetSocketGetPort; +virNetSocketGetSELinuxContext; +virNetSocketGetUNIXIdentity; +virNetSocketHasCachedData; +virNetSocketHasPassFD; +virNetSocketHasPendingData; +virNetSocketIsLocal; +virNetSocketListen; +virNetSocketLocalAddrString; +virNetSocketNewConnectCommand; +virNetSocketNewConnectExternal; +virNetSocketNewConnectLibSSH2; +virNetSocketNewConnectSockFD; +virNetSocketNewConnectSSH; +virNetSocketNewConnectTCP; +virNetSocketNewConnectUNIX; +virNetSocketNewListenFD; +virNetSocketNewListenTCP; +virNetSocketNewListenUNIX; +virNetSocketNewPostExecRestart; +virNetSocketPreExecRestart; +virNetSocketRead; +virNetSocketRecvFD; +virNetSocketRemoteAddrString; +virNetSocketRemoveIOCallback; +virNetSocketSendFD; +virNetSocketSetBlocking; +virNetSocketUpdateIOCallback; +virNetSocketWrite; + + +# Let emacs know we want case-insensitive sorting +# Local Variables: +# sort-fold-case: t +# End: diff --git a/tests/Makefile.am b/tests/Makefile.am index 17a2a72..9a6453b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -114,8 +114,8 @@ test_helpers = commandhelper ssh test_conf test_programs = virshtest sockettest \ nodeinfotest virbuftest \ commandtest seclabeltest \ - virhashtest virnetmessagetest virnetsockettest \ - viratomictest virnetserverclienttest \ + virhashtest \ + viratomictest \ utiltest shunloadtest \ virtimetest viruritest virkeyfiletest \ virauthconfigtest \ @@ -131,6 +131,17 @@ test_programs = virshtest sockettest \ virstoragetest \ $(NULL) +if WITH_REMOTE +test_programs += \ + virnetmessagetest \ + virnetsockettest \ + virnetserverclienttest \ + $(NULL) +if WITH_GNUTLS +test_programs += virnettlscontexttest virnettlssessiontest +endif WITH_GNUTLS +endif WITH_REMOTE + if WITH_LINUX test_programs += fchosttest endif WITH_LINUX @@ -144,10 +155,6 @@ test_programs += virdbustest \ virsystemdtest endif WITH_DBUS -if WITH_GNUTLS -test_programs += virnettlscontexttest virnettlssessiontest -endif WITH_GNUTLS - if WITH_SECDRIVER_SELINUX if WITH_ATTR test_programs += securityselinuxtest -- 1.8.3.1

2 3

[libvirt] Second pass at patch to get different SELinux Labels for virt-sandbox
by Dan Walsh 04 Oct '13

04 Oct '13

selinux-policy-3.12.1-87.fc21 selinux-policy-3.12.1-87.fc20 Now have lxc_contexts files that look like > cat /etc/selinux/targeted/contexts/lxc_contexts lxc=system_u:system_r:svirt_lxc_net_t:s0 qemu=system_u:system_r:svirt_qemu_net_t:s0 kvm=system_u:system_r:svirt_qemu_net_t:s0 process=system_u:system_r:svirt_lxc_net_t:s0 file=system_u:object_r:svirt_sandbox_file_t:s0 content=system_u:object_r:virt_var_lib_t:s0 [sandbox PATCH] virt-sandbox patch to launch containers with proper

1 1

[libvirt] [PATCH] docs: aclpolkit: Fix a heading typo
by Cole Robinson 04 Oct '13

04 Oct '13

--- docs/aclpolkit.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 1a09139..91b5296 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -303,7 +303,7 @@ </p> - <h2><a name="checks">Writing acces control policies</a></h2> + <h2><a name="checks">Writing access control policies</a></h2> <p> If using versions of polkit prior to 0.106 then it is only -- 1.8.3.1

2 2

[libvirt] Xen Project Developer Summit: check the schedule and register!
by Dario Faggioli 04 Oct '13

04 Oct '13

Hi all, The program for the Xen Project Developer Summit 2013 has been announced! Get more details at the links below: xendevelopersummit2013.sched.org/ http://blog.xen.org/index.php/2013/10/02/xen-project-developer-summit-line-… http://events.linuxfoundation.org/events/xen-project-developer-summit Don't miss the opportunity to come and see what's going on in the Xen Project's community. Register and join us in Edinburgh! Regards, Dario -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

1 0

[libvirt] [PATCH] storage: fix file allocation behavior in file cloning
by Oskari Saarenmaa 04 Oct '13

04 Oct '13

Fixed the safezero call for allocating the rest of the file after cloning an existing volume; it used to always use a zero offset, causing it to only allocate the beginning of the file. Also modified file creation to try to use fallocate(2) to pre-allocate disk space before copying any data to make sure it fails early on if disk is full and makes sure we can skip zero blocks when copying file contents. If fallocate isn't available we will zero out the rest of the file after cloning and only use sparse cloning if client requested a lower allocation than the input volume's capacity. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- the safezero mmap issue fixed in my previous patch never showed up because all safezero calls previously had 0 offset (or maybe everyone's using posix_fallocate) configure.ac | 8 ++++---- src/storage/storage_backend.c | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 553015a..220d95b 100644 --- a/configure.ac +++ b/configure.ac @@ -253,10 +253,10 @@ AC_CHECK_SIZEOF([long]) dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions -AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ - getpwuid_r getuid kill mmap newlocale posix_fallocate posix_memalign \ - prlimit regexec sched_getaffinity setgroups setns setrlimit symlink \ - sysctlbyname]) +AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \ + getmntent_r getpwuid_r getuid kill mmap newlocale posix_fallocate \ + posix_memalign prlimit regexec sched_getaffinity setgroups setns \ + setrlimit symlink sysctlbyname]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b7edf85..5f1bc66 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -129,7 +129,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, int fd, unsigned long long *total, - int is_dest_file) + int want_sparse) { int inputfd = -1; int amtread = -1; @@ -191,7 +191,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, interval = ((wbytes > amtleft) ? amtleft : wbytes); int offset = amtread - amtleft; - if (is_dest_file && memcmp(buf+offset, zerobuf, interval) == 0) { + if (want_sparse && memcmp(buf+offset, zerobuf, interval) == 0) { if (lseek(fd, interval, SEEK_CUR) < 0) { ret = -errno; virReportSystemError(errno, @@ -315,6 +315,7 @@ static int createRawFile(int fd, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol) { + int need_alloc = 1; int ret = 0; unsigned long long remain; @@ -328,17 +329,41 @@ createRawFile(int fd, virStorageVolDefPtr vol, goto cleanup; } +#ifdef HAVE_FALLOCATE + /* Try to preallocate all requested disk space, but fall back to + * other methods if this fails with ENOSYS or EOPNOTSUPP. + * NOTE: do not use posix_fallocate; posix_fallocate falls back + * to writing zeroes block by block in case fallocate isn't + * available, and since we're going to copy data from another + * file it doesn't make sense to write the file twice. */ + if (fallocate(fd, 0, 0, vol->allocation) == 0) { + need_alloc = 0; + } else if (errno != ENOSYS && errno != EOPNOTSUPP) { + ret = -errno; + virReportSystemError(errno, + _("cannot allocate %llu bytes in file '%s'"), + vol->allocation, vol->target.path); + goto cleanup; + } +#endif + remain = vol->allocation; if (inputvol) { - ret = virStorageBackendCopyToFD(vol, inputvol, fd, &remain, 1); + /* allow zero blocks to be skipped if we've requested sparse + * allocation (allocation < capacity) or we have already + * been able to allocate the required space. */ + int want_sparse = (need_alloc == 0) || + (vol->allocation < inputvol->capacity); + + ret = virStorageBackendCopyToFD(vol, inputvol, fd, &remain, want_sparse); if (ret < 0) { goto cleanup; } } - if (remain) { - if (safezero(fd, 0, remain) < 0) { + if (remain && need_alloc) { + if (safezero(fd, vol->allocation - remain, remain) < 0) { ret = -errno; virReportSystemError(errno, _("cannot fill file '%s'"), vol->target.path); -- 1.8.3.1

2 1

[libvirt] [PATCH] virfile: safezero: fall back to writing block by block if mmap fails
by Oskari Saarenmaa 04 Oct '13

04 Oct '13

mmap can fail on 32-bit systems if we're trying to zero out a lot of data. Fall back to using block-by-block writing in that case. While we could map smaller blocks it's unlikely that this code is used a lot and its easier to just fall back to one of the existing methods. Also modified the block-by-block zeroing to not allocate a megabyte of zeroes if we're writing less than that. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- src/util/virfile.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 16f8101..f662127 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1032,16 +1032,18 @@ safezero(int fd, off_t offset, off_t len) errno = ret; return -1; } + #else -# ifdef HAVE_MMAP int safezero(int fd, off_t offset, off_t len) { - static long pagemask = 0; - off_t map_skip; int r; char *buf; + unsigned long long remain, bytes; +# ifdef HAVE_MMAP + static long pagemask = 0; + off_t map_skip; /* align offset and length, rounding offset down and length up */ if (pagemask == 0) @@ -1057,30 +1059,23 @@ safezero(int fd, off_t offset, off_t len) buf = mmap(NULL, len + map_skip, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset - map_skip); - if (buf == MAP_FAILED) - return -1; + if (buf != MAP_FAILED) { + memset(buf + map_skip, 0, len); + munmap(buf, len + map_skip); - memset(buf + map_skip, 0, len); - munmap(buf, len + map_skip); - - return 0; -} - -# else /* HAVE_MMAP */ + return 0; + } -int -safezero(int fd, off_t offset, off_t len) -{ - int r; - char *buf; - unsigned long long remain, bytes; + /* fall back to writing zeroes using safewrite if mmap fails (for + * example because of virtual memory limits) */ +# endif /* HAVE_MMAP */ if (lseek(fd, offset, SEEK_SET) < 0) return -1; /* Split up the write in small chunks so as not to allocate lots of RAM */ remain = len; - bytes = 1024 * 1024; + bytes = MAX(1024 * 1024, len); r = VIR_ALLOC_N(buf, bytes); if (r < 0) { @@ -1104,7 +1099,6 @@ safezero(int fd, off_t offset, off_t len) VIR_FREE(buf); return 0; } -# endif /* HAVE_MMAP */ #endif /* HAVE_POSIX_FALLOCATE */ -- 1.8.3.1

2 3

[libvirt] [PATCH v2] test: Fix coverity warnings
by Cole Robinson 04 Oct '13

04 Oct '13

--- v2: Address Eric's suggestion Address additional coverity warnings pointed out by John src/test/test_driver.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 255cc2b..c2e530e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6547,16 +6547,12 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, { virDomainObjPtr vm = NULL; int ret = -1; - virDomainSnapshotObjPtr snap = NULL; virCheckFlags(0, -1); if (!(vm = testDomObjFromSnapshot(snapshot))) goto cleanup; - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); @@ -6573,14 +6569,13 @@ testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, { virDomainObjPtr vm = NULL; int ret = -1; - virDomainSnapshotObjPtr snap = NULL; virCheckFlags(0, -1); if (!(vm = testDomObjFromSnapshot(snapshot))) goto cleanup; - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) + if (!testSnapObjFromSnapshot(vm, snapshot)) goto cleanup; ret = 1; @@ -6679,8 +6674,8 @@ testDomainSnapshotCreateXML(virDomainPtr domain, goto cleanup; if (redefine) { - if (!virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, - &update_current, flags) < 0) + if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, + &update_current, flags) < 0) goto cleanup; } else { if (!(def->dom = virDomainDefCopy(vm->def, @@ -7078,6 +7073,8 @@ cleanup: testDomainEventQueue(privconn, event); if (event2) testDomainEventQueue(privconn, event2); + } else { + virDomainEventFree(event2); } virObjectUnlock(vm); testDriverUnlock(privconn); -- 1.8.3.1

3 3

[libvirt] [PATCH] qemu: Use maximum guest memory size when getting NUMA placement advice
by Peter Krempa 04 Oct '13

04 Oct '13

When starting the VM the guest balloon driver is not loaded at that time. We need to ask numad for placement of the complete VM. --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7a30a5e..079f062 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3684,7 +3684,7 @@ int qemuProcessStart(virConnectPtr conn, (vm->def->numatune.memory.placement_mode == VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO)) { nodeset = virNumaGetAutoPlacementAdvice(vm->def->vcpus, - vm->def->mem.cur_balloon); + vm->def->mem.max_balloon); if (!nodeset) goto cleanup; -- 1.8.3.2

2 2

[libvirt] [PATCH v3 0/8] test: Mock snapshot APIs and misc improvements
by Cole Robinson 04 Oct '13

04 Oct '13

This series implements snapshot and managed save APIs for the test driver, and adds some misc improvements, like specifying domain transient state in the driver XML. v3: Rebase Validate that managedsave, transient, and runstate combo make sense Use STREQ_NULLABLE to simplify a check Cole Robinson (8): test: Allow specifying object transient state in driver XML test: Wire up managed save APIs test: Implement readonly snapshot APIs test: Implement snapshot create/delete/revert APIs qemu: snapshots: Simplify REDEFINE flag check qemu: snapshot: Break out redefine preparation to shared function test: snapshot: Add REDEFINE support test: Allow specifying domainsnapshot XML src/conf/domain_conf.c | 2 +- src/conf/snapshot_conf.c | 150 ++++++ src/conf/snapshot_conf.h | 7 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 145 +----- src/test/test_driver.c | 1162 +++++++++++++++++++++++++++++++++++++++++++++- tests/virshtest.c | 2 +- 7 files changed, 1328 insertions(+), 141 deletions(-) -- 1.8.3.1

3 29

[libvirt] [PATCH] nodedev: Resolve Relax-NG validity error
by John Ferlan 04 Oct '13

04 Oct '13

Commit id 'c4a4603de' added an output <path> to the nodedev xml, but did not update the schema. This resulted in the failure of the 'virt-xml-validate' on a file generated by 'virsh nodedev-dumpxml pci_0000_00_00_0' (for example). This was found/seen by running autotest on my host. --- I'm not sure if something like this needs to be backported or not, but I'm sure someone will let me know... docs/schemas/nodedev.rng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index d2bebff..81ab4d4 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -13,6 +13,9 @@ and in virsh --> <element name="name"><text/></element> <optional> + <element name="path"><text/></element> + </optional> + <optional> <element name="parent"><text/></element> </optional> -- 1.8.3.1

2 2

[libvirt] [PATCH 0/5] Fixes for lxc veth handling
by Daniel P. Berrange 04 Oct '13

04 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The primary goal of this series was to address the race condition in creation of veth device names. A few other bugs were identified along the way though & fixed. Daniel P. Berrange (5): Don't set netdev offline in container cleanup Avoid reporting an error if veth device is already deleted Avoid deleting NULL veth device name Retry veth device creation on failure Use 'vnet' as prefix for veth devices src/lxc/lxc_process.c | 3 +- src/util/virnetdevveth.c | 168 ++++++++++++++++++++++++++++++----------------- 2 files changed, 107 insertions(+), 64 deletions(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] test: snapshots: Fix some unused variables
by Cole Robinson 03 Oct '13

03 Oct '13

Spotted by coverity as John mentioned here: http://www.redhat.com/archives/libvir-list/2013-October/msg00078.html --- src/test/test_driver.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 255cc2b..a09facb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6547,16 +6547,12 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, { virDomainObjPtr vm = NULL; int ret = -1; - virDomainSnapshotObjPtr snap = NULL; virCheckFlags(0, -1); if (!(vm = testDomObjFromSnapshot(snapshot))) goto cleanup; - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); @@ -6568,27 +6564,11 @@ cleanup: static int -testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, +testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot ATTRIBUTE_UNUSED, unsigned int flags) { - virDomainObjPtr vm = NULL; - int ret = -1; - virDomainSnapshotObjPtr snap = NULL; - virCheckFlags(0, -1); - - if (!(vm = testDomObjFromSnapshot(snapshot))) - goto cleanup; - - if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) - goto cleanup; - - ret = 1; - -cleanup: - if (vm) - virObjectUnlock(vm); - return ret; + return 1; } static int -- 1.8.3.1

2 1

[libvirt] [PATCH] build: fix 'make -C src check' under subset builds
by Eric Blake 03 Oct '13

03 Oct '13

Another build failure detected on cygwin, where lxc is not built. The lxc_monitor_protocol.c file requires the use of $(XDR_CFLAGS), but should only be built on platforms where WITH_LXC is true; however, 'make -C src check' was unconditionally trying to build the .o file (and with the wrong CFLAGS) in order to validate the matching -structs file. Rework the checks to only test files that are built for the current configuration. * src/Makefile.am (PROTOCOL_STRUCTS): Split list by which files are currently being compiled. (EXTRA_DIST): Ensure that -structs files are shipped even when not built. (check-protocol): Declare unconditionally, now that the condition has been moved into PROTOCOL_STRUCTS. (libvirt_driver_lxc_impl_la_CFLAGS): Add $(XDR_CFLAGS). (libvirt_net_rpc_la_SOURCES): List generated files more compactly. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This is a build-breaker, but I'm still in the middle of running a (lengthy) 'make distcheck' on several platforms before pushing, so a review wouldn't hurt. src/Makefile.am | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 09311b7..20ba1c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -428,18 +428,35 @@ check-symsorting: EXTRA_DIST += check-symfile.pl check-symsorting.pl # Keep this list synced with RPC_PROBE_FILES -PROTOCOL_STRUCTS = \ +PROTOCOL_STRUCTS = +if WITH_REMOTE +PROTOCOL_STRUCTS += \ $(srcdir)/remote_protocol-structs \ $(srcdir)/lxc_protocol-structs \ $(srcdir)/qemu_protocol-structs \ + $(NULL) +endif WITH_REMOTE +PROTOCOL_STRUCTS += \ $(srcdir)/virnetprotocol-structs \ $(srcdir)/virkeepaliveprotocol-structs \ + $(NULL) +if WITH_LXC +PROTOCOL_STRUCTS += \ $(srcdir)/lxc_monitor_protocol-structs \ + $(NULL) +endif WITH_LXC +if WITH_LIBVIRTD +PROTOCOL_STRUCTS += \ $(srcdir)/lock_protocol-structs \ $(NULL) +endif WITH_LIBVIRTD + +# The various -structs files live in git, because they are only +# conditionally generated; ship one -structs file for each .x file. +EXTRA_DIST += $(notdir $(RPC_PROBE_FILES:.x=-structs))) -if WITH_REMOTE check-protocol: $(PROTOCOL_STRUCTS) $(PROTOCOL_STRUCTS:structs=struct) +.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # The .o file that pdwtags parses is created as a side effect of running # libtool; but from make's perspective we depend on the .lo file. @@ -458,13 +475,6 @@ $(srcdir)/lock_protocol-struct: \ $(srcdir)/%-struct: locking/lockd_la-%.lo $(PDWTAGS) -else !WITH_REMOTE -# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be -# re-generated when configured --without-remote. -check-protocol: -endif !WITH_REMOTE -EXTRA_DIST += $(PROTOCOL_STRUCTS) - check-drivername: $(AM_V_GEN)$(PERL) $(srcdir)/check-drivername.pl \ $(srcdir)/driver.h \ @@ -538,7 +548,6 @@ EXTRA_DIST += check-driverimpls.pl check-aclrules.pl check-aclperms.pl check-local: check-protocol check-symfile check-symsorting \ check-drivername check-driverimpls check-aclrules \ check-aclperms -.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc TEST_DRIVER_SOURCES = \ @@ -1183,6 +1192,7 @@ endif ! WITH_DRIVER_MODULES libvirt_driver_lxc_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ + $(XDR_CFLAGS) \ $(FUSE_CFLAGS) \ -I$(top_srcdir)/src/access \ -I$(top_srcdir)/src/conf \ @@ -2203,10 +2213,9 @@ BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) libvirt_net_rpc_la_SOURCES = \ rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetprotocol.h rpc/virnetprotocol.c \ rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c \ - rpc/virkeepalive.h rpc/virkeepalive.c + rpc/virkeepalive.h rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) if WITH_SSH2 libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -- 1.8.3.1

1 1

[libvirt] [PATCH] Fix crash in libvirtd when events are registered & ACLs active
by Daniel P. Berrange 03 Oct '13

03 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When a client disconnects from libvirtd, all event callbacks must be removed. This involves running the public API virConnectDomainEventDeregisterAny This code does not run in normal API dispatch context, so no identity was set. The result was that the access control drivers denied the attempt to deregister callbacks. The callbacks thus continued to trigger after the client was free'd causing fairly predictable use of free memory & a crash. This can be triggered by any client with readonly access when the ACL drivers are active. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/remote.c | 6 ++++++ 1 file changed, 6 insertions(+) NB, this bug is a publically reported security flaw and I'll be backporting it to other stable branches. A CVE will be assigned soon and will notify when that info is available. diff --git a/daemon/remote.c b/daemon/remote.c index 9497cc1..f3de6a0 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -666,8 +666,11 @@ void remoteClientFreeFunc(void *data) /* Deregister event delivery callback */ if (priv->conn) { + virIdentityPtr sysident = virIdentityGetSystem(); size_t i; + virIdentitySetCurrent(sysident); + for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { if (priv->domainEventCallbackID[i] != -1) { VIR_DEBUG("Deregistering to relay remote events %zu", i); @@ -678,6 +681,9 @@ void remoteClientFreeFunc(void *data) } virConnectClose(priv->conn); + + virIdentitySetCurrent(NULL); + virObjectUnref(sysident); } VIR_FREE(priv); -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: check actual netdev type rather than config netdev type during init
by Laine Stump 03 Oct '13

03 Oct '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1012834 Note that a similar problem was reported in: https://bugzilla.redhat.com/show_bug.cgi?id=827519 but the fix only worked for <interface type='hostdev'>, *not* for <interface type='network'> where the network itself was a pool of hostdevs. The symptom in both cases was this error message: internal error: Unable to determine device index for network device In both cases the cause was lack of proper handling for netdevs (<interface>) of type='hostdev' when scanning the netdev list looking for alias names in qemuAssignDeviceNetAlias() - those that aren't type='hostdev' have an alias of the form "net%d", while those that are hostdev use "hostdev%d". This special handling was completely lacking prior to the fix for Bug 827519 which was: When searching for the highest alias index, libvirt looks at the alias for each netdev and if it is type='hostdev' it ignores the entry. If the type is not hostdev, then it expects the "net%d" form; if it doesn't find that, it fails and logs the above error message. That fix works except in the case of <interface type='network'> where the network uses hostdev (i.e. the network is a pool of VFs to be assigned to the guests via PCI passthrough). In this case, the check for type='hostdev' would fail because it was done as: def->net[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV (which compares what was written in the config) when it actually should have been: virDomainNetGetActualType(def->net[i]) == VIR_DOMAIN_NET_TYPE_HOSTDEV (which compares the type of netdev that was actually allocated from the network at runtime). Of course the latter wouldn't be of any use if the netdevs of type='network' hadn't already acquired their actual network connection yet, but manual examination of the code showed that this is never the case. While looking through qemu_command.c, two other places were found to directly compare the net[i]->type field rather than getting actualType: * qemuAssignDeviceAliases() - in this case, the incorrect comparison would cause us to create a "net%d" alias for a netdev with type='network' but actualType='hostdev'. This alias would be subsequently overwritten by the proper "hostdev%d" form, so everything would operate properly, but a string would be leaked. This patch also fixes this problem. * qemuAssignDevicePCISlots() - would defer assigning a PCI address to a netdev if it was type='hostdev', but not for type='network + actualType='hostdev'. In this case, the actual device usually hasn't been acquired yet anyway, and even in the case that it has, there is no practical difference between assigning a PCI address while traversing the netdev list or while traversing the hostdev list. Because changing it would be an effective NOP (but potentially cause some unexpected regression), this usage was left unchanged. --- src/qemu/qemu_command.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ba102f4..e976466 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -817,7 +817,8 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) for (i = 0; i < def->nnets; i++) { int thisidx; - if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + if (virDomainNetGetActualType(def->nets[i]) + == VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* type='hostdev' interfaces have a hostdev%d alias */ continue; } @@ -987,8 +988,9 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) /* type='hostdev' interfaces are also on the hostdevs list, * and will have their alias assigned with other hostdevs. */ - if ((def->nets[i]->type != VIR_DOMAIN_NET_TYPE_HOSTDEV) && - (qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0)) { + if (virDomainNetGetActualType(def->nets[i]) + != VIR_DOMAIN_NET_TYPE_HOSTDEV && + qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0) { return -1; } } -- 1.7.11.7

2 1

[libvirt] [PATCH 0/3] Avoid crash due to race in nwfilter reload/libvirtd startup
by Daniel P. Berrange 03 Oct '13

03 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The past 24 hours have seen a flurry of libvirtd crash reports from Fedora users. https://bugzilla.redhat.com/show_bug.cgi?id=1014933 In one thread we have the libvirtd daemon startup code running, and it is in the middle of QEMU state initialization. #9 0xb00882e4 in qemuStateInitialize (privileged=true, callback=0xb77a0420 <daemonInhibitCallback>, opaque=0xb8b1fc98) at qemu/qemu_driver.c:595 driverConf = 0xaf5afcd8 "/etc/libvirt/qemu.conf" conn = 0x0 ebuf = "\000\260\025\267\024\071P\257\214\000\000\000\360\316\341\257\335\242\023\267\214\000\000\000\210\177X\257\001\000\000\000l\000\000\000\360\316\341\257\000\260\025\267\264\316\341\257\210\177X\257$\316\341\257$\316\341\257l\000\000\000\304\316\341\257\201\321LRl\000\000\000\235R\022\267\000)\233\351\260\316\341\257\000\000\000\000\253G\022\267\000\260\025\267\340\316\341\257\a\000\000\000\v\260\023\267\000\260\025\267\001\000\000\000\254\325\334\266\000\260\025\267\214\261\023\267 :P\257\037:P\257\000\000\000\000/\261\023\267\000\260\025\267uc\334\266\000\260\025\267A\262\023\267\037:P\257\000\000\000\000\001\000\000\000\000\000\000\000\340\316\341\257\334\316\341\257\001\000\000\000\001\000\000\000\033c\024\267"... membase = 0x0 mempath = 0x0 cfg = 0xaf509050 run_uid = 4294967295 run_gid = 4294967295 __func__ = "qemuStateInitialize" __FUNCTION__ = "qemuStateInitialize" #10 0xb74c5325 in virStateInitialize (privileged=true, callback=callback@entry=0xb77a0420 <daemonInhibitCallback>, opaque=opaque@entry=0xb8b1fc98) at libvirt.c:833 i = 6 __func__ = "virStateInitialize" #11 0xb77a049e in daemonRunStateInit (opaque=opaque@entry=0xb8b1fc98) at libvirtd.c:876 srv = 0xb8b1fc98 __func__ = "daemonRunStateInit" In another thread, we have a dbus event being handled by the nwfilter driver, and the nwfilter driver calls into the QEMU driver....which has not finished initializing itself yet! Thread 1 (Thread 0xb6366ac0 (LWP 7041)): #0 0xb0052861 in virQEMUCloseCallbacksGetForConn (closeCallbacks=0x0, conn=0xb8b2cc20) at qemu/qemu_conf.c:861 list = 0xb8ac57e8 data = {conn = 0xb8b2cc20, list = 0xb8ac57e8, oom = false} #1 virQEMUCloseCallbacksRun (closeCallbacks=0x0, conn=conn@entry=0xb8b2cc20, driver=0xaf50b350) at qemu/qemu_conf.c:890 list = 0xb8b2cc20 i = <optimized out> __func__ = "virQEMUCloseCallbacksRun" #2 0xb009df3b in qemuConnectClose (conn=0xb8b2cc20) at qemu/qemu_driver.c:1057 driver = <optimized out> #3 0xb74babc1 in virConnectDispose (obj=0xb8b2cc20) at datatypes.c:159 conn = 0xb8b2cc20 #4 0xb742f22c in virObjectUnref (anyobj=anyobj@entry=0xb8b2cc20) at util/virobject.c:264 klass = 0xb8b2cba0 obj = 0xb8b2cc20 lastRef = true __func__ = "virObjectUnref" #5 0xb74c5811 in virConnectClose (conn=conn@entry=0xb8b2cc20) at libvirt.c:1503 __func__ = "virConnectClose" __FUNCTION__ = "virConnectClose" #6 0xb023424e in nwfilterStateReload () at nwfilter/nwfilter_driver.c:301 conn = 0xb8b2cc20 #7 0xb02342fc in nwfilterFirewalldDBusFilter (connection=0xaf501038, message=0xaf503910, user_data=0x0) at nwfilter/nwfilter_driver.c:90 __func__ = "nwfilterFirewalldDBusFilter" #8 0xb711efb9 in dbus_connection_dispatch (connection=0xaf501038) at dbus-connection.c:4631 filter = <optimized out> next = 0x0 message = 0xaf503910 link = <optimized out> filter_list_copy = 0xaf5009dc message_link = 0xaf500a18 result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED pending = <optimized out> reply_serial = <optimized out> status = <optimized out> found_object = 3071507249 __FUNCTION__ = "dbus_connection_dispatch" #9 0xb740caeb in virDBusWatchCallback (fdatch=fdatch@entry=8, fd=15, events=1, opaque=0xaf500ca8) at util/virdbus.c:144 watch = 0xaf500ca8 info = 0xaf500de0 dbus_flags = 1 This DBus event is triggered when the firewalld driver is reloaded, or restarted. I confirmed this analysis by adding a sleep(10) to the QEMU driver startup code, and then triggering a firewalld restart. Sure enough it crashed & burned with the same trace. The reason why it has suddenly hit us is that we are unlucky enough to have a firewalld update in Fedora repos at the same time as a libvirt update, and lots of people are pulling both updates down in one yum transaction! After wasting time figuring out how to avoid the race condition with mutexes and other synchronization ideas, I realized that the nwfilter code was in fact bogus. The only reason it gets a virConnectPtr is so that the code for reloading filters can access its nwfilterPrivateData field to get the virNWFilterDriverStatePtr object instance. This is insanely convoluted, since the nwfilter driver can trivially pass the driver state instance into the virNWFilterConfLayerInit method at startup. Thus these patches just rip out all use of virConnectPtr from the nwfilter driver code, thus avoiding the race with the QEMU driver initialization code. This also fixes the nwfilter driver in cases where the QEMU driver is disabled, but LXC driver still wants to use nwfilter. Daniel P. Berrange (3): Remove virConnectPtr arg from virNWFilterDefParse* Don't pass virConnectPtr in nwfilter 'struct domUpdateCBStruct' Remove use of virConnectPtr from all remaining nwfilter code src/conf/nwfilter_conf.c | 78 ++++++++++++++++------------------ src/conf/nwfilter_conf.h | 24 ++++------- src/lxc/lxc_driver.c | 3 +- src/nwfilter/nwfilter_dhcpsnoop.c | 12 +++--- src/nwfilter/nwfilter_driver.c | 49 +++++++++------------ src/nwfilter/nwfilter_gentech_driver.c | 32 +++++++------- src/nwfilter/nwfilter_gentech_driver.h | 10 ++--- src/nwfilter/nwfilter_learnipaddr.c | 6 +-- src/qemu/qemu_driver.c | 6 ++- src/uml/uml_driver.c | 3 +- tests/nwfilterxml2xmltest.c | 2 +- 11 files changed, 102 insertions(+), 123 deletions(-) -- 1.8.3.1

3 8

[libvirt] ANNOUNCE: Perl binding Sys-Virt releases 1.1.2 & 1.1.3
by Daniel P. Berrange 03 Oct '13

03 Oct '13

I am pleased to announce that releases 1.1.2 & 1.1.3 of Sys-Virt, the libvirt Perl API binding are now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.1.2.tar.gz http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.1.3.tar.gz Changed in the 1.1.2 release: - Add all new constants in libvirt 1.1.2 Changed in the 1.1.3 release: - Add all new APIs in libvirt 1.1.3 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, 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 :|

1 0

[libvirt] [PATCH 00/18] qemumonitorjsontest: Introduce some tests
by Michal Privoznik 03 Oct '13

03 Oct '13

and fix some bugs I've ran into while writing the tests. Michal Privoznik (18): qemuMonitorJSONGetVirtType: Fix error message qemumonitorjsontest: Test qemuMonitorJSONSystemPowerdown qemuMonitorJSONSendKey: Avoid double free qemuMonitorTestFree: Join worker thread unconditionally qemumonitorjsontest: Extend the test for yet another monitor commands qemumonitorjsontest: Test qemuMonitorJSONGetCPUInfo qemumonitorjsontest: Test qemuMonitorJSONGetVirtType qemumonitorjsontest: Test qemuMonitorJSONGetBalloonInfo qemumonitorjsontest: Test qemuMonitorJSONGetBlockInfo qemumonitorjsontest: Test qemuMonitorJSONGetBlockStatsInfo qemumonitorjsontest: Test qemuMonitorJSONGetMigrationCacheSize qemumonitorjsontest: Test qemuMonitorJSONGetMigrationStatus qemumonitorjsontest: Test qemuMonitorJSONGetSpiceMigrationStatus qemumonitorjsontest: Test qemuMonitorJSONGetPtyPaths qemumonitorjsontest: Test qemuMonitorJSONSendKey qemumonitorjsontest: Test qemuMonitorJSONSetBlockIoThrottle qemumonitorjsontest: Test qemuMonitorJSONGetTargetArch qemumonitorjsontest: Test qemuMonitorJSONGetMigrationCapability src/qemu/qemu_monitor_json.c | 5 +- tests/qemumonitorjsontest.c | 955 ++++++++++++++++++++++++++++++++++++++++++- tests/qemumonitortestutils.c | 3 +- 3 files changed, 959 insertions(+), 4 deletions(-) -- 1.8.1.5

3 40

[libvirt] ANNOUNCE: libvirt 1.0.5.6 maintenance release
by Cole Robinson 03 Oct '13

03 Oct '13

libvirt 1.0.5.6 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.6.tar.gz Changes in this version: * virsh: fix change-media bug on disk block type * Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) * Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) * Include process start time when doing polkit checks * qemuDomainChangeGraphics: Check listen address change by listen type * security: provide supplemental groups even when parsing label (CVE-2013-4291) * python: return dictionary without value in case of no blockjob * virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

5 11

[libvirt] [PATCHv3] lxc veth interfaces: fix interface name collisions
by Oskari Saarenmaa 02 Oct '13

02 Oct '13

The previous veth interface naming scheme tried to find the lowest unused index for both the parent and container veth interfaces. That's susceptible to race conditions when multiple containers are started at the same time. Try to pick a random unused interface id for the parent if one wasn't given by the caller and use that as a template for the container interface name. This should prevent races to create two uniquely named interfaces for each container. The caller can still assign the parent interface name manually and that name is used for in container (before the interface is moved to the container namespace and renamed.) Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- My previous two patches for this issue were rejected because of concerns with the naming scheme (in v1) or leaving fixing the race condition to the caller (v2) and I mostly forgot about this issue after implementing a workaround in my application, but yesterday someone else on #virt ran into the same issue and I took another look at my patches. The third iteration of this patch uses random identifiers and makes sure they're not already in use, but still does not retry interface creation on failure. I believe this is good enough as the likelihood of two containers starting up at the same time and coming up with the same random 32-bit identifier should be rather low. This does change the interface names from nice low integers to random larger integers, but I don't see that an issue. And the caller can select any other name they like if that's not acceptable. src/util/virnetdevveth.c | 95 ++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 68 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 039767f..9a5bc63 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -23,6 +23,7 @@ #include <config.h> +#include <net/if.h> #include <sys/wait.h> #include "virnetdevveth.h" @@ -33,119 +34,77 @@ #include "virfile.h" #include "virstring.h" #include "virutil.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_NONE /* Functions */ /** - * virNetDevVethGetFreeName: - * @veth: pointer to store returned name for veth device - * @startDev: device number to start at (x in vethx) - * - * Looks in /sys/class/net/ to find the first available veth device - * name. - * - * Returns non-negative device number on success or -1 in case of error - */ -static int virNetDevVethGetFreeName(char **veth, int startDev) -{ - int devNum = startDev-1; - char *path = NULL; - - VIR_DEBUG("Find free from veth%d", startDev); - do { - VIR_FREE(path); - ++devNum; - if (virAsprintf(&path, "/sys/class/net/veth%d/", devNum) < 0) - return -1; - VIR_DEBUG("Probe %s", path); - } while (virFileExists(path)); - VIR_FREE(path); - - if (virAsprintf(veth, "veth%d", devNum) < 0) - return -1; - - return devNum; -} - -/** * virNetDevVethCreate: * @veth1: pointer to name for parent end of veth pair - * @veth2: pointer to return name for container end of veth pair + * @veth2: pointer to name for container end of veth pair * * Creates a veth device pair using the ip command: * ip link add veth1 type veth peer name veth2 - * If veth1 points to NULL on entry, it will be a valid interface on - * return. veth2 should point to NULL on entry. * - * NOTE: If veth1 and veth2 names are not specified, ip will auto assign - * names. There seems to be two problems here - - * 1) There doesn't seem to be a way to determine the names of the - * devices that it creates. They show up in ip link show and - * under /sys/class/net/ however there is no guarantee that they - * are the devices that this process just created. - * 2) Once one of the veth devices is moved to another namespace, it - * is no longer visible in the parent namespace. This seems to - * confuse the name assignment causing it to fail with File exists. - * Because of these issues, this function currently allocates names - * prior to using the ip command, and returns any allocated names - * to the caller. + * If veth1 or veth2 points to NULL on entry, they will be + * a valid interface on return. * * Returns 0 on success or -1 in case of error */ int virNetDevVethCreate(char** veth1, char** veth2) { - 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("Host: %s guest: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth1, vethDev)) < 0) - goto cleanup; + size_t veth_path_max = sizeof("/sys/class/net//") + IF_NAMESIZE; + char *veth1_path; + + if (VIR_ALLOC_N(*veth1, IF_NAMESIZE) < 0 || + VIR_ALLOC_N(veth1_path, veth_path_max) < 0) { + VIR_FREE(*veth1); + return -1; + } + while (1) { + snprintf(*veth1, IF_NAMESIZE, "veth%u", (unsigned int) virRandomBits(32)); + snprintf(veth1_path, veth_path_max, "/sys/class/net/%s/", *veth1); + if (! virFileExists(veth1_path)) + break; + } + VIR_FREE(veth1_path); VIR_DEBUG("Assigned host: %s", *veth1); veth1_alloc = true; - vethDev++; } argv[3] = *veth1; - while (*veth2 == NULL) { - if ((vethDev = virNetDevVethGetFreeName(veth2, vethDev)) < 0) { + if (*veth2 == NULL) { + /* Append a 'c' to veth1 if name */ + if (virAsprintf(veth2, "%sc", *veth1) < 0) { if (veth1_alloc) VIR_FREE(*veth1); - goto cleanup; - } - - /* Just make sure they didn't accidentally get same name */ - if (STREQ(*veth1, *veth2)) { - vethDev++; - VIR_FREE(*veth2); - continue; + return -1; } - VIR_DEBUG("Assigned guest: %s", *veth2); veth2_alloc = true; } argv[8] = *veth2; - VIR_DEBUG("Create Host: %s guest: %s", *veth1, *veth2); + VIR_DEBUG("Create veth host: %s guest: %s", *veth1, *veth2); if (virRun(argv, NULL) < 0) { if (veth1_alloc) VIR_FREE(*veth1); if (veth2_alloc) VIR_FREE(*veth2); - goto cleanup; + return -1; } - rc = 0; - -cleanup: - return rc; + return 0; } /** -- 1.8.3.1

2 2

Re: [libvirt] [Qemu-devel] Attaching PCI devices to the PCIe root complex
by Michael S. Tsirkin 02 Oct '13

02 Oct '13

On Wed, Sep 25, 2013 at 11:48:28AM +0300, Marcel Apfelbaum wrote: > On Wed, 2013-09-25 at 10:01 +0300, Michael S. Tsirkin wrote: > > On Tue, Sep 24, 2013 at 06:01:02AM -0400, Laine Stump wrote: > > > When I added support for the Q35-based machinetypes to libvirt, I > > > specifically prohibited attaching any PCI devices (with the exception of > > > graphics controllers) to the PCIe root complex, > > > > That's wrong I think. Anything attached to RC is an integrated > > endpoint, and these can be PCI devices. > I couldn't find on PCIe spec any mention that "Root Complex Integrated EndPoint" > must be PCIe. But, from spec 1.3.2.3: > - A Root Complex Integrated Endpoint must not require I/O resources claimed through BAR(s). > - A Root Complex Integrated Endpoint must not generate I/O Requests. > - A Root Complex Integrated Endpoint is required to support MSI or MSI-X or both if an > interrupt resource is requested. Heh PCI-SIG keeps fighting against legacy interrupts and IO. But lots of hardware happily ignores these rules. And the reason is simple: software does not enforce them. Here's integrated stuff on my laptop: 00:02.0 VGA compatible controller: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller (rev 09) (prog-if 00 [VGA controller]) Subsystem: Lenovo Device 21cf Flags: bus master, fast devsel, latency 0, IRQ 43 Memory at f0000000 (64-bit, non-prefetchable) [size=4M] Memory at e0000000 (64-bit, prefetchable) [size=256M] I/O ports at 5000 [size=64] Expansion ROM at <unassigned> [disabled] Capabilities: [90] MSI: Enable+ Count=1/1 Maskable- 64bit- Capabilities: [d0] Power Management version 2 Capabilities: [a4] PCI Advanced Features Kernel driver in use: i915 So it has an IO BAR. 00:1a.0 USB controller: Intel Corporation 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2 (rev 04) (prog-if 20 [EHCI]) Subsystem: Lenovo Device 21cf Flags: bus master, medium devsel, latency 0, IRQ 16 Memory at f252a000 (32-bit, non-prefetchable) [size=1K] Capabilities: [50] Power Management version 2 Capabilities: [58] Debug port: BAR=1 offset=00a0 Capabilities: [98] PCI Advanced Features Kernel driver in use: ehci-pci So IRQ but no MSI. > I suppose that this restriction can be removed for PCI devices that > 1. Actually work when plugged in into RC Integrated EndPoint > 2. Respond to the above limitations These limitations are just guidance for future devices. They can't change the past, such devices were made. > > > > > and had planned to > > > prevent attaching them to PCIe root ports (ioh3420 device) and PCIe > > > downstream switch ports (xio-3130 device) as well. I did this because, > > > even though qemu currently allows attaching a normal PCI device in any > > > of these three places, the restriction exists for real hardware and I > > > didn't see any guarantee that qemu wouldn't add the restriction in the > > > future in order to more closely emulate real hardware. > > > > > > However, since I did that, I've learned that many of the qemu "pci" > > > devices really should be considered as "pci or pcie". Gerd Hoffman lists > > > some of these cases in a bug he filed against libvirt: > > > > > > https://bugzilla.redhat.com/show_bug.cgi?id=1003983 > > > > > > I would like to loosen up the restrictions in libvirt, but want to make > > > sure that I don't allow something that could later be forbidden by qemu > > > (thus creating a compatibility problem during upgrades). Beyond Gerd's > > > specific requests to allow ehci, uhci, and hda controllers to attach to > > > PCIe ports, are there any other devices that I specifically should or > > > shouldn't allow? (I would rather be conservative in what I allow - it's > > > easy to allow more things later, but nearly impossible to revoke > > > permission once it's been allowed). > For the moment I would not remove any restrictions, but only the ones > requested and verified by somebody. > > > > > IMO, we really need to grow an interface to query this kind of thing. > Basically libvirt needs to know: > 1. for (libvirt) controllers: what kind of devices can be plugged in > 2. for devices (controller is also a device) > - to which controllers can it be plugged in > - does it support hot-plug? > 3. implicit controllers of the machine types (q35 - "pcie-root", i440fx - "pci-root") > All the above must be exported to libvirt > > Implementation options: > 1. Add a compliance field on PCI/PCIe devices and controllers stating if it supports > PCI/PCIe or both (and maybe hot-plug) > - consider plug type + compliance to figure out whether a plug can go into a socket > > 2. Use Markus Armbruster idea of introducing a concept of "plug and sockets": > - dividing the devices into adapters and plugs > - adding sockets to bridges(buses?). > In this way it would be clear which devices can connect to bridges > > Any thoughts? > Thanks, > Marcel It's all not too hard to implement, we just need to know what kind of interface makes sense for management. So Cc libvir-list(a)redhat.com . > > > > >

2 2

[libvirt] [PATCHv2 0/2] Allow updating QoS via virDomainUpdateDeviceFlags
by Michal Privoznik 02 Oct '13

02 Oct '13

*** BLURB HERE *** Michal Privoznik (2): qemu_hotplug: Allow QoS update in qemuDomainChangeNet virNetDevBandwidthEqual: Make it more robust src/qemu/qemu_hotplug.c | 20 ++++++++++++++++++-- src/util/virnetdevbandwidth.c | 26 ++++++++++++++++++++------ 2 files changed, 38 insertions(+), 8 deletions(-) -- 1.8.1.5

2 5

[libvirt] libvirt-glib fails to compile with CLANG compiler
by Jason Helfman 02 Oct '13

02 Oct '13

When compiling libvirt-glib with CLANG, I get the following error. 16 warnings generated. CCLD libvirt-glib-1.0.la GEN LibvirtGLib-1.0.gir /usr/local/lib/libvirt.so: undefined reference to `__stack_chk_fail_local' clang: error: linker command failed with exit code 1 (use -v to see invocation) linking of temporary binary failed: Command '['/usr/local/bin/libtool', '--mode=link', '--tag=CC', '--silent', 'clang', '-o', '/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7/libvirt-glib/tmp-introspectOO6vqG/LibvirtGLib-1.0', '-export-dynamic', '-O2', '-pipe', '-fno-strict-aliasing', '-L/usr/local/lib', '-fstack-protector', '/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7/libvirt-glib/tmp-introspectOO6vqG/LibvirtGLib-1.0.o', '-L.', './libvirt-glib-1.0.la', '-lgio-2.0', '-lgobject-2.0', '-Wl,--export-dynamic', '-lgmodule-2.0', '-lgthread-2.0', '-pthread', '-L/usr/local/lib', '-lglib-2.0', '-lintl']' returned non-zero exit status 1 gmake[2]: *** [LibvirtGLib-1.0.gir] Error 1 gmake[2]: Leaving directory `/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7/libvirt-glib' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/usr/home/helfman/workspace/ports/devel/libvirt-glib/work/libvirt-glib-0.1.7' gmake: *** [all] Error 2 *** [do-build] Error code 1 -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

3 7

[libvirt] ANNOUNCE: libvirt 0.9.12.2 maintenance release
by Guido Günther 01 Oct '13

01 Oct '13

libvirt 0.9.12.2 maintenance release is now available. This is libvirt 0.9.12 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.12.2.tar.gz md5sum: 8d5fdc4517a83ba9d99fd47fa70f7ed1 libvirt-0.9.12.2.tar.gz sha1: 8c49123c673231f1f0ed665156c88dd7c109be30 libvirt-0.9.12.2.tar.gz sha256: 32b48c7e56048f670ffe980abc9d60710e7811e361a162b0ac31ec57719ac577 libvirt-0.9.12.2.tar.gz Changes in this release: Prepare for 0.9.12.2 (Guido Günther) Distribute viratomic.h (Guido Günther) Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) (Daniel P. Berrange) Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) (Daniel P. Berrange) Include process start time when doing polkit checks (Daniel P. Berrange) Move virProcess{Kill, Abort, TranslateStatus} into virprocess.{c, h} (Daniel P. Berrange) Move virProcessKill into virprocess.{h, c} (Daniel P. Berrange) Rename virCommandTranslateStatus to virProcessTranslateStatus (Daniel P. Berrange) Rename virPid{Abort, Wait} to virProcess{Abort, Wait} (Daniel P. Berrange) Rename virKillProcess to virProcessKill (Daniel P. Berrange) Introduce APIs for splitting/joining strings (Daniel P. Berrange) For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Cheers, -- Guido

1 0

[libvirt] [v0.9.12-maint] Distribute viratomic.h
by Guido Günther 01 Oct '13

01 Oct '13

Sicne cbcb1983afbd76f0503185e4183afa10af88af47 we need viratmic.h in the distributed tarball as well. This fixes "make distcheck". --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index 6656fa0..88b6160 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ augeastest_DATA = # These files are not related to driver APIs. Simply generic # helper APIs for various purposes UTIL_SOURCES = \ + util/viratomic.h \ util/bitmap.c util/bitmap.h \ util/buf.c util/buf.h \ util/command.c util/command.h \ -- 1.8.4.rc3

3 4