Commit 229fb598 authored by Guido Günther's avatar Guido Günther

New upstream version 1.3.1~rc2

parent 369ed73f
......@@ -118,6 +118,7 @@ Aurelien Rougemont <beorn@binaries.fr>
Bamvor Jian Zhang <bamv2005@gmail.com>
Bamvor Jian Zhang <bjzhang@suse.com>
Beat Jörg <Beat.Joerg@ssatr.ch>
Ben Gray <ben.r.gray@gmail.com>
Benjamin Cama <benoar@dolka.fr>
Bharata B Rao <bharata@linux.vnet.ibm.com>
Bing Bu Cao <mars@linux.vnet.ibm.com>
......
2016-01-15 John Ferlan <jferlan@redhat.com>
cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup
Commit id '90b721e43' moved where the virCgroupAddTask was made until
after the check for the vcpupin checks. However, in doing so it missed
an option where if the cpumap didn't exist, then the code would continue
back to the top of the current vcpu loop. The results was that the
virCgroupAddTask wouldn't be called.
2016-01-15 John Ferlan <jferlan@redhat.com>
Revert "lxc_cgroup: Add check for NULL cgroup before AddTask call"
This reverts commit ae09988eb787df63d3bb298f713a3bbd77275901.
Since commit id '71ce4759' has been reverted, this one is no
longer necessary.
2016-01-15 John Ferlan <jferlan@redhat.com>
Revert "util: cgroups do not implicitly add task to new machine cgroup"
This reverts commit 71ce475967b3523882b0e1a0f649fdbea5abf9d5.
Since commit id 'a41c00b47' has been reverted, this no longer is
necessary
2016-01-14 John Ferlan <jferlan@redhat.com>
Revert "qemu: do not put a task into machine cgroup"
This reverts commit a41c00b472efaa192d2deae51ab732e65903238f.
After much testing and upstream discussion this has been deemed to be
the incorrect operation since it means we no longer have any guarantee
about which resource controllers the QEMU processes in general are in.
2016-01-14 Cédric Bosdonnat <cbosdonnat@suse.com>
virt-aa-helper: don't deny writes to readonly mounts
There is no need to deny writes on a readonly mount: write still
won't be accepted, even if the user remounts the folder as RW in
the guest as qemu sets the 9p mount as ro.
This deny rule was leading to problems for example with readonly /:
The qemu process had to write to a bunch of files in / like logs,
sockets, etc. This deny rule was also preventing auditing of these
denials, making it harder to debug.
2016-01-14 John Ferlan <jferlan@redhat.com>
conf: Initialize 'deflate' for balloon parse XML
Commit id '7bf3198df' neglected to initialize deflate leading to a
possibility if model allocation/checks fail, then the VIR_FREE(deflate)
would be erroneous. Noted by Jan Tomko.
2016-01-14 Michal Privoznik <mprivozn@redhat.com>
wireshark: Drop DESTDIR from install path
In 50078cfbcbf3c8 I've tried to fix distcheck but accidentally
broke rpm build. The problem is that rpm build not only sets
DESTDIR but also passes plugindir path. This results in double
DESTDIR being in the plugin path, Drop one.
2016-01-14 Guido Günther <agx@sigxcpu.org>
virsh: Update description of lxc-enter-namespace
Mention that we run a command in that namespace
2016-01-13 Cole Robinson <crobinso@redhat.com>
build: fix distdir with wireshark disabled
Even though the Makefile has WITH_WIRESHARK guards, the _SOURCES
variables are still processed when adding bits to the dist archive.
plugin.c is a generated file that is only built when wireshark is
enabled and it shouldn't be distributed, so use 'nodist'
2016-01-13 Michal Privoznik <mprivozn@redhat.com>
qemuProcessCleanupChardevDevice: Don't unlink NULL paths
So, you try to start a domain, but before we even get to the part
where chardev part of qemu command line is generated (and
possibly missing path to unix sockets is made up) an error occurs
which results in calling qemuProcessStop. This will then try to
clean up the mess and possibly ends up calling unlink(NULL).
==8085== Thread 3:
==8085== Syscall param unlink(pathname) points to unaddressable byte(s)
==8085== at 0xA85EA57: unlink (in /lib64/libc-2.21.so)
==8085== by 0x213D3C24: qemuProcessCleanupChardevDevice (qemu_process.c:2866)
==8085== by 0x558D6B1: virDomainChrDefForeach (domain_conf.c:22924)
==8085== by 0x213DA9AE: qemuProcessStop (qemu_process.c:5326)
==8085== by 0x213DA2F2: qemuProcessStart (qemu_process.c:5190)
==8085== by 0x2142957F: qemuDomainObjStart (qemu_driver.c:7396)
==8085== by 0x214297DB: qemuDomainCreateWithFlags (qemu_driver.c:7450)
==8085== by 0x21429842: qemuDomainCreate (qemu_driver.c:7468)
==8085== by 0x5611B95: virDomainCreate (libvirt-domain.c:6753)
==8085== by 0x125D9A: remoteDispatchDomainCreate (remote_dispatch.h:3613)
==8085== by 0x125CB7: remoteDispatchDomainCreateHelper (remote_dispatch.h:3589)
==8085== by 0x568BF41: virNetServerProgramDispatchCall (virnetserverprogram.c:437)
==8085== Address 0x0 is not stack'd, malloc'd or (recently) free'd
==8085==
2016-01-13 Jim Fehlig <jfehlig@suse.com>
xenconfig: check return value of regcomp
Commit ec63000a missed checking the return value of regcomp(),
which coverity promptly identified.
2016-01-13 Michal Privoznik <mprivozn@redhat.com>
wireshark: Install into DESTDIR
Like everything we install, it should be prefixed with DESTDIR.
2016-01-13 Jim Fehlig <jfehlig@suse.com>
Xen: use correct domctl version in domaininfolist union
Commmit fd2e3c4c used the domctl version 8 structure for version 9
in the xen_getdomaininfolist union, resulting in insufficient buffer
size (and subsequent memory corruption) for the GETDOMAININFOLIST
ioctl.
2016-01-13 Cole Robinson <crobinso@redhat.com>
testutils: Fix coverity warning with REGENERATE_OUTPUT
- Don't double check for expectName
- actual is always non-NULL by this point, so don't check it either
build: Kill tools/wireshark Makefiles
Just handle it all in tools/Makefile.am. I verified the generated output
looks similar to the pre patch output, but I didn't test it.
2016-01-13 Michal Privoznik <mprivozn@redhat.com>
Expand $(wildcard) correctly
So after da176bf6b756 and friend we have switched to $(wildcard
some/path/*.xml) instead of enumerating the files explicitly.
This is nice, however it makes distcheck build from VPATH fail.
The reason is that it's is not obvious to what does the wildcard
refer to: srcdir or builddir?
2016-01-12 Dmitry Andreev <dandreev@virtuozzo.com>
qemu: add support of optional 'autodeflate' attribute
Autodeflate can be enabled/disabled for memballon device
of model 'virtio'.
xml:
<devices>
<memballoon model='virtio' autodeflate='on'/>
</devices>
qemu:
qemu -device virtio-balloon-pci,...,deflate-on-oom=on
Autodeflate cannot be enabled/disabled for running domain.
2016-01-12 Dmitry Andreev <dandreev@virtuozzo.com>
qemu: add capability check for memballoon 'deflate-on-oom' feature
Add appropriate capability check and new virQEMUCaps flag for the new
virtio balloon feature. QEMU commit with the complete feature description:
http://git.qemu.org/?p=qemu.git;a=commit;h=e3816255bf4b6377bb405331e2ee0dc14d841b80
2016-01-12 Dmitry Andreev <dandreev@virtuozzo.com>
conf: introduce 'autodeflate' attribute for memballoon device
Excessive memory balloon inflation can cause invocation of OOM-killer,
when Linux is under severe memory pressure. QEMU memballoon device
has a feature to release some memory at the last moment before some
process will be get killed by OOM-killer.
Introduce a new optional balloon device attribute 'autodeflate' to
enable or disable this feature.
2016-01-12 Cole Robinson <crobinso@redhat.com>
rpc: socket: Don't repeatedly attempt to launch daemon
On every socket connect(2) attempt we were re-launching session
libvirtd, up to 100 times in 5 seconds.
This understandably caused some weird load races and intermittent
qemu:///session startup failures
https://bugzilla.redhat.com/show_bug.cgi?id=1271183
2016-01-12 Cole Robinson <crobinso@redhat.com>
rpc: socket: Explicitly error if we exceed retry count
When we autolaunch libvirtd for session URIs, we spin in a retry
loop waiting for the daemon to start and the connect(2) to succeed.
However if we exceed the retry count, we don't explicitly raise an
error, which can yield a slew of different error messages elsewhere
in the code.
Explicitly raise the last connect(2) failure if we run out of retries.
2016-01-12 Cole Robinson <crobinso@redhat.com>
rpc: socket: Minor cleanups
- Add some debugging
- Make the loop dependent only on retries
- Make it explicit that connect(2) success exits the loop
- Invert the error checking logic
2016-01-12 Roman Bogorodskiy <bogorodskiy@gmail.com>
Add missing virxdrdefs.h include to log_protocol
Commit 2b6f6ad introduced the virxdrdefs.h header with
common definitions to be included in the protocol files,
but logging/log_protocol.x was missed, so add it there as well.
Hopefully this fixes build on OS X.
2016-01-12 Andrea Bolognani <abologna@redhat.com>
virsh: Fix alignment in VIRSH_COMMON_OPT_CONFIG definition
2016-01-12 Ben Gray <ben.r.gray@gmail.com>
rpc: Don't rewrite msg->fds on every read dispatch
When we are receiving data in smaller chunks it might happen that
virNetServerClientDispatchRead() will be called multiple times. And as
that happens, if it is a message that also transfer headers, we decode
the number of them every single time and, unfortunately, also allocate
the memory for them. That causes a leak, in the best scenario.
Best viewed with '-w'.
2016-01-12 John Ferlan <jferlan@redhat.com>
virsh: Create macro for common "interface" option
......@@ -20,7 +20,7 @@ LCOV = lcov
GENHTML = genhtml
SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \
tests po examples tools/wireshark
tests po examples
ACLOCAL_AMFLAGS = -I m4
......
......@@ -1853,6 +1853,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -1865,11 +1866,10 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
LCOV = lcov
GENHTML = genhtml
SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \
tests po examples tools/wireshark
tests po examples
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
......
......@@ -957,7 +957,7 @@ WITH_YAJL2_TRUE
WITH_YAJL_FALSE
WITH_YAJL_TRUE
QEMU
ws_plugindir
plugindir
WITH_WIRESHARK_DISSECTOR_FALSE
WITH_WIRESHARK_DISSECTOR_TRUE
WIRESHARK_DISSECTOR_LIBS
......@@ -60325,14 +60325,14 @@ fi
if test "x$with_wireshark_dissector" != "xno" ; then
if test "x$with_ws_plugindir" = "xcheck" ; then
ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
if test "x$ws_plugindir" = "x" ; then
ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
fi
elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then
as_fn_error $? "ws-plugindir must be used only with valid path" "$LINENO" 5
else
ws_plugindir=$with_ws_plugindir
plugindir=$with_ws_plugindir
fi
fi
......@@ -70713,7 +70713,7 @@ _ACEOF
ac_config_files="$ac_config_files run"
ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile docs/Makefile gnulib/lib/Makefile gnulib/tests/Makefile libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc src/libvirt.pc src/libvirt-qemu.pc src/libvirt-lxc.pc libvirt.spec mingw-libvirt.spec po/Makefile.in include/libvirt/libvirt-common.h daemon/Makefile examples/Makefile tests/Makefile tools/Makefile tools/wireshark/Makefile tools/wireshark/src/Makefile"
ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile docs/Makefile gnulib/lib/Makefile gnulib/tests/Makefile libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc src/libvirt.pc src/libvirt-qemu.pc src/libvirt-lxc.pc libvirt.spec mingw-libvirt.spec po/Makefile.in include/libvirt/libvirt-common.h daemon/Makefile examples/Makefile tests/Makefile tools/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -72268,8 +72268,6 @@ do
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"tools/wireshark/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wireshark/Makefile" ;;
"tools/wireshark/src/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wireshark/src/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......@@ -2817,9 +2817,7 @@ AC_CONFIG_FILES([\
daemon/Makefile \
examples/Makefile \
tests/Makefile \
tools/Makefile \
tools/wireshark/Makefile \
tools/wireshark/src/Makefile])
tools/Makefile])
AC_OUTPUT
AC_MSG_NOTICE([])
......
......@@ -1882,6 +1882,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -1894,7 +1895,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
INCLUDES = \
-I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
-I$(top_srcdir) \
......
......@@ -149,7 +149,7 @@ fig = \
migration-unmanaged-direct.fig
schemadir = $(pkgdatadir)/schemas
schema_DATA = $(wildcard schemas/*.rng)
schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
EXTRA_DIST= \
apibuild.py genaclperms.pl \
......
......@@ -1753,6 +1753,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -1765,7 +1766,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR = ../src
......@@ -1892,7 +1892,7 @@ fig = \
migration-unmanaged-direct.fig
schemadir = $(pkgdatadir)/schemas
schema_DATA = $(wildcard schemas/*.rng)
schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
EXTRA_DIST = apibuild.py genaclperms.pl site.xsl newapi.xsl news.xsl \
page.xsl hacking1.xsl hacking2.xsl wrapstring.xsl $(dot_html) \
$(dot_html_in) $(gif) $(apihtml) $(apipng) $(devhelphtml) \
......
......@@ -5375,6 +5375,14 @@ qemu-kvm -net nic,model=? /dev/null
the virtualization platform
</p>
<ul><li>'virtio' — default with QEMU/KVM</li><li>'xen' — default with Xen</li></ul>
</dd><dt><code>autodeflate</code></dt><dd>
<p>
The optional <code>autodeflate</code> attribute allows to
enable/disable (values "on"/"off", respectively) the ability of the
QEMU virtio memory balloon to release some memory at the last moment
before a guest's process get killed by Out of Memory killer.
<span class="since">Since 1.3.1, QEMU and KVM only</span>
</p>
</dd><dt><code>period</code></dt><dd>
<p>
The optional <code>period</code> allows the QEMU virtio memory balloon
......
......@@ -5962,6 +5962,16 @@ qemu-kvm -net nic,model=? /dev/null
<li>'xen' &mdash; default with Xen</li>
</ul>
</dd>
<dt><code>autodeflate</code></dt>
<dd>
<p>
The optional <code>autodeflate</code> attribute allows to
enable/disable (values "on"/"off", respectively) the ability of the
QEMU virtio memory balloon to release some memory at the last moment
before a guest's process get killed by Out of Memory killer.
<span class="since">Since 1.3.1, QEMU and KVM only</span>
</p>
</dd>
<dt><code>period</code></dt>
<dd>
<p>
......
......@@ -3420,6 +3420,11 @@
<value>none</value>
</choice>
</attribute>
<optional>
<attribute name="autodeflate">
<ref name="virOnOff"/>
</attribute>
</optional>
<interleave>
<optional>
<ref name="alias"/>
......
......@@ -16,7 +16,7 @@
## License along with this library. If not, see
## <http://www.gnu.org/licenses/>.
FILTERS = $(wildcard xml/nwfilter/*.xml)
FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml)
EXTRA_DIST = \
apparmor/TEMPLATE.qemu \
......@@ -30,8 +30,8 @@ EXTRA_DIST = \
systemtap/events.stp \
systemtap/rpc-monitor.stp \
$(FILTERS) \
$(wildcard xml/storage/*.xml) \
$(wildcard xml/test/*.xml)
$(wildcard $(srcdir)/xml/storage/*.xml) \
$(wildcard $(srcdir)/xml/test/*.xml)
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
......
......@@ -1876,6 +1876,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -1888,8 +1889,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
FILTERS = $(wildcard xml/nwfilter/*.xml)
FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml)
EXTRA_DIST = \
apparmor/TEMPLATE.qemu \
apparmor/TEMPLATE.lxc \
......@@ -1902,8 +1902,8 @@ EXTRA_DIST = \
systemtap/events.stp \
systemtap/rpc-monitor.stp \
$(FILTERS) \
$(wildcard xml/storage/*.xml) \
$(wildcard xml/test/*.xml)
$(wildcard $(srcdir)/xml/storage/*.xml) \
$(wildcard $(srcdir)/xml/test/*.xml)
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \
-I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib
......@@ -2336,8 +2336,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@WITH_NWFILTER_FALSE@install-data-local:
@WITH_NWFILTER_FALSE@uninstall-local:
@WITH_NWFILTER_FALSE@install-data-local:
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
......
......@@ -1809,6 +1809,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -1821,7 +1822,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
# Initialize variables, so gnulib.mk can append to them
......
......@@ -3269,6 +3269,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -3281,7 +3282,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
AUTOMAKE_OPTIONS = 1.9.6 foreign subdir-objects
SUBDIRS = .
GNULIB_TESTS = test-accept test-alloca-opt test-areadlink \
......
......@@ -18,8 +18,8 @@
virincdir = $(includedir)/libvirt
allheaders = $(wildcard libvirt/*.h)
virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders))
allheaders = $(wildcard $(srcdir)/libvirt/*.h)
virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h, $(allheaders))
EXTRA_DIST = libvirt/libvirt-common.h.in
......
......@@ -1772,6 +1772,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
plugindir = @plugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......@@ -1784,10 +1785,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ws_plugindir = @ws_plugindir@
virincdir = $(includedir)/libvirt
allheaders = $(wildcard libvirt/*.h)
virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders))
allheaders = $(wildcard $(srcdir)/libvirt/*.h)
virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h, $(allheaders))
# Temporarily disabled, but we need it for building
EXTRA_DIST = libvirt/libvirt-common.h.in libvirt/libvirt-admin.h
......
......@@ -378,7 +378,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 1.3.1
Release: 0rc1%{?dist}%{?extra_release}
Release: 0rc2%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
......@@ -387,7 +387,7 @@ URL: http://libvirt.org/
%if %(echo %{version} | grep -o \\. | wc -l) == 3
%define mainturl stable_updates/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}-rc1.tar.gz
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}-rc2.tar.gz
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
......
......@@ -378,7 +378,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: @VERSION@
Release: 0rc1%{?dist}%{?extra_release}
Release: 0rc2%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
......@@ -387,7 +387,7 @@ URL: http://libvirt.org/
%if %(echo %{version} | grep -o \\. | wc -l) == 3
%define mainturl stable_updates/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}-rc1.tar.gz
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}-rc2.tar.gz
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
......
......@@ -28,20 +28,20 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[
dnl Check for system location of wireshark plugins
if test "x$with_wireshark_dissector" != "xno" ; then
if test "x$with_ws_plugindir" = "xcheck" ; then
ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
if test "x$ws_plugindir" = "x" ; then
dnl On some systems the plugindir variable may not be stored within pkg config.
dnl Fall back to older style of constructing the plugin dir path.
ws_plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
fi
elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then
AC_MSG_ERROR([ws-plugindir must be used only with valid path])
else
ws_plugindir=$with_ws_plugindir
plugindir=$with_ws_plugindir
fi
fi
AC_SUBST([ws_plugindir])
AC_SUBST([plugindir])
])
AC_DEFUN([LIBVIRT_RESULT_WIRESHARK],[
......
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.