On 06/20/19 14:21, Philippe Mathieu-Daudé wrote: > Enable the EDK2 Crypto Policy features on the PC machine. > > Reviewed-by: Markus Armbruster <arm...@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/i386/pc.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 2c5446b095..fe99ebfe3d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -39,6 +39,7 @@ > #include "hw/nvram/fw_cfg.h" > #include "hw/timer/hpet.h" > #include "hw/firmware/smbios.h" > +#include "hw/firmware/uefi_edk2.h" > #include "hw/loader.h" > #include "elf.h" > #include "multiboot.h" > @@ -1049,6 +1050,11 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, > PCMachineState *pcms) > return fw_cfg; > } > > +static void pc_uefi_setup(PCMachineState *pcms) > +{ > + edk2_add_host_crypto_policy(pcms->fw_cfg); > +} > + > static long get_file_size(FILE *f) > { > long where, size; > @@ -1653,6 +1659,7 @@ void pc_machine_done(Notifier *notifier, void *data) > if (pcms->fw_cfg) { > pc_build_smbios(pcms); > pc_build_feature_control_file(pcms); > + pc_uefi_setup(pcms); > /* update FW_CFG_NB_CPUS to account for -device added CPUs */ > fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); > } >
Reviewed-by: Laszlo Ersek <ler...@redhat.com>