Re: [kvm-unit-tests PATCH v2 1/2] s390x: factor out common args for genprotimg

Janosch Frank
2022-08-25T14:30:42Z

On 8/25/22 15:15, Nico Boehr wrote:
> Upcoming changes will add more arguments to genprotimg. To avoid
> duplicating this logic, move the arguments to genprotimg to a variable.
>
> Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
> Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

> ---
> s390x/Makefile | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/s390x/Makefile b/s390x/Makefile
> index efd5e0c13102..d17055ebe6a8 100644
> --- a/s390x/Makefile
> +++ b/s390x/Makefile
> @@ -165,11 +165,13 @@ $(SNIPPET_DIR)/c/%.hdr: $(SNIPPET_DIR)/c/%.gbin $(HOST_KEY_DOCUMENT)
> %.bin: %.elf
> $(OBJCOPY) -O binary $< $@
>
> +genprotimg_args = --host-key-document $(HOST_KEY_DOCUMENT) --no-verify
> +
> %selftest.pv.bin: %selftest.bin $(HOST_KEY_DOCUMENT) $(patsubst %.pv.bin,%.parmfile,$@)
> - $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --no-verify --image $< -o $@
> + $(GENPROTIMG) $(genprotimg_args) --parmfile $(patsubst %.pv.bin,%.parmfile,$@) --image $< -o $@
>
> %.pv.bin: %.bin $(HOST_KEY_DOCUMENT)
> - $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify --image $< -o $@
> + $(GENPROTIMG) $(genprotimg_args) --image $< -o $@
>
> $(snippet_asmlib): $$(patsubst %.o,%.S,$$@) $(asm-offsets)
> $(CC) $(CFLAGS) -c -nostdlib -o $@ $<