[Qemu-devel] Re: [PATCH 4/7] move 'unsafe' to end of caching modes in help

[Anthony Liguori]

Hi Kevin,

There's an on-going discussion on this patch.  Could you drop it from your pull request but leave it in your tree until the discussion is resolved?

Thanks,

Anthony Liguori

> On Jul 26, 2010 9:01 AM, "Kevin Wolf" <address@hidden> wrote:
>
> From: Bruce Rogers <address@hidden>
>
> Libvirt parses qemu help output to determine qemu features. In particular
> it probes for the following: "cache=writethrough|writeback|none". The
> addition of the unsafe cache mode was inserted within this string, as
> opposed to being added to the end, which impacted libvirt's probe.
> Unbreak libvirt by keeping the existing cache modes intact and add
> unsafe to the end.
>
> This problem only manifests itself if a caching mode is explicitly
> specified in the libvirt xml, in which case older syntax for caching is
> passed to qemu, which it  no longer understands.
>
> Signed-off-by: Bruce Rogers <address@hidden>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
>  qemu-options.hx |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 0d7dd90..9ecc54e 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -118,7 +118,7 @@ ETEXI
>  DEF("drive", HAS_ARG, QEMU_OPTION_drive,
>      "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
>      "       [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
> -    "       [,cache=writethrough|writeback|unsafe|none][,format=f]\n"
> +    "       [,cache=writethrough|writeback|none|unsafe][,format=f]\n"
>      "       [,serial=s][,addr=A][,id=name][,aio=threads|native]\n"
>      "       [,readonly=on|off]\n"
>      "                use 'file' as a drive image\n", QEMU_ARCH_ALL)
> --
> 1.7.1.1