From: Bruce Rogers Date: Wed, 21 Jul 2010 20:32:28 +0000 (-0600) Subject: move 'unsafe' to end of caching modes in help X-Git-Tag: v0.13.0-rc1~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50aa457e1d0135f7e336a2157fc5f7ac7dd15589;p=thirdparty%2Fqemu.git move 'unsafe' to end of caching modes in help 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 Signed-off-by: Kevin Wolf (cherry picked from commit 6c6b6ba20a167a89f85606125ee1e10eafef5b33) Signed-off-by: Anthony Liguori --- diff --git a/qemu-options.hx b/qemu-options.hx index 40cee704eab..db86feb09b8 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)