diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 31d3fee213..a784f5768c 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -162,6 +162,45 @@ qemu+ssh://root@example.com/system (remote access, SSH tunnelled) of libvirt, once QMP processing moves to a dedicated thread.
++ The QEMU driver comes with sane default values. However, during its + initialization it reads a configuration file which offers system + administrator or an user to override some of that default. The location + of the file depends on the connection URI, as follows: +
+ +qemu:///system |
+ /etc/libvirt/qemu.conf |
+
qemu:///session |
+ $XDG_CONFIG_HOME/libvirt/qemu.conf |
+
qemu:///embed |
+ $rootdir/etc/qemu.conf |
+
+ If $XDG_CONFIG_HOME
is not set in the environment, it
+ defaults to $HOME/.config
. For the embed URI the
+ $rootdir
represents the specified root directory from
+ the connection URI.
+
+ Please note, that it is very likely that the only qemu.conf file that
+ will exist after installing libvirt is the
+ /etc/libvirt/qemu.conf
, if users of the session daemon or
+ the embed driver want to override a built in value, then they need to
+ create the file before connecting to the respective URI.
+
diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst index ed591f4778..6545dc58d3 100644 --- a/docs/manpages/libvirtd.rst +++ b/docs/manpages/libvirtd.rst @@ -136,6 +136,16 @@ When run as *root* The default configuration file used by ``libvirtd``, unless overridden on the command line using the ``-f`` | ``--config`` option. +If QEMU driver is installed, then the following file is also read: + +* ``@SYSCONFDIR@/libvirt/qemu.conf`` + +This file contains various knobs and default values for virtual machines +created within QEMU driver, and offers a way to override the built in defaults, +for instance (but not limited to): paths to various supplementary binaries, TLS +certificates location, graphical consoles configuration and others. Location of +this file can't be overridden by any command line switch. + * ``@RUNSTATEDIR@/libvirt/libvirt-sock`` * ``@RUNSTATEDIR@/libvirt/libvirt-sock-ro`` @@ -166,6 +176,16 @@ When run as *non-root* The default configuration file used by ``libvirtd``, unless overridden on the command line using the ``-f``|``--config`` option. +If QEMU driver is installed, then the following file is also read: + +* ``$XDG_CONFIG_HOME/libvirt/qemu.conf`` + +If the file exists, it can contain various knobs and default values for virtual +machines created within QEMU driver, and offers a way to override the built in +defaults, for instance (but not limited to): paths to various supplementary +binaries, TLS certificates location, graphical consoles configuration and +others. Location of this file can't be overridden by any command line switch. + * ``$XDG_RUNTIME_DIR/libvirt/libvirt-sock`` The socket ``libvirtd`` will use. diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst index fbcc6e45fa..d82d09ee61 100644 --- a/docs/manpages/virtqemud.rst +++ b/docs/manpages/virtqemud.rst @@ -111,6 +111,17 @@ When run as *root* The default configuration file used by ``virtqemud``, unless overridden on the command line using the ``-f`` | ``--config`` option. +In addition to the default configuration file, ``virtqemud`` reads +configuration for the qemu driver from: + +* ``@SYSCONFDIR@/libvirt/qemu.conf`` + +This file contains various knobs and default values for virtual machines +created within QEMU driver, and offers a way to override the built in defaults, +for instance (but not limited to): paths to various supplementary binaries, TLS +certificates location, graphical consoles configuration and others. Location of +this file can't be overridden by any command line switch. + * ``@RUNSTATEDIR@/libvirt/virtqemud-sock`` * ``@RUNSTATEDIR@/libvirt/virtqemud-sock-ro`` * ``@RUNSTATEDIR@/libvirt/virtqemud-admin-sock`` @@ -132,6 +143,17 @@ When run as *non-root* The default configuration file used by ``virtqemud``, unless overridden on the command line using the ``-f``|``--config`` option. +In addition to the default configuration file, ``virtqemud`` reads +configuration for the qemu driver from: + +* ``$XDG_CONFIG_HOME/libvirt/qemu.conf`` + +If the file exists, it can contain various knobs and default values for virtual +machines created within QEMU driver, and offers a way to override the built in +defaults, for instance (but not limited to): paths to various supplementary +binaries, TLS certificates location, graphical consoles configuration and +others. Location of this file can't be overridden by any command line switch. + * ``$XDG_RUNTIME_DIR/libvirt/virtqemud-sock`` * ``$XDG_RUNTIME_DIR/libvirt/virtqemud-admin-sock``