bhyve: introduce virtbhyved daemon

The virtbhyved daemon will be responsible for providing the bhyve API
driver functionality. The bhyve driver is still loaded by the main
libvirtd daemon at this stage, so virtbhyved must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-03-16 17:05:24 +00:00
parent 60ee70e93e
commit b90e2c3923
2 changed files with 43 additions and 0 deletions

4
.gitignore vendored
View File

@ -118,6 +118,9 @@
/src/admin/admin_client.h
/src/admin/admin_protocol.[ch]
/src/admin/admin_server_dispatch_stubs.h
/src/bhyve/test_virtbhyved.aug
/src/bhyve/virtbhyved.aug
/src/bhyve/virtbhyved.conf
/src/esx/*.generated.*
/src/hyperv/*.generated.*
/src/interface/test_virtinterfaced.aug
@ -200,6 +203,7 @@
/src/vbox/virtvboxd.aug
/src/vbox/virtvboxd.conf
/src/virt-aa-helper
/src/virtbhyved
/src/virtinterfaced
/src/virtxend
/src/virtlockd

View File

@ -47,6 +47,45 @@ libvirt_driver_bhyve_impl_la_CFLAGS = \
libvirt_driver_bhyve_impl_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
sbin_PROGRAMS += virtbhyved
nodist_conf_DATA += bhyve/virtbhyved.conf
augeas_DATA += bhyve/virtbhyved.aug
augeastest_DATA += bhyve/test_virtbhyved.aug
CLEANFILES += bhyve/virtbhyved.aug
virtbhyved_SOURCES = $(REMOTE_DAEMON_SOURCES)
virtbhyved_CFLAGS = \
$(REMOTE_DAEMON_CFLAGS) \
-DDAEMON_NAME="\"virtbhyved\"" \
-DMODULE_NAME="\"bhyve\"" \
$(NULL)
virtbhyved_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
virtbhyved_LDADD = $(REMOTE_DAEMON_LD_ADD)
bhyve/virtbhyved.conf: remote/libvirtd.conf.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
$< > $@
bhyve/virtbhyved.aug: remote/libvirtd.aug.in
$(AM_V_GEN)$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
$< > $@
bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
bhyve/virtbhyved.conf $(AUG_GENTEST)
$(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \
$(srcdir)/remote/test_libvirtd.aug.in | \
$(SED) \
-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
> $@ || rm -f $@
conf_DATA += bhyve/bhyve.conf
augeas_DATA += bhyve/libvirtd_bhyve.aug
augeastest_DATA += bhyve/test_libvirtd_bhyve.aug