- Devel - libvirt List Archives

[libvirt] [PATCH] build: be smarter about building documentation
by Eric Blake 07 Oct '13

07 Oct '13

I'm tired of cryptic reports on IRC from people who build from git, then type 'make install' and have it fail quite a ways down the road because the documentation wasn't built. It's a feature that documentation is not built during development if the toolchain is not present (not all git developers build tarballs, and the tarballs already contain pre-built docs); but this only works as long as you don't try to install or make a tarball from that setup. With this patch in place, and without xhtml1-dtds, I now get this nice failure: $ make install cfg.mk:109: *** ERROR: missing doc toolchain (install xhtml1-dtds and xmllint). Stop. and all with no impact to regular 'make' or 'make check'. Along the way, I tried to discover why 'yum-builddeps libvirt' doesn't always tell developers to install xhtml1-dtds - my conclusion was that if the .srpm is unavailable, then yum-builddeps can't figure out anything that is required. The spec file already has a BuildRequires on the doc toolchain (and therefore, the docs shipped with an rpm are up-to-date, even if the spec file applied patches that affect the docs). So thankfully I don't have to make any spec file changes in this patch. * cfg.mk: Let 'make install' and 'make dist' error much earlier if we detect a build from git without doc toolchain. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Heavily influenced by code in gnulib's GNUMakefile :) cfg.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/cfg.mk b/cfg.mk index e6584e8..7e17b5c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -88,6 +88,29 @@ else distdir: sc_vulnerable_makefile_CVE-2012-3386.z endif +# We intentionally don't require the doc toolchain during 'make' during +# development, but 'make dist' must ship pre-built docs, and 'make install' +# from a git build fails if docs weren't built, both with awkward error +# messages if we let the build run that far. Therefore, bail loud and +# early if we detect a git tree but no doc toolchain. +ifeq ($(MAKELEVEL),0) + _is-dist-target ?= $(filter-out %clean, \ + $(filter maintainer-% dist% alpha beta stable,$(MAKECMDGOALS))) + _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS))) + ifneq (,$(_is-dist-target)$(_is-install-target)) + ifeq ($(shell \ + if test -e $(srcdir)/.git; then \ + if test -x $(XMLLINT) && test -x $(XMLCATALOG) && \ + $(XMLCATALOG) '$(XML_CATALOG_FILE)' \ + "-//W3C//DTD XHTML 1.0 Strict//EN" >/dev/null; then \ + echo works; \ + else echo oops; fi;\ + else echo tarball; fi),oops) + $(error ERROR: missing doc toolchain (install xhtml1-dtds and xmllint)) + endif + endif +endif + # Files that should never cause syntax check failures. VC_LIST_ALWAYS_EXCLUDE_REGEX = \ (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.po)$$ -- 1.8.3.1

2 4

[libvirt] [PATCH]doc: fix typo in HACKING
by Chen Hanxiao 07 Oct '13

07 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/installion/installation Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index f9f8381..f8797cc 100644 --- a/HACKING +++ b/HACKING @@ -45,7 +45,7 @@ post your patches: --to=libvir-list(a)redhat.com master (Note that the "git send-email" subcommand may not be in the main git package -and using it may require installion of a separate package, for example the +and using it may require installation of a separate package, for example the "git-email" package in Fedora.) For a single patch you can omit "--cover-letter", but a series of two or more patches needs a cover letter. If you get tired of typing "--to=libvir-list(a)redhat.com" designation you can set -- 1.8.2.1

2 2

[libvirt] [PATCH v2] LXC: Detect fs support. Mount only supported filesystems
by Bogdan Purcareata 07 Oct '13

07 Oct '13

Kept ((access(dstpath, R_OK) < 0) || (!lxcCheckFSSupport(mnt->type))) when determining support for the mount. Even if the filesystem type is supported, there is still a chance to fail when building the dstpath (virFileMakePath). If that call fails, starting the container will fail. Specifically encountered this problem for securityfs, as I was unable to mkdir /sys/kernel/security. Signed-off-by: Bogdan Purcareata <bogdan.purcareata(a)freescale.com> --- src/lxc/lxc_container.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 989e920..496443d 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -509,6 +509,67 @@ static int lxcContainerChildMountSort(const void *a, const void *b) # define MS_SLAVE (1<<19) #endif +/* + * This function attempts to detect kernel support + * for a specific filesystem type. This is done by + * inspecting /proc/filesystems. + */ +static int lxcCheckFSSupport(const char *fs_type) +{ + FILE *fp = NULL; + int ret = -1; + const char *fslist = "/proc/filesystems"; + char *line = NULL; + char *type; + size_t n; + + /* there should be no problem mounting an entry + * with NULL fs type, hence NULL fs types are + * supported */ + if (!fs_type) { + ret = 1; + goto out; + } + + VIR_DEBUG("Checking kernel support for %s in %s", fs_type, fslist); + + if (!(fp = fopen(fslist, "r"))) { + virReportSystemError(errno, + _("Unable to read %s"), + fslist); + goto out; + } + + while(getline(&line, &n, fp) > 0) { + type = strstr(line, fs_type); + + if (!type) + continue; + + if (!strncmp(type, fs_type, strlen(type))) { + ret = 1; + goto cleanup; + } + } + + if (ferror(fp)) { + virReportSystemError(errno, + _("Error reading line from %s"), + fslist); + goto cleanup; + } + + VIR_DEBUG("No kernel support for %s", fs_type); + + ret = 0; + +cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fp); +out: + return ret; +} + static int lxcContainerGetSubtree(const char *prefix, char ***mountsret, size_t *nmountsret) @@ -789,17 +850,23 @@ static int lxcContainerMountBasicFS(bool userns_enabled) for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) { virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; const char *srcpath = NULL; + const char *dstpath = NULL; VIR_DEBUG("Processing %s -> %s", mnt->src, mnt->dst); srcpath = mnt->src; + dstpath = mnt->dst; /* Skip if mount doesn't exist in source */ if ((srcpath[0] == '/') && (access(srcpath, R_OK) < 0)) continue; + if ((access(dstpath, R_OK) < 0) || /* mount is not present on host */ + (!lxcCheckFSSupport(mnt->type))) /* no fs support in kernel */ + continue; + #if WITH_SELINUX if (STREQ(mnt->src, SELINUX_MOUNT) && (!is_selinux_enabled() || userns_enabled)) -- 1.7.11.7

