[libvirt] opening tap devices that are created in a container
by Jason Baron
Hi,
Opening tap devices, such as macvtap, that are created in containers is
problematic because the interface for opening tap devices is via
/dev/tapNN and devtmpfs is not typically mounted inside a container as
its not namespace aware. It is possible to do a mknod() in the
container, once the tap devices are created, however, since the tap
devices are created dynamically its not possible to apriori allow access
to certain major/minor numbers, since we don't know what these are going
to be. In addition, its desirable to not allow the mknod capability in
containers. This behavior, I think is somewhat inconsistent with the
tuntap driver where one can create tuntap devices inside a container by
first opening /dev/net/tun and then using them by supplying the tuntap
device name via the ioctl(TUNSETIFF). And since TUNSETIFF validates the
network namespace, one is limited to opening network devices that belong
to your current network namespace.
Here are some options to this issue, that I wanted to get feedback
about, and just wondering if anybody else has run into this.
1)
Don't create the tap device, such as macvtap in the container. Instead,
create the tap device outside of the container and then move it into the
desired container network namespace. In addition, do a mknod() for the
corresponding /dev/tapNN device from outside the container before doing
chroot().
This solution still doesn't allow tap devices to be created inside the
container. Thus, in the case of kubevirt, which runs libvirtd inside of
a container, it would mean changing libvirtd to open existing tap
devices (as opposed to the current behavior of creating new ones). This
would not require any kernel changes, but as mentioned seems
inconsistent with the tuntap interface.
2)
Add a new kernel interface for tap devices similar to how /dev/net/tun
currently works. It might be nice to use TUNSETIFF for tap devices, but
because tap devices have different fops they can't be easily switched
after open(). So the suggestion is a new ioctl (TUNGETFDBYNAME?), where
the tap device name is supplied and a new fd (distinct from the fd
returned by the open of /dev/net/tun) is returned as an output field as
part of the new ioctl parameter.
It may not make sense to have this new ioctl call for /dev/net/tun since
its really about opening a tap device, so it may make sense to introduce
it as part of a new device, such as /dev/net/tap. This new ioctl could
be used for macvtap and ipvtap (or any tap device). I think it might
also improve performance for tuntap devices themselves, if they are
opened this way since currently all tun operations such as read() and
write() take a reference count on the underlying tuntap device, since it
can be changed via TUNSETIFF. I tested this interface out, so I can
provide the kernel changes if that's helpful for clarification.
Thanks,
-Jason
6 years, 12 months
[libvirt] [PATCH] qemu: hotplug: don't overwrite error message in qemuDomainAttachNetDevice
by Katerina Koukiou
Since commit f14c37, virDomainConfVMNWFilterTeardown is reporting errors
thus any previously reported error gets overwritten.
We need to save the errors in qemuDomainAttachNetDevice before calling
this function when we are in cleanup code.
https://bugzilla.redhat.com/show_bug.cgi?id=1598311
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 3dfa51b0a0..2e13cab233 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -793,6 +793,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
bool charDevPlugged = false;
bool netdevPlugged = false;
char *netdev_name;
+ virErrorPtr save_error = NULL;
/* preallocate new slot for device */
if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0)
@@ -1074,7 +1075,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
qemuDomainReleaseDeviceAddress(vm, &net->info, NULL);
if (iface_connected) {
+ virErrorPreserveLast(&save_error);
virDomainConfNWFilterTeardown(net);
+ virErrorRestore(&save_error);
if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
ignore_value(virNetDevMacVLanDeleteWithVPortProfile(
--
2.15.0
6 years, 12 months
[libvirt] [PATCH v3 0/8] Enable vfio-pci 'property' for mediated device
by Erik Skultety
RFC here:
https://www.redhat.com/archives/libvir-list/2018-May/msg02218.html
Since v1 [1]:
- remodeled egl-headless to be a standalone graphics element instead of a
result of some automagic with graphic's <gl> element
- pushed the first 5 simple fixes that were RB'd
- fixed some nits raised during review
Since v2 [2]
- converted the 'display' and 'egl-headless' PostParse callbacks in patches 2
and 6 to Validate callbacks as they should have been since the beginning (see
the RFC)
- some minor nits
- added a standalone patch substituting some 'error' labels with 'cleanup' as
requested during review
[1] https://www.redhat.com/archives/libvir-list/2018-June/msg01740.html
[2] https://www.redhat.com/archives/libvir-list/2018-July/msg00485.html
Erik Skultety (8):
qemu: caps: Introduce a capability for egl-headless
conf: Introduce a new graphics display type 'headless'
qemu: caps: Add vfio-pci.display capability
conf: Introduce virDomainGraphicsDefHasOpenGL helper
conf: Replace 'error' with 'cleanup' in
virDomainHostdevDefParseXMLSubsys
conf: Introduce new <hostdev> attribute 'display'
qemu: command: Enable formatting vfio-pci.display option onto cmdline
docs: Update news about the VNC console enablement for mdevs
docs/formatdomain.html.in | 53 +++++++++-
docs/news.xml | 10 ++
docs/schemas/domaincommon.rng | 8 ++
src/conf/domain_conf.c | 106 ++++++++++++++++----
src/conf/domain_conf.h | 5 +
src/libvirt_private.syms | 1 +
src/libxl/libxl_conf.c | 1 +
src/qemu/qemu_capabilities.c | 10 ++
src/qemu/qemu_capabilities.h | 4 +
src/qemu/qemu_command.c | 60 +++++++++++-
src/qemu/qemu_domain.c | 107 ++++++++++++++++++++-
src/qemu/qemu_driver.c | 2 +
src/qemu/qemu_hotplug.c | 1 +
src/qemu/qemu_process.c | 4 +
src/vmx/vmx.c | 1 +
tests/domaincapsschemadata/full.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +
tests/qemuxml2argvdata/graphics-egl-headless.args | 26 +++++
tests/qemuxml2argvdata/graphics-egl-headless.xml | 31 ++++++
.../qemuxml2argvdata/graphics-sdl-egl-headless.xml | 35 +++++++
.../graphics-spice-egl-headless.args | 31 ++++++
.../graphics-spice-egl-headless.xml | 36 +++++++
.../graphics-spice-invalid-egl-headless.xml | 37 +++++++
.../graphics-vnc-egl-headless.args | 28 ++++++
.../qemuxml2argvdata/graphics-vnc-egl-headless.xml | 37 +++++++
.../hostdev-mdev-display-missing-graphics.xml | 35 +++++++
.../hostdev-mdev-display-spice-egl-headless.args | 32 ++++++
.../hostdev-mdev-display-spice-egl-headless.xml | 40 ++++++++
.../hostdev-mdev-display-spice-opengl.args | 31 ++++++
.../hostdev-mdev-display-spice-opengl.xml | 41 ++++++++
.../hostdev-mdev-display-vnc-egl-headless.args | 32 ++++++
.../hostdev-mdev-display-vnc-egl-headless.xml | 40 ++++++++
.../qemuxml2argvdata/hostdev-mdev-display-vnc.args | 31 ++++++
.../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 39 ++++++++
tests/qemuxml2argvdata/hostdev-mdev-display.xml | 39 ++++++++
tests/qemuxml2argvtest.c | 48 +++++++++
.../graphics-spice-egl-headless.xml | 44 +++++++++
.../graphics-vnc-egl-headless.xml | 42 ++++++++
.../hostdev-mdev-display-active.xml | 47 +++++++++
tests/qemuxml2xmltest.c | 4 +
50 files changed, 1168 insertions(+), 29 deletions(-)
create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args
create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args
create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.args
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.args
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.args
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.args
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml
create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.xml
create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-active.xml
--
2.14.4
6 years, 12 months
[libvirt] [PATCH v3 0/1] qemu: Add entry for balloon stat stat-disk-caches
by Tomáš Golembiovský
v3: changes suggested by John Ferlan
- updated commit message
- fixed units (bytes -> kB) in one comment
- NOTE: Various spelling is used throughout libvirt (kb/kB/KiB) interchangeably
with the same meaning. I tried to keep the spelling consistent with the
context around the place where the change occurred.
- updated qemuDomainGetStatsBalloon()
- moved the entry in virsh output to last position
- updated virsh.pod
v2:
- moved item to last position in array
- documented item also in libvirt-domain.c
- added item to virsh listing
Tomáš Golembiovský (1):
qemu: Add entry for balloon stat stat-disk-caches
include/libvirt/libvirt-domain.h | 9 ++++++++-
src/libvirt-domain.c | 3 +++
src/qemu/qemu_driver.c | 1 +
src/qemu/qemu_monitor_json.c | 2 ++
tools/virsh-domain-monitor.c | 2 ++
tools/virsh.pod | 5 +++++
6 files changed, 21 insertions(+), 1 deletion(-)
--
2.17.1
6 years, 12 months
[libvirt] [PATCH v3] qemu: fix broken autostart symlink after renaming domain.
by Julio Faracco
If a domain is configured to start on boot, it has a symlink to the
domain definition inside the autostart directory. If you rename this
domain, the definition is renamed too. The symlink need to be pointed to
this renamed file. This commit recreates the symlink after renaming the
XML file.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594985
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/qemu/qemu_driver.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8fae46370e..6bbea324b9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -20914,6 +20914,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
char *old_dom_name = NULL;
char *new_dom_cfg_file = NULL;
char *old_dom_cfg_file = NULL;
+ char *new_dom_autostart_link = NULL;
+ char *old_dom_autostart_link = NULL;
virCheckFlags(0, ret);
@@ -20934,6 +20936,22 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
vm->def->name)))
goto cleanup;
+ if (vm->autostart) {
+ if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir,
+ new_dom_name)) ||
+ !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir,
+ vm->def->name)))
+ goto cleanup;
+
+ if (virFileIsLink(old_dom_autostart_link) &&
+ unlink(old_dom_autostart_link) < 0) {
+ virReportSystemError(errno,
+ _("Failed to delete symlink '%s'"),
+ old_dom_autostart_link);
+ goto cleanup;
+ }
+ }
+
event_old = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_RENAMED);
@@ -20946,6 +20964,16 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0)
goto rollback;
+
+ if (vm->autostart) {
+ if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) {
+ virReportSystemError(errno,
+ _("Failed to create symlink '%s to '%s'"),
+ new_dom_autostart_link, new_dom_cfg_file);
+ goto rollback;
+ }
+ }
+
if (virFileExists(old_dom_cfg_file) &&
unlink(old_dom_cfg_file) < 0) {
virReportSystemError(errno,
@@ -20960,6 +20988,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
ret = 0;
cleanup:
+ VIR_FREE(old_dom_autostart_link);
+ VIR_FREE(new_dom_autostart_link);
VIR_FREE(old_dom_cfg_file);
VIR_FREE(new_dom_cfg_file);
VIR_FREE(old_dom_name);
@@ -20979,6 +21009,18 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
if (virFileExists(new_dom_cfg_file))
unlink(new_dom_cfg_file);
+ if (vm->autostart) {
+ if (virFileExists(new_dom_autostart_link))
+ unlink(new_dom_autostart_link);
+
+ if (!virFileExists(old_dom_autostart_link) &&
+ symlink(old_dom_cfg_file, old_dom_autostart_link) < 0) {
+ virReportSystemError(errno,
+ _("Failed to create symlink '%s to '%s'"),
+ old_dom_autostart_link, old_dom_cfg_file);
+ }
+ }
+
goto cleanup;
}
--
2.17.1
6 years, 12 months
[libvirt] [PATCH v2 0/2] tests: Add/Update QEMU caps data for 2.11+ on x86_64
by Erik Skultety
Since v1:
- regenerated domaincapsschemadata to satisfy the test suite
Erik Skultety (2):
tests: Add capabilities data for QEMU 2.11 x86_64
tests: Update capabilities data for QEMU 2.12+ x86_64
tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 37 +-
.../caps_2.11.0.x86_64.replies | 19416 +++++++++++++++++++
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 961 +
.../caps_2.12.0.x86_64.replies | 539 +-
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 183 +-
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 219 +-
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 57 +-
tests/qemucapabilitiestest.c | 1 +
8 files changed, 20807 insertions(+), 606 deletions(-)
create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
--
2.14.4
6 years, 12 months
[libvirt] [PATCH] maint: update to latest gnulib
by Michal Privoznik
The changelog is quite long because we haven't updated gnulib in
a while. Anyway, among the new changes you'll find GCC 8 support,
faster build time, mingw fixes and many others.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
Pushed under "gnulib update" rule.
.gnulib | 2 +-
bootstrap | 266 ++++++++++++++++++++++++++++++++++++--------------------------
2 files changed, 155 insertions(+), 113 deletions(-)
diff --git a/.gnulib b/.gnulib
index d6397dde2e..5b78831df0 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8
+Subproject commit 5b78831df03b49408676227604cf16f90dee07ac
diff --git a/bootstrap b/bootstrap
index 92be11439a..ed3b0a4b70 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2018-07-01.02; # UTC
# Bootstrap this package from checked-out sources.
@@ -47,6 +47,8 @@ PERL="${PERL-perl}"
me=$0
+default_gnulib_url=git://git.sv.gnu.org/gnulib
+
usage() {
cat <<EOF
Usage: $me [OPTION]...
@@ -76,6 +78,37 @@ contents are read as shell variables to configure the bootstrap.
For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
are honored.
+Gnulib sources can be fetched in various ways:
+
+ * If this package is in a git repository with a 'gnulib' submodule
+ configured, then that submodule is initialized and updated and sources
+ are fetched from there. If \$GNULIB_SRCDIR is set (directly or via
+ --gnulib-srcdir) and is a git repository, then it is used as a reference.
+
+ * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir),
+ then sources are fetched from that local directory. If it is a git
+ repository and \$GNULIB_REVISION is set, then that revision is checked
+ out.
+
+ * Otherwise, if this package is in a git repository with a 'gnulib'
+ submodule configured, then that submodule is initialized and updated and
+ sources are fetched from there.
+
+ * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are
+ cloned into that directory using git from \$GNULIB_URL, defaulting to
+ $default_gnulib_url.
+ If \$GNULIB_REVISION is set, then that revision is checked out.
+
+ * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
+ used. If it is a git repository and \$GNULIB_REVISION is set, then that
+ revision is checked out.
+
+If you maintain a package and want to pin a particular revision of the
+Gnulib sources that has been tested with your package, then there are two
+possible approaches: either configure a 'gnulib' submodule with the
+appropriate revision, or set \$GNULIB_REVISION (and if necessary
+\$GNULIB_URL) in $me.conf.
+
Running without arguments will suffice in most cases.
EOF
}
@@ -109,9 +142,6 @@ die() { warn_ "$@"; exit 1; }
# Configuration.
-# Name of the Makefile.am
-gnulib_mk=gnulib.mk
-
# List of gnulib modules needed.
gnulib_modules=
@@ -170,7 +200,15 @@ source_base=lib
m4_base=m4
doc_base=doc
tests_base=tests
-gnulib_extra_files=''
+gnulib_extra_files="
+ build-aux/install-sh
+ build-aux/mdate-sh
+ build-aux/texinfo.tex
+ build-aux/depcomp
+ build-aux/config.guess
+ build-aux/config.sub
+ doc/INSTALL
+"
# Additional gnulib-tool options to use. Use "\newline" to break lines.
gnulib_tool_option_extras=
@@ -264,24 +302,18 @@ case "$0" in
*) test -r "$0.conf" && . ./"$0.conf" ;;
esac
-# Extra files from gnulib, which override files from other sources.
-test -z "${gnulib_extra_files}" && \
- gnulib_extra_files="
- build-aux/install-sh
- build-aux/mdate-sh
- build-aux/texinfo.tex
- build-aux/depcomp
- build-aux/config.guess
- build-aux/config.sub
- doc/INSTALL
-"
-
if test "$vc_ignore" = auto; then
vc_ignore=
test -d .git && vc_ignore=.gitignore
test -d CVS && vc_ignore="$vc_ignore .cvsignore"
fi
+if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
+ use_gnulib=false
+else
+ use_gnulib=true
+fi
+
# Translate configuration into internal form.
# Parse options.
@@ -612,85 +644,94 @@ git_modules_config () {
test -f .gitmodules && git config --file .gitmodules "$@"
}
-if $use_git; then
- gnulib_path=$(git_modules_config submodule.gnulib.path)
- test -z "$gnulib_path" && gnulib_path=gnulib
-fi
-
-# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
-# submodule, for use in the rest of the script.
-
-case ${GNULIB_SRCDIR--} in
--)
- # Note that $use_git is necessarily true in this case.
- if git_modules_config submodule.gnulib.url >/dev/null; then
- echo "$0: getting gnulib files..."
- git submodule init -- "$gnulib_path" || exit $?
- git submodule update -- "$gnulib_path" || exit $?
-
- elif [ ! -d "$gnulib_path" ]; then
- echo "$0: getting gnulib files..."
-
- trap cleanup_gnulib 1 2 13 15
-
- shallow=
- git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
- git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
- cleanup_gnulib
-
- trap - 1 2 13 15
+if $use_gnulib; then
+ if $use_git; then
+ gnulib_path=$(git_modules_config submodule.gnulib.path)
+ test -z "$gnulib_path" && gnulib_path=gnulib
fi
- GNULIB_SRCDIR=$gnulib_path
- ;;
-*)
- # Use GNULIB_SRCDIR directly or as a reference.
- if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
- git_modules_config submodule.gnulib.url >/dev/null; then
- echo "$0: getting gnulib files..."
- if git submodule -h|grep -- --reference > /dev/null; then
- # Prefer the one-liner available in git 1.6.4 or newer.
- git submodule update --init --reference "$GNULIB_SRCDIR" \
- "$gnulib_path" || exit $?
- else
- # This fallback allows at least git 1.5.5.
- if test -f "$gnulib_path"/gnulib-tool; then
- # Since file already exists, assume submodule init already complete.
- git submodule update -- "$gnulib_path" || exit $?
- else
- # Older git can't clone into an empty directory.
- rmdir "$gnulib_path" 2>/dev/null
- git clone --reference "$GNULIB_SRCDIR" \
- "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
- && git submodule init -- "$gnulib_path" \
- && git submodule update -- "$gnulib_path" \
- || exit $?
+
+ # Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
+ # submodule, for use in the rest of the script.
+
+ case ${GNULIB_SRCDIR--} in
+ -)
+ # Note that $use_git is necessarily true in this case.
+ if git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ git submodule init -- "$gnulib_path" || exit $?
+ git submodule update -- "$gnulib_path" || exit $?
+
+ elif [ ! -d "$gnulib_path" ]; then
+ echo "$0: getting gnulib files..."
+
+ trap cleanup_gnulib 1 2 13 15
+
+ shallow=
+ if test -z "$GNULIB_REVISION"; then
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
fi
+ git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
+ || cleanup_gnulib
+
+ trap - 1 2 13 15
fi
GNULIB_SRCDIR=$gnulib_path
+ ;;
+ *)
+ # Use GNULIB_SRCDIR directly or as a reference.
+ if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
+ git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ if git submodule -h|grep -- --reference > /dev/null; then
+ # Prefer the one-liner available in git 1.6.4 or newer.
+ git submodule update --init --reference "$GNULIB_SRCDIR" \
+ "$gnulib_path" || exit $?
+ else
+ # This fallback allows at least git 1.5.5.
+ if test -f "$gnulib_path"/gnulib-tool; then
+ # Since file already exists, assume submodule init already complete.
+ git submodule update -- "$gnulib_path" || exit $?
+ else
+ # Older git can't clone into an empty directory.
+ rmdir "$gnulib_path" 2>/dev/null
+ git clone --reference "$GNULIB_SRCDIR" \
+ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+ && git submodule init -- "$gnulib_path" \
+ && git submodule update -- "$gnulib_path" \
+ || exit $?
+ fi
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ fi
+ ;;
+ esac
+
+ if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
+ && ! git_modules_config submodule.gnulib.url >/dev/null; then
+ (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
fi
- ;;
-esac
-# $GNULIB_SRCDIR now points to the version of gnulib to use, and
-# we no longer need to use git or $gnulib_path below here.
+ # $GNULIB_SRCDIR now points to the version of gnulib to use, and
+ # we no longer need to use git or $gnulib_path below here.
+
+ if $bootstrap_sync; then
+ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+ echo "$0: updating bootstrap and restarting..."
+ case $(sh -c 'echo "$1"' -- a) in
+ a) ignored=--;;
+ *) ignored=ignored;;
+ esac
+ exec sh -c \
+ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+ $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ "$0" "$@" --no-bootstrap-sync
+ }
+ fi
-if $bootstrap_sync; then
- cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
- echo "$0: updating bootstrap and restarting..."
- case $(sh -c 'echo "$1"' -- a) in
- a) ignored=--;;
- *) ignored=ignored;;
- esac
- exec sh -c \
- 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
- $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
- "$0" "$@" --no-bootstrap-sync
- }
+ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+ <$gnulib_tool || exit $?
fi
-gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit $?
-
# Get translations.
download_po_files() {
@@ -898,32 +939,33 @@ fi
# Import from gnulib.
-gnulib_tool_options="\
- --import\
- --no-changelog\
- --aux-dir $build_aux\
- --doc-base $doc_base\
- --lib $gnulib_name\
- --m4-base $m4_base/\
- --source-base $source_base/\
- --tests-base $tests_base\
- --local-dir $local_gl_dir\
- $gnulib_tool_option_extras\
-"
-if test $use_libtool = 1; then
- case "$gnulib_tool_options " in
- *' --libtool '*) ;;
- *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
- esac
-fi
-echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
- || die "gnulib-tool failed"
+if $use_gnulib; then
+ gnulib_tool_options="\
+ --no-changelog\
+ --aux-dir=$build_aux\
+ --doc-base=$doc_base\
+ --lib=$gnulib_name\
+ --m4-base=$m4_base/\
+ --source-base=$source_base/\
+ --tests-base=$tests_base\
+ --local-dir=$local_gl_dir\
+ $gnulib_tool_option_extras\
+ "
+ if test $use_libtool = 1; then
+ case "$gnulib_tool_options " in
+ *' --libtool '*) ;;
+ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+ esac
+ fi
+ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+ $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+ || die "gnulib-tool failed"
-for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file \
- || die "failed to symlink $file"
-done
+ for file in $gnulib_files; do
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || die "failed to symlink $file"
+ done
+fi
bootstrap_post_import_hook \
|| die "bootstrap_post_import_hook failed"
--
2.16.4
6 years, 12 months
[libvirt] [PATCH] AUTHORS: Add Katerina Koukiou
by Ján Tomko
$ git log --format=oneline --committer=kkoukiou | wc -l
3
Also set up the mailmap entry to avoid duplicates in the
generated authors file.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
.mailmap | 1 +
AUTHORS.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/.mailmap b/.mailmap
index 913395b89c..311a10a8e9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,6 +42,7 @@
<mnestratov(a)virtuozzo.com> <mnestratov(a)parallels.com>
<nshirokovskiy(a)virtuozzo.com> <nshirokovskiy(a)parallels.com>
<jyang(a)redhat.com> <osier(a)yunify.com>
+<kkoukiou(a)redhat.com> <k.koukiou(a)googlemail.com>
# Name consolidation:
# Preferred author spelling <preferred email>
diff --git a/AUTHORS.in b/AUTHORS.in
index 62afa56e27..fbac54c48d 100644
--- a/AUTHORS.in
+++ b/AUTHORS.in
@@ -25,6 +25,7 @@ Ján Tomko <jtomko(a)redhat.com>
Jim Fehlig <jfehlig(a)suse.com>
Jiří Denemark <jdenemar(a)redhat.com>
John Ferlan <jferlan(a)redhat.com>
+Katerina Koukiou <kkoukiou(a)redhat.com>
Laine Stump <laine(a)redhat.com>
Mark McLoughlin <markmc(a)redhat.com>
Martin Kletzander <mkletzan(a)redhat.com>
--
2.16.1
6 years, 12 months
[libvirt] [PATCH 0/2] tests: Add/Update QEMU caps data for 2.11+ on x86_64
by Erik Skultety
Erik Skultety (2):
tests: Add capabilities data for QEMU 2.11 x86_64
tests: Update capabilities data for QEMU 2.12+ x86_64
.../caps_2.11.0.x86_64.replies | 19416 +++++++++++++++++++
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 961 +
.../caps_2.12.0.x86_64.replies | 539 +-
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 183 +-
.../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 219 +-
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 57 +-
tests/qemucapabilitiestest.c | 1 +
7 files changed, 20790 insertions(+), 586 deletions(-)
create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
create mode 100644 tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
--
2.14.4
6 years, 12 months
