From patchwork Wed Jul 1 10:53:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1320407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=AdYyR47F; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49xdR24D9mz9sTY for ; Wed, 1 Jul 2020 20:54:53 +1000 (AEST) Received: from localhost ([::1]:33278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqaOB-0003MF-9S for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2020 06:54:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqaN8-00020c-Ud; Wed, 01 Jul 2020 06:53:46 -0400 Received: from mail-eopbgr10106.outbound.protection.outlook.com ([40.107.1.106]:9187 helo=EUR02-HE1-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 1jqaN7-0002Jl-B9; Wed, 01 Jul 2020 06:53:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a8Bql5/4iQ6r+LWOA4iO0w+ro6MjVAt/kEUhoK/KmL9oONbZ12z3TiBsy2/VoQQr9lQGguDOo2EtUXqWjxZqTXcdXxDUO8OWzLgFhkldkrNjhdq7omQGNk7tTZLGumO2/TsTffl3WrZZNeMrD/3YMfW2CPgBArVIKWJ1FW90EqzQGC30RGAExtEG4Oe4bdwBtXiHZpM9RR2pLRAklqEvCwh57hWcHS5C5B5sIZ/EzFjLjUghKUOSh10RhwmCzn2scDpMICedMEI1dIdSBkMqNiJ6xpquADL3z7tBQGNWMPn1ZCoO6NB/On74uvWphV6rD4uhybkRNkXdXJSuTwij3A== 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=n6G1dRBHL0pLEdzQ/5RUVCtUO777notCFjPwcfqsYyo=; b=IxTG3qTkeNbC4rT9Fw9hbxEUIX4sV4xUz2ZddPHfDvHMG/KtgabxRvFo6L0usIWrbXwVqezxK6FwKgKKmbvpozkKjPPP1dU1diShLM1bB6y2oTZw5H3BexvvXlC6zRUiFfJwpU+dli6k2ASpmlnupYjxJ0A0dxOobULkgkBKv3ZPwfuETldDwqgEwWdTNtPvI3AfFmG05mxPLuaXSFoQb/fw7aC12IrdGGz0KgCOmBtc7QGhm/MBOeG85+1ypSNAfMQB20sSXwT2vucTJxCYDEpQ2ZURIMTVZIclLqRzktIr4+uLK8yzRs0pxJN6F/FyIurKAUvlJ4uwFd+wyMm8pg== 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=n6G1dRBHL0pLEdzQ/5RUVCtUO777notCFjPwcfqsYyo=; b=AdYyR47F2jdozjTXjiumxiYE1kQfzO7xEsI5+OPWxgfrtTPa/+wZFOG3ZiVWUGzFzK2/pYtBL2goEPfGZekdsfksj7Sd+DBckhq+5SBffG9APzgkTmmGGeyAuTw+DKhoXO3sHy5qwBYvI3sBu/nmW+yxBo7WKld2Jx6rx9rozdY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4850.eurprd08.prod.outlook.com (2603:10a6:20b:d2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.26; Wed, 1 Jul 2020 10:53:39 +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.028; Wed, 1 Jul 2020 10:53:39 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 1/5] iotests: QemuIoInteractive: use qemu_io_args_no_fmt Date: Wed, 1 Jul 2020 13:53:27 +0300 Message-Id: <20200701105331.121670-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200701105331.121670-1-vsementsov@virtuozzo.com> References: <20200701105331.121670-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.28) by AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20 via Frontend Transport; Wed, 1 Jul 2020 10:53:38 +0000 X-Mailer: git-send-email 2.18.0 X-Originating-IP: [185.215.60.28] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d4e6549-91fb-48f3-a20f-08d81dad02db X-MS-TrafficTypeDiagnostic: AM6PR08MB4850: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:530; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KPz+yvYR7HBBt+GpgHxau4RovWGBoKuU0c35+gGzls4KIkME2pjPZWBB34djGHyghwvBExzOLVeccTLYCN7IIYEMK2biQg1tqnWLenntEbvD/gK4etXkyU9DJbcGmSHy3AuQmEVbeIgXJoUFPTyEz0kOlMFr6fHHQQUxQ5zuKcsldISPd1a7OT5CDZLNRUALxi1GAcFZtUF3KUMzPm5hjy7CH+B8AjYcyIDOuRzK6aG37PWotEGFkByINaYeWBKZL8QiP5zYP2MDzQrSNCjbVPl2H9pfxsRFSE6r7GtvI024k6t7Ck9Y5o069+AoIl7Vy3XLk1hk+JhAdHuLiYLv8w== 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)(136003)(366004)(39840400004)(376002)(346002)(396003)(2906002)(83380400001)(956004)(316002)(2616005)(6512007)(6916009)(107886003)(6666004)(66946007)(66556008)(4326008)(5660300002)(66476007)(86362001)(4744005)(1076003)(478600001)(186003)(6506007)(36756003)(52116002)(8936002)(26005)(16526019)(6486002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: hprFzC+PiB3y93Kbx66HoTjI34VF8rSDWXV91NJZu5Ijl2Wq81e0R2o6P8u7bAxVUOJ5tgF7CCF7fA7CeKE+c+1OPwLskSvzU/H/sFEjFmlevOzt5GXELl1rSKZy2fkO0lEa/UxFgGCjv4/QMFmUXO8uncOH13y+HC3IDCRgn4zRUvPK3OJFi6oR09Lzgh7Uh8mx8hotqpjok+7Tped0GD9TwuuAGsxLttQltfm01s2kduAP8RWz99k6saq16aANcrzb/XzBt/2piqp9bOrglLAJ+LFqKP3plqBLz+6WtrXWW4wQc1T/TvqMhESpsJ4yF6Rm8CZhbxR3rjeD/GnxpOjCpTFuiDSlYOrLYTgjvg05LJG8zIQSt1FqggG1YPcsMOcM+ddTCL0aXXorNtvgfRdfGPDYMv2/b1CCMxyXqJ/cf9+y/qchE8xNaZS3btfx40i2x1vZIGbouk26V9EYXol4Wy/3q+AZMzKxdTSLMyI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d4e6549-91fb-48f3-a20f-08d81dad02db X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 10:53:38.9292 (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: NWfjh0QoAlFcruazSNwntKxM7IJJFbZ4fAGRIB9C6YCp/3h/YaJPD3YaBszkZygo8nSz+2lUkTORsmwH+KDWnLwnzI/CcjNpRLvxeXH+95o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4850 Received-SPF: pass client-ip=40.107.1.106; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/01 06:53:43 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, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The only user (iotest 205) of QemuIoInteractive provides -f argument, so it's a bit inefficient to use qemu_io_args, which contains -f too. And we are going to add one more test, which wants to specify -f by hand. Let's use qemu_io_args_no_fmt. 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(): class QemuIoInteractive: def __init__(self, *args): - self.args = qemu_io_args + list(args) + self.args = qemu_io_args_no_fmt + list(args) self._p = subprocess.Popen(self.args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, From patchwork Wed Jul 1 10:53:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1320406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=sey34xSB; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49xdQP3c47z9sTT for ; Wed, 1 Jul 2020 20:54:21 +1000 (AEST) Received: from localhost ([::1]:59238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqaNf-0002OY-7v for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2020 06:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqaN8-0001zR-Bv; Wed, 01 Jul 2020 06:53:46 -0400 Received: from mail-eopbgr10133.outbound.protection.outlook.com ([40.107.1.133]:2638 helo=EUR02-HE1-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 1jqaN6-0002JK-QO; Wed, 01 Jul 2020 06:53:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n3/Wr5W/xiTs8MxJDLNAseCoSrREsMfpbGd+WApCm+uP6IZAXC+RTBscTW+5zB2eCtrlqPu/AdvJrp2p/cMD2L5+d7Rf99E6R8g/Lx45qRRqFvKYqjQcm1uWRkj6/1gfHHz2w8BwALUnmMCbdip7W0++RId80/1eFviDzA8LPHjUipkLsAHWB0/iyLsgXRXr+537vZAt1AY67j2wp3DX2XVcqOFbmokOks68kaIaVLhwrGUbuCjgCoQufS9dqjdB8wKj8+m1YNVkGYu5Dd1GEgRO0rELdyaC1AiVTIQTcwd9FaAC2H6lk1nj8/KFSaerqxnCKbpbhNco/iZ/tO52kQ== 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=CYZsvrdBC7fM5IWsY1MIRuH8ZTl28pVdRfLQ3vO6S+4=; b=eoKs8fU+POQDzOzP2GvgBRGI3+G59Xw0mW/0ya1eaAZ4K7nlEaHikQ5foqHK8pN22pijU//SyPmdbiA8uiAk4K84y1eJRldSjr6TfFBJy8+AmRiM2EC1EbfrMxrQHL1tfaPFpJuAMHEb3k/RV/fOs0iyvUAWvsxD/rjXLSX3fKXtZy1r4jIl0oL2DmrFVzi9BX6pQu/YQ8wCDi4o5MtfqP5kIuQrdVBkCS/APtHn5fcNkqEkotngFnfLyeQJQYC/ZK3kUFYw69gCxdoFROXGQP81hy3dcTiLlib9YjcmFM5a7xMzgADRpPV9xHuLWo7oNLDltnSDndhPHWU7m2PwYQ== 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=CYZsvrdBC7fM5IWsY1MIRuH8ZTl28pVdRfLQ3vO6S+4=; b=sey34xSB0NQovfX3cJhZ11S+bWv+kauoCNEZOBMJPQfgQAuHuiYFbgWklI6FiZEPgqwhsgw6uqP043LbmRHunGJnWRojqC4ZOuByLU+kahzEiPWEMiIZQjxA0jvhTcFOrcgqzPZvEu1seWrVsc5QqWqZui184CLJ11igXgETCaA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4850.eurprd08.prod.outlook.com (2603:10a6:20b:d2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.26; Wed, 1 Jul 2020 10:53:39 +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.028; Wed, 1 Jul 2020 10:53:39 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 2/5] iotests.py: QemuIoInteractive: print output on failure Date: Wed, 1 Jul 2020 13:53:28 +0300 Message-Id: <20200701105331.121670-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200701105331.121670-1-vsementsov@virtuozzo.com> References: <20200701105331.121670-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.28) by AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20 via Frontend Transport; Wed, 1 Jul 2020 10:53:39 +0000 X-Mailer: git-send-email 2.18.0 X-Originating-IP: [185.215.60.28] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4be2d367-387c-4877-0dc2-08d81dad0358 X-MS-TrafficTypeDiagnostic: AM6PR08MB4850: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YfzA3gxuqG7NEwtTDCAdU4gS0u0XIRpMp3neaeEsOE+QQXuoiC6j98Yeso+QW1lcJMArpuQ8juppl/3rmOSgo2wJ6rzCn3cVRO7fknNQQ06L1O2mpzjJLpEWgy5dzr/Ii6Exp5y8ip4/V/47JY6WjtVzLMsBvP+o0G9hIF5ITpcJzuqY3HpM+3mkMWWaxk5gY6r2v+bxfGswUTTfwLe6eOD1FepJNHxt2IGk6qTZ4B4WmsvH8X8MDKG5UTZIC1rw1fSf2B7IUzy4hRw+/8ZcyyJ6asRsLc5VETs5yTEokz/jGhStOnM7Q2lJdnwZfzZythrrupHLa2ivPN5C5AGNqQ== 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)(136003)(366004)(39840400004)(376002)(346002)(396003)(2906002)(83380400001)(956004)(316002)(2616005)(6512007)(6916009)(107886003)(6666004)(66946007)(66556008)(4326008)(5660300002)(66476007)(86362001)(4744005)(1076003)(478600001)(186003)(6506007)(36756003)(52116002)(8936002)(26005)(16526019)(6486002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: TCQW1onjwgt9fuLXWm08n9WpFUs+HchjcZ1yiP8VyttGhg6B7v2UXZI0mtvI4gIAQGFBsu8MgNWpvJ8CBsf0nnd0OabYnHKIyIFD/cACo4eKmult4DQ/vGoJ4PJXM8Yymtj6bg3zNwnfOqTI7dQz/r+Gbj3/nAlDKr8ZItk3JxLJB788mwQUZPCbWxBr9gkR7EOdXJR3kIFi8s/adwb+74ALFGzkup/mL6O+oQD19o0XWfmRU3sQDYM55VE2bTuE7AOpy8qaNh7SoZ78jMn/kzPtBG8GjXQ6h5Za9lihvLZ6k73ofjjgjy1FOoKdfPVN10bxLHdGYqLYxJ7iActmgAxkZtumEl48Bztpzc0MLfOtejAyZP4tqrX9j+YKmZHYRv4h1Kz5J730pg/4i/mj5j4RjoNC9xpoWDxM4dqlYyHaJJYOP474RFbmk/XLbE0JtmVUQnBqxQCXVwncMRpADx7jDIFGk3TU2c7qbHTIrnA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4be2d367-387c-4877-0dc2-08d81dad0358 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 10:53:39.7895 (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: N23+KkAoFVxGv+HXbaInK9uxtBXZBNgQoWwE0sMfh5MeT/AOqYSVQJqYyodzQI9fSHVqJG2hTMn3X8W0XNeuweK+NfOPLCMtdf6M+OksgVA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4850 Received-SPF: pass client-ip=40.107.1.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/01 06:53:39 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, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Make it simpler to debug when qemu-io fails 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=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) - assert self._p.stdout.read(9) == 'qemu-io> ' + out = self._p.stdout.read(9) + if out != 'qemu-io> ': + # Most probably qemu-io just failed to start. + # Let's collect the whole output and exit. + out += self._p.stdout.read() + self._p.wait(timeout=1) + raise ValueError(out) def close(self): self._p.communicate('q\n') From patchwork Wed Jul 1 10:53:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1320409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=rHf9Nz/Y; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49xdSc2YDhz9sTT for ; Wed, 1 Jul 2020 20:56:16 +1000 (AEST) Received: from localhost ([::1]:38398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqaPV-0005fI-Us for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2020 06:56:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqaNA-00025i-Sn; Wed, 01 Jul 2020 06:53:48 -0400 Received: from mail-eopbgr10133.outbound.protection.outlook.com ([40.107.1.133]:2638 helo=EUR02-HE1-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 1jqaN9-0002JK-2u; Wed, 01 Jul 2020 06:53:48 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E4eaGCT5DmjN0yezzXruzmFlEr8Hk/H9ojE43T/BQ+jLMJ6STFdtQto6a2gRdzgOygg0WRfFzJS+lbtjFaPDQ63baZ95DGqQXtOY/gpbpvBA3gSu/UCwS1p4d3gC2jeJIheVzlaiVYylNNqr560WJv8eO/AnolgqKE61dBZ8l8zhIJT7WAMMnZtaK4Sadq+qGsf/QJU8+NoQMLv2Dn6cWNplgVEpUufE9Mcjl/wnrS9vH8Z7HU09bvMv0ccZ7ZpvDCJiTAdVC2JinaT3UZD+a9b+OVMXRVvMEez5hXw6SImnyDLlCOZjFg7iWu4KIVfBpkrG1yYjG0Sm+w9Ked7wQg== 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=iTil3AQGxHhzTY22bEOMgdhz3baVKtAIRIum9+ZopiI=; b=EKpOUk3VCSVwz/ywIHSomedtyKn1FVe4qqO6WfRh+PxU7jzg6XlOtkehjKfSyWhARgckwr8BwEx3GUIO0ztUaGuPwh6iWYqzuGXhI8pGwBz+jkiTcogcNy9fXXfmtiSRrxjxSErU625x+Yt4YhwHRyuzQejYAzvlcVk4utgyBgYI1E4PRHicULFWiEkHitUN7TDPaOk22T7Zbw3MNRwh/ncmJSpPcZjpoLabUIn2QlfVpb5sQJ7GoOpRSUg1rtXlcgKH30xu3Ic9wamsVx8cqsfB5ltg+hy1WcjGEKW3GJ12se93N67cJVWz575575tQE6ZuCNn1xmcmwrifsr1B+Q== 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=iTil3AQGxHhzTY22bEOMgdhz3baVKtAIRIum9+ZopiI=; b=rHf9Nz/YyVQDzll3K7iKp4qkmfgR/lwJYX3UX8k89xU0d/ddaM0x0aRDBVFBvrtUlAn8xlaQqLsq3vL9oGd9YkeMndEE5o466eji3kpQBrz7P9HmtlBcD/dfELKMf3D7Phl6jFXF/JYXgIGOGnYGhRnk0IkRJcej+cLaXOGVxdM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4850.eurprd08.prod.outlook.com (2603:10a6:20b:d2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.26; Wed, 1 Jul 2020 10:53:40 +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.028; Wed, 1 Jul 2020 10:53:40 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 3/5] nbd: make nbd_export_close_all() synchronous Date: Wed, 1 Jul 2020 13:53:29 +0300 Message-Id: <20200701105331.121670-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200701105331.121670-1-vsementsov@virtuozzo.com> References: <20200701105331.121670-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.28) by AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20 via Frontend Transport; Wed, 1 Jul 2020 10:53:39 +0000 X-Mailer: git-send-email 2.18.0 X-Originating-IP: [185.215.60.28] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5895c814-13c0-4f8e-ce14-08d81dad03de X-MS-TrafficTypeDiagnostic: AM6PR08MB4850: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eHUY3jhihVBZEK7EFZvL55Lx+7mmzCTiZOXjn2jXoBfj2jL3gy+m08Y/Uu1xSE7SMt5Su4LBio+dxdbseYggDADdALkUoiGJhybqJ13skFfX2SJ9AcS34ayU2J2nmVNpiO5gc7VcnVy1mmQNCf2MEIZEYJ3Hh/YSt8fgLPZr5yQSR0qvH/iA+gyTVd3ytpjOsba9XhK/SxpiVLiPt4wEI7nXf+rKTbX7/AaekF+4iUpCFwM19k9kZRvc9GpzRWq8GcLL3liYsA52wUwmpLS2fMmSBOuBf8gV2ASHR7bL9252q+fypagsvfV4vB1nzhe7d3ljHMa1BBEjXY9Hm/9MOg== 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)(136003)(366004)(39840400004)(376002)(346002)(396003)(2906002)(83380400001)(956004)(316002)(2616005)(6512007)(6916009)(107886003)(6666004)(66946007)(66556008)(4326008)(5660300002)(66476007)(86362001)(1076003)(478600001)(186003)(6506007)(36756003)(52116002)(8936002)(26005)(16526019)(6486002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 1+sCkSpx0DpXWajS685Tx+V5T3jqMimluTH+tOqEYEuG5GUjmifJljl7UMZRSSmZCmLNFAr0VrtIyuByX446KCnkZPQgeJ8KQCrF29znTrkteARHf2WjhVqGAlIhM6MInnUn8Edj44q+oK1rx9Y6t0Pycro3N0VQxaGGQM3OhOvfVo5u2+FEahoKszHI12dST/2QH4ZwmBdqdQtPq0bUey75oh8M+WgddnBKrBrf5CBkixBkRLiFg3YYv4x6YZWw/yBuK6P1n3R0zT52zZYTwJj60Sn1cCkvG3xhrVstSyGOtDcelLgks8thN3zpLSad3OchvSoCXvZR0HPpnL1eeexEVxP7i/1FmnUb8xGTaV6MFBau2BgJyn/lL/V9m1Sw/iutebnduOQl8IUSK3Kt5a5USoryqOmMaZ6cSvXb9bZ4QfRR7OUSRIOvg5vcwUFEDT8UBUaxp2KtB0NA4V5WokBKCzdC9KwHy/514EU1aX8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5895c814-13c0-4f8e-ce14-08d81dad03de X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 10:53:40.6377 (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: JNUhP1KOOpwk/0H0g556y5qyqwmU5UTlBkk22e3N5bFjoJnP5N23fWlffRiounOxk5tI67XgzvEIAeti7HUg4mqLuSOLzF1pdTylntf8TpU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4850 Received-SPF: pass client-ip=40.107.1.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/01 06:53:39 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, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Consider nbd_export_close_all(). The call-stack looks like this: nbd_export_close_all() -> nbd_export_close -> call client_close() for each client. client_close() doesn't guarantee that client is closed: nbd_trip() keeps reference to it. So, nbd_export_close_all() just reduce reference counter on export and removes it from the list, but doesn't guarantee that nbd_trip() finished neither export actually removed. Let's wait for all exports actually removed. Without this fix, the following crash is possible: - export bitmap through internal 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 fails: bdrv_release_dirty_bitmap_locked: Assertion `!bdrv_dirty_bitmap_busy(bitmap)' failed Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- v2: rewritten, try to wait exports directly. Note: I'm not sure in my understanding of AIO_WAIT_WHILE and related things and really hope for review. nbd/server.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nbd/server.c b/nbd/server.c index 20754e9ebc..9d64b00f4b 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -102,6 +102,8 @@ struct NBDExport { }; static QTAILQ_HEAD(, NBDExport) exports = QTAILQ_HEAD_INITIALIZER(exports); +static QTAILQ_HEAD(, NBDExport) closed_exports = + QTAILQ_HEAD_INITIALIZER(closed_exports); /* NBDExportMetaContexts represents a list of contexts to be exported, * as selected by NBD_OPT_SET_META_CONTEXT. Also used for @@ -1655,6 +1657,7 @@ void nbd_export_close(NBDExport *exp) g_free(exp->name); exp->name = NULL; QTAILQ_REMOVE(&exports, exp, next); + QTAILQ_INSERT_TAIL(&closed_exports, exp, next); } g_free(exp->description); exp->description = NULL; @@ -1717,7 +1720,9 @@ void nbd_export_put(NBDExport *exp) g_free(exp->export_bitmap_context); } + QTAILQ_REMOVE(&closed_exports, exp, next); g_free(exp); + aio_wait_kick(); } } @@ -1737,6 +1742,9 @@ void nbd_export_close_all(void) nbd_export_close(exp); aio_context_release(aio_context); } + + AIO_WAIT_WHILE(NULL, !(QTAILQ_EMPTY(&exports) && + QTAILQ_EMPTY(&closed_exports))); } static int coroutine_fn nbd_co_send_iov(NBDClient *client, struct iovec *iov, From patchwork Wed Jul 1 10:53:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1320410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=rnNsYvWr; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49xdSt1FpYz9sTT for ; Wed, 1 Jul 2020 20:56:30 +1000 (AEST) Received: from localhost ([::1]:39410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqaPj-00066i-To for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2020 06:56:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqaNB-000274-Bn; Wed, 01 Jul 2020 06:53:49 -0400 Received: from mail-eopbgr10106.outbound.protection.outlook.com ([40.107.1.106]:9187 helo=EUR02-HE1-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 1jqaN9-0002Jl-Jo; Wed, 01 Jul 2020 06:53:49 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mipsvGHa1yWLC6VMYF3CMlzaof+BS8u39fn0fJsCAL9YjMtjhS2GvD5lHrGPM5991NaBZnfo8Mq+33dDJYdfZbbrfGHkPI82128UaS7HyFve6lKMF3GD7OcUi3a9a81ajnqeCL8iXiJQ0YuJuHftea9o+CJi3S/RqAc3EJbEwMgA9mNnWOD/1KuabNY8ogyBYHC5WS/9JN7bUXckwZliTbNL/rlnhqbaBYcVfy6snGuTchCS55u5r2+1wmKF5xH9/2o4lunaUL5cN8oDBtgpjsH/87NMtgH9y18hiPUKB4N2SD6MUoLRO6Q0xoqIQOZP2wesGOIVvutYOx3ygR1uVQ== 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=aMZayBVdy65Ef8lV9b/bq1XSjq3qIc6iKRIc1Fnp604=; b=AXrIqL6fHMcSOags8NxAaFdHa0qJmN7iknzOzYdHIpPkxumh0h1LCzLPIkaJ/hNAlyL2lXiGo/vGOirqWS3QNgMsAuC2hXV32QKgMx/hZjIiEnO9ta9AaxBqCrZuaAzHE/PdSyJv2ap2IpvmddKoUc6iGK8KW0GZonLBK1f0xYfPYcrRCqnhz/7w5bXXPPzrW/1+BsP3aqkPVY9yhCLKHpn5+iSxQhivB2e1V0chXkpT8ff44/SZkAcx9FHOypwunJhh/XUhpVtxRxgH+mFBfMVUTIs1uGb313HgkPOlX7RSMif6DpJIe0XaLvQjTy53aEE3cazuAl8Znc5QPYMDVw== 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=aMZayBVdy65Ef8lV9b/bq1XSjq3qIc6iKRIc1Fnp604=; b=rnNsYvWriA+BakRJdGOqe5cRAK86fiW1SJqJtFoGYpS5R9bgTTDg9O51cyIxFCadG9CGcoATlrPTfVbV24vSYS/N9PUD47jhPmYD1qeSrUxe/8VAfXamAUMOfRCRpGyxKzTgg406U31k7kcAb81FyA+GEPil1lrKP78GaxXlq+I= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4850.eurprd08.prod.outlook.com (2603:10a6:20b:d2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.26; Wed, 1 Jul 2020 10:53:41 +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.028; Wed, 1 Jul 2020 10:53:41 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 4/5] iotests.py: filter_testfiles(): filter SOCK_DIR too Date: Wed, 1 Jul 2020 13:53:30 +0300 Message-Id: <20200701105331.121670-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200701105331.121670-1-vsementsov@virtuozzo.com> References: <20200701105331.121670-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.28) by AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20 via Frontend Transport; Wed, 1 Jul 2020 10:53:40 +0000 X-Mailer: git-send-email 2.18.0 X-Originating-IP: [185.215.60.28] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33bf41a3-e514-4f35-ab7f-08d81dad0462 X-MS-TrafficTypeDiagnostic: AM6PR08MB4850: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:65; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nv1UgIr1UVa6KRN8x1ULon3JIJH42jC17eMhrG0OI/+S//crFfok4f/q9BdUOA7mzBa2vNqq/YCEA3oez90rrn2wxwYEKbIniVLNQDIbxpHNks0PILHlI6unTjdUcDFxacYNMLWISg/bqzXBn6ovOhrVFuBVf1GK6Kw7wAXsDqqzImV/LjgPRaDqlvgsRsVrgDoCPyTQnO8b8tcZWYK26nCnkNUT4aYiSBfzcNzrLRKF59sOL8SYCE/c8/wbTQszcX3vxPDwiJ5jpxr89zeGSS+9cvm99c3nI5sG14V2makNKstcjAviwrSlVEs9Gn7DwTC1jdIolPCuX+KHgS/nvQ== 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)(136003)(366004)(39840400004)(376002)(346002)(396003)(2906002)(83380400001)(956004)(316002)(2616005)(6512007)(6916009)(107886003)(6666004)(66946007)(66556008)(4326008)(5660300002)(66476007)(86362001)(4744005)(1076003)(478600001)(186003)(6506007)(36756003)(52116002)(8936002)(26005)(16526019)(6486002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: O3GVwxxGCv5NtesyHy+pjl8RPO72n+0REbcCVhnSv4Iyh3OB4VVzzbg0vWF9RcK8iusdPQXvYNfWPmAc07gXrXHHS2nb2hLH9o8fPeUdfb84NpM1qac7kVIB3uhs1fsrmd7+sNq3ki/igK/o7b45Al2wZs4vsVD33Q8XH3aixzZ+arOUNlh2oDujZpVSOwadKj1NvjbOMK1ltTk9m6h2lriOV6HcSHsB9G107Dd52OZoooXuAzmYad+3FLTR+/UZu5zdy4x2f96O6JrZ6cWiJnQQW1VgCwcF2Q5TGV4Sob0oRTLwKkpuVGX01Pl/5dnvcF+2N0bZTA4Wf//oEpoLPrQsVzvpTQLNIzqn5cXHqh3rDRc+Jk58apw4OEJSCxim7qzS3JJJ1Y6zC+OBhnmjJrrGVXAIhPmUQB6bUthlz6vOAkjxE0c5xOqsc517a4JLhvRoEld1zvQYSG/34NdWMm0IpR5olCZVSxXhlGFkLlM= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33bf41a3-e514-4f35-ab7f-08d81dad0462 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 10:53:41.4671 (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: H2o4Uz5ibHDk6A5wr4iv6LgcbUqJyP7mgZjNZeJBXmlpc6J3QvYeoTtL+ujzvS+Lh+1S5mAA8EEBoG4LCg3qtr17sQUzpvd4Ha1jq4vTcJY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4850 Received-SPF: pass client-ip=40.107.1.106; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/01 06:53:43 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, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/iotests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 def filter_testfiles(msg): - prefix = os.path.join(test_dir, "%s-" % (os.getpid())) - return msg.replace(prefix, 'TEST_DIR/PID-') + pref1 = os.path.join(test_dir, "%s-" % (os.getpid())) + pref2 = os.path.join(sock_dir, "%s-" % (os.getpid())) + return msg.replace(pref1, 'TEST_DIR/PID-').replace(pref2, 'SOCK_DIR/PID-') def filter_qmp_testfiles(qmsg): def _filter(_key, value): From patchwork Wed Jul 1 10:53:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1320408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=pLzwI8k8; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49xdS40R6Tz9sTT for ; Wed, 1 Jul 2020 20:55:48 +1000 (AEST) Received: from localhost ([::1]:36832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqaP3-0004vG-Mp for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2020 06:55:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqaND-0002Dl-GA; Wed, 01 Jul 2020 06:53:51 -0400 Received: from mail-eopbgr10133.outbound.protection.outlook.com ([40.107.1.133]:2638 helo=EUR02-HE1-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 1jqaNB-0002JK-Gi; Wed, 01 Jul 2020 06:53:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KA2OcxUNuP75Ph1f8nBss5xTTadNzfiAqk40qEVapYVAQMNYOjMROiPZpepErICMc3YvLe98m/M+0GLL5b+TidpKYyz3wMhdowNUFb0NUUKhsuqVejXsvhMHYY7yehTRUdT3/pwH5S76ttERcTEU3XCBrPyItEz+WVQ2kiyFeijNBmPUdME8aWFrV7jxAI59KbqjU94jhDRMKq3h355b46Zg0ZsFzO/a6CYR/lccvx0pQcVCmYjdHMKSxP66jd7Td1X2tty6RiqYriaSh+1ht5ihFZBiLpt/rltSEtJn2j5OUN9/7IYGvtQRKsub/KPEPiVuG2T3LI/N/Sl49JNLNw== 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=INV8Y637qC2GJVOVxdRU5pSc9L2uP2EMdzF41dyXMa8=; b=STWtP+YxzWEb5c21t2+pGJMirzXyXmOxIw7720zfJ7wF7IXix3lMbXfk4jcq2pzIdLRZaL0inTM6T1D7JWI08QBRHLsRS/iTFGL6acNpBWct74EPwoPJ/lh8xf1ylt6HY1/p9oa2bBVarikp/7zPCQJngJGdmOolHKfKWJ0zVjylJ33F13r7UgEo6KtQkokxnl/h4LDb5IPtiHkBaR4IZIWtk2Sr/x6wcNu7BcB4dGb45ZXR4uhhTMtOM9aQTG4yCQM8f3xp3hqfTWAxp8QmjR1ulieI/Ly7xMIUl+y7BI8rPX8je+TsWjTFGKW3pcVLqSlQrMH0913ZxpnjAqaqug== 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=INV8Y637qC2GJVOVxdRU5pSc9L2uP2EMdzF41dyXMa8=; b=pLzwI8k8v9CYD6Kl9hIXBWEzlhi2QM20BPvuGf9cOHBfIs7A+grk3QhKOFc5c5kpeJNeqdIPk+Nj6DQQMzXwziW0A/1/NQe0OYvVcaA5A5iOo9MJcqVsF4Fig//IBCNKpQj0inD+rfKJwYgLmdGU6M4MlBZWQdUMiXZ6env9Fb0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4850.eurprd08.prod.outlook.com (2603:10a6:20b:d2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.26; Wed, 1 Jul 2020 10:53:42 +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.028; Wed, 1 Jul 2020 10:53:42 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 5/5] iotests: test shutdown when bitmap is exported through NBD Date: Wed, 1 Jul 2020 13:53:31 +0300 Message-Id: <20200701105331.121670-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200701105331.121670-1-vsementsov@virtuozzo.com> References: <20200701105331.121670-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.28) by AM0P190CA0004.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20 via Frontend Transport; Wed, 1 Jul 2020 10:53:41 +0000 X-Mailer: git-send-email 2.18.0 X-Originating-IP: [185.215.60.28] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bcf01570-f800-408f-cc7f-08d81dad04d7 X-MS-TrafficTypeDiagnostic: AM6PR08MB4850: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J71mtDPx81/WNwZjQOqEZrd2xXXKSEa+evYwDLUneIiDUvGhHk3I8xKBAayekDwCztcBh3Y5wZCepWnkoT4SZuFbmDlle7w4k4dC0D4VmsPzWtlIIk3vg0Ju78rE52IaacQiiSbikCFEwBaBb11v1sslD+Odlo75K11OIFbL1+3GeWlcrpYPBy5/GgMw2rdiUUYGMFEPTXvMPnji26XLEvwfeYLV7tWwa3DorAd+1j4ne7oGJEJ2b7FhRZRGrEjZ04UI/PT7B9uoNnWRTTL955M03woL9joXuFxjwLmXoq+bSxRAfMVSslkKnx3cgD+LnzK+ntUGWTGurTsLkKs0sLM8BIVUkyIFs7cE7AGTnqjSyJwfNejm78lkUXhnyeQM+grqt6KyUm6JBY9KerkYUOZ16khjPTAbf1G2i2jSqBKoYMVPCVkNt0aFIun6yfvqW2dXR56gY+7yZUAlCxl4vHBZS5jrRouJqDpyKmJa9V0= 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)(136003)(366004)(39840400004)(376002)(346002)(396003)(2906002)(83380400001)(956004)(316002)(2616005)(6512007)(6916009)(107886003)(6666004)(66946007)(66556008)(4326008)(5660300002)(66476007)(86362001)(1076003)(478600001)(186003)(6506007)(36756003)(52116002)(8936002)(26005)(16526019)(6486002)(8676002)(2004002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: iTaEELjJHYESdJnqjZWjHRCh15pCjy/4s6n4xrc1I51zxX3SnW5fcKDwAr0xNjWDo4iH2CUPF7dxGVDjlxJXHdLpG9FJa8LWFokpPvjxZi2Swg9S3F5m+JZyKTwQ6VixS4I/Xj/ORB/QLCyE7EkB/ALYRIVARpRcthUQOwT395Z9WZX/WXLVMdTwjYMmM53a8B5g/q9yK9fevcFmrVcSfgK+sq17GptqdAr/8YRNnbLpKLBvN4FYtaeXvpscF+aJUrDatCdHSUbeQYaeEJpDG9ElIqnnpGuL/aiWgHV55egf638cEtSb5D4h7shVoWd0hHBdEfAVGN5JPsTWDLXG5wHB28Hu1gTxGK93IbuXjJodIrBiQR+LgkmWPS2UW+IiXmZWuX9Ibtw5RrUlwu9S8T7XHy7jheisN+kg/P38Nv9QE1zGldUr9tlPZOTkkwjT1dBnFqqhHigMmPZSrXqqGAze8hH3fbF+PA3ng/zu0z4= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: bcf01570-f800-408f-cc7f-08d81dad04d7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 10:53:42.2586 (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: Fz/anZ1oi/N9bLVzanavgwF5dlwFEUVpctMonnfTqysRzzl4B42MIMX9NFbagOBVg+yafmFS6t3TSmdhVUWMVgDJqRLRMW48QriwUOYqO4w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4850 Received-SPF: pass client-ip=40.107.1.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/01 06:53:39 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, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Tested-by: Eric Blake Reviewed-by: Eric Blake --- tests/qemu-iotests/299 | 65 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/299.out | 10 ++++++ tests/qemu-iotests/group | 1 + 3 files changed, 76 insertions(+) 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 runs +iotests.script_initialize( + supported_fmts=['qcow2'], +) + +nbd_sock = iotests.file_path('nbd.sock', base_dir=iotests.sock_dir) +nbd_uri = 'nbd+unix:///disk?socket=' + nbd_sock +size = 1024 * 1024 + +vm = 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=[iotests.filter_qmp_testfiles]) + +vm.qmp_log('nbd-server-add', **{ + 'device': 'disk', + 'writable': True, + 'bitmap': 'bitmap0' +}) + +p = iotests.QemuIoInteractive('-f', 'raw', nbd_uri) +# wait for connection and check it: +iotests.log(p.cmd('read 0 512').rstrip(), filters=[iotests.filter_qemu_io]) + +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", "node": "disk"}} +{"return": {}} +{"execute": "nbd-server-start", "arguments": {"addr": {"data": {"path": "SOCK_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