3 4

[libvirt] [PATCH v2]lxc: do cleanup when failed to bind fs as read-only
by Chen Hanxiao 07 Oct '13

07 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We forgot to do cleanup when lxcContainerMountFSTmpfs failed to bind fs as read-only. v2: fix an indentation issue Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c60f5d8..b1f429c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1451,6 +1451,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, virReportSystemError(errno, _("Failed to make directory %s readonly"), fs->dst); + goto cleanup; } } -- 1.8.2.1

2 3

[libvirt] [PATCH 1/2] free cmd in virNetDevVethDelete
by Gao feng 07 Oct '13

07 Oct '13

Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/util/virnetdevveth.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 403961b..1085217 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -196,6 +196,7 @@ int virNetDevVethDelete(const char *veth) { virCommandPtr cmd = virCommandNewArgList("ip", "link", "del", veth, NULL); int status; + int ret = -1; if (virCommandRun(cmd, &status) < 0) return -1; @@ -203,11 +204,16 @@ int virNetDevVethDelete(const char *veth) if (status != 0) { if (!virNetDevExists(veth)) { VIR_DEBUG("Device %s already deleted (by kernel namespace cleanup)", veth); - return 0; + ret = 0; + goto cleanup; } virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to delete veth device %s"), veth); - return -1; + goto cleanup; } - return 0; + + ret = 0; +cleanup: + virCommandFree(cmd); + return ret; } -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] Fixes for Mac OS X
by Ryota Ozaki 05 Oct '13

05 Oct '13

These patches enable libvirtd to run on Mac OS X. We still cannot build libvirtd from libvirt git repository due to a prcgen problem(*) though, we can build with libvirt tarballs, that means that we can use libvirtd installed by HomeBrew. (*) https://www.redhat.com/archives/libvirt-users/2013-February/msg00033.html I tested the patches on Mac OS X 10.8.5. Ryota Ozaki (2): rpc: fix getsockopt for LOCAL_PEERCRED on Mac OS X nodeinfo: make freebsdNodeGetCPUCount work on Mac OS X src/nodeinfo.c | 15 ++++++++++++--- src/rpc/virnetsocket.c | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) -- 1.8.4

1 2

[libvirt] [PATCH] build: fix build on 32-bit platforms
by Eric Blake 04 Oct '13

04 Oct '13

qemumonitorjsontest.c: In function 'testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo': qemumonitorjsontest.c:1134: warning: integer constant is too large for 'long' type * tests/qemumonitorjsontest.c (testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo) (testQemuMonitorJSONqemuMonitorJSONGetBlockStatsInfo): Use correct type. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/qemumonitorjsontest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 026beee..cd83592 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1131,7 +1131,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *data) if (qemuMonitorJSONGetBalloonInfo(qemuMonitorTestGetMonitor(test), &currmem) < 0) goto cleanup; - if (currmem != (4294967296/1024)) { + if (currmem != (4294967296ULL/1024)) { virReportError(VIR_ERR_INTERNAL_ERROR, "Unexpected currmem value: %llu", currmem); goto cleanup; @@ -1389,7 +1389,7 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockStatsInfo(const void *data) &extent) < 0) goto cleanup; - if (extent != 5256018944) { + if (extent != 5256018944ULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "Invalid extent: %llu, expected 5256018944", extent); -- 1.8.3.1

1 0

[libvirt] [PATCH] build: fix build on RHEL 5
by Eric Blake 04 Oct '13

04 Oct '13

On RHEL 5, compilation fails with: storage/storage_backend.c: In function 'createRawFile': storage/storage_backend.c:339: warning: implicit declaration of function 'fallocate' storage/storage_backend.c:339: warning: nested extern declaration of 'fallocate' [-Wnested-externs] But: $ grep HAVE_FALLOCATE config.h /* #undef HAVE_FALLOCATE */ Huh? It turns out that in kernels that old, fallocate() is not implemented (config.h is correct), but <linux/fs.h> defines HAVE_FALLOCATE as an empty witness macro for a completely different purpose. Since storage_backend.c is including <linux/fs.h> on RHEL 5, we are hosed by the kernel definition. Newer kernels no longer pollute the namespace, and it's fairly easy to convert to an expression that works with both the old kernel witness and the new-style config.h (undefined or 1). Problem introduced in commit 532fef3. * src/storage/storage_backend.c (createRawFile): Avoid namespace pollution from kernel, by checking HAVE_FALLOCATE for a value. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/storage/storage_backend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 5f1bc66..662af32 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -329,7 +329,8 @@ createRawFile(int fd, virStorageVolDefPtr vol, goto cleanup; } -#ifdef HAVE_FALLOCATE +/* Avoid issues with older kernel's <linux/fs.h> namespace pollution. */ +#if HAVE_FALLOCATE - 0 /* 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 -- 1.8.3.1

1 0

[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