From patchwork Thu Mar 17 07:58:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 87351 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 AD9F2B6FC9 for ; Thu, 17 Mar 2011 18:59:13 +1100 (EST) Received: from localhost ([127.0.0.1]:60370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q086u-00047X-Kg for incoming@patchwork.ozlabs.org; Thu, 17 Mar 2011 03:59:08 -0400 Received: from [140.186.70.92] (port=52802 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q0863-00047R-Cv for qemu-devel@nongnu.org; Thu, 17 Mar 2011 03:58:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q0862-0003UU-D1 for qemu-devel@nongnu.org; Thu, 17 Mar 2011 03:58:15 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:45952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q0862-0003Sh-2R for qemu-devel@nongnu.org; Thu, 17 Mar 2011 03:58:14 -0400 Received: from [192.168.88.2] (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 369D8A2965; Thu, 17 Mar 2011 10:58:12 +0300 (MSK) Message-ID: <4D81BF12.4020500@msgid.tls.msk.ru> Date: Thu, 17 Mar 2011 10:58:10 +0300 From: Michael Tokarev Organization: Telecom Service, JSC User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.16) Gecko/20110307 Icedove/3.0.11 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Enigmail-Version: 1.0.1 OpenPGP: id=804465C5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 86.62.121.231 Cc: Subject: [Qemu-devel] [PATCH +STABLE-0.14] exit if -drive specified is invalid instead of ignoring the "wrong" -drive 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 Trivial patch. I've sent it yesterday but somehow it didn't reach the list. This fixes the problem when qemu continues even if -drive specification is somehow invalid, resulting in a mess. Applicable for both current master and for stable-0.14 (and 0.13 and 0.12 as well). The prob can actually be seriuos: when you start guest with two drives and make an error in the specification of one of them, and the guest has something like a raid array on the two drives, guest may start failing that array or kick "missing" drives which may result in a mess - this is what actually happened to me, I did't want a resync at all, and a resync resulted in re-writing (and allocating) a 4TB virtual drive I used for testing, which in turn resulted in my filesystem filling up and whole thing failing badly. Yes it was just testing VM, I experimented with larger raid arrays, but the end result was quite, well, unexpected. Thanks! Signed-off-by: Michael Tokarev --- vl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 8bcf2ae..79f996e 100644 --- a/vl.c +++ b/vl.c @@ -2098,7 +2098,8 @@ int main(int argc, char **argv, char **envp) HD_OPTS); break; case QEMU_OPTION_drive: - drive_def(optarg); + if (drive_def(optarg) == NULL) + exit(1); break; case QEMU_OPTION_set: if (qemu_set_option(optarg) != 0)