Do you want to use the "xen" name here too?
Daniel P. Berrangé writes:
> Prepare for reusing libvirtd source to create other daemons by making
> the driver(s) to load conditionally defined by the make rules.
>
> If nothing is set, all drivers will be loaded, ignoring any missing ones
> as historically done.
>
> If MODULE_NAME is set only one driver will be loaded and that one must
> succeed.
>
> Reviewed-by: Andrea Bolognani <abologna@xxxxxxxxxx>
> Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
> ---
> src/remote/remote_daemon.c | 55 +++++++++++++++++++++-----------------
> 1 file changed, 31 insertions(+), 24 deletions(-)
>
> diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
> index f1daaeb944..97621884b0 100644
> --- a/src/remote/remote_daemon.c
> +++ b/src/remote/remote_daemon.c
> @@ -311,60 +311,67 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority)
>
> static int daemonInitialize(void)
> {
> - /*
> +#ifdef MODULE_NAME
> + /* This a dedicated per-driver daemon build */
> + if (virDriverLoadModule(MODULE_NAME, MODULE_NAME "Register", true) < 0)
> + return -1;
> +#else
> + /* This is the legacy monolithic libvirtd built with all drivers
> + *
> * Note that the order is important: the first ones have a higher
> * priority when calling virStateInitialize. We must register the
> * network, storage and nodedev drivers before any stateful domain
> * driver, since their resources must be auto-started before any
> * domains can be auto-started.
> */
> -#ifdef WITH_NETWORK
> +# ifdef WITH_NETWORK
> if (virDriverLoadModule("network", "networkRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_INTERFACE
> +# endif
> +# ifdef WITH_INTERFACE
> if (virDriverLoadModule("interface", "interfaceRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_SECRETS
> +# endif
> +# ifdef WITH_SECRETS
> if (virDriverLoadModule("secret", "secretRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_STORAGE
> +# endif
> +# ifdef WITH_STORAGE
> if (virDriverLoadModule("storage", "storageRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_NODE_DEVICES
> +# endif
> +# ifdef WITH_NODE_DEVICES
> if (virDriverLoadModule("nodedev", "nodedevRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_NWFILTER
> +# endif
> +# ifdef WITH_NWFILTER
> if (virDriverLoadModule("nwfilter", "nwfilterRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_LIBXL
> +# endif
> +# ifdef WITH_LIBXL
> if (virDriverLoadModule("libxl", "libxlRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_QEMU
> +# endif
> +# ifdef WITH_QEMU
> if (virDriverLoadModule("qemu", "qemuRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_LXC
> +# endif
> +# ifdef WITH_LXC
> if (virDriverLoadModule("lxc", "lxcRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_VBOX
> +# endif
> +# ifdef WITH_VBOX
> if (virDriverLoadModule("vbox", "vboxRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_BHYVE
> +# endif
> +# ifdef WITH_BHYVE
> if (virDriverLoadModule("bhyve", "bhyveRegister", false) < 0)
> return -1;
> -#endif
> -#ifdef WITH_VZ
> +# endif
> +# ifdef WITH_VZ
> if (virDriverLoadModule("vz", "vzRegister", false) < 0)
> return -1;
> +# endif
> #endif
> return 0;
> }
> --
> 2.21.0
Reviewed-by: Christophe de Dinechin <dinechin@xxxxxxxxxx>
--
Cheers,
Christophe de Dinechin (IRC c3d)
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
