From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49952 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdOFN-0002Ob-Q6 for qemu-devel@nongnu.org; Mon, 26 Jul 2010 10:01:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdOFA-0005QT-CK for qemu-devel@nongnu.org; Mon, 26 Jul 2010 10:01:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54500) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdOFA-0005QK-35 for qemu-devel@nongnu.org; Mon, 26 Jul 2010 10:01:24 -0400 From: Kevin Wolf Date: Mon, 26 Jul 2010 16:01:14 +0200 Message-Id: <1280152877-29037-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1280152877-29037-1-git-send-email-kwolf@redhat.com> References: <1280152877-29037-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] move 'unsafe' to end of caching modes in help List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Bruce Rogers 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 --- 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