qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Guenter Roeck <linux@roeck-us.net>,
	Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] z2: Make providing flash images non-mandatory
Date: Tue, 18 Feb 2020 07:37:43 +0100	[thread overview]
Message-ID: <9854376f-eb4f-2456-de03-52c72b810e37@redhat.com> (raw)
In-Reply-To: <20200217210903.18602-1-linux@roeck-us.net>

On 2/17/20 10:09 PM, Guenter Roeck wrote:
> Up to now, the z2 machine only boots if a flash image is provided.
> This is not really necessary; the machine can boot from initrd or from
> SD without it. At the same time, having to provide dummy flash images
> is a nuisance and does not add any real value. Make it optional.
> 
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>   hw/arm/z2.c | 6 ------
>   1 file changed, 6 deletions(-)
> 
> diff --git a/hw/arm/z2.c b/hw/arm/z2.c
> index 34794fe3ae..4bb237f22d 100644
> --- a/hw/arm/z2.c
> +++ b/hw/arm/z2.c
> @@ -314,12 +314,6 @@ static void z2_init(MachineState *machine)
>       be = 0;
>   #endif
>       dinfo = drive_get(IF_PFLASH, 0, 0);
> -    if (!dinfo && !qtest_enabled()) {
> -        error_report("Flash image must be given with the "
> -                     "'pflash' parameter");
> -        exit(1);
> -    }
> -
>       if (!pflash_cfi01_register(Z2_FLASH_BASE, "z2.flash0", Z2_FLASH_SIZE,
>                                  dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
>                                  sector_len, 4, 0, 0, 0, 0, be)) {
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>



  reply	other threads:[~2020-02-18  6:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-17 21:09 [PATCH] z2: Make providing flash images non-mandatory Guenter Roeck
2020-02-18  6:37 ` Philippe Mathieu-Daudé [this message]
2020-02-18 16:13 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9854376f-eb4f-2456-de03-52c72b810e37@redhat.com \
    --to=philmd@redhat.com \
    --cc=linux@roeck-us.net \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).