From patchwork Mon Nov 18 17:02:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 11250035 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52383109A for ; Mon, 18 Nov 2019 17:09:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2887B2195D for ; Mon, 18 Nov 2019 17:09:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Af99O4jA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2887B2195D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkX5-0002QS-RW for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Nov 2019 12:09:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52745) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkQn-0003Tr-MV for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWkQl-0002kA-Mb for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:16 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35821 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWkQi-0002gE-6v for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574096591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UzVNhB0B8XOLmpCcaY1y+ngg7apmCBSl9Y+iNAHUwRg=; b=Af99O4jALt+U1EA9KV+X0bRC69T24sLxumXKb1Q0zXnHLvqlpjgPf9tS32HxI55IG9gCoJ WK8rqbrDKO/mjxbpRJK2QCX5CsejVdCE0IS+q8eYwMRehv6kXRGYakJ3DlXcb9ONLoJWV7 Fap+jhlxY3j7NrU+yFrSfUiESyqk+JM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-r6xyGtwCPvez4yXdn37YuQ-1; Mon, 18 Nov 2019 12:03:08 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C3960802D14; Mon, 18 Nov 2019 17:03:07 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5BDC608B5; Mon, 18 Nov 2019 17:03:06 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 1/4] qemu-iotests/iotests.py: improve assert_qmp message Date: Mon, 18 Nov 2019 18:02:53 +0100 Message-Id: <20191118170256.31477-2-kwolf@redhat.com> In-Reply-To: <20191118170256.31477-1-kwolf@redhat.com> References: <20191118170256.31477-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: r6xyGtwCPvez4yXdn37YuQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Vladimir Sementsov-Ogievskiy From the two values compared, make it obvious which is found at path, and which is expected. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Kevin Wolf --- tests/qemu-iotests/iotests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 075f4739da..6a248472b9 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -731,8 +731,8 @@ class QMPTestCase(unittest.TestCase): self.fail('no match for "%s" in %s' % (str(result), str(value))) else: self.assertEqual(result, value, - 'values not equal "%s" and "%s"' - % (str(result), str(value))) + '"%s" is "%s", expected "%s"' + % (path, str(result), str(value))) def assert_no_active_block_jobs(self): result = self.vm.qmp('query-block-jobs') From patchwork Mon Nov 18 17:02:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 11250031 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D6E83109A for ; Mon, 18 Nov 2019 17:07:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA669218BA for ; Mon, 18 Nov 2019 17:07:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M1sq5CkS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA669218BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkV8-0007ze-R9 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Nov 2019 12:07:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52778) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkQp-0003UI-JU for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWkQn-0002m2-IY for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:19 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:42270 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWkQl-0002iJ-E1 for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574096593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FA/lTay4S60YUrBvocezR8r2XTSFFCGlkm59hr5jyyY=; b=M1sq5CkSO1rLVwYmHEQXl6b/eG8e2BjbeqmwSOVtkmWcfYRick2Otgo+XR43y6lTyP6eqp suflZET6f2izEW6a5QFBC+qDTiCwDrKsvQaF+5NKZdPrUXNChNmceKMmelgfpOy/i+5iTR +wdGXelpfXEg52E0n52FZ5UkIfFye5s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-OMjn5gNwOJCYNRmR8tvftA-1; Mon, 18 Nov 2019 12:03:10 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 299818005B4; Mon, 18 Nov 2019 17:03:09 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D743608B5; Mon, 18 Nov 2019 17:03:07 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 2/4] iotests: Fix "no qualified output" error path Date: Mon, 18 Nov 2019 18:02:54 +0100 Message-Id: <20191118170256.31477-3-kwolf@redhat.com> In-Reply-To: <20191118170256.31477-1-kwolf@redhat.com> References: <20191118170256.31477-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: OMjn5gNwOJCYNRmR8tvftA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The variable for error messages to be displayed is $results, not $reason. Fix 'check' to print the "no qualified output" error message again instead of having a failure without any message telling the user why it failed. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- tests/qemu-iotests/check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 71fe38834e..90970b0549 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -887,7 +887,7 @@ do if [ ! -f "$reference" ] then status="fail" - reason="no qualified output" + results="no qualified output" err=true else if diff -w "$reference" $tmp.out >/dev/null 2>&1 From patchwork Mon Nov 18 17:02:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 11250027 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3178109A for ; Mon, 18 Nov 2019 17:06:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 606C1218BA for ; Mon, 18 Nov 2019 17:06:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SwNDtL/n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 606C1218BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkTo-000632-Fr for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Nov 2019 12:06:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkQp-0003UM-Jf for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWkQn-0002m1-IS for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:19 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:44969 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWkQj-0002hv-Pq for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:03:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574096592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tS4/JJfUyOIkfOccEZ4Dz+J3zLgGC6/2fKmToSRnGug=; b=SwNDtL/n38iaTM4t5UXAYhCqm/NbHHLTPimcBdZxyF8XZ+IvggT/02ocPgcNIVa996sIdX +D8voQQBF3v7RkisIpX2c9yhk9Rkz1jTGCtBEuf1HSoT8XpdNwAxVF9pS6JLSM+FuKoV+Q 6hIEHzE4lkjZsTZGENmrzSP8UFy9Hhc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-280-XXNuw2SpMo2TvD8LITrsKQ-1; Mon, 18 Nov 2019 12:03:11 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8068311331B8; Mon, 18 Nov 2019 17:03:10 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 762B260618; Mon, 18 Nov 2019 17:03:09 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 3/4] block: Remove 'backing': null from bs->{explicit_, }options Date: Mon, 18 Nov 2019 18:02:55 +0100 Message-Id: <20191118170256.31477-4-kwolf@redhat.com> In-Reply-To: <20191118170256.31477-1-kwolf@redhat.com> References: <20191118170256.31477-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: XXNuw2SpMo2TvD8LITrsKQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" bs->options and bs->explicit_options shouldn't contain any options for child nodes. bdrv_open_inherited() takes care to remove any options that match a child name after opening the image and the same is done when reopening. However, we miss the case of 'backing': null, which is a child option, but results in no child being created. This means that a 'backing': null remains in bs->options and bs->explicit_options. A typical use for 'backing': null is in live snapshots: blockdev-add for the qcow2 overlay makes sure not to open the backing file (because it is already opened and blockdev-snapshot will attach it). After doing a blockdev-snapshot, bs->options and bs->explicit_options become inconsistent with the actual state (bs has a backing file now, but the options still say null). On the next occasion that the image is reopened, e.g. switching it from read-write to read-only when another snapshot is taken, the option will take effect again and the node incorrectly loses its backing file. Fix bdrv_open_inherited() to remove the 'backing' option from bs->options and bs->explicit_options even for the case where it specifies that no backing file is wanted. Reported-by: Peter Krempa Signed-off-by: Kevin Wolf Reviewed-by: Alberto Garcia Tested-by: Peter Krempa --- block.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block.c b/block.c index 4cffc2bc35..473eb6eeaa 100644 --- a/block.c +++ b/block.c @@ -3019,6 +3019,8 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, "use \"backing\": null instead"); } flags |= BDRV_O_NO_BACKING; + qdict_del(bs->explicit_options, "backing"); + qdict_del(bs->options, "backing"); qdict_del(options, "backing"); } From patchwork Mon Nov 18 17:02:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 11250033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46861109A for ; Mon, 18 Nov 2019 17:09:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C23C21739 for ; Mon, 18 Nov 2019 17:09:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hCLt05OK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C23C21739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkWI-0001d5-TW for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Nov 2019 12:08:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53031) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWkRs-00041B-5c for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:04:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWkRo-0003aD-Be for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:04:24 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31322 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWkRn-0003XG-PE for qemu-devel@nongnu.org; Mon, 18 Nov 2019 12:04:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574096655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X1v8CJQdw3hRlCho3Nj+vtvfYmjtWDrdyBrr7HhXf/E=; b=hCLt05OKrR7Z0ZDacdA2bf1A3GBuqRzKBPwYnPgb1zIU4CMkxJd2n7hdxMt08XqW3T8mlg Cr4hxsy3+Ds6CXVBCLWbMuV6RECYGnxqOlPILkGQo+FS77hoKRsSn5UCJUtdzAb5iQG3Ma WygOjW7fXvMO8IfoqTplnFWqqjS5tds= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-130-h-TAObjXMUKYFSV1OENHsA-1; Mon, 18 Nov 2019 12:03:13 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E48D100ED88; Mon, 18 Nov 2019 17:03:12 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE45B608B5; Mon, 18 Nov 2019 17:03:10 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 4/4] iotests: Test multiple blockdev-snapshot calls Date: Mon, 18 Nov 2019 18:02:56 +0100 Message-Id: <20191118170256.31477-5-kwolf@redhat.com> In-Reply-To: <20191118170256.31477-1-kwolf@redhat.com> References: <20191118170256.31477-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: h-TAObjXMUKYFSV1OENHsA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Test that doing a second blockdev-snapshot doesn't make the first overlay's backing file go away. Signed-off-by: Kevin Wolf Reviewed-by: Peter Krempa --- tests/qemu-iotests/273 | 76 +++++++++ tests/qemu-iotests/273.out | 337 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 414 insertions(+) create mode 100755 tests/qemu-iotests/273 create mode 100644 tests/qemu-iotests/273.out diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273 new file mode 100755 index 0000000000..98a672516d --- /dev/null +++ b/tests/qemu-iotests/273 @@ -0,0 +1,76 @@ +#!/usr/bin/env bash +# +# Test multiple blockdev-snapshot calls with 'backing': null +# +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +seq=$(basename "$0") +echo "QA output created by $seq" + +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +# This is a qcow2 regression test +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux + +do_run_qemu() +{ + echo Testing: "$@" + $QEMU -nographic -qmp-pretty stdio -nodefaults "$@" + echo +} + +run_qemu() +{ + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp | + _filter_generated_node_ids | _filter_imgfmt | _filter_actual_image_size +} + +TEST_IMG="$TEST_IMG.base" _make_test_img 64M +TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base" +_make_test_img -b "$TEST_IMG.mid" + +run_qemu \ + -blockdev file,node-name=base,filename="$TEST_IMG.base" \ + -blockdev file,node-name=midf,filename="$TEST_IMG.mid" \ + -blockdev '{"driver":"qcow2","node-name":"mid","file":"midf","backing":null}' \ + -blockdev file,node-name=topf,filename="$TEST_IMG" \ + -blockdev '{"driver":"qcow2","file":"topf","node-name":"top","backing":null}' \ +<