diff mbox

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

Message ID AANLkTimEQAf7wSWvkKzAOkeUUujR4ax9GZ3LERN3berk@mail.gmail.com
State New
Headers show

Commit Message

Anthony Liguori July 26, 2010, 5:28 p.m. UTC 
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" <kwolf@redhat.com> wrote:

From: Bruce Rogers <brogers@novell.com>

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 <brogers@novell.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu-options.hx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

--
1.7.1.1

Comments

Kevin Wolf July 27, 2010, 4:10 p.m. UTC | #1 
Am 26.07.2010 19:28, schrieb 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?

Right, so I guess waiting some hours was enough and you're going to pull
it without changes now?

Kevin
Anthony Liguori July 27, 2010, 4:17 p.m. UTC | #2 
On 07/27/2010 11:10 AM, Kevin Wolf wrote:
> Am 26.07.2010 19:28, schrieb 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?
>>      
> Right, so I guess waiting some hours was enough and you're going to pull
> it without changes now?
>    

Yeah, I'll do the pull now.  Sorry for the noise :-)

Regards,

Anthony Liguori

> Kevin
>
diff mbox

Patch

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)