Patchwork block: read-only: open cdrom as read-only when using monitor's change command

login
register
mail settings
Submitter Naphtali Sprei
Date April 25, 2010, 4:30 p.m.
Message ID <1272213037-30327-1-git-send-email-nsprei@redhat.com>
Download mbox | patch
Permalink /patch/50943/
State New
Headers show

Comments

Naphtali Sprei - April 25, 2010, 4:30 p.m.
Current code of monitor command: 'change', used to open file for read-write
uncoditionally. Change to open it as read-only for CDROM, and read-write for all others.

Signed-off-by: Naphtali Sprei <nsprei@redhat.com>
---
 monitor.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Anthony Liguori - May 3, 2010, 6:05 p.m.
On 04/25/2010 11:30 AM, Naphtali Sprei wrote:
> Current code of monitor command: 'change', used to open file for read-write
> uncoditionally. Change to open it as read-only for CDROM, and read-write for all others.
>
> Signed-off-by: Naphtali Sprei<nsprei@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   monitor.c |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index c25d551..df5a15d 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1083,6 +1083,7 @@ static int do_change_block(Monitor *mon, const char *device,
>   {
>       BlockDriverState *bs;
>       BlockDriver *drv = NULL;
> +    int bdrv_flags;
>
>       bs = bdrv_find(device);
>       if (!bs) {
> @@ -1099,7 +1100,8 @@ static int do_change_block(Monitor *mon, const char *device,
>       if (eject_device(mon, bs, 0)<  0) {
>           return -1;
>       }
> -    if (bdrv_open(bs, filename, BDRV_O_RDWR, drv)<  0) {
> +    bdrv_flags = bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM ? 0 : BDRV_O_RDWR;
> +    if (bdrv_open(bs, filename, bdrv_flags, drv)<  0) {
>           qerror_report(QERR_OPEN_FILE_FAILED, filename);
>           return -1;
>       }
>

Patch

diff --git a/monitor.c b/monitor.c
index c25d551..df5a15d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1083,6 +1083,7 @@  static int do_change_block(Monitor *mon, const char *device,
 {
     BlockDriverState *bs;
     BlockDriver *drv = NULL;
+    int bdrv_flags;
 
     bs = bdrv_find(device);
     if (!bs) {
@@ -1099,7 +1100,8 @@  static int do_change_block(Monitor *mon, const char *device,
     if (eject_device(mon, bs, 0) < 0) {
         return -1;
     }
-    if (bdrv_open(bs, filename, BDRV_O_RDWR, drv) < 0) {
+    bdrv_flags = bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM ? 0 : BDRV_O_RDWR;
+    if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) {
         qerror_report(QERR_OPEN_FILE_FAILED, filename);
         return -1;
     }