Re: [Qemu-devel] [PATCH v3 12/12] docs/interop/firmware.json: Prefer -machine to if=pflash

[Laszlo Ersek]

On 03/08/19 14:14, Markus Armbruster wrote:
> The previous commit added a way to configure firmware with -blockdev
> rather than -drive if=pflash.  Document it as the preferred way.
> 
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  docs/interop/firmware.json | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json
> index 28f9bc1591..ff8c2ce5f2 100644
> --- a/docs/interop/firmware.json
> +++ b/docs/interop/firmware.json
> @@ -212,9 +212,13 @@
>  #
>  # @executable: Identifies the firmware executable. The firmware
>  #              executable may be shared by multiple virtual machine
> -#              definitions. The corresponding QEMU command line option
> -#              is "-drive
> -#              
> if=pflash,unit=0,readonly=on,address@hidden@filename,address@hidden@format".
> +#              definitions. The preferred corresponding QEMU command
> +#              line options are
> +#                  -drive 
> if=none,id=pflash0,readonly=on,address@hidden@filename,address@hidden@format
> +#                  -machine pflash0=pflash0
> +#              or equivalent -blockdev instead of -drive.
> +#              With QEMU versions older than 4.0, you have to use
> +#                  -drive 
> if=pflash,unit=0,readonly=on,address@hidden@filename,address@hidden@format
>  #
>  # @nvram-template: Identifies the NVRAM template compatible with
>  #                  @executable. Management software instantiates an
> @@ -225,9 +229,13 @@
>  #                  individual copies of it are. An NVRAM file is
>  #                  typically used for persistently storing the
>  #                  non-volatile UEFI variables of a virtual machine
> -#                  definition. The corresponding QEMU command line
> -#                  option is "-drive
> -#                  
> if=pflash,unit=1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,address@hidden@format".
> +#                  definition. The preferred corresponding QEMU
> +#                  command line options are
> +#                      -drive 
> if=none,id=pflash1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,address@hidden@format
> +#                      -machine pflash1=pflash1
> +#                  or equivalent -blockdev instead of -drive.
> +#                  With QEMU versions older than 4.0, you have to use
> +#                      -drive 
> if=pflash,unit=1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,address@hidden@format
>  #
>  # Since: 3.0
>  ##
> 

Awesome.

Reviewed-by: Laszlo Ersek <address@hidden>

Thanks!
Laszlo