From: Markus Armbruster <armbru@redhat.com>
To: "Dr. David Alan Gilbert \(git\)" <dgilbert@redhat.com>
Cc: philmd@redhat.com, liq3ea@gmail.com, qemu-devel@nongnu.org,
armbru@redhat.com, kraxel@redhat.com, lersek@redhat.com
Subject: Re: [PATCH] fw_cfg: Allow reboot-timeout=-1 again
Date: Fri, 25 Oct 2019 23:11:52 +0200 [thread overview]
Message-ID: <87a79o4jjb.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <20191025165706.177653-1-dgilbert@redhat.com> (David Alan Gilbert's message of "Fri, 25 Oct 2019 17:57:06 +0100")
"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> writes:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> Commit ee5d0f89de3e53cdb0dc added range checking on reboot-timeout
> to only allow the range 0..65535; however both qemu and libvirt document
> the special value -1 to mean don't reboot.
> Allow it again.
>
> Fixes: ee5d0f89de3e53cdb0dc ("fw_cfg: Fix -boot reboot-timeout error checking")
> RH bz: https://bugzilla.redhat.com/show_bug.cgi?id=1765443
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hw/nvram/fw_cfg.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 7dc3ac378e..1a9ec44232 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -247,10 +247,11 @@ static void fw_cfg_reboot(FWCfgState *s)
>
> if (reboot_timeout) {
> rt_val = qemu_opt_get_number(opts, "reboot-timeout", -1);
> +
> /* validate the input */
> - if (rt_val < 0 || rt_val > 0xffff) {
> + if (rt_val < -1 || rt_val > 0xffff) {
> error_report("reboot timeout is invalid,"
> - "it should be a value between 0 and 65535");
> + "it should be a value between -1 and 65535");
> exit(1);
> }
> }
Semantic conflict with "PATCH] qemu-options.hx: Update for
reboot-timeout parameter", Message-Id:
<20191015151451.727323-1-hhan@redhat.com>.
I'm too tired right now to risk an opinion on which one we want.
next prev parent reply other threads:[~2019-10-25 21:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 16:57 [PATCH] fw_cfg: Allow reboot-timeout=-1 again Dr. David Alan Gilbert (git)
2019-10-25 21:11 ` Markus Armbruster [this message]
2019-10-28 13:47 ` Dr. David Alan Gilbert
2019-10-29 12:09 ` Markus Armbruster
2019-10-29 12:56 ` Dr. David Alan Gilbert
2019-10-30 22:17 ` Han Han
2019-10-31 13:35 ` Dr. David Alan Gilbert
2019-11-01 5:28 ` Markus Armbruster
2019-10-25 21:28 ` Laszlo Ersek
2019-10-29 2:26 ` Dr. David Alan Gilbert
2019-10-29 14:03 ` Philippe Mathieu-Daudé
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=87a79o4jjb.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=lersek@redhat.com \
--cc=liq3ea@gmail.com \
--cc=philmd@redhat.com \
--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).