From patchwork Mon Jul 26 17:28:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 59931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BEA4EB70AA for ; Tue, 27 Jul 2010 03:39:45 +1000 (EST) Received: from localhost ([127.0.0.1]:46837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdReP-0000kQ-IA for incoming@patchwork.ozlabs.org; Mon, 26 Jul 2010 13:39:41 -0400 Received: from [140.186.70.92] (port=49976 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdRZe-0006Tz-TP for qemu-devel@nongnu.org; Mon, 26 Jul 2010 13:34:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdRTI-0006zc-7l for qemu-devel@nongnu.org; Mon, 26 Jul 2010 13:28:13 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:39800) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdRTI-0006zJ-5C for qemu-devel@nongnu.org; Mon, 26 Jul 2010 13:28:12 -0400 Received: by vws19 with SMTP id 19so2658273vws.4 for ; Mon, 26 Jul 2010 10:28:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.220.128.68 with SMTP id j4mr4269675vcs.68.1280165288661; Mon, 26 Jul 2010 10:28:08 -0700 (PDT) Received: by 10.220.201.11 with HTTP; Mon, 26 Jul 2010 10:28:08 -0700 (PDT) Received: by 10.220.201.11 with HTTP; Mon, 26 Jul 2010 10:28:08 -0700 (PDT) In-Reply-To: <1280152877-29037-5-git-send-email-kwolf@redhat.com> References: <1280152877-29037-1-git-send-email-kwolf@redhat.com> <1280152877-29037-5-git-send-email-kwolf@redhat.com> Date: Mon, 26 Jul 2010 12:28:08 -0500 Message-ID: From: Anthony Liguori To: Kevin Wolf X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [PATCH 4/7] move 'unsafe' to end of caching modes in help X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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" wrote: 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(-) -- 1.7.1.1 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)