From nobody Thu Apr 25 23:14:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=nutanix.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520950468978282.99723531218547; Tue, 13 Mar 2018 07:14:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0EE185546; Tue, 13 Mar 2018 14:14:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1734518210; Tue, 13 Mar 2018 14:14:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DF1984CA99; Tue, 13 Mar 2018 14:14:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2DE7d3P029462 for ; Tue, 13 Mar 2018 10:07:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id E4BEA18B24; Tue, 13 Mar 2018 14:07:39 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC25E60F84 for ; Tue, 13 Mar 2018 14:07:35 +0000 (UTC) Received: from mx0a-002c1b01.pphosted.com (mx0a-002c1b01.pphosted.com [148.163.151.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA70CC0587CE for ; Tue, 13 Mar 2018 14:07:34 +0000 (UTC) Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2DE4v4v026645 for ; Tue, 13 Mar 2018 07:07:34 -0700 Received: from nam03-by2-obe.outbound.protection.outlook.com (mail-by2nam03lp0052.outbound.protection.outlook.com [216.32.180.52]) by mx0a-002c1b01.pphosted.com with ESMTP id 2gmft1v1dw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Mar 2018 07:07:33 -0700 Received: from nutanix.com (62.254.189.133) by CY4PR0201MB3412.namprd02.prod.outlook.com (2603:10b6:910:8b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Tue, 13 Mar 2018 14:07:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=B+FS41+XSlVjHEXA93KIP3BPk3JGyqXxTS4G3bso4g4=; b=wRkTFm0G6NZCvz8hn8dXgtbTFhaBa5gqZMxugJ+BaG4iy5P6DeY8ZFYI+zyLqjCDBb1QI4Ww42QPfWe5kdmBxo7UdmtfV+oufBwPn/skJmc6xmUwEhlXKa5IEkIKBEz11kl012Mzlm9B/x+I+tO+lT2kYyuJdbcuFJPzmTrBF6o= From: Jonathan Davies To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 14:07:08 +0000 Message-Id: <20180313140708.13855-1-jonathan.davies@nutanix.com> MIME-Version: 1.0 X-Originating-IP: [62.254.189.133] X-ClientProxiedBy: BN6PR11CA0012.namprd11.prod.outlook.com (2603:10b6:405:2::22) To CY4PR0201MB3412.namprd02.prod.outlook.com (2603:10b6:910:8b::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50263fc7-36e4-4ba5-34c1-08d588ebc38e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:CY4PR0201MB3412; X-Microsoft-Exchange-Diagnostics: 1; CY4PR0201MB3412; 3:LXD5cTe+s2oR7O806pIseseLSuA8tzKi1CmV7vyg+sISj6Zy/4sKr7yBAQO3ZbKeb3/hkX5i4uUAgvgQ4YMFuk/NB5zCV1K5yp9BZ37KD2OR+Yn9AgHF25lKKAufFbijERnCCqKoGKC5oVn2w6JD32kPeEGUwtkKcb9Yg2ZbifHnbteKoSSbxgpm6N8yzQAeUmLXJiB5WtVkdFRsCY89IcEkFKVXiG8LwWTmEKXZm+OT/cjTi7A+1jfnzYCqkl7X; 25:0XkIKbKZ9J2SAUcTmXHA0ykycjyz870nhIOYI0gLq8gOIHNO7i9fM4UIIKeduqGc43tssKjcUwYQ3u8JDEEl5Bi1g6lA6xP8cIdbx8Lp6JaywAN6Z9ZSnSeluEf0p5PsVxGyoOCoAPk8ac8re8D5hfYgKigTBAiTFOZK0AdtVpPQIQ09oMSk/eP8y+ql+lhsCdfdMBH6HAb7TXHWB0iMdVZ32VDt21Fzp2P1XIcV9lFVFSD9jkrTv4Nofm4/PQEqnUgVHAKXqe6r3tRHX8yMvs8REyVFZGsxazVJEKFggYbIwBW/Mmg8+0I5AxMkW5P6uEB1cRK2Sdgmn4MMTLN33Q==; 31:xobSrlv9yr2WOF1Hk1HPInuqNoxkfXgt8O5Ez53e+HLxi9xvrP5kRapICEKiHR2DVBbslf86Y8mHQsJ5EvFbzXmvt1jaIOinEz3Y9jGIGTfcNV6u1+BEI1mm+kfFBanJdAO7CrL42SJngW7d7jddA+bpSTVja9GTS8l2oTC5tjxdhCQbIX1CEKmMWXGIXOgpTZFMjiUGswI8Acv56ye8FM9y9/sOYqJqU0CcDMsunlA= X-MS-TrafficTypeDiagnostic: CY4PR0201MB3412: X-Microsoft-Exchange-Diagnostics: 1; CY4PR0201MB3412; 20:vtROe4tGUfP3d9LED+nhWMg9xvvvzskF3Oc7jaPomxX8+2xax5R6iJJKDA1EZwypAt/rynrOTtsvMx+/BCepuBS6mWsHRBoSRp/NzmVuhKAP+25DTyt8Adwz3F0ZvxW8ALD2sMffH8O3hyooOUrwA1mtzh1oqf1xyUnCdvAWTWjv/FCljpwfuGtPdt0Fs0ttJHXp+Ati8eZFK/8qVYx0+Cvalyzj5/10wEEh/uRzj9UJMigQnuDKZVTCFpgTgDzt7bRolklXfrDf0T00q4+B4nS3pkvVAfVDy7e2APMCgLcEgQthJuqdyTAVohXoGyOBErAKlUzzFeUg4uFl+g4uVOQRmO6jhxbx62XweTFVerYrIdBIzOGkuHmpvqmRqG8IYWT71ZWnpbeDTbvcE8xL53hXsbmExQ+wOlCoW6Q3iY4JlRBnNtQJcG9intHwwZ3pXXThKZxn/mcwEenjaAbJ0ZZP5Izcz5herFOSRS7az8WmzCeZqlesfqwIStGRhphf1stf0Aigc5D2AmVTZ1yvkWh2VALvTf9O6JGQLs/2Q0TMjOS5RDRfQ8TffSTr2X83AtJjHEoYryzjJuH2wHGtZWxsZJFhHUqj+dI6M+X/RnE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506)(52384705835673); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231221)(944501244)(52105095)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:CY4PR0201MB3412; BCL:0; PCL:0; RULEID:; SRVR:CY4PR0201MB3412; X-Microsoft-Exchange-Diagnostics: 1; CY4PR0201MB3412; 4:ew8Ez3L+uEG5E/cCHZBCPGvlmVpz+FFMnak6jgpyjNRNykeeouJlcAM7tYnpsSI8N14ZopRWcTwM7vpe4S0BzyRYdOwyxWteu5FdZdUqyURgHx+l+GcpPB3xpPYomLL5wmXYIHQ+U/Hk3/tR2+ECGibuCIFP3Wp2Sg6wFNq1XiY48paiwA2A97DBod06FvwR28x8ZpjFd114N6UzzP64v4aNHgMa5UZHfY9yx7JWy+w3WzjWMeaRRDiH3ujfBtUoaPQLt9+M78ifRqg2rIzlnv2ST464mYZUeFHQKPoExzRbmUvyKyyEHfN2wOd564ozzyWnD6PdOkDMAJNaH8xxiSpBtdNmoegAoKFN1Ryr5iY= X-Forefront-PRVS: 0610D16BBE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(376002)(39860400002)(346002)(366004)(396003)(189003)(199004)(81166006)(47776003)(81156014)(25786009)(107886003)(386003)(68736007)(105586002)(316002)(50226002)(2906002)(4326008)(59450400001)(26005)(97736004)(53936002)(2361001)(16526019)(186003)(106356001)(2351001)(1076002)(8936002)(16586007)(6116002)(21086003)(1857600001)(3846002)(8676002)(55016002)(6916009)(48376002)(7736002)(33026002)(6666003)(5660300001)(69596002)(86362001)(52116002)(575784001)(478600001)(7696005)(51416003)(36756003)(50466002)(305945005)(66066001)(64030200001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR0201MB3412; H:nutanix.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Received-SPF: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR0201MB3412; 23:+pw8rrRFjZB4Y2ghXgqn/eVTa7agGM0HqTweyf4?= =?us-ascii?Q?wCN29msXJY/JrraqOU6QEdMJZ3/H69rb+cZu2gQIKCd9951soCarlN1A6iXZ?= =?us-ascii?Q?TxI3+lGZ2p0QrrVP6cpy6cCHsyHl8R2/HrbE/RvZPrGBLh1935tSTZjclJ7c?= =?us-ascii?Q?tSH1Aagam++TKoqebGSnZjY/UDT/cNAmzysd+37n0rBbDTM9td8JWtpUgZbt?= =?us-ascii?Q?YYa5xHj1UT2oiT7na1xShxzkOPqV4S3lp8UHyOX254feJKwsnTckzZLNfOKP?= =?us-ascii?Q?ysJhNJwMmYW8WksEgxSTFzLZEjCRoovNso0bA/U400dIZgieTgo9QvZb2F9f?= =?us-ascii?Q?//IFDdMyMCzp4vlhGNptmxO4eu+nwpON7g+so/ZRruiPaRXsGKPHXhewTwmH?= =?us-ascii?Q?wlbqcrr5SdckY/gGcGvMqbQIE8DI5cV3RCYF6Y3HgmWXr0d81Ll3mv6QpnoX?= =?us-ascii?Q?GbK0WQuLtVnc5fitn+rIfnBhHMAHGiMPAlQ99mt6Ycxybg6Ne6XCoGbR5YKX?= =?us-ascii?Q?Dk4s48gtBkliRZi3cujZIsldqz6cDw2nOZLbgtBvx7H4SwtzieWDy+URZpn5?= =?us-ascii?Q?OXR7jYCXWqj93xz0EhsZMWaCdb0CJ3sMpztCQ4zYXv+hIN2UHpaWO7j2FNXo?= =?us-ascii?Q?5l8iHWu/fOUvZgpKOicZrZaOc0WDnfxgZ7fMsb3TeuHRMjl5k5+ikKDwRO5f?= =?us-ascii?Q?CBCTQ+peubn7PbVDRfEI8xqYOAbUQf9J208kFk9iGOO86HTYSslaqYHAnDGD?= =?us-ascii?Q?2NlUrIA+l83QTs90QHKUBVCnOihs/iPhQxjzsSYy7B8DWnsoEFloq8bzT6cl?= =?us-ascii?Q?CB6H2JVAaiuacD9pZMAS3yXkrbYQibvBpExxXxl7iQ+LvX4OrJyZON16950d?= =?us-ascii?Q?SRA7y6Jot0ugNctuw/rV0hynhTXktS+/AXE01jVBumL/vFHrR/nDKPJu8Rsu?= =?us-ascii?Q?XGB2Oli1QvS9M2OFBDe7YfAHnh/akA1SMwXPNydQnwNsX9YVPKLMz+pnB4NZ?= =?us-ascii?Q?Zz/8OAHyCOtb3cWE2inZ9N4QOO4pAvtj0Zn4Opxe38WamKCGTcLnJ0Hb8g0U?= =?us-ascii?Q?tFMSr5wA9EmEuWzsufDmMibyK5jpSKR1xUZTQRJeLWu+7ZavHmulnH8g/+pN?= =?us-ascii?Q?6lXkQyalBx0JWRQqrywLRD+xVbp8YdezFiJ7ckGz9i0GNbRzIMB2amSAxQsY?= =?us-ascii?Q?8UUzuqJv3dhzCMyiLaC1URdq26TezQx8Mwww7ADUgYPbm95b/jyUwYIIbUvv?= =?us-ascii?Q?zHS3NUfNFh+f6NEwZWugb7xIOPbhwjdhvLVJb6pA9sm5H0geCWgB2u3cAvwd?= =?us-ascii?Q?eDQ=3D=3D?= X-Microsoft-Antispam-Message-Info: etrZ7yeGVYnkiQGnpaY1/yc3+uPQA/vITlh+NmsQtMH4bN3pACVslgJswPIyUnHJQ9r0DTreGhPX080aDiri1bXBD4ap6V303bGuMdsDMIC2CXYz8qvJGrTQg2GbUxlJLP1L4oPlc7obP3PRds6kazI0qWdUzcP20CN0XpFtSAJlALdwSLurssrOMSq2XSfk X-Microsoft-Exchange-Diagnostics: 1; CY4PR0201MB3412; 6:atL6YAjwcFKDKzPfD6CjaJAQnkEPwBNj3lfl/2dxJoU8Lm5K2mj6yYIpH+muuiNbMR+aFLnqesMmBmNsoCvjhbje2SotOFdZhV/Yo5Tke63yjKNSbs6eMR/UHWJNofeowrSlMG+6uSzNf+E2gf1XGZfadIfOjAai30fN/C0upe3co20ccsqYZwED9q9wcSI9HbCvffUc5WAVRTOyw0EWUvYJlt/q0Qj3vdXpXqlwbVg9NEXMnckw4pXHQugTWxc0LEE5G8K/6ZHDoflQXCedD/Wdqo7nknIqAeW0Nc1FGduqE/f/sMCNIx4BadJDdOzQui7X1K4HzJnn5KtF5FMOUtcsVeyWjEIT00FQDTbV2ak=; 5:JtuVEZxBwgi1lMAahKCGOeI+5NRctnjnLUoeGaliLJxGbV0yO4oRBgoj3Hnl1TK9knNVJ9806XAwL/6UjV8ZzRh3kji98oP3Zfla9HjhoG1mi6j/Zq5FBiIOoaQLO0eAAXOG+0YjkoanFxL0vDKPAG6pvZ1YmCGWhg52KOz85FE=; 24:quXEn3s9jG7fKDK8IA7QfRpz0QyDBHvVHpjomq0e7UBPtp7PGWuztWnEomWD3QZbyqNBs8+/c+Q1TPlXhTlj5grURBxp1jSnhY3F/mQO+go=; 7:RIg7julDuJ+2TThUjN/V1dTmsb8EYVZCLkya6pTfMrlEH0V2Bb3Cv5zXPbkepBgYuvSvUVf7qeKSQkJ5o2qCZDBX+H0vT9Y55vr2r03ngQLeGWVBOjOpQUdNbOnYDKRSiUQ8H97ktVgKMBKxqhCQ8EP+VM+MrPxf1mDzoqvxA66rTSWbv35UtorNuw5i/5nBMmg50ErxKyoHXPMM6cu+xtlVPJVns4/q/hm1d0fxy/FoS12UDOEyn6X2rEw2j+di SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2018 14:07:31.6736 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50263fc7-36e4-4ba5-34c1-08d588ebc38e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR0201MB3412 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-13_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=722 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803130168 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 13 Mar 2018 14:07:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 13 Mar 2018 14:07:34 +0000 (UTC) for IP:'148.163.151.68' DOMAIN:'mx0a-002c1b01.pphosted.com' HELO:'mx0a-002c1b01.pphosted.com' FROM:'jonathan.davies@nutanix.com' RCPT:'' X-RedHat-Spam-Score: -0.8 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW) 148.163.151.68 mx0a-002c1b01.pphosted.com 148.163.151.68 mx0a-002c1b01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Tue, 13 Mar 2018 10:14:23 -0400 Cc: Jonathan Davies Subject: [libvirt] [PATCH] qemu: hotplug: fail when net device detach times out X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 13 Mar 2018 14:14:27 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" qemuDomainDetachNetDevice should not treat a timeout in a call to qemuDomainWaitForDeviceRemoval as success. Instead, it should treat it as failure -- this is the intention behind having a timeout. If qemuDomainWaitForDeviceRemoval times out, it returns 0. In this instance, if qemuDomainDetachNetDevice returns 0, virsh detach-interface reports: Interface detached successfully with a zero exit status. But with a negative return value from qemuDomainDetachNetDevice, virsh detach-interface reports: error: Failed to detach interface error: An error occurred, but the cause is unknown with a non-zero exit status, which is more appropriate. Signed-off-by: Jonathan Davies --- src/qemu/qemu_hotplug.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4be0f546c..d9a2f2d4d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5082,8 +5082,13 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; =20 - if ((ret =3D qemuDomainWaitForDeviceRemoval(vm)) =3D=3D 1) + ret =3D qemuDomainWaitForDeviceRemoval(vm); + if (ret =3D=3D 1) { ret =3D qemuDomainRemoveNetDevice(driver, vm, detach); + } else if (ret =3D=3D 0) { + VIR_WARN("Detach of device %s timed out; treating as a failure", d= etach->ifname); + ret =3D -1; + } =20 cleanup: qemuDomainResetDeviceRemoval(vm); --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list