From nobody Tue May 7 02:47:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1593095378; cv=pass; d=zohomail.com; s=zohoarc; b=C0UcgtMt5a0tKVuvNc5RGd/bc3lHPAaPPeCcROjlW5WHXnu+J30ZcT4K+pHVPmZcsJZ+tffxPPumx80Gu8qpBlBzcB5rTpWyCPyt3sup8pxPcI/N6oHsmwU59BjBSXQGrhdUIEAsjGRS+UUwIMD+3UJ0kevfOW0ckhZ6QF5/Z3w= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593095378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tbq74YhTjFQoZvt1OvZXCNsEXGF68Q9mmhsiDql408k=; b=FFfUO8ioZCADBBPqDDuU4SgHF+MD69Z+G2Wo4ypjDh2zMJKlML4LhhE2X8XThlQ84lwi5oq9B9xdQStJiP7oWqxNdI1soxFv5/MgZV9gfW4U/Tj4Zneh5FTvS2EKqTTgBm6jsXFjf9zxY9SMt4B6Cd8oAMv8CNd32I8m2Z1Jats= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593095378886529.7983664561245; Thu, 25 Jun 2020 07:29:38 -0700 (PDT) Received: from localhost ([::1]:51452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joSsj-0006BI-G1 for importer@patchew.org; Thu, 25 Jun 2020 10:29:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSps-0002cE-TC; Thu, 25 Jun 2020 10:26:40 -0400 Received: from mail-eopbgr60095.outbound.protection.outlook.com ([40.107.6.95]:41601 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSpr-0005wS-0R; Thu, 25 Jun 2020 10:26:40 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2100.eurprd08.prod.outlook.com (2603:10a6:203:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20; Thu, 25 Jun 2020 14:26:34 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%4]) with mapi id 15.20.3131.020; Thu, 25 Jun 2020 14:26:34 +0000 Received: from kvm.sw.ru (185.215.60.69) by AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21 via Frontend Transport; Thu, 25 Jun 2020 14:26:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VTClRV7IxQJgPXzRJdWSJjQqdymxW2dLcgTHdwEU21+pLbetF6Mj2X/c3JJPqHF8+h2SvlTgYeHrZiI7Qmi38kZQDtHJ6fICM3Z+51XOKR02FClREx8/TfHXm89uVcztzgEk/zeZf6gUdkOUz94VpTPofhhVuFIMzmYJgw1iMo8Itu15ENYnsdnru3F5uci2L/njsq4um6k8UhLxSVJXT6ED68FbIVI2rFnTVAkgDi6P3ElVY5tHdv5JmsuvrkryzHfbitf8BA8cZ+op8V7Z1TpHwqedRbFD7r++2NnJFwE6YUImUnziysT+/BAfAWqTFYr4EgCxVh9q9naj1kuygw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tbq74YhTjFQoZvt1OvZXCNsEXGF68Q9mmhsiDql408k=; b=GkglmXQ8lQPAnooPlx4D4ztaukJDm7Hz6k6PXtrr7+6Ia8YVGFbWbVqr4aviknd1iWwbsr704iGm3+fH7OON8zldAfeR61kJWwSwLabLtUcZtH52yHzkTMdIW3RiDmc3pQcpUTEnciZXfoXZmNjI089/XLn/6EhYHRLq9EkmhwqUaSbK9HCDw1tz+y1+YsR1Zi2qkpkzIKv3BIHdci0dCbS2P1ELCc6WWnx4tL2lALLet3vM+jdHhL2saxI4CP5zdqEiiB1q0FayHOdhdbYycEpVwarLR3DKwZh10L55HDFzD0KO6igWj5Wd8Qkq4xBZ1eNhqMXM5Fwpk+2nT3Jf3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tbq74YhTjFQoZvt1OvZXCNsEXGF68Q9mmhsiDql408k=; b=LdRUGXa85Kdd5GvbNxQnmGRRDI+yBDIxOfGFial1p4cClEMPaTAHc+klhqWTKFFpUoOBhvSfTrtmswaqXMbr4d5hGxAJMDjIXJfFWO3KNqDjaT+on9VUlhrg7HLXkEx+BjIX3VmPZlAxH5iL7gNqV6P8Cfxp5G+6rHnAtsly52Y= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 1/4] iotests: QemuIoInteractive: use qemu_io_args_no_fmt Date: Thu, 25 Jun 2020 17:25:37 +0300 Message-Id: <20200625142540.24589-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200625142540.24589-1-vsementsov@virtuozzo.com> References: <20200625142540.24589-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 306f7d73-5e64-4efb-292f-08d81913c341 X-MS-TrafficTypeDiagnostic: AM5PR0801MB2100: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-Forefront-PRVS: 0445A82F82 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OWB8Zct0s+HvJ5lcvfzDgTEk2UIHjyZ9FAoVuOJJbMvBs7GxNI8RrUoNuN3VhRvGH9njk7yEobPWqnKJwtZly/4hM7G8H+nHMNGEiJrGeiwcTZ0DgGn0y1WY+/BJ/dmb/VfE2ULpX+xj4ZC58jkXiyWucdjvl4bSMZkUvX7lh/3+IXNurq3ELFjeS/ynD17+78uE/AGAq5m2ezw+MQuxhMQW4YM5YBaELoCrO8ra2nb0xTOOetCDwNWprLXFmZS3n+8KkZm5tdrKVRb34xY58JVN1om3c8y8yMotclVnP4FepoQENAC6j4tSBEcnnh40x4UcCN7gIkNiglhWrbT2aQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(6029001)(4636009)(346002)(39840400004)(396003)(136003)(376002)(366004)(52116002)(5660300002)(4744005)(6506007)(2616005)(86362001)(956004)(316002)(36756003)(6512007)(1076003)(6916009)(8936002)(4326008)(107886003)(8676002)(66556008)(66946007)(66476007)(478600001)(186003)(6486002)(2906002)(83380400001)(16526019)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: g5zN6xJzJg2q2E0Ih9SaSjCT/mf7KQkSf4BS1tTIlQnSrRNqbyTSlxzs3v6begfdaG+2pRrOCviw1Z9EDbseBrYuwHWsndurztUi+osWUK6rAtd6lcPu2w5CTLO7cVEkn3olGF75+NA1+sPbuvbqAQp3BL4t/u93w1LlCPF5Yai+W+LZuvdM+IviPZ8rFpZd8V/rokVx4goth4s8B5FefENK4wrG6GFG3Y5mvVaqbxU8i1tNvkL+c7seUvBe/S34d7Og0dIMKHHcHez0HG+SEsLi742xPWOGTXw+/7CmxF09WdtPqEKb0q0+tWUZbkQTDv5PWGzrde/sn/2dtqndNFbDpUPmZ5R2uLFY5iIg+KVxy8cIhjCti420JaPvqNaA7UbNZUFV9nuvU3L6dzbRRU/WlLenYYvHo2MKhJ5jYO9voVYTbXukulOuBGlf4DVXZpaIrTyF3MFzfiKahztdmxxU4Datxo0MiCGo2v0IZm0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 306f7d73-5e64-4efb-292f-08d81913c341 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2020 14:26:34.6075 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hl6Bga6XWaiwOguULLNoF7VMwwhRR7IUF2arawILL2yv6AA/H9OljhAH/JphOi4/VtVo3CfQGsf0twl37tf1md91qz7QJ5aW11jWwvT57T8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2100 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.95; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 10:26:34 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" All users of QemuIoInteractive provides -f argument, so it's incorrect to use qemu_io_args, which contains -f too. Let's use qemu_io_args_no_fmt, which also makes possible to use --image-opts with QemuIoInteractive in the following patch. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/iotests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 5ea4c4df8b..efe9958f5e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -211,7 +211,7 @@ def get_virtio_scsi_device(): =20 class QemuIoInteractive: def __init__(self, *args): - self.args =3D qemu_io_args + list(args) + self.args =3D qemu_io_args_no_fmt + list(args) self._p =3D subprocess.Popen(self.args, stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.STDOUT, --=20 2.21.0 From nobody Tue May 7 02:47:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1593095472; cv=pass; d=zohomail.com; s=zohoarc; b=FVzEq53s0jDcdcMdIrhwV1/3p4VHsb3sKgNFPNkidg27stC/uH6pCLgWCX1Bkya38RApz0NaFjSF1KvfhpopxnpyxYNmmlLOLlgAOze65P9K3jnvLdrflqp7QvV5PGpAaoveaH+krv1Aq0FPxp/eb08cO8juRwzOjqs+gkt419c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593095472; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VwdvNOvaU3Z4nkWyN9DgjwhHJqsngiYCe1YrrtDxEiQ=; b=RYo+qEh4gBEeVVBenKq/zRwMtRx660FfASR1xoExMAaK4yJ8AzrQBHwVXTS2ZGMOt5TA1qH8/M1yFs96m8KIkMavQKrF/EeM40NozyBiSq6ALs4usOxmJOgUwtofVSeB3Ebo8RLR2MqiRe2ytomZRW0qSuVOWi4N6cseZGDkwRo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593095472148761.0348350721905; Thu, 25 Jun 2020 07:31:12 -0700 (PDT) Received: from localhost ([::1]:55446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joSuE-0007wj-NV for importer@patchew.org; Thu, 25 Jun 2020 10:31:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSpv-0002fo-2y; Thu, 25 Jun 2020 10:26:43 -0400 Received: from mail-eopbgr60095.outbound.protection.outlook.com ([40.107.6.95]:41601 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSpt-0005wS-FH; Thu, 25 Jun 2020 10:26:42 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2100.eurprd08.prod.outlook.com (2603:10a6:203:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20; Thu, 25 Jun 2020 14:26:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%4]) with mapi id 15.20.3131.020; Thu, 25 Jun 2020 14:26:35 +0000 Received: from kvm.sw.ru (185.215.60.69) by AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21 via Frontend Transport; Thu, 25 Jun 2020 14:26:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DeoFcjzm0NiqeTRBVCbafSWN+KNnY3h2au2zAsn+06Rubf8taw6wOSC1DHdATDn+3/SByvUjxdYuVNkUU/K0T7zJRvxdaMkllbQvB8Y2zdB0K//k9+18GTzxpoH1I8gJAL/+GKgD/TMhnKigSGZBlDW5df7UnQ2Miqp7wDWjIpFFWi3+fxuKjXyK26+CT+i20+WKH5t+t8cSwEUcIf1A8XJWH+JbVx+90zaADr+jttkMywqK1HTwFAX8RK4Oh8dWilLtdnxb0agdMywjIIrI8LZyyZAVgVQAKAeVMB6ebkOa/k9VpOhfw/Dz38iM7q4Sewinat/W53++THwKw2h7Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VwdvNOvaU3Z4nkWyN9DgjwhHJqsngiYCe1YrrtDxEiQ=; b=SoyNttiTK2kxQ4KGhSEIyhYZ1Ly6s+AYn3FqBVpCjzZvLDi9sXt4aSCjhIOIDF+VwIGgfMPot3CPyPQvtSSJGfoVzZl8N/YktuKYPhA+ToFTeXt169+eLL419Zf0suHtC2blAixw2YKkEisxIVwB+Ydhzb+saXm+uoD9KY7YjqYLOmSP1yBd3yNwd0Ss1wptx2id5LNW9qtU+k0NS25FIFCHCX42LtcZhINCgcv7RuSnIOcqvNQaOeykQSRDaiTUheoWlf8fyS/B5b68Vlo7Zu6+3vx0nmfbr6XEgFrlDwdaktD4Yb0GKBQf0ZuZmySH9bvViO1Uw4MfYavRlwkkdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VwdvNOvaU3Z4nkWyN9DgjwhHJqsngiYCe1YrrtDxEiQ=; b=AOodmUJWqAGg1K2zr5WakyilR3+ZV7NIJ4KXeDrpYyn4AOVFQWCFxAy21A58Dxwd3hEM0jorQrh5Z5djgDCViIr6Ta6SlVvCR1iPs1DC5sASu/bA56+ueXwRlamLUFaESDFIhstTnYLmCUguQ7EDXTXXBnPmjk/+ocY4wRmkkEk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 2/4] iotests.py: QemuIoInteractive: print output on failure Date: Thu, 25 Jun 2020 17:25:38 +0300 Message-Id: <20200625142540.24589-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200625142540.24589-1-vsementsov@virtuozzo.com> References: <20200625142540.24589-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e8c31b3-686b-4c61-88d0-08d81913c3cd X-MS-TrafficTypeDiagnostic: AM5PR0801MB2100: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-Forefront-PRVS: 0445A82F82 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zB9Slcwe4M6wYt8bj9Sljt4/x+3ham6of1zsJYoHHhbaToCtytPPRyGjVCa7xlNP0+fcPK6zMFxg28Erv/kGWFvQgyotK4DuO/PFk4EZ3wl04W4/ua31YQStKY23ipsZVCmsf+2++Grp7Wz0DRtgUEpzYX8li1zuKqxH4iNCytEILTRlFZb5yBIs+20R3KO/wkbeUPlzfAX5nfCAnNfad0QIovjoBKEGptFkMC0PGbLan8IUTSzMzgLQMwadqQxP3kHjBKeUGy0dwkq1Nm/21cb2Y/majvqY4k5ty/UrP8wUKrETxpVQXRgLrI7gUqrIfJEvOE5txb4tzLapvRQwnA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(6029001)(4636009)(346002)(39840400004)(396003)(136003)(376002)(366004)(52116002)(5660300002)(4744005)(6506007)(2616005)(86362001)(956004)(316002)(36756003)(6512007)(1076003)(6916009)(8936002)(4326008)(107886003)(8676002)(66556008)(66946007)(66476007)(478600001)(186003)(6486002)(2906002)(83380400001)(16526019)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: O2E+pvyzjEEw37nZLyyvYZ3UZ19CjMwy9FkixdQtb3WhTm4BTJkSVlQToO3R0N19zooEe2k4C1Y/3wFMmoJvjaU41z604Z4fJ7FDM/YLEwFi3T43lwPfHf37HNvoc2cNnhiZdBCeE05BedFrTGnAnFDjviabsx3YZQku50TFgvk94tK/0HUtapJNd+a0sE7eydt+ThQB8c/19LU25GRfXFNSNxdwjE6lv1X+/rwd05OsqevmVOTHEj8XYfmuO/g3ANRM/EJLVg83NzwlfFZobnTCRmmKYS1GAQcp1XsT9YWAHSHowGiu0z+czMthsx2CpOInQf2QUMi2PjPwcAw6Dm8uvxH7i3brAVuAIup4ZWQJ9DGt1lvFhwVH6VP//ERGltOEStcWLJKtieaF70iN7XEF2ijMvxboZAOxDmNnmEPcBsASFBsTa2SPIj7szZJBZlzEEcMqmSuzyRVhqWkt/KF8XhJjQk7WsqeEI0U4bew= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e8c31b3-686b-4c61-88d0-08d81913c3cd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2020 14:26:35.4239 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HMn6uCGmFU1SpWdmCNqO6uk1RgxaJiJ1NTalG2uXYSUmRGxTa+WDcN91stNsykfnd69QEfyNLApvZpjbBgGSXbeQeF/RolmTDDC/MM+TCHk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2100 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.95; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 10:26:34 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Make it simpler to debug when qemu-io failes due to wrong arguments or environment. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/iotests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index efe9958f5e..ac9d199a1e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -216,7 +216,13 @@ class QemuIoInteractive: stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.STDOUT, universal_newlines=3DTrue) - assert self._p.stdout.read(9) =3D=3D 'qemu-io> ' + out =3D self._p.stdout.read(9) + if out !=3D 'qemu-io> ': + # Most probably qemu-io just failed to start. + # Let's collect the whole output and exit. + out +=3D self._p.stdout.read() + self._p.wait(timeout=3D1) + raise ValueError(out) =20 def close(self): self._p.communicate('q\n') --=20 2.21.0 From nobody Tue May 7 02:47:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1593095276; cv=pass; d=zohomail.com; s=zohoarc; b=KRsQX4qpvMhNg/jUX4cJlLJ0T0RkdJba5w3qQhKpuCp+Ejn88dn+TaasCZfKSDqfPX58iLQVUTGB+BlStNZkGENFURjaRxQ/o6/iZ1O3llNNYjQFMJPff/PGWgaklxQIXxV5rSC13ulU9zdI4mB79ppULjRXpDeskxg55N2GJ3s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593095276; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6gf/fm1Xuy5nNsip81jgnPQAgfaRX4h9522+LWJgoMw=; b=Lw7B+U2ipwTQWbjC2kmn56cQjqER0ommPGfzWSHMZIPzHokSLojKqlKkraR7UHbasuX0tRSz08Igp8GNpghwK8iBOCle6ACLRMFu93YCnlBx0tKVxmQGyj7bWwi45yaC9j1ehiN62uanKOsCZZ6qrTd7JNnL9lN4FIwSdM5NTaU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593095276176966.5089428879301; Thu, 25 Jun 2020 07:27:56 -0700 (PDT) Received: from localhost ([::1]:46100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joSr3-0003yi-QA for importer@patchew.org; Thu, 25 Jun 2020 10:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSpy-0002mM-9y; Thu, 25 Jun 2020 10:26:46 -0400 Received: from mail-eopbgr60138.outbound.protection.outlook.com ([40.107.6.138]:2563 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSpw-00061d-Jy; Thu, 25 Jun 2020 10:26:46 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2100.eurprd08.prod.outlook.com (2603:10a6:203:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20; Thu, 25 Jun 2020 14:26:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%4]) with mapi id 15.20.3131.020; Thu, 25 Jun 2020 14:26:36 +0000 Received: from kvm.sw.ru (185.215.60.69) by AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21 via Frontend Transport; Thu, 25 Jun 2020 14:26:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OM6zha6hz6NsEFjpw1TuOG3Tarbl1EeH+0t3BsO27XIzdorOfLNKi6XMxvy3v7JGx/eLHB3hikuw3dJr5offe6dr249Db3gjbZApMy7jmQH4gkD7zIBBuvxPMgfRY4WOEQ+xnASB0kb26TMoQVW620+GFU2dhFxHfdWU1Zbo8AvynwZijWCSNJ5Q/NOgUzizim/AZzFhPSO82k5D6D5gY0smyDmuHSMzHsy9vPjmHtmvpsFf5kg6kSqhis0yIQkRw78SkngsnV9CpHks9LVmXk1qfRRPooCurcbizPulwExZLPMxSbKjmcp7NYntWFE/I72/oVpspaBSLKid4Y5bgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6gf/fm1Xuy5nNsip81jgnPQAgfaRX4h9522+LWJgoMw=; b=JbnseEl3fjVDjivolutS5ymb485qj61D9OSytJpwRDr1uMaRjTI8l3s35RNTlY7P8ihfS2RXLvMOB21yjF4ZFohbQ5NUHmprFqwIifW57xIQ0vB1n29neA89yPCDGDW4DGaCtsGT/h7h2UQ5wlMOBs4MRX8nVubG5MaP0PlGpNPYszvA2iJyzF5DZWvphdmO0WH+iBG7WUwxjFhoFNlmGXhTDlvaWBStuFSEGfT+bqZ60T4u/XqKfYMMzpQTe0JF49xMcYi4PCrbPi09f+c4hO8d8EwRVHfoRcNvGANGIYjpVBct7tTlEUCjYjiJU3IxH9Y4Uk9OvVFZz7T/r2TtJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6gf/fm1Xuy5nNsip81jgnPQAgfaRX4h9522+LWJgoMw=; b=Zu+C/YMt/KD7m/k31PK6FI8r0Z7hONrTGGrwxdqmP5XXMKxTfXIGNWhXU/r8LKbZOpJdZKHvuJQRS8wcWEfqnBxgODbYBrjvVMc79Xis+tkHJqMeMtueOq7Qj6v3v/oh4J6tyoa/sM3EasqEVv8h8Cmj1iHxjeFcksYGoG7i7jQ= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 3/4] nbd: make client_close synchronous Date: Thu, 25 Jun 2020 17:25:39 +0300 Message-Id: <20200625142540.24589-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200625142540.24589-1-vsementsov@virtuozzo.com> References: <20200625142540.24589-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a236c39-a9d0-4397-92fb-08d81913c437 X-MS-TrafficTypeDiagnostic: AM5PR0801MB2100: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 0445A82F82 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dF47U7O66pfirLDMqb+F2BlFR08rTOmJmE1HTQ+KVpLUIooZjQQM23gYRkQ17k3C9lLQ4JuygET3SHJpRBbFsmLZcr8kqw2PwKPLrukCEvATD8g2drgcqP3GsqYkBF87de1uaJfNcY1laMDQxvZ1V62ZO22ae3x1dfSz5A+F3oj+9sF2HPbLgjJ3LfgpRGuo6QIkkKxjtOo9GJHo+QHt7HMDzD+01TC7SjomahPrgF4GdXwyGY24HojV6QEhsEBs68dJWq52WDUjWvYPH/xDYoSuA0oNW1NxuwIhGuRFYFnUTHRtKCVanEn1KdhxjI80HnogD6A1B5afkehxmzAdXg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(39840400004)(396003)(136003)(376002)(366004)(52116002)(5660300002)(6506007)(2616005)(86362001)(956004)(316002)(36756003)(6512007)(1076003)(6916009)(8936002)(4326008)(107886003)(8676002)(66556008)(66946007)(66476007)(478600001)(186003)(6486002)(2906002)(83380400001)(16526019)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Nvk03OUJU9deoKigOtAQGdop4w1DX3BBR3J8dBNo/CDNnETr1QGv8w/jSdvpn3y7miuWp3pncx6d6Rs/Z04pv74uMfxxpzmFmttaKXZuslB84OaHhOJuJTN3ykC8aOxz8+e7XpsEx+s0OuXisKYRqiCtDC5PFGhQwT2ljFR9VeE4Cq/YHmCPS5ZPJxyClX82Rd0zrZpvdvnJYzVjhzHeUe/UAZ5IAfPZUuOlQ4rIKWQ21ZzJGmz3GkX28nj2YaHBlWDT42iTpdxc3SD8pmh+3ollTa9ELOJVMBkFpGgVnWzw/uzwfQJ4WKKlFVo1rw0eu031nOazVPO9GH9ITo+czoIAFhIoicpeWwODaaTK9EEMdlz0u9XaBK42awaOgB8X3vBmjKz1x5VBl3gaxC+iA4ncXDuUocfYuQH5x5sbkvcf1faJiyQJ/rTkmGy81pfUoDV0MRFYGrwpPC5g+Vv4IyYoH9JEM7BPA1CCSRQzSaI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a236c39-a9d0-4397-92fb-08d81913c437 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2020 14:26:36.1507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mQlZBO4YYNA6vIkTmUiRPQyICva1NO05iLxpOuYCsrjBZHYG06sZVp20ccN1Rvv9pKgBKh0xwBACsR8/+wR0Qu//o3Uo3tWD1jC3wy9BHfE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2100 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 10:26:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" client_close doesn't guarantee that client is closed: nbd_trip() keeps reference to it. Let's wait for nbd_trip to finish. Without this fix, the following crash is possible: - export bitmap through unternal Qemu NBD server - connect a client - shutdown Qemu On shutdown nbd_export_close_all is called, but it actually don't wait for nbd_trip() to finish and to release its references. So, export is not release, and exported bitmap remains busy, and on try to remove the bitmap (which is part of bdrv_close()) the assertion fairs: bdrv_release_dirty_bitmap_locked: Assertion `!bdrv_dirty_bitmap_busy(bitmap= )' failed Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- nbd/server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nbd/server.c b/nbd/server.c index 20754e9ebc..5e27a8d31a 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1419,6 +1419,8 @@ static void client_close(NBDClient *client, bool nego= tiated) qio_channel_shutdown(client->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); =20 + AIO_WAIT_WHILE(client->exp->ctx, client->recv_coroutine); + /* Also tell the client, so that they release their reference. */ if (client->close_fn) { client->close_fn(client, negotiated); @@ -2450,6 +2452,7 @@ static coroutine_fn void nbd_trip(void *opaque) =20 trace_nbd_trip(); if (client->closing) { + client->recv_coroutine =3D NULL; nbd_client_put(client); return; } --=20 2.21.0 From nobody Tue May 7 02:47:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1593095547; cv=pass; d=zohomail.com; s=zohoarc; b=ajWo0p0m7MVfeton6wWHS/kEnRq+uJW62dzjfIa7Wz7d3MAoo2WsrvmX91NgC7fRljdHHZMrPWyVXRUpfLqDe4/J4DnMioRclYk/gwUHLE/n3MYzed2oowqzAEDgGnbJxu5jEcSqNlco0Tu7zgeSkRHk6ptoX8K/h5zNbcQdK5g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593095547; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vRo5exCgF0rD4yOM/HfO6/WA4BuwO/sih+kRw+C+q68=; b=hOJkx4AEyn0WvZdWl0wCxIcsFNOzmaNf+DGAt3wfnM/Fzk4PzB73RKDPGLv8BEl+nWfBUZcwL2cJ4fXUTyMmch/7IeqRcofU9JidPV8OWyupjg5Bp2us4f6/RgqIo4JjrjBd/Fh9qHDy3u9SKWXWbri/4+Osiu1Qrop/KN3cBk0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593095547821613.5064273719776; Thu, 25 Jun 2020 07:32:27 -0700 (PDT) Received: from localhost ([::1]:59362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joSvS-00019q-GP for importer@patchew.org; Thu, 25 Jun 2020 10:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSq0-0002rp-Rr; Thu, 25 Jun 2020 10:26:48 -0400 Received: from mail-eopbgr60138.outbound.protection.outlook.com ([40.107.6.138]:2563 helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joSpy-00061d-Rq; Thu, 25 Jun 2020 10:26:48 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB2100.eurprd08.prod.outlook.com (2603:10a6:203:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20; Thu, 25 Jun 2020 14:26:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%4]) with mapi id 15.20.3131.020; Thu, 25 Jun 2020 14:26:37 +0000 Received: from kvm.sw.ru (185.215.60.69) by AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21 via Frontend Transport; Thu, 25 Jun 2020 14:26:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WbAQ5ggpDuNObyR22wkFFkgZQhcZC6xtMdD3wMN+5BWCnVk+U/qh8b6TjQkOFrOunkbMaFJTG9C/ky6wb3rDxpyppHTUFnhAS3W/AxQn9Keds5dOfYiu1YrG2jRdP/1EVCTNdwHiWWQssfJ/sRxvMYGjNUQYUlh3PRv/J3fZ1C0rYe8NTjkm66FCslY/1AQeQbi+p5Bq7t9IixvISzyNJBQaGK2cmSrd6ziQJQYVkrH9T+wiBeTT/RqQogHCMzvJLG6TCJa6/4Q23VjlDGq5R9u0+oa1IRCKJ5/ZfN/qkKw5GdwGWOnMMXjS9GxFvPum9Y5QQ/0f0JB6f8vMGDBy7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vRo5exCgF0rD4yOM/HfO6/WA4BuwO/sih+kRw+C+q68=; b=Z7FmO/DqNuCuuPZVq355ql4jQhPpAurdPKFt84+4oHicjuJgCWePYJSn6azkimc4EXk77O2Ls5a+uqNsrIUGCqk2Z3688Q9F4u0/Kl1YjB1JgKfUoZ5w+a57iKnSz0B2SvH7AOuczfr8j1NNyDppQQMiirxANiSpLR9OjLwTTR0ESFF+O62AZxB3I1avg3wWk4bZVbMEe0WOm9gGf8CSuol6TheTZuD5fdHfNIflG2pTXcx6oVQQ2HFyoi8ZOcIGMve23bJqJQ+/ZsCRRmpufkN52verxxi/pqZ8VPjjovqnXvsf57cioyW6PvsXApHitPILr0AzEv2aHlpKYEs3OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vRo5exCgF0rD4yOM/HfO6/WA4BuwO/sih+kRw+C+q68=; b=VLOX12Y3MJ7XWrjueDWNBYZgnXCZmbVVcgbq6aCVWvG8Jky+i8ahAuukY9G/zbf9u0mtOHsAcJpHbHG0SrOtObGQn4fNu/dSbIYLLldAYe7Il6E9CQc+VyblIiewxM/AIx/F5mAzbGVe13m840wt1aO8pozG06NovfP52Km0TW0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 4/4] iotests: test shutdown when bitmap is exported through NBD Date: Thu, 25 Jun 2020 17:25:40 +0300 Message-Id: <20200625142540.24589-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200625142540.24589-1-vsementsov@virtuozzo.com> References: <20200625142540.24589-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR05CA0089.eurprd05.prod.outlook.com (2603:10a6:208:136::29) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18616bb4-b94b-4f6f-d155-08d81913c4a9 X-MS-TrafficTypeDiagnostic: AM5PR0801MB2100: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-Forefront-PRVS: 0445A82F82 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eyjrv+RuEXjupnC8QdIVoXY5Nla6SW6vniSVcDejD5uBOjZ4t50D00X4kq/kqRqn5UDJN2XpdG+gv/tCcD4+yItjcy6w/KNNQZbO2Mnzq6kVp5yUnyUw0myApRuypyLKWwTrTxg7C5lDx7XSZucemdW3fl4O/Ag3Yl7+m4UFQe3hOBhAYMolkYTGhrGucrY8afZhaHOcqx2+wH3CJyBj1hwkuelgdOFdwI0ErEgl7fRSaI0ipmExvtFjFNwueyQPYE6nJUVp6JEbKwyxYg+NvdyJ5UHsHNPYSCHHLRdzk8EgVYQJxqcObXyVA82qZM5oDPKyRVRfzokxx0yjzhAPFUMGG8YioE0gPXbXwT2JwMTR7S1vXAo/fCnbObhSYgiSUF90icgZunSz6XN8Qfp5ODBKreBhnr1HOMFU9Y9drXgxCFDLyn+YTD/Wr65trgBAWS0VoZjJxJjNGkH4olI1HvF0wrlhBlswKoy0Z8zYGIs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(39840400004)(396003)(136003)(376002)(366004)(52116002)(5660300002)(6506007)(2616005)(86362001)(956004)(316002)(36756003)(6512007)(1076003)(6916009)(8936002)(4326008)(107886003)(8676002)(66556008)(66946007)(66476007)(478600001)(6666004)(186003)(6486002)(2906002)(83380400001)(16526019)(26005)(21314003)(2004002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: ElENr13cnoDcaCdTKYktElzOD+yGzeFFuP5BGOE8mcAz8LPDEyiriEq+lP2uOKhx+1HYqjKo/0ZvQizq/NbN+Xi6N0813V4S7h4A9BKDIr9urHcPU4ng4KxM/fSWGPcUW7y61d66Dozl0FKoi54AqVGTDGPck1quSQ/SOHh603EwWmiQYKfg60KtGF/zio6x5R4NP3jU6pXIOwfFO6UkuFXr2h4knxCbRROSEYt8warLF3Qype1Pfzm24YZoGY+9VNlPoyv1MK8XYKzCd6Yp/Kn9Itw9B8hftk1PT3+hZj1Nq+aqYylAKITctxlyuu59v1D4QlV91g90yvKA2620I2WrZ6dmAYloCaiEQoY1/FHLxuJvpmKOyYO50ix6d9tgj8CbB0kd1d2Hq19Au/RMEajADJZxtnhgzp+esloXSqYyy5XjsJsQWlCU9kDuQgQUog0l8Hkgc0VZqhUDH4Ox/cNrRB/BE3bY4HM/GUSEwt8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18616bb4-b94b-4f6f-d155-08d81913c4a9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2020 14:26:36.8666 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wppvyFFL33Llr/vCQrOUYM2XR27i4KZO9YRjYBi2HCVTXV4L1WIMpmf1IREmyQrfHjpbOmib/zgG110pI+ADj6NtzNCODLYgQJ3qNYAOcEg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2100 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.6.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 10:26:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Test shutdown when bitmap is exported through NBD and active client exists. The previous patch fixes a crash, provoked by this scenario. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/299 | 65 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/299.out | 10 ++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 5 +-- 4 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/qemu-iotests/299 create mode 100644 tests/qemu-iotests/299.out diff --git a/tests/qemu-iotests/299 b/tests/qemu-iotests/299 new file mode 100644 index 0000000000..e129c7f7cb --- /dev/null +++ b/tests/qemu-iotests/299 @@ -0,0 +1,65 @@ +#!/usr/bin/env python3 +# +# Test shutdown when bitmap is exported through NBD server +# +# Copyright (c) 2020 Virtuozzo International GmbH. +# +# 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 . +# + +import iotests + +# The test is unrelated to formats, restrict it to qcow2 to avoid extra ru= ns +iotests.script_initialize( + supported_fmts=3D['qcow2'], +) + +nbd_sock =3D iotests.file_path('nbd.sock', base_dir=3Diotests.sock_dir) +nbd_uri =3D 'nbd+unix:///disk?socket=3D' + nbd_sock +size =3D 1024 * 1024 + +vm =3D iotests.VM() +vm.launch() + +vm.qmp_log('blockdev-add', **{ + 'node-name': 'disk', + 'driver': 'null-co', + 'size': 1024 * 1024, +}) + +vm.qmp_log('block-dirty-bitmap-add', **{ + 'node': 'disk', + 'name': 'bitmap0' +}) + +vm.qmp_log('nbd-server-start', **{ + 'addr': { + 'type': 'unix', + 'data': {'path': nbd_sock} + } +}, filters=3D[iotests.filter_qmp_testfiles]) + +vm.qmp_log('nbd-server-add', **{ + 'device': 'disk', + 'writable': True, + 'bitmap': 'bitmap0' +}) + +p =3D iotests.QemuIoInteractive('-f', 'raw', nbd_uri) +# wait for connection and check it: +iotests.log(p.cmd('read 0 512').rstrip(), filters=3D[iotests.filter_qemu_i= o]) + +vm.shutdown() + +p.close() diff --git a/tests/qemu-iotests/299.out b/tests/qemu-iotests/299.out new file mode 100644 index 0000000000..bba4252923 --- /dev/null +++ b/tests/qemu-iotests/299.out @@ -0,0 +1,10 @@ +{"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name"= : "disk", "size": 1048576}} +{"return": {}} +{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "no= de": "disk"}} +{"return": {}} +{"execute": "nbd-server-start", "arguments": {"addr": {"data": {"path": "S= OCK_DIR/PID-nbd.sock"}, "type": "unix"}}} +{"return": {}} +{"execute": "nbd-server-add", "arguments": {"bitmap": "bitmap0", "device":= "disk", "writable": true}} +{"return": {}} +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index d886fa0cb3..250192352c 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -302,3 +302,4 @@ 291 rw quick 292 rw auto quick 297 meta +299 auto quick diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index ac9d199a1e..31d4b105ca 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -345,8 +345,9 @@ def filter_qmp(qmsg, filter_fn): return qmsg =20 def filter_testfiles(msg): - prefix =3D os.path.join(test_dir, "%s-" % (os.getpid())) - return msg.replace(prefix, 'TEST_DIR/PID-') + pref1 =3D os.path.join(test_dir, "%s-" % (os.getpid())) + pref2 =3D os.path.join(sock_dir, "%s-" % (os.getpid())) + return msg.replace(pref1, 'TEST_DIR/PID-').replace(pref2, 'SOCK_DIR/PI= D-') =20 def filter_qmp_testfiles(qmsg): def _filter(_key, value): --=20 2.21.0