External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-13 17:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
6d0b1d2df5
libvirt/src/qemu/Makefile.inc.am

268 lines
6.9 KiB
Makefile
Raw Normal View History

maint: Add filetype annotations to Makefile.inc.am Vim has trouble figuring out the filetype automatically because the name doesn't follow existing conventions; annotations like the ones we already have in Makefile.ci help it out. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-04-12 12:41:10 +00:00
# vim: filetype=automake
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
QEMU_DRIVER_SOURCES = \
qemu/qemu_agent.c \
qemu/qemu_agent.h \
qemu/qemu_alias.c \
qemu/qemu_alias.h \
qemu/qemu_block.c \
qemu/qemu_block.h \
qemu/qemu_blockjob.c \
qemu/qemu_blockjob.h \
qemu/qemu_capabilities.c \
qemu/qemu_capabilities.h \
qemu/qemu_command.c \
qemu/qemu_command.h \
qemu: add a DBus daemon helper unit Add a unit to start & stop a private dbus-daemon. The daemon is meant to be started on demand, and associated with a QEMU process. It should be stopped when the QEMU process is stopped. The current policy is permissive like a session bus. Stricter policies can be added later, following recommendations from: https://git.qemu.org/?p=qemu.git;a=blob;f=docs/interop/dbus.rst Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-02-25 09:55:08 +00:00
qemu/qemu_dbus.c \
qemu/qemu_dbus.h \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
qemu/qemu_domain.c \
qemu/qemu_domain.h \
qemu/qemu_domain_address.c \
qemu/qemu_domain_address.h \
qemu/qemu_cgroup.c \
qemu/qemu_cgroup.h \
qemu: Extend QEMU with external TPM support Implement functions for managing the storage of the external swtpm as well as starting and stopping it. Also implement functions to use swtpm_setup, which simulates the manufacturing of a TPM, which includes creation of certificates for the device. Further, the external TPM needs storage on the host that we need to set up before it can be run. We can clean up the host once the domain is undefined. This patch also implements a small layer for external device support that calls into the TPM device layer if a domain has an attached TPM. This is the layer we will wire up later on. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2017-04-04 16:22:31 +00:00
qemu/qemu_extdevice.c \
qemu/qemu_extdevice.h \
qemu: Introduce basic skeleton for parsing firmware description The firmware description is a JSON file which follows specification from qemu.git/docs/interop/firmware.json. The description file basically says: Firmware file X is {bios|uefi}, supports these targets and machine types, requires these features to be enabled on qemu cmd line and this is how you put it onto qemu cmd line. The firmware.json specification covers more (i.e. how to select the right firmware) but that will be covered and implemented in next commits. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-02-19 10:07:46 +00:00
qemu/qemu_firmware.c \
qemu/qemu_firmware.h \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
qemu/qemu_hostdev.c \
qemu/qemu_hostdev.h \
qemu/qemu_hotplug.c \
qemu/qemu_hotplug.h \
qemu/qemu_conf.c \
qemu/qemu_conf.h \
qemu: generalize qemuFetchConfigs The same config files disovery & priority rules are used for vhost-user backends. No functional change, the only difference is that qemuInteropFetchConfigs() takes a "name" argument and construct paths with it (ex: "firmware"). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-09-23 10:44:24 +00:00
qemu/qemu_interop_config.c \
qemu/qemu_interop_config.h \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
qemu/qemu_process.c \
qemu/qemu_process.h \
qemu/qemu_processpriv.h \
qemu/qemu_migration.c \
qemu/qemu_migration.h \
qemu/qemu_migration_cookie.c \
qemu/qemu_migration_cookie.h \
src/qemu: Fix indentation in Makefile.inc.am Three lines are a bit off there. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
2019-01-09 16:18:58 +00:00
qemu/qemu_migration_params.c \
qemu/qemu_migration_params.h \
qemu/qemu_migration_paramspriv.h \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
qemu/qemu_monitor.c \
qemu/qemu_monitor.h \
qemu: add qemu_monitor_priv.h to sources list Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-06-12 09:16:41 +00:00
qemu/qemu_monitor_priv.h \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
qemu/qemu_monitor_text.c \
qemu/qemu_monitor_text.h \
qemu/qemu_monitor_json.c \
qemu/qemu_monitor_json.h \
qemu/qemu_driver.c \
qemu/qemu_driver.h \
qemu/qemu_interface.c \
qemu/qemu_interface.h \
qemu/qemu_capspriv.h \
qemu/qemu_security.c \
qemu/qemu_security.h \
qemu: caps: Move QAPI schema related code into separate file Extract the code into qemu_qapi.c/h so that we separate it from various parts of the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2018-03-20 07:44:11 +00:00
qemu/qemu_qapi.c \
qemu/qemu_qapi.h \
qemu: add slirp helper unit The unit provides the functions associated with a slirp-helper: - probing / checking capabilities - opening the socketpair - starting / stoping the helper - registering for dbus-vmstate migration Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2019-08-08 14:55:05 +00:00
qemu/qemu_slirp.c \
qemu/qemu_slirp.h \
qemu: Extend QEMU with external TPM support Implement functions for managing the storage of the external swtpm as well as starting and stopping it. Also implement functions to use swtpm_setup, which simulates the manufacturing of a TPM, which includes creation of certificates for the device. Further, the external TPM needs storage on the host that we need to set up before it can be run. We can clean up the host once the domain is undefined. This patch also implements a small layer for external device support that calls into the TPM device layer if a domain has an attached TPM. This is the layer we will wire up later on. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2017-04-04 16:22:31 +00:00
qemu/qemu_tpm.c \
qemu/qemu_tpm.h \
qemu: add vhost-user helpers Add qemuVhostUserFetchConfigs() to discover vhost-user helpers. qemuVhostUserFillDomainGPU() will find the first matching GPU helper with the required capabilities and set the associated vhost_user_binary. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Cole Robinson <crobinso@redhat.com>
2019-09-23 10:44:33 +00:00
qemu/qemu_vhost_user.c \
qemu/qemu_vhost_user.h \
qemu: add vhost-user-gpu helper unit Similar to the qemu_tpm.c, add a unit with a few functions to start/stop and setup the cgroup of the external vhost-user-gpu process. See function documentation. The vhost-user connection fd is set on qemuDomainVideoPrivate struct. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Cole Robinson <crobinso@redhat.com>
2019-09-23 10:44:37 +00:00
qemu/qemu_vhost_user_gpu.c \
qemu/qemu_vhost_user_gpu.h \
qemu: add code for handling virtiofsd Start virtiofsd for each <filesystem> device using it. Pre-create the socket for communication with QEMU and pass it to virtiofsd. Note that virtiofsd needs to run as root. https://bugzilla.redhat.com/show_bug.cgi?id=1694166 Introduced by QEMU commit a43efa34c7d7b628cbf1ec0fe60043e5c91043ea Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Tested-by: Andrea Bolognani <abologna@redhat.com>
2019-11-01 11:34:52 +00:00
qemu/qemu_virtiofs.c \
qemu/qemu_virtiofs.h \
qemu: driver: Move checkpoint-related code to qemu_checkpoint.c Move all extensive functions to a new file so that we don't just pile everything in the common files. This obviously isn't possible with straight code movement as we still need stubs in qemu_driver.c Additionally some functions e.g. for looking up a checkpoint by name were so short that moving the impl didn't make sense. Note that in the move the new file also doesn't use virQEMUMomentReparent but rather an stripped down copy. As I plan to split out snapshot code into a separate file the unification doesn't make sense any more. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
2019-09-19 14:49:21 +00:00
qemu/qemu_checkpoint.c \
qemu/qemu_checkpoint.h \
qemu: Implement backup job APIs and qemu handling This allows to start and manage the backup job. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-09-18 11:11:12 +00:00
qemu/qemu_backup.c \
qemu/qemu_backup.h \
qemu: move qemuDomainDefValidateFeatures to qemu_validate.c This patch introduces a new file to host domain validations from the QEMU driver. And to get things started, let's move qemuDomainDefValidateFeatures() to this new file. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-03-26 21:31:11 +00:00
qemu/qemu_validate.c \
qemu/qemu_validate.h \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
$(NULL)
make check-driverimpls work again Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-11-11 12:41:34 +00:00
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
src: Make check-aclrules work again Previously we generated all source files into $srcdir which is no longer true. This means that we can't just blindly prepend each source file with $srcdir. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-11-11 05:37:33 +00:00
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
EXTRA_DIST += $(QEMU_DRIVER_SOURCES)
if WITH_QEMU
noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la
libvirt_driver_qemu_la_SOURCES =
libvirt_driver_qemu_la_LIBADD = \
libvirt_driver_qemu_impl.la \
libvirt.la \
build: link to glib library Add the main glib.h to internal.h so that all common code can use it. Historically glib allowed applications to register an alternative memory allocator, so mixing g_malloc/g_free with malloc/free was not safe. This was feature was dropped in 2.46.0 with: commit 3be6ed60aa58095691bd697344765e715a327fc1 Author: Alexander Larsson <alexl@redhat.com> Date: Sat Jun 27 18:38:42 2015 +0200 Deprecate and drop support for memory vtables Applications are still encourged to match g_malloc/g_free, but it is no longer a mandatory requirement for correctness, just stylistic. This is explicitly clarified in commit 1f24b36607bf708f037396014b2cdbc08d67b275 Author: Daniel P. Berrangé <berrange@redhat.com> Date: Thu Sep 5 14:37:54 2019 +0100 gmem: clarify that g_malloc always uses the system allocator Applications can still use custom allocators in general, but they must do this by linking to a library that replaces the core malloc/free implemenentation entirely, instead of via a glib specific call. This means that libvirt does not need to be concerned about use of g_malloc/g_free causing an ABI change in the public libary, and can avoid memory copying when talking to external libraries. This patch probes for glib, which provides the foundation layer with a collection of data structures, helper APIs, and platform portability logic. Later patches will introduce linkage to gobject which provides the object type system, built on glib, and gio which providing objects for various interesting tasks, most notably including DBus client and server support and portable sockets APIs, but much more too. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-29 15:12:24 +00:00
$(GLIB_LIBS) \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
$(NULL)
mod_LTLIBRARIES += libvirt_driver_qemu.la
libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
libvirt_driver_qemu_impl_la_CFLAGS = \
$(GNUTLS_CFLAGS) \
$(LIBNL_CFLAGS) \
$(SELINUX_CFLAGS) \
$(XDR_CFLAGS) \
-I$(srcdir)/access \
src: access: generate source files into build directory Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-10-23 23:36:43 +00:00
-I$(builddir)/access \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
-I$(srcdir)/conf \
-I$(srcdir)/secret \
src: introduce hypervisor/domain_cgroup.c There is duplicated code between virt drivers that needs to be moved to avoid code repetition. In the case of duplicated code between lxc_cgroup.c and qemu_cgroup.c a common place would be utils/vircgroup.c. The problem is that this would introduce /conf related definitions that shouldn't be imported to vircgroup.c, which is supposed to be a place for utilitary cgroups functions only. And syntax-check would forbid it anyway due to cross-directory includes being used. An alternative would be to overload domain_conf.c, which already contains all the definitions required. But that file is already crowded with XML handling code and we wouldn't do any favors to it by putting more utilitary, non-XML parsing/formatting code there. In [1], Cole suggested a 'domain_cgroup' file to host common code between lxc_cgroup and qemu_cgroup, and Daniel suggested a 'src/hypervisor' dir to host these type of files. This patch introduces src/hypervisor/domain_cgroup.c and, to get started, introduces a new virDomainCgroupSetupBlkio() function to host shared code between virLXCCgroupSetupBlkioTune() and qemuSetupBlkioCgroup(). [1] https://www.redhat.com/archives/libvir-list/2019-December/msg00817.html Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2020-02-17 21:29:11 +00:00
-I$(srcdir)/hypervisor \
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
$(AM_CFLAGS) \
$(NULL)
libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_qemu_impl_la_LIBADD = \
$(CAPNG_LIBS) \
$(GNUTLS_LIBS) \
$(LIBNL_LIBS) \
$(SELINUX_LIBS) \
$(LIBXML_LIBS) \
$(NULL)
libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES)
if WITH_DTRACE_PROBES
libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo
nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h
BUILT_SOURCES += libvirt_qemu_probes.h
tapset_DATA += libvirt_qemu_probes.stp
CLEANFILES += \
libvirt_qemu_probes.h \
libvirt_qemu_probes.o \
libvirt_qemu_probes.lo \
libvirt_qemu_probes.stp \
$(NULL)
endif WITH_DTRACE_PROBES
qemu: introduce virtqemud daemon The virtqemud daemon will be responsible for providing the qemu API driver functionality. The qemu driver is still loaded by the main libvirtd daemon at this stage, so virtqemud must not be running at the same time. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-03-16 17:05:24 +00:00
sbin_PROGRAMS += virtqemud
nodist_conf_DATA += qemu/virtqemud.conf
augeas_DATA += qemu/virtqemud.aug
augeastest_DATA += qemu/test_virtqemud.aug
CLEANFILES += qemu/virtqemud.aug
virtqemud_SOURCES = $(REMOTE_DAEMON_SOURCES)
src: stop distributing generated source files Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-10-23 12:24:37 +00:00
nodist_virtqemud_SOURCES = $(REMOTE_DAEMON_GENERATED)
qemu: introduce virtqemud daemon The virtqemud daemon will be responsible for providing the qemu API driver functionality. The qemu driver is still loaded by the main libvirtd daemon at this stage, so virtqemud must not be running at the same time. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-03-16 17:05:24 +00:00
virtqemud_CFLAGS = \
$(REMOTE_DAEMON_CFLAGS) \
-DDAEMON_NAME="\"virtqemud\"" \
-DMODULE_NAME="\"qemu\"" \
$(NULL)
virtqemud_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
virtqemud_LDADD = $(REMOTE_DAEMON_LD_ADD)
systemd: Add sysconf files for all daemons While not terribly useful in general, tweaking each daemon's timeout (or disabling it off altogether) is a valid use case which we can very easily support while being consistent with what already happens for libvirtd. This is a first step in that direction. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2020-04-01 17:59:14 +00:00
SYSCONF_FILES += qemu/virtqemud.sysconf
qemu: introduce virtqemud daemon The virtqemud daemon will be responsible for providing the qemu API driver functionality. The qemu driver is still loaded by the main libvirtd daemon at this stage, so virtqemud must not be running at the same time. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-03-16 17:05:24 +00:00
SYSTEMD_UNIT_FILES += \
virtqemud.service \
virtqemud.socket \
virtqemud-ro.socket \
virtqemud-admin.socket \
$(NULL)
SYSTEMD_UNIT_FILES_IN += \
qemu/virtqemud.service.in \
$(NULL)
configure: Provide OpenRC scripts for sub-daemons There is plenty of distributions that haven't switched to systemd nor they force their users to (Gentoo, Alpine Linux to name a few). With the daemon split merged their only option is to still use the monolithic daemon which will go away eventually. Provide init scripts for these distros too. For now, I'm not introducing config files which would correspond to the init files except for libvirtd and virtproxyd init scripts where it might be desirable to tweak the command line of corresponding daemons. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-10-31 17:59:19 +00:00
OPENRC_INIT_FILES += \
virtqemud.init \
$(NULL)
OPENRC_INIT_FILES_IN += \
qemu/virtqemud.init.in \
$(NULL)
qemu: introduce virtqemud daemon The virtqemud daemon will be responsible for providing the qemu API driver functionality. The qemu driver is still loaded by the main libvirtd daemon at this stage, so virtqemud must not be running at the same time. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-03-16 17:05:24 +00:00
VIRTQEMUD_UNIT_VARS = \
$(VIRTD_UNIT_VARS) \
-e 's|[@]name[@]|Libvirt qemu|g' \
-e 's|[@]service[@]|virtqemud|g' \
-e 's|[@]sockprefix[@]|virtqemud|g' \
$(NULL)
configure: Provide OpenRC scripts for sub-daemons There is plenty of distributions that haven't switched to systemd nor they force their users to (Gentoo, Alpine Linux to name a few). With the daemon split merged their only option is to still use the monolithic daemon which will go away eventually. Provide init scripts for these distros too. For now, I'm not introducing config files which would correspond to the init files except for libvirtd and virtproxyd init scripts where it might be desirable to tweak the command line of corresponding daemons. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-10-31 17:59:19 +00:00
virtqemud.init: qemu/virtqemud.init.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(LIBVIRTD_INIT_VARS) $< > $@-t && mv $@-t $@
qemu: introduce virtqemud daemon The virtqemud daemon will be responsible for providing the qemu API driver functionality. The qemu driver is still loaded by the main libvirtd daemon at this stage, so virtqemud must not be running at the same time. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-03-16 17:05:24 +00:00
virtqemud.service: qemu/virtqemud.service.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@
virtqemu%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
$(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@
qemu/virtqemud.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
$< > $@
qemu/virtqemud.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
$< > $@
qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
build: fix use of $(AUG_GENTEST) as a dependency The use of $(AUG_GENTEST) as a dependency in the makefiles is a problem because this was assumed to be the filename of the script, but is in fact a full shell command line. Split it into two variables, so it can be correctly used for dependencies. Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-09-27 13:17:54 +00:00
qemu/virtqemud.conf $(AUG_GENTEST_SCRIPT)
qemu: introduce virtqemud daemon The virtqemud daemon will be responsible for providing the qemu API driver functionality. The qemu driver is still loaded by the main libvirtd daemon at this stage, so virtqemud must not be running at the same time. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-03-16 17:05:24 +00:00
$(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
> $@ || rm -f $@
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
conf_DATA += qemu/qemu.conf
augeas_DATA += qemu/libvirtd_qemu.aug
build: create all augeas test files in same dir as their source The current make rules are inconsistent about which directory the augeas test files are created in. Put them all in the same dir as their source. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-07-19 15:48:10 +00:00
augeastest_DATA += qemu/test_libvirtd_qemu.aug
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
build: create all augeas test files in same dir as their source The current make rules are inconsistent about which directory the augeas test files are created in. Put them all in the same dir as their source. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-07-19 15:48:10 +00:00
qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
build: fix use of $(AUG_GENTEST) as a dependency The use of $(AUG_GENTEST) as a dependency in the makefiles is a problem because this was assumed to be the filename of the script, but is in fact a full shell command line. Split it into two variables, so it can be correctly used for dependencies. Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-09-27 13:17:54 +00:00
$(srcdir)/qemu/qemu.conf $(AUG_GENTEST_SCRIPT)
build: make augeas-gentest.pl write to stdout The augeas-gentest.pl program merges a config file into a augeas file, saving the output to a new file. It is going to be useful to further process the output file, and it would be easier if this can be done with a pipeline, so change augeas-gentest.pl to write to stdout instead of a file. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-07-17 10:39:32 +00:00
$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
INSTALL_DATA_DIRS += qemu
install-data-qemu:
$(MKDIR_P) -m 0751 "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
build: honour $(runstatedir) in make rules Creating various directories using $(runstatedir) instead of $(localstatedir)/run. There's no functional change by default yet since both expressions expand to the same value. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-20 15:08:19 +00:00
$(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu"
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
qemu: Extend qemu_conf with tpm-emulator support Extend qemu_conf with user and group for running the tpm-emulator and add directories to the configuration for the locations of the log, state, and socket of the tpm-emulator. Also add these new directories to the QEMU Makefile.inc.am and the RPM spec file libvirt.spec.in. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2017-04-04 16:22:31 +00:00
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm"
build: honour $(runstatedir) in make rules Creating various directories using $(runstatedir) instead of $(localstatedir)/run. There's no functional change by default yet since both expressions expand to the same value. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-20 15:08:19 +00:00
$(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm"
qemu: Extend qemu_conf with tpm-emulator support Extend qemu_conf with user and group for running the tpm-emulator and add directories to the configuration for the locations of the log, state, and socket of the tpm-emulator. Also add these new directories to the QEMU Makefile.inc.am and the RPM spec file libvirt.spec.in. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2017-04-04 16:22:31 +00:00
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu"
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
uninstall-data-qemu:
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||:
build: honour $(runstatedir) in make rules Creating various directories using $(runstatedir) instead of $(localstatedir)/run. There's no functional change by default yet since both expressions expand to the same value. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-20 15:08:19 +00:00
rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu" ||:
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||:
qemu: Extend qemu_conf with tpm-emulator support Extend qemu_conf with user and group for running the tpm-emulator and add directories to the configuration for the locations of the log, state, and socket of the tpm-emulator. Also add these new directories to the QEMU Makefile.inc.am and the RPM spec file libvirt.spec.in. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2017-04-04 16:22:31 +00:00
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm"
build: honour $(runstatedir) in make rules Creating various directories using $(runstatedir) instead of $(localstatedir)/run. There's no functional change by default yet since both expressions expand to the same value. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-08-20 15:08:19 +00:00
rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm" ||:
qemu: Extend qemu_conf with tpm-emulator support Extend qemu_conf with user and group for running the tpm-emulator and add directories to the configuration for the locations of the log, state, and socket of the tpm-emulator. Also add these new directories to the QEMU Makefile.inc.am and the RPM spec file libvirt.spec.in. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2017-04-04 16:22:31 +00:00
rmdir "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu" ||:
make: split qemu driver build rules into qemu/Makefile.inc.am Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2018-02-21 18:05:56 +00:00
endif WITH_QEMU
.PHONY: \
install-data-qemu \
uninstall-data-qemu \
$(NULL)
EXTRA_DIST += \
qemu/qemu.conf \
qemu/libvirtd_qemu.aug \
qemu/test_libvirtd_qemu.aug.in \
qemu/THREADS.txt \
libvirt_qemu_probes.d \
$(NULL)
qemu: introduce a new "virt-qemu-run" program The previous "QEMU shim" proof of concept was taking an approach of only caring about initial spawning of the QEMU process. It was then registered with the libvirtd daemon who took over management of it. The intent was that later libvirtd would be refactored so that the shim retained control over the QEMU monitor and libvirt just forwarded APIs to each shim as needed. This forwarding of APIs would require quite alot of significant refactoring of libvirtd to achieve. This impl thus takes a quite different approach, explicitly deciding to keep the VMs completely separate from those seen & managed by libvirtd. Instead it uses the new "qemu:///embed" URI scheme to embed the entire QEMU driver in the shim, running with a custom root directory. Once the driver is initialization, the shim starts a VM and then waits to shutdown automatically when QEMU shuts down, or should kill QEMU if it is terminated itself. This ought to use the AUTO_DESTROY feature but that is not yet available in embedded mode, so we rely on installing a few signal handlers to gracefully kill QEMU. This isn't reliable if we crash of course, but you can restart with the same root dir. Note this program does not expose any way to manage the QEMU process, since there's no RPC interface enabled. It merely starts the VM and cleans up when the guest shuts down at the end. This program is installed to /usr/bin/virt-qemu-run enabling direct use by end users. Most use cases will probably want to integrate the concept directly into their respective application codebases. This standalone binary serves as a nice demo though, and also provides a way to measure performance of the startup process quite simply. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-05-17 12:01:59 +00:00
QEMU_SHIM_SOURCES = qemu/qemu_shim.c
EXTRA_DIST += $(QEMU_SHIM_SOURCES)
if WITH_QEMU
bin_PROGRAMS += virt-qemu-run
virt_qemu_run_SOURCES = $(QEMU_SHIM_SOURCES)
qemu: fix linking virt-qemu-run on some distros Debian/Ubuntu linkers are more strict that other distros requiring glib to be linked explicitly. macOS needs -export-dynamic instead of -Wl,--export-dynamic Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2020-01-27 12:42:04 +00:00
virt_qemu_run_LDADD = \
libvirt.la \
$(GLIB_LIBS) \
$(NULL)
virt_qemu_run_LDFLAGS = -export-dynamic
qemu: introduce a new "virt-qemu-run" program The previous "QEMU shim" proof of concept was taking an approach of only caring about initial spawning of the QEMU process. It was then registered with the libvirtd daemon who took over management of it. The intent was that later libvirtd would be refactored so that the shim retained control over the QEMU monitor and libvirt just forwarded APIs to each shim as needed. This forwarding of APIs would require quite alot of significant refactoring of libvirtd to achieve. This impl thus takes a quite different approach, explicitly deciding to keep the VMs completely separate from those seen & managed by libvirtd. Instead it uses the new "qemu:///embed" URI scheme to embed the entire QEMU driver in the shim, running with a custom root directory. Once the driver is initialization, the shim starts a VM and then waits to shutdown automatically when QEMU shuts down, or should kill QEMU if it is terminated itself. This ought to use the AUTO_DESTROY feature but that is not yet available in embedded mode, so we rely on installing a few signal handlers to gracefully kill QEMU. This isn't reliable if we crash of course, but you can restart with the same root dir. Note this program does not expose any way to manage the QEMU process, since there's no RPC interface enabled. It merely starts the VM and cleans up when the guest shuts down at the end. This program is installed to /usr/bin/virt-qemu-run enabling direct use by end users. Most use cases will probably want to integrate the concept directly into their respective application codebases. This standalone binary serves as a nice demo though, and also provides a way to measure performance of the startup process quite simply. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-05-17 12:01:59 +00:00
endif WITH_QEMU
Reference in New Issue Copy Permalink