Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGW0q-0002eu-Ox for qemu-devel@nongnu.org; Fri, 04 Dec 2009 06:07:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGW0l-0002ZR-QJ for qemu-devel@nongnu.org; Fri, 04 Dec 2009 06:07:48 -0500 Received: from [199.232.76.173] (port=37113 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGW0l-0002ZF-K9 for qemu-devel@nongnu.org; Fri, 04 Dec 2009 06:07:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43425) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGW0l-0002kx-4q for qemu-devel@nongnu.org; Fri, 04 Dec 2009 06:07:43 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB4B7dup012559 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 4 Dec 2009 06:07:39 -0500 From: Kevin Wolf Date: Fri, 4 Dec 2009 12:06:32 +0100 Message-Id: <1259924792-11124-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [FOR 0.12][PATCH] Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf Part of the first patch of the -drive rerror series has been merged once more on top of the rest of the series. This effectively disables the rerror option and always goes with the default value. Reverting the commit re-enables the option. This reverts commit fc072ec4df0996682dfbff6c735e2bbc0d93132f. Signed-off-by: Kevin Wolf --- vl.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 96ab020..d6f196c 100644 --- a/vl.c +++ b/vl.c @@ -1964,10 +1964,6 @@ BlockInterfaceErrorAction drive_get_on_error( { DriveInfo *dinfo; - if (is_read) { - return BLOCK_ERR_REPORT; - } - QTAILQ_FOREACH(dinfo, &drives, next) { if (dinfo->bdrv == bdrv) return is_read ? dinfo->on_read_error : dinfo->on_write_error; -- 1.6.2.5