From patchwork Mon Jan 9 15:57:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 9505613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7A60F60710 for ; Mon, 9 Jan 2017 17:30:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49C90284B9 for ; Mon, 9 Jan 2017 17:30:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BB1D284C0; Mon, 9 Jan 2017 17:30:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 10969284B9 for ; Mon, 9 Jan 2017 17:30:36 +0000 (UTC) Received: from localhost ([::1]:41579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQdmF-0004Su-95 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Jan 2017 12:30:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQdlm-0004QG-7d for qemu-devel@nongnu.org; Mon, 09 Jan 2017 12:30:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cQdlj-00081T-2u for qemu-devel@nongnu.org; Mon, 09 Jan 2017 12:30:06 -0500 Received: from mail-db5eur01on0110.outbound.protection.outlook.com ([104.47.2.110]:34784 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cQdli-0007zz-FT; Mon, 09 Jan 2017 12:30:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=oBFWXBi735Pr0WNKhYTDz9Z5u9Oq5E4YXxWe0TVpPZU=; b=f0qAy36YkQTPNMDlF7R5oCfJZy23fMTa+27lsss0zpkIuwFvsv2qGHOPkFLSPkgBqH15yYhhECweN/i1E7HjHUiItSCtNw4lCVC2aA1t5TkdwlGeXSaA9nklkcNPfhJvZTdS/OsS1W66ihTf2Mu4NLuWeKIdmSUYbZMSjXQADSE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=den@virtuozzo.com; Received: from [172.16.24.6] (195.214.232.6) by DB6PR0801MB1797.eurprd08.prod.outlook.com (10.169.227.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7; Mon, 9 Jan 2017 15:57:45 +0000 To: Vladimir Sementsov-Ogievskiy , , References: <1479837270-79005-1-git-send-email-vsementsov@virtuozzo.com> <1479837270-79005-16-git-send-email-vsementsov@virtuozzo.com> From: "Denis V. Lunev" Message-ID: <17f2544f-b91f-34a8-8c48-8992d0af105f@openvz.org> Date: Mon, 9 Jan 2017 18:57:41 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <1479837270-79005-16-git-send-email-vsementsov@virtuozzo.com> X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0101CA0012.eurprd01.prod.exchangelabs.com (10.168.141.150) To DB6PR0801MB1797.eurprd08.prod.outlook.com (10.169.227.20) X-MS-Office365-Filtering-Correlation-Id: a8ee3d4d-2593-4507-b632-08d438a84145 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DB6PR0801MB1797; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1797; 3:JVaU8U+DjhrutjrExJKQ/hdzcFtA3SoMyhqgORIEtGC7I7lzJjfGyGV8YgZfvG47HqUvIhCOL3oTVVeUT6kFtvY5QbmALqCoWm8mAprdKvlhsmZVxzsUsI4o6tIHfJ73xUMrd4rgrfHJLLfljmm023A16BXugV2G1/+5jO/RstgCYCAR+M38IQ4zI78YF7LJF8hCru+2Vu+doVyCDyN7iIFilyRp/2K7/Ge9vgqpbYPqG+8VTJz46UZtGHYqY3tMTg42ejGEPgAIK2bXAlt0RA== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1797; 25:FCqidL0EOsGmNQTVWBpQ86xCzmgFzg4t8rLTgXiuXOkkjUQ+hqZOr/tifSZzky4gBr6u+LJwF52kZdainrz0qruTNjgRc9A67RNL3mLV1sFbnvuCC6QD/I1RrastoKgNL/P8JoBwBDfRqMpWXjilOoQf+JcWpn5BZBkaOI7Xkl1gk38DyFOA40Wmakc/RfzJuJUvu+IVtKwUm4lFwOse0NwFCZAqIK1DRfZpJrxjtjC8vRncOgC8nbNTonl38OzRfo370GWgch9j00lZRf1PBUG0hnlL5/xuinUBmd9dNgqHOIbmvVc0ogUVVjO2qAJ+uJ0nwAtR9I6sQ/zdTcyn+Gs0dC4kkc1+26z2l+yNm2VsJBynnx+SGA2+KdyaX5M/4WMCpY9hwwbxYu+XG0lwp81R4MK2yi8Pq8V8aoDT3hYrSo2w6Av9bWMzG95eAtp4ikz8kc/wh7tjSxfOTJeOsXQU26xIGrxV1+vAz6G7tvEqV75cc4ToyMER5d/69Imn1/st5Ny0mmsrMBBNhOyG0bctu5NgFU70bejXTPqy+3k/3XQ9R3j1zFGaB2+T/wMW7U3syupIQ6KAuaYZqOyFtACW/b5nW7TqHM9kF+7cUn9sqEoG6QXbcldHnwb0VfxB+B274ccHEzB5ouEXvAGLSLBpzeqc/TpMmtvAZ0H0/MuLGt2+e5ljt7OYC5InpTTScgtamFzIZBnPUqevgeAT/1xtTM+45R7tlrDYHdzCnDg= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1797; 31:dhq3/bILZtcK4z96ACOZbg8cG+xr7xKiEOz4s/uBt6pgVuv8l5vNxvH8CeQngIoHoGbbZ1OhIHWa8g+DPZwHoocrKl9mh7iFOdouawjF9L5zfdTUl38xOgbW16nTQ/zGhcHnlCnImpljY8xOBl8e8wt7MiUrqjyX+wE/Io34VFTqxoIHHxA1J2IgtI8p737Ho9RVcUfMqeSs2mcwj+4Bo2CirZKBJhoRI4YKwRkDFGCm9qeK5JxmxCXJKwpYLRrY; 20:V/+zvwdXZeqq4M/pyNbpifFTFsQMg5S+xb9TnshkV7lRcyIAyyBVOn4PwuOYWUs2L/xVX7mStVwqnOJ/sVb/e3edjTLoH0P5wd9pExHkIrTb7/Dw0gu864tKARYsNR7pJ7PKw6uvFchnuwvxgpuiu0dhwTrGCfucHrX+Ss4LtWv83WE9bDX/LiQcwhfS229+ohH8xLtkm12iIFg7h7000iOEbG1cOGh6tYKyeSPszXIj+F6taBno1KxsaomZKnTt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148); SRVR:DB6PR0801MB1797; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1797; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1797; 4:UoW3mq+sxXM6fqRmWgo2esJoixJCPx4OvLWJaS+sAmDR+Qz9zTfkju87Z1VhkN1kxATmmdqQLLjX1iS7+wYop6RbmBoykyn3bAUayLaNVAjKhYu5r4yhqVkDkCfiqUYV6SXEUlGrKH7+fZpkVXZKHvK+a6ZfXDp3oTZYURmkBUXW/7ThZWqOS/xXt7TWRyy6l+AcSWEXZSlQi+iRk3mFHmhCbpfNUP+7ax+bbpRAXGAjG3Z+dppVKgXJoh1LS51egIKvvQWzd84R3Uy5YqcPWVPlAynOB80pTSaXtSIkxNrTl4QEFClZrJPmesHq/5B0yMxIneQ8E0B6NBBQuCs057MAZ8bFz4T8luKQGWiYbIo6dl7Jgm7x+rIFb43wl54jzA3Q9/RHmf4E2KLE1dyIvWpTPNIpqqZ4m4kfmX7ADwxk8g8TmHw1/vvQSOyjOuH85iaa+n+Yxaa8+tINwgzKSX48+6u/aVEGwLPjvTjvO6yO+KWEKcYfJs6LWoW5EIs3BZkXa20pIF4D+8nN1vXWykwNOX/2JF14axGCRBzU9A4hDcDuv92bUFIkwgCRSC4lb06LwHnhkQZyCSz6Gi3ntA== X-Forefront-PRVS: 0182DBBB05 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(7916002)(39450400003)(377454003)(189002)(24454002)(199003)(4001350100001)(5660300001)(42186005)(31696002)(65826007)(2201001)(33646002)(54906002)(31686004)(230700001)(36756003)(92566002)(7416002)(77096006)(305945005)(6666003)(106356001)(105586002)(90366009)(7736002)(2950100002)(42882006)(66066001)(65806001)(64126003)(65956001)(68736007)(47776003)(25786008)(50466002)(23676002)(229853002)(6486002)(38730400001)(189998001)(8676002)(81166006)(81156014)(101416001)(97736004)(54356999)(76176999)(6116002)(50986999)(3846002)(2906002)(5001770100001)(83506001)(4326007)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB1797; H:[172.16.24.6]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjZQUjA4MDFNQjE3OTc7MjM6WVpPR3lpSlRnRlVDVWFYQzVpOU5CU2t5?= =?utf-8?B?dnFxQ2JuU2h4Um9TQVBBR2E2V0FLTlNDOTYzTU9FYm84TE1CKzR6RkhVbXhq?= =?utf-8?B?aWNRcTRvMXJVWVkzWG9LMEk3WktrVVBTMVZGSFpabzRablRCYlNzdGtIMjZK?= =?utf-8?B?aHFZTFlEQURNd3ZKajAwQmFYUVFmeXRPTG5wWnBrSGJZb2lPOGRDTkUxY3U5?= =?utf-8?B?RnFBdEdrVHo0S0UrYnA4VnFENG1rWkxhMVBGUzRGTlpycVBtSkgvRHhKeElq?= =?utf-8?B?eEtBb1JPalR5cytMMjBOYXR6TGFISlRhVnUvTXZ6VUtvVDNsanhIS0piWmV0?= =?utf-8?B?RVFTYVpSL0FSbW1XbmV0UGU4UHdyL2NLbVA4TEVHd0NkbGc4ajFPUDFsb3dm?= =?utf-8?B?eWUzR2doODlodVZ2eGhlaGg5RVpBcWtRR21sMDlseTRYNTVPU01oTWE3WkxP?= =?utf-8?B?Z2FLV2FtdWJBWFFnKzJIY2JmMS9TcXZGcFBDL0tFS2diNkpRM3grTVdLSjRN?= =?utf-8?B?UjNnSU4xUHNoWExwdVNjb2VTd2lkenI1RU0xUlBqZTUxMmNoMXo4anRqR3Ja?= =?utf-8?B?enR2d05jTmtadHY4MWxiTjM4ekJYRjBLYzdodktqMTlEV094bDlkc092NUpH?= =?utf-8?B?TEVZc1FpNEZZcjdvQzF4bEhmZERTZWpVWnA0RnRIOWJMd2JvUFZCODVDQmEr?= =?utf-8?B?ZjkyeVVSQXVwYjNpSFE5NWdHckRYQTdYV2tXZkZOYW5PR3N3Q2VRY04wMzlB?= =?utf-8?B?QzF1Y3A2dExRSE9rOGhGbTFBTjhGWGJXOTREM1l5WkxiN3U5cytvNk1ZeFht?= =?utf-8?B?L3lRNXo2aVVUTXExa25MQnJ6WlBCK3FmNnIvOGNaNzJaWUh1OFl3WFNGY3FF?= =?utf-8?B?dkg0WUFPN3loUCtoR1UrSmpoUjkzcFlGRnNNRkRpcC9iNGcyOWY1WDdBdEFk?= =?utf-8?B?TC9ndGs1U3J3VUZqTVNOR0lDL0dGODB0YXViN2xpenRuMnAwdHJab1FtSlhO?= =?utf-8?B?Yk1zRWhhMFJ3QUZPenVXU2pDRHIweFBBTWxhemdoZ1JTNFZGTnZQUml1eDR4?= =?utf-8?B?eGpXbU8yRmJtbnZaNm5rNDdPMkdDWWF0b0ZDem9uWko0ZzBtdzVhRXFrSVJ1?= =?utf-8?B?bGExRm9lTWZIenpjcXk1SnEyeXU0MnJReEhjTkRzRlMwUHBQckI3Q2dBSkp3?= =?utf-8?B?cEZ6UnhZc0VqaFBvLy9xQklIMGdOdk0zcFlsSW96ZGVaTUczakt6cDVkZzFV?= =?utf-8?B?VlJwVFdDSnROWUZoejNpbk53K2k0Ky90S0liQkRNc2JYQ3FRbU12WE9seVBu?= =?utf-8?B?YmMrZytybDBVRWUycjN3OGZNZk1jNWd1enJUcGQrVG5PWGd3amU4M1d4M043?= =?utf-8?B?UFE3dWNBb1FCNFRrR3pza25MaHhJeS9aNUVtRVBmTHRvdkkzZ1dodThjT3Qx?= =?utf-8?B?a3dxdllkODY2TU02T01vc1picmhJOW4rdUh3WnUydzRBUGoyV2pzV1lWUFVF?= =?utf-8?B?ZndaamxJdmZOVnVMczRDa1RXekJ3R0hNTGVBME51NnZlNHBBL1F6UVUwQkdv?= =?utf-8?B?ak40U2FCT29DeTJQaUw2OEdnYWgwVVBjVUdLTnlXci9wY3pqb2tZWE94WVR3?= =?utf-8?B?QnFxLzU1eERzd0daWjhJMzBxNVNOV1pyUWc2Q044MUZJRG1qZ1BoK2wxZzFJ?= =?utf-8?B?MXpIRG5KMG41SFlZeEp2djgwSXg3cDB5dFh6eDRObjVEZms1K0lucHhPYWpy?= =?utf-8?B?Ymd3a3lWM0llazRDcUlJNHpVaXhpdzVSRjNNQkZUcmpNck1jYzZ0RlYrWE8x?= =?utf-8?B?SW5Sc2Y0VEdLazZZcUtwREd4YlVEcDBzNVhPVFZQV3h6SDk1Ulc5T21rVVds?= =?utf-8?B?TnFWMU9KVVlEWVFpQ1BqelNEYis0WldOWVpEbUUvWDQxVnBzL0toYjNHd3pr?= =?utf-8?B?UW1zWVNQbzh2SUE9PQ==?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1797; 6:MtvKsj2WgRj9xon7bZfQFyTTee5hih5TvnOg35l581zTABIzE/ahGIA02zVWbqHmWgr+x0ugRxZIMziPYDriDaHXxXLxa7rKIEh6k2jOM9xMBrUelMUq3xL8X2a3YZeuR53OxXlUUcAXswxlMDBNbf35cimi62kZQh3qEAC4GvFi7BEX+UwkH6NoGK8hPdlwBcWsK/FHExwLjjOT4Wx9h42qqz0FLj3k6XsitRF+6sLTHHgaMw/J1jk/W/uwC00cSqOmsoGZE3Zxvu2M6NRMOeNvRO6y4eyPziYMD+2iYlj9xsxo23ZUEK+471cj55kUAh0m/UyZTg7XCC3hkafDrasrdjbiB9YZnaW2Zn5pIVKlveM5zm75CRd2Dy2RmiaFDxf6hy0Xj2qA2AQl8626JQVqqHEMW24V4joiyzknvyo=; 5:VBQ/rS7K7yUXAJJuAyzBxJDiasjbqTkZ4JZSUBrvovnJ6fOWAISQ0BVAPe/x2tQnIAzj/wzZiANi+RuI428dzTbZ3Tj5OF6zcTTSuoCeXriYTNOv+IgS1dfWE9AQ1CL0G9xxSzlcSHEz1rPsrO66DEgQqXY46qp558VuTPHIKbI=; 24:MmEDSsnddRVVwrsihSI9jBD2/1H8XmE6mwLIrWPGpd+if05dznbxAsH424QcrfgdDiHtBZ3a0/zDAKApP7REduYUQWwD8LenCT+CE0ufIWo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1797; 7:BJK2mCFaLaPq2fnDPfqBgh7PwL8L6pWd0wcGoYhAcv1OZwVurdBBX2A05qMkhUZQt9gXKPwY5QrqhODU4o2+iwTuF/xlrZT5m6TzypomVSG4bVn8+7c0+jwqXDk6z6jGnIMTJuLloxKJJ0kXC3EgZZ4GKVFAFqCokf+eqRiwQkBn1pjoqvpdey99ZMyWXPXnYK8SIum4wB6TU0ndTDow6QSrajuwNpBFDdrUj7wfNJ3nWcE7zbgO4ypFGI/qpcTKZjaEIaljLGjP1Lx9YVvcWiL7YVUNigd+XoduiFmaWweg/NHsZRJqPYPM72V4JxKqysF+at0owpdHrMn0pR0PmA0itWeb0sixmVBKSiDSe9TUfO0btqoR3NZ70QwXb6JIyEkpYPmTyZkPIEtH8DDPFg3koB1hQa/RhGUkvjor6edR7S0J9F42mD926l1NFWwhdoUFHm0Lhv8Few7YEMJFOg==; 20:FpPp0JwQoq5fLupGWibgVDwuNL74FPaWCUlykM4rQAf8KvQIBwAXcQj4mH1SVX9O9YrMe9Y9KUM3DplQYHr6f6VBKWdJLQhFpAZzZLpKwCEFfWN5rrN7qjvnHYj3c6DTt0nvToib2gkXFEEosmC1a82jYNPySS4R92I632PR+zM= X-OriginatorOrg: openvz.org X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2017 15:57:45.2809 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1797 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.110 Subject: Re: [Qemu-devel] [PATCH 15/17] iotests: add default node-name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, famz@redhat.com, lirans@il.ibm.com, quintela@redhat.com, jsnow@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 11/22/2016 08:54 PM, Vladimir Sementsov-Ogievskiy wrote: > When testing migration, auto-generated by qemu node-names differs in > source and destination qemu and migration fails. After this patch, > auto-generated by iotest nodenames will be the same. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > tests/qemu-iotests/iotests.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index f5ca4b8..264ee20 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -162,7 +162,8 @@ class VM(qtest.QEMUQtestMachine): > def add_drive(self, path, opts='', interface='virtio', format=imgfmt): > '''Add a virtio-blk drive to the VM''' > options = ['if=%s' % interface, > - 'id=drive%d' % self._num_drives] > + 'id=drive%d' % self._num_drives, > + 'node-name=drivenode%d' % self._num_drives] > > if path is not None: > options.append('file=%s' % path) this patch is rotten, it breaks 041 test Correct code should be like this as was implemented originally. Den diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 28295a2..9272dce 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -199,6 +199,7 @@ class VM(object): options.append('file=%s' % path) options.append('format=%s' % imgfmt) options.append('cache=%s' % cachemode) + options.append('node-name=drivenode%d' % self._num_drives) if opts: options.append(opts)