From nobody Fri Oct 24 22:14:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15187032566461013.8988795367294; Thu, 15 Feb 2018 06:00:56 -0800 (PST) Received: from localhost ([::1]:51306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emK5D-00022A-PZ for importer@patchew.org; Thu, 15 Feb 2018 09:00:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emJxU-0001q7-KQ for qemu-devel@nongnu.org; Thu, 15 Feb 2018 08:52:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emJxQ-0000z6-Dg for qemu-devel@nongnu.org; Thu, 15 Feb 2018 08:52:20 -0500 Received: from mail-db5eur01on0107.outbound.protection.outlook.com ([104.47.2.107]:9504 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 1emJxQ-0000xE-6w; Thu, 15 Feb 2018 08:52:16 -0500 Received: from vova-pc.sw.ru (195.214.232.6) by AM5PR0801MB2052.eurprd08.prod.outlook.com (2603:10a6:203:4c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.506.18; Thu, 15 Feb 2018 13:52:14 +0000 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=o9cOsy/DQJASWxnG1fINGqQeNBAPAShRQxuh+1WXmQM=; b=QCEAhztaVsxnhd2ktq8eKc3zdX+dlW13B4Z60YUNvOtDtynQ4ZAIdUPbn9sIvkMco7Qvx7UyyydPg/fgvoISweyKgIrXCPz3tofsF/EGCaXudVJqMlBKuN2ankqwA45OwSjIXOCsX5xIgHtmtj05YeBrLFZnnKf20PYJO8sqbEs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 15 Feb 2018 16:51:43 +0300 Message-Id: <1518702707-7077-6-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518702707-7077-1-git-send-email-vsementsov@virtuozzo.com> References: <1518702707-7077-1-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR07CA0005.eurprd07.prod.outlook.com (2603:10a6:7:67::15) To AM5PR0801MB2052.eurprd08.prod.outlook.com (2603:10a6:203:4c::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 585d02ff-b929-47d7-8994-08d5747b51f5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM5PR0801MB2052; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 3:T0pRlAkkXw012/O76mKdXD6SjcWWkbvTAHHE90jVUMIQ1T9LIJxY8jcf7N8HxMgf6kYG/d51C3nlWHapHPvVqm8hSnqK1lDwdOlhUDKxu8FMvMcRXUtnHsRvXjCW8SP+MRv55A3Xw6yI3KvfMkoecHU07UeIffKpCZpym0yV7LvXyH8TirxRBOF/jqSQckeRAYP7Lt2yOtaZ6aDAErJPqqDTlEc+N2uCUIZ0ZpIvRThpFTwD5PsSjJzTF/Ljmd4M; 25:Do6XkC06yJKRcEKu+iBuHUd2gVpoRRZlFdQQakF/pVznimDAufTb7QkduCSrKW4Xln854LLnwhCsDmP4x4gpiMW6tLMZUNThyFx54vsBCtjDrhJWwSfdDuSr9acyVCwDhblBIE61bji2aeBnaWIoySUiaQCn532kxPYcc1qtQiSxgbJljEwBLYaSpn3qfIyi6EzN0gzFPCVVnOW47O8LoGxZOsMXmo690vmefpzj2KyhLmhmL83ERd8rvKiaBY8RQ8G+351XQ0hk/FO3fuMXQB0d6aH86EtCj0nDt/PTHOaRNEJGOKRSXs9ZmpsF6Qs/zac5gzbIurbulRXmi1P7TQ==; 31:h+wFlMoGW69MmLUliKW2J05v+UL51RMYYdHrF8qRm5wdSZJV/So704qbmA+ZYb9jPxpXafxLVbwSdHb/vXxr18KQ3qFCXFF0s8c32CsxbYPQW4GptVSuj2fl1KCi+okpr1EUjj/nO2QP4y0g9WUVFTAljUqcDdwViqEM0ouM0E3vQQAwbKIKPQzgLCEiP5Yj4JkHQeVIRVkbOB1zjF5j6JslELQn26xkiD4KSGWYmWQ= X-MS-TrafficTypeDiagnostic: AM5PR0801MB2052: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 20:IA8XDH8eBMoW6huZ/fP83a/YQTWITC+uVuVsdfHmr7qKvbfIG1KEhDORiDItELqoxHA79n3eDVB/lyyNWVwoAJhKd+EnkEE/esWuQd4P5jKkkGOLXP7944D/NB6ba73y8mmt/Nx00mrIx8EZN8ztpwjuDNPuYQw5Nl/ziyrMQCjucdXS1mAIB/uOt3dw0Gnw2b1T5a7Dp0O8SA9L5W9jcRqtS5wU/y9DXQZqkl98YgDPiSvgayVMoKShXbmpfW5WJhK4FnP7oRcABchotdNjWYznKpqAAtp7wnUeLgo3y6/ruGgnMopGpcfFacQVbf7k/6jIDtfLBdy58SPjPCBHUmRCUVUqKfDwKvQc8z3z9VE1PbzCOmxV4DBuOTeGEfZXKE81sNocZBcjDUNFYI19TNMmn2K/Neoc4R0LGAKG8BXeZVGSt1KVpXEjJNziVjeK8s9jvYyz4uub12amC+zD1b5v2QFJMNFLhJuiUtrkQQ29PP9c2VYKG/7s3rUbSo5m; 4:S7sqz/+XnhtzvgkNsfFgH25nH33rIYiU4ZIx6wk5GBrv3GWPTBgkTrYWdizJs9mTWq5Wfc8VvKBdSYOiDF1L1YSlbGhfH3BPrGxxSHPg/OP8+3jkyXdL7y6fVUvYleRURvAZgHtf02R7Vm78clLKyrVjPbQKYiCfYcl9b3H1U1ZKdxW/xbf/5JiSmQdAZUVScxfd2lnkhQdN5k4uN99mq73QKwMRlYP3ECddUovFQ7zDnGO6jN7XmhhqxxQMDqR2eAXyZmWAEAQc8tkgUZ61QIk5vwBEVeluBrx66VEIeyeE7RRtzBtdUJwMnoeTiZxi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231101)(944501161)(93006095)(93001095)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:AM5PR0801MB2052; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB2052; X-Forefront-PRVS: 058441C12A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(39380400002)(376002)(346002)(39840400004)(366004)(189003)(199004)(105586002)(52116002)(305945005)(8676002)(81166006)(26005)(6512007)(51416003)(76176011)(5660300001)(81156014)(53936002)(25786009)(7736002)(97736004)(55236004)(16586007)(69596002)(6506007)(36756003)(47776003)(86362001)(15650500001)(66066001)(316002)(386003)(6486002)(106356001)(68736007)(50226002)(4326008)(53416004)(3846002)(2906002)(8936002)(478600001)(6116002)(16526019)(186003)(107886003)(48376002)(2950100002)(6666003)(50466002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB2052; H:vova-pc.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB2052; 23:F6wMb5d/EW6RCegzsRPiTZ8QmB+6p2eprveQzJU?= =?us-ascii?Q?rg8dO07tt85NU2cvcE8na4N2AT9TQQHaMF6PiYoiOiNRtHR57XBRvP8uYDXH?= =?us-ascii?Q?a5SItHsGCO+DnPPLsgCGSsyEjjo2GlBKI3gBBpf437CCx3tKQK1FzWCBb22u?= =?us-ascii?Q?rPtv5VZGxFmkAgu2wwPRv5k0NLj3ABMGiQkB2f30lcUiy5QZVfh4cEouq3jU?= =?us-ascii?Q?aXtJLYKrDRqh3ip4nMo5G41rAKaoeln/pjb0B6vH/bcIZJG7pX+Z1knTjnOn?= =?us-ascii?Q?TTBuvj6VKmsyAT6CulPrC854QlYge+c32bT03VYfWlc1ppo9bz9+TKqTmEhJ?= =?us-ascii?Q?i71pRCOkYVtAbu08df6Cdq8d8fQkuu2a5/vHLlvH1fjf/StLuzPIXpze100J?= =?us-ascii?Q?KoPQ7gpTbDgx/EFnFtGjtnLm52OAUfNmz4GSsuJwp6b4XbZBMnsjVhvdQI7p?= =?us-ascii?Q?EnFFcdlaAhdodwc12A/qiwzyC4DsmEhM/5iDc70EMtrDftMgyRDpq5AI+Js5?= =?us-ascii?Q?Q2hNpGtd76Gg/w+iN8V2sSr7iDG4OyY4hnEmC4W82MauUhoEUpW2URrdYHI8?= =?us-ascii?Q?nXLc7lsdlmyRK2AzAZcC0DzQbnkV2k3EjM55zC2EDBN5XKhHSYxi2EOJwOSU?= =?us-ascii?Q?cED6QD7vjh7GSWWhnhek849ybt2oC8/RFx2udiKknXfWVeuU6KxV9Y3c337p?= =?us-ascii?Q?5UgmSSTKvHTZdDtvjTApka3Tg8kjwZwGRWmEaWqSKkjAzbZio6+YoqLiyKNP?= =?us-ascii?Q?+MgPQr3jcHRz+r/SkQCsEiXKedBsxT69sNbLtBef+b6IH1BInidG6gzs8RRj?= =?us-ascii?Q?/SHgAgByuJUWO6CfB6FQetuZVMF0fJbeBY/85eTQXLKWT4Z9Il4SZ5ObcrDQ?= =?us-ascii?Q?xvfSHpFPzGYJsX0DY93pyK2SpwXAYIFEQXhIvQXSGcs9bRvVB0EQhzz/VeZT?= =?us-ascii?Q?DLljR3oDPuz2lTrhRoEl7dSxD2LN+ICDUpaj5mRE9BTjYTik4DaOYn4cEKna?= =?us-ascii?Q?1gZk3Pe8F7nTocOf3gpgZFX62uR1r10itYhzqj1MlZj+2aRGeCJm3KBwu+FI?= =?us-ascii?Q?LwOadbP7eBt1CTrq3/ZhZRwUAtF64OiaytXLTZiDf8p6Loomi3xjsshv6xNm?= =?us-ascii?Q?hJLkQTJXVVKxY/Sqvly/k0mvxL9CIzy6bhQgtI9uaOLzNMRuaQD1rdk1xcwu?= =?us-ascii?Q?WN9U4qUry6d1VqUnken3tUju5u1o1itjJM4pCcFrQy81Y+PMjL3N1ULB4Fw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 6:VH87TSYG4dj19hyepUS8xZ8IZKhAcga02ucUIPMxgTj1eWjCiYQh8ZrlcQvmGG59CpIBRzc8Gi5MAVH6pAoraHIW4aIVj4IljNV8n3VAsQ2JXiRm+mmqmdbbPiStbiYJNUyJ86UXoCop+l7p1uwCDyy3s60BG7A9Jm8pTrSYfmKh4xb7bvw9vCpFEJTmipNZlJpIb8HdEKGQxUaok3WKlP3w/TO8kFdz5Z1BLRSr5CDGy6QcVRO2xbAD06Ov2IBool/9QbI34tveZAYJ8AnrL26rgtsg0O1LRu7Z8jhQ6QZkuIvNpVoO/w2LcKcYsZdxKAldnb6Qf9Gym9E8xLuZBwAMC5nfJaSYvPfjGoAl3Q0=; 5:fDDO7olebiMi7lj9c+UOOAOEUzX3BcL3agCoHLL6mG0i6pT7ots8PupLavFLWqzrAzqMU8hhwATxHN//yD05hiifbMHXVVsB6oR+TRmc1wAc//AHmh4QrX/yIHxUX+D0mm4UIqQ6/xqZVZwENumZZQZkfUkR1wOAtWIXZc6CL2Q=; 24:An7ULhoVezG3niKRUmDsFbuI3bYfL1TDTgQsbLlWwAmsHtYooHE9KjdiPruo2bOsCZjY0hSXVDMXLtWaDawyhHDtG9WSNrPItDfGAgbxojc=; 7:dpemeYhwy26gLAUHCEAS6M+GLMkz/wcEJ+jw8eERgAA0k0Cwfc22gFL+YBPJEX0qd+LxDkax3em7Cn92ibdXQ7crVG4z/3v3TKYqz8THMJQIpucrNW9NJ5ukhFrcRlyR2N46FrzVmcbyGdhmHCjImiVfDPV4Tu3VhsQzDkUSZrL4RDKe+jzguQsmtkYTqEGAPuQQf+dMAh8QWoStBQejsUyOdlcwMjXNvET3xBzR8nJ3yZuCJAz6wLyYJGWsiUBi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 20:z57TQCs9YIQU4eJmB62YlEOTyqqC4y4gHqy1oejf7p7T0CI9EA5R2uqhHlzNNd3IToPrRLhs02b3tp/ttXvccZRC75Ebdc+D4WeRljBDbNKvrwUytlc3Qt6AMiLKElc7wtOZBOjLgla8Zs2bASPt1PGQM+IEoH60KUWNFV4u8eM= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2018 13:52:14.1701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 585d02ff-b929-47d7-8994-08d5747b51f5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2052 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.107 Subject: [Qemu-devel] [PATCH 5/9] nbd/client: fix error messages in nbd_handle_reply_err 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, vsementsov@virtuozzo.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 1. NBD_REP_ERR_INVALID is not only about length, so, make message more general 2. hex format is not very good: it's hard to read something like "option a (set meta context)", so switch to dec. Signed-off-by: Vladimir Sementsov-Ogievskiy --- nbd/client.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index 89f80f9590..1f730341c0 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -180,22 +180,22 @@ static int nbd_handle_reply_err(QIOChannel *ioc, NBDO= ptionReply *reply, goto cleanup; =20 case NBD_REP_ERR_POLICY: - error_setg(errp, "Denied by server for option %" PRIx32 " (%s)", + error_setg(errp, "Denied by server for option %" PRIu32 " (%s)", reply->option, nbd_opt_lookup(reply->option)); break; =20 case NBD_REP_ERR_INVALID: - error_setg(errp, "Invalid data length for option %" PRIx32 " (%s)", + error_setg(errp, "Invalid parameters for option %" PRIu32 " (%s)", reply->option, nbd_opt_lookup(reply->option)); break; =20 case NBD_REP_ERR_PLATFORM: - error_setg(errp, "Server lacks support for option %" PRIx32 " (%s)= ", + error_setg(errp, "Server lacks support for option %" PRIu32 " (%s)= ", reply->option, nbd_opt_lookup(reply->option)); break; =20 case NBD_REP_ERR_TLS_REQD: - error_setg(errp, "TLS negotiation required before option %" PRIx32 + error_setg(errp, "TLS negotiation required before option %" PRIu32 " (%s)", reply->option, nbd_opt_lookup(reply->option)); break; =20 @@ -204,17 +204,17 @@ static int nbd_handle_reply_err(QIOChannel *ioc, NBDO= ptionReply *reply, break; =20 case NBD_REP_ERR_SHUTDOWN: - error_setg(errp, "Server shutting down before option %" PRIx32 " (= %s)", + error_setg(errp, "Server shutting down before option %" PRIu32 " (= %s)", reply->option, nbd_opt_lookup(reply->option)); break; =20 case NBD_REP_ERR_BLOCK_SIZE_REQD: - error_setg(errp, "Server requires INFO_BLOCK_SIZE for option %" PR= Ix32 + error_setg(errp, "Server requires INFO_BLOCK_SIZE for option %" PR= Iu32 " (%s)", reply->option, nbd_opt_lookup(reply->option)); break; =20 default: - error_setg(errp, "Unknown error code when asking for option %" PRI= x32 + error_setg(errp, "Unknown error code when asking for option %" PRI= u32 " (%s)", reply->option, nbd_opt_lookup(reply->option)); break; } --=20 2.11.1