Martin Polednik has uploaded a new change for review. Change subject: ovmf: add OVMF dependency and qemu configuration ......................................................................
ovmf: add OVMF dependency and qemu configuration We can specify location where QEMU looks up UEFI image and variable store (nvram) template. This patch requires OVMF package and explicitly sets the store to it's default location. Change-Id: Ief1dc80915d237f0e8408f51cb912921d9d8e08e Signed-off-by: Martin Polednik <[email protected]> --- M configure.ac M lib/vdsm/tool/configurators/libvirt.py M vdsm.spec.in 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/52434/1 diff --git a/configure.ac b/configure.ac index cb35c71..3bcba0d 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,20 @@ ) AC_SUBST([LIBVIRT_SERVICE_DEFAULT], ["${with_libvirt_service_default}"]) +AC_ARG_WITH( + [ovmf], + [AS_HELP_STRING( + [--enable-ovmf], + [configure full path of libvirt service environment file. + @<:@default=no@:>@] + )], + , + [enable_ovmf="no"] +) +AS_IF([test "${enable_ovmf}" = "yes"], + AC_SUBST([OVMF], ['1']), + AC_SUBST([OVMF], ['0'])) + # Users and groups AC_SUBST([VDSMUSER], [vdsm]) diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py index e9c5392..c2fa46f 100644 --- a/lib/vdsm/tool/configurators/libvirt.py +++ b/lib/vdsm/tool/configurators/libvirt.py @@ -297,6 +297,8 @@ 'remote_display_port_min': 5900, 'remote_display_port_max': 6923, 'auto_dump_path': '"/var/log/core"', + 'nvram': ('["/usr/share/OVMF/OVMF_CODE.fd:' + '/usr/share/OVMF/OVMF_VARS.fd"]'), }, }, diff --git a/vdsm.spec.in b/vdsm.spec.in index 3c33c05..c614342 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -14,6 +14,7 @@ %global with_gluster_mgmt @GLUSTER_MGMT@ %global with_hooks @HOOKS@ %global with_vhostmd @VHOSTMD@ +%global with_ovmf @OVMF@ # Glusterfs package version %global gluster_version 3.7.1 @@ -254,6 +255,10 @@ Requires(post): /bin/hostname %endif +%if 0%{?with_ovmf} +Requires: OVMF +%endif + Conflicts: vdsm-hook-sriov %description -- To view, visit https://gerrit.ovirt.org/52434 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief1dc80915d237f0e8408f51cb912921d9d8e08e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
