qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: Fam Zheng <famz@redhat.com>
Cc: qemu-devel@nongnu.org, stefanha@redhat.com,
	edivaldoapereira@yahoo.com.br
Subject: Re: [Qemu-devel] [PATCH] blockdev: fix cdrom read_only flag
Date: Tue, 15 Oct 2013 11:13:48 +0200	[thread overview]
Message-ID: <20131015091348.GB3039@dhcp-200-207.str.redhat.com> (raw)
In-Reply-To: <1381800446-3937-1-git-send-email-famz@redhat.com>

Am 15.10.2013 um 03:27 hat Fam Zheng geschrieben:
> Since 0ebd24e0, cdrom doesn't have read-only on by default, which will
> error out when using an read only image. Fix it by setting the default
> value when parsing opts.
> 
> Reported-by: Edivaldo de Araujo Pereira <edivaldoapereira@yahoo.com.br>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  blockdev.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/blockdev.c b/blockdev.c
> index 4f76e28..7f5ef4a 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -625,7 +625,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
>      int cyls, heads, secs, translation;
>      int max_devs, bus_id, unit_id, index;
>      const char *devaddr;
> -    bool read_only, copy_on_read;
> +    bool read_only = false;
> +    bool copy_on_read;
>      Error *local_err = NULL;
>  
>      /* Change legacy command line options into QMP ones */
> @@ -701,7 +702,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
>              media = MEDIA_DISK;
>          } else if (!strcmp(value, "cdrom")) {
>              media = MEDIA_CDROM;
> -            qdict_put(bs_opts, "read-only", qstring_from_str("on"));
> +            read_only = true;
>          } else {
>              error_report("'%s' invalid media", value);
>              goto fail;
> @@ -709,7 +710,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
>      }
>  
>      /* copy-on-read is disabled with a warning for read-only devices */
> -    read_only = qemu_opt_get_bool(legacy_opts, "read-only", false);
> +    read_only = qemu_opt_get_bool(legacy_opts, "read-only", read_only);

I believe we must move this line to above the media=... handling for
compatibility with old versions. Or actually, using |= instead of = may
be enough.

The reason is this command line:

    -drive file=test.iso,media=cdrom,readonly=off

Which, "obviously", means that a read-only CD-ROM device should be
created.

Kevin

  reply	other threads:[~2013-10-15  9:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-15  1:27 [Qemu-devel] [PATCH] blockdev: fix cdrom read_only flag Fam Zheng
2013-10-15  9:13 ` Kevin Wolf [this message]
2013-10-15  9:29   ` Fam Zheng

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=20131015091348.GB3039@dhcp-200-207.str.redhat.com \
    --to=kwolf@redhat.com \
    --cc=edivaldoapereira@yahoo.com.br \
    --cc=famz@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).