From nobody Thu May 2 04:27:55 2024 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512735232047344.890368591762; Fri, 8 Dec 2017 04:13:52 -0800 (PST) Received: from localhost ([::1]:36792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNHX3-0000iM-Nr for importer@patchew.org; Fri, 08 Dec 2017 07:13:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNHVN-0007NB-5Q for qemu-devel@nongnu.org; Fri, 08 Dec 2017 07:11:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNHVJ-000449-Tn for qemu-devel@nongnu.org; Fri, 08 Dec 2017 07:11:49 -0500 Received: from mail-he1eur01on0126.outbound.protection.outlook.com ([104.47.0.126]:59386 helo=EUR01-HE1-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 1eNHVJ-00043g-HH; Fri, 08 Dec 2017 07:11:45 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1998.eurprd08.prod.outlook.com (2603:10a6:800:8a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Fri, 8 Dec 2017 12:11:42 +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=pgydEVKFTd8EUx8iDwhFoKXzF312gSOWv4EQ2uu0jxU=; b=anySSmitinkmC4Tc9caiQ9Mocn9IWHmxH3SPWcWKi7JFQvmyYe4vTG9KT0IsF+X2E1mJVeTriGGTExUe1NC99/81taakQAWVe87ajCtUQPlsVZfg1q6ZIL66YwzvNPdiBJpV7IAavK/dwX3IuWaRUVxPO7BshNwrtNAcZmxnkBM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 8 Dec 2017 15:10:32 +0300 Message-Id: <1512735034-35327-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512735034-35327-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1512735034-35327-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM5PR0602CA0015.eurprd06.prod.outlook.com (2603:10a6:203:a3::25) To VI1PR0801MB1998.eurprd08.prod.outlook.com (2603:10a6:800:8a::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8259669-26c3-4c3f-a7f2-08d53e34d811 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:VI1PR0801MB1998; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 3:9xqlpaPXMLhZ6bl/mb3ht3kw+fQbr6BdxNP2s2DbQ5B4skkQswqsa+8lKq3zxufHNXBRLqLMGrP1QgvZmDMEImWnCWQZ05KletxIO9KiSn0rtxUaAIGy+2RNpLScMyQkoUpvQtmt6qRteahDcJD25uDhjrjmAj9Q3FZjj+bOG3g4jaEbKSUyIIU9I9B60NTGJNmy9st4uo5scH3JMuONh6o/E9u+LroicKFKXYwI+vc5ZeHJ/0gwuItx5LgaYKZ0; 25:SEFxvTtqyQHhwdkkwjstaERwYyEfABQhImkupDKyN6uT4q3AFuFenkeDi9/Ft3d+b3jQvm9BWmST7Ite8679jGvkOyLbgkWs3IxzT6Tt8tWtmHo7+ypc7oIrBoC+hTyOi6cSC3H9Np749WS5uC4xM8zMdufXKXH69Y3I6mc4GN4f4ol8kfupqRvVcHXrlhetOA0gKZg8F3K4m3oM3foV2YgREIuM3kzpg+tjJ1+n9tIGUUp0LgusCfrEAGxtiIQ4QIkOUpogSdDCUb3JE3FNKzFat4nvhHSAJn3a1YMFtVBJv1lT8x0NUcQwo+B50io65tEhtiOHiNYhPDhdijKJzw==; 31:KwjIy9YmpOc6oMuqovWJNIp2HOcbm6vGGEIPevGc7Nk92zUhg1UhB0fDRiqcufBD0Vj5/KhGMYgL0EDuv5AHKdZ0+u3/tCzCP9+8+ZvIyuFLBSyAC1zgWs0Ilky+TZvd60O5Kx0vAJm303EHV6MdCMXIbYHw5K6moYGuZ1GONIbdZ50h19GJ6LUFDvYwAF4+f3M4Mes1ZvV+aErudNwuZ146OBwn5rl6aStjbQzY4ew= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1998: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 20:CpvIj/l5pW0X7n947UReqzlM6R9eFX1KU2/mDt3dMgcfoJ8Xyyp77InzDCaF5fh5t88QyADuWz3iZq3AYEQmsDsSYUVyw97UeCCkFIV9wtmo3Wj14DWy/YZUkDpx35ekvlRaGzh668WxOYkOH30rYD3VkTyrJrn7ea04nRa7ilafWzlgrVTiu2VeTdEVQiTeaBKgI6kiMCQPC9lCQoUJcecUv4aW67hCARsNVNxNAdY4dHHk89ZajQnqj3wBDRCfXdHni1BhabBO2tdlXRRxROHmLeMRjAF0aCSkaCYaPCGdaBBaKvCvbjjYRNaZfal3lQ0TVSa1TGyf9OO8oQhP1IahSR8+9kF88gsUXM8IurZWf4/5HTfhHrNSegWX1xf9duSPyGbUaPprBWW2rYe8M/UD3wL/U0NVxi8q37pJZSg=; 4:kkhF0w1F2C6o1W7ohe1wrJRm4co21zg4HfoBsmsRZdsS4ba0Vb+WcSb7nnyWbbSXueHbMtK4YfyKHiEclFiILUf79VsuK7cPRBkZjKZ1gOSxWvW9bNpHxgA9+9+hA74KFNd/YoKeXaMNbtK6m3C1cSEMyEddGUaYSylZvNg1rm2qQFKBVJft4ZYPPmSDgGJTBW279uogLn8YZk5Pnbv9UorQBsy8hC1fekIbHHQFVOuM6lMvYEJZEOCpOK6vouQkOuBl1iTQC+W6T4IFTZwWyA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011); SRVR:VI1PR0801MB1998; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1998; X-Forefront-PRVS: 0515208626 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400002)(346002)(376002)(366004)(189003)(199004)(50466002)(47776003)(69596002)(3846002)(25786009)(55236003)(97736004)(36756003)(16526018)(51416003)(6116002)(478600001)(6512007)(48376002)(76176011)(6486002)(52116002)(16586007)(316002)(6506006)(2950100002)(305945005)(5660300001)(68736007)(8676002)(7736002)(107886003)(50226002)(86362001)(6916009)(575784001)(2361001)(2351001)(4326008)(81156014)(53416004)(2906002)(53936002)(6666003)(105586002)(8936002)(66066001)(81166006)(33646002)(106356001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1998; H:xantnef-ws.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; VI1PR0801MB1998; 23:ggZiZwYAiwxOWgy5o53TqjpJD4jkGdvhXRh8N75?= =?us-ascii?Q?bjeHJxKhcP9nTjyxhU5YehRt5uwvcLq3HFWCmvWnxdzLW+eLVFtZ8QC7CAtu?= =?us-ascii?Q?EwbTW9buwEPnfklAzIaZPJFOTgbsMqeikLArDDyJxvt63u+ONwZMCNmuVrPi?= =?us-ascii?Q?7esm6MdT3gkY2xIY5Rbqv+3MMildFTgIPcih7aL/TxyDMCQU1uq2CoOVXHaf?= =?us-ascii?Q?x+UzK/a353AAK0et3qiyljihI7rYuBDJU75EwUztYg3MpiWqSGfo/8fnaF57?= =?us-ascii?Q?pPJPayZfdJLuOvxEkJGSF3ewm0jsaIthKhg4ZNkpCbvetxa2YdmYNJPvH9JU?= =?us-ascii?Q?uodLtbV4eyK70R8whbehX6fk8xEGI7EnpwrQV0cOGogn62WRIt6HmdO8xtgH?= =?us-ascii?Q?sq+pv/emxsXom19DD3xrf5t0xnqfQ4JnanD5Bz+DGzwkxR10rEv1IeXQi8IY?= =?us-ascii?Q?qpMkhzrqePNidUdjIpkjR0+X9ax7EzgALkyFocz8FG+Esqa9Xqs4hq5fKHmX?= =?us-ascii?Q?vHB9Ur8TUuO1WfmIDqO5TX5X8hbmr3tNsb0pB945XFp4b+buPISEFPWzr0D3?= =?us-ascii?Q?BV0qN0r2JdhlxnrWT/5V7cJP03U2OxU0f97B0IKP0UFNybTQ1PePY1mcL0ZL?= =?us-ascii?Q?/gwqwScxegwoXjiQj1tsvopRvmtIClMU7b2vGCx9c5EIVZALJQfNyvZVAJGj?= =?us-ascii?Q?3DnAh/xJkyOvgJKMpQF+V+AEg6tvkGFEpYffFrMfoUEKOBXwhSrVi7uCLsxF?= =?us-ascii?Q?a/6Age3R9tUgMNzcarVhTvTu1tzkrlOZ0aaiIbKKuxe7iurYrDdUnyhqQaI2?= =?us-ascii?Q?5b+7IkeVuGac/b5ZSJVRWe+1CFpPSyLZBxfwm+AEewHdFyQwyy16yyzZsGXM?= =?us-ascii?Q?OFo8WRmcUsw3iKnDD5gPEUsgolFIGKru25sqAQ4p6fG1j6KwuMDWbOwzmIPc?= =?us-ascii?Q?4uojIY9+S6IKQ+PhcDLAa3QHmvHFMJEBdCgQKJ2Q1vfOoVz3aRlAaB0tAYF5?= =?us-ascii?Q?bMinYQjRG0OsGBzu73S2le0EcrHGDm93jmD3aT7gxj403a3Xqe+0k+py+YwC?= =?us-ascii?Q?w20LjhPyk2gmMUtiI6UrNJpUXQNlYGpoi75/BWwXdzFaf9z1juIZGEO2BZG8?= =?us-ascii?Q?lgygfgOOcZsTRUbaT2hTqjNEK34bdaXYQDJLCaz4iCwwQjmYEd5l3wK7/8fX?= =?us-ascii?Q?X+IeWtNPdJOaodx8=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 6:eeKQ4MU3NhRUhHpF43lwuL+pRv18piCwbFwHSxppGVsaGnPxsfGrBFOiryk5CN+odYnCeIHGfmYDPOg68tEQ9leolYKSYA6EJRS2bxeBAHXF05+YPhAfOHX1FcZNUsKrNLUK9+YAMEJBFms3xuw3r+rhnNEVKZgQsrEWp4HskcWMTsirnbVucKOL4NJFsnlwyR7PabFuuJ3e4hkvG1SzsKp6fwuo/TJn0eFkD45OUtrRnBZQ8BuWdr+oyVZVKclgWJjCLaAWs9VNNp8HfSy1SKQJwq0YDmPdDoUhbuH14NtGXhqWM3O/DPWnror0cwkbynlCBhRzxlWdtMt6qS+s7zl1xOHaiZbc1xO203ovp54=; 5:dDUVzv2rIATTKNnUUVthNIiwVLD+teo0uSZ8W4ymgU6NOl3Er3qioohQ03+AMuEdDHRHUVVK8dsUhiGr8q5pvLnCjxagUW+50wvSkV7OnieI/VWHkYoTjw6+KDoX1xh8z2K12rVTXAd2zCGQeCTEy1Y7FLnV+JM17KEm/sAXfMI=; 24:ogr/b4eKoW0EFPeYw/RHyoZwoM4MvOfRN90RYzxMQYuuabJp+F5bs8M0nosRayzOPVS08hMb18ILlHnbGrA1jfG60V9WWPgWO5/f81/0CL4=; 7:w1Vu9DOYxhHW1VkOAoUL4q2TshgiSAjB6hE4+GMZi4odFSfOgS+OhjlBdEAg5Pql67+/HlWArx4lpqzjKW0Va9wYBHl1FaIkJtzd8k0ol0AVteS+YZpoLD/Xov2bi8WdEpk4NBd/j0HVENGCaclMpd/ekZh2OdPNZfJLyjpTEiJY0tush4nfoxFLp3iGyLVpBWWmFeG/W0r9DwOdXWQNdwp0lCzR9ctGSXwSFVKwOzjRmYIqKfHq0Pm1zx2ycw7w SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 20:KhqvNMS4aIuIzgXQpJwV1+9yfDRlXKqEnWmmqBs796AOVOSSrVx2kEnBTbdXVj880sp+knZ4jbVTL6l2KODBYu+GUjqxveUfL9RarPHBhSwzjS6x9nYMu2h319MFVzNu94cWoRcyYPVlfPBQl3WHu+FUf9D/i6X3gy0pIdGsg9g= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 12:11:42.3300 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8259669-26c3-4c3f-a7f2-08d53e34d811 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1998 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.0.126 Subject: [Qemu-devel] [PATCH 1/3] ide: pass IDEState to trim AIO callback 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: Anton Nefedov , jsnow@redhat.com, qemu-block@nongnu.org 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" It will be needed to handle invalid requests Signed-off-by: Anton Nefedov --- hw/ide/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 471d0c9..02a6b2c 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -383,7 +383,7 @@ static void ide_set_signature(IDEState *s) =20 typedef struct TrimAIOCB { BlockAIOCB common; - BlockBackend *blk; + IDEState *s; QEMUBH *bh; int ret; QEMUIOVector *qiov; @@ -426,6 +426,8 @@ static void ide_trim_bh_cb(void *opaque) static void ide_issue_trim_cb(void *opaque, int ret) { TrimAIOCB *iocb =3D opaque; + IDEState *s =3D iocb->s; + if (ret >=3D 0) { while (iocb->j < iocb->qiov->niov) { int j =3D iocb->j; @@ -443,7 +445,7 @@ static void ide_issue_trim_cb(void *opaque, int ret) } =20 /* Got an entry! Submit and exit. */ - iocb->aiocb =3D blk_aio_pdiscard(iocb->blk, + iocb->aiocb =3D blk_aio_pdiscard(s->blk, sector << BDRV_SECTOR_BITS, count << BDRV_SECTOR_BITS, ide_issue_trim_cb, opaque); @@ -467,11 +469,11 @@ BlockAIOCB *ide_issue_trim( int64_t offset, QEMUIOVector *qiov, BlockCompletionFunc *cb, void *cb_opaque, void *opaque) { - BlockBackend *blk =3D opaque; + IDEState *s =3D opaque; TrimAIOCB *iocb; =20 - iocb =3D blk_aio_get(&trim_aiocb_info, blk, cb, cb_opaque); - iocb->blk =3D blk; + iocb =3D blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque); + iocb->s =3D s; iocb->bh =3D qemu_bh_new(ide_trim_bh_cb, iocb); iocb->ret =3D 0; iocb->qiov =3D qiov; @@ -901,7 +903,7 @@ static void ide_dma_cb(void *opaque, int ret) case IDE_DMA_TRIM: s->bus->dma->aiocb =3D dma_blk_io(blk_get_aio_context(s->blk), &s->sg, offset, BDRV_SECTOR_SIZE, - ide_issue_trim, s->blk, ide_dma_cb= , s, + ide_issue_trim, s, ide_dma_cb, s, DMA_DIRECTION_TO_DEVICE); break; default: --=20 2.7.4 From nobody Thu May 2 04:27:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15127352334322.1691233051050176; Fri, 8 Dec 2017 04:13:53 -0800 (PST) Received: from localhost ([::1]:36793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNHX3-0000iX-A7 for importer@patchew.org; Fri, 08 Dec 2017 07:13:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNHVN-0007N9-4p for qemu-devel@nongnu.org; Fri, 08 Dec 2017 07:11:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNHVK-00044O-GC for qemu-devel@nongnu.org; Fri, 08 Dec 2017 07:11:49 -0500 Received: from mail-he1eur01on0126.outbound.protection.outlook.com ([104.47.0.126]:59386 helo=EUR01-HE1-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 1eNHVK-00043g-7C; Fri, 08 Dec 2017 07:11:46 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1998.eurprd08.prod.outlook.com (2603:10a6:800:8a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Fri, 8 Dec 2017 12:11:43 +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=yBOLAnVbiK0jqGeBtYA2DboABFjjMLS4jcc9kN9MpII=; b=SagV/tCZFJBLpk+W08gkaLe8QyrmqOINXZohoxGGQpE88rUXdgUgcnkha9oLCTYebcMtHaGEuQDY7VBICGqerKWubq/fwlGMdpkDBMyezPku4tma8Va2Qix0gXSJ8Uldo04YS+fxaXqLN/joaT0GNmkVyuBk6+6Pm8BcepKU5rY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 8 Dec 2017 15:10:33 +0300 Message-Id: <1512735034-35327-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512735034-35327-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1512735034-35327-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM5PR0602CA0015.eurprd06.prod.outlook.com (2603:10a6:203:a3::25) To VI1PR0801MB1998.eurprd08.prod.outlook.com (2603:10a6:800:8a::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdddd35b-66f5-4e0b-502f-08d53e34d8dc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:VI1PR0801MB1998; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 3:Mt33cusTISi0SOU0W+megOIljxyqWMuWsxmaRWnWyd4QBWXdEth508YTjW6CSm79i7z/5P0zUfuLoZfHUjnFet1Di6KwxOOo1xKoBCBmEaIJkLcK1SFkIw2ZKjudT0C+N1u4FewqxiIF6YvTSPtdQ7Cvuw7BuJ+9gf7DCheNkQks2sY076ij9Y7fEqdS0M40EONTYx6Xy/oVjA4D0yVd4S5WqHnHkvXgodvrjIeDxcQR3MfhPJ3oGN912+QeuCuM; 25:UfawyDxDmqu26e5XDMN6oyHrnKDVLwLmi2Mx9kGkTUZ0a7j7iesPVj/VPEKqWeA+FD9S723ewiIvsftayfPD0EZjHscSF2hSM85WAu9yJ7B2iw+zC4NwwNq0tJ1S6jOtGWJ+Q9X51eihav05agJnWgJ0i3LXmoe3TDDqQdeSaTKw/+OsCuMz/W4CPM10adHGhd+RIEoeiMp57/cX099/4//w2AcTQ+xSIWgVBATqFLarKPdL23iWJ4wVKbf209eRhCEtIMNiEDv+2x0sQlbRLPNv6iRVJdQPR7qoFPTlnlQpo5axf5o1eB9iHBgSn5Kco5deEromCC1FDk0P71PzVw==; 31:xDLYQhq+EDP+d4urzWQuN72Dj/B6SE3HFzMxF3JusVF2lPwoIQ71fxO9l8xtvhzUayIzspfhQllsuYdjrx2odmRd06hACKUJKt+pyUwfqWdMzIsNCrSvnJtdjaIp8OQP2NmZexiy9Fwr6cl+aMAapkJGXWE9TU8C2b8APDESr3DzC0y2BrJ+3bKjpM5bkxu+1YZBtFfH25achaBd5dMMhFs8hnk3va/nQfP3OL0HE34= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1998: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 20:l4wZI/BA5kz401jFr40/40T6raUl7SPz3S6JzsqEBvodg50wbgZQN1+AwmArE/HR77lj9fg1ROX81nhxmtoeeNjV/Q/jpCn6kLkVRJ2PU3b2TTMbNzfrlXRHIeeoO7q+TFIl2mSVPFOgIIt9ASMUyBaaA1zJEa0pmJyzNpUoWqrZWqnCjaR2m1payashyOjz4EVM9ClzSM//axH4znIIbdxYhWD21bLahjag6v0fzSlGLxHEGsWinvS9yLsfz2sZzg4rG2seFB6YAaqvAWuZuplMMHhctL/hPeE31eFAaCSSeyVUyN/Q2TrosnW1oyRV44tRMCEdlrqNsjO41PTnnWVMHVkNwNSoBlYPfXKflN8dkX75gG5eeaNiLaW+Uvb9ahmV75/IfnGN2ckOT46AzTC3CR9uzwLvcVBWAP2SGws=; 4:KtsN86JmuSTnDUr20TYWhZNbXJIx5uIaSoOMayKBLKncE9pz9HCJJtjPnCn/jrn1GSk2ILIyduCxasrSRGG63FmS4cko+8PCD5K2/GgZwkqDCrvP3oT6i5A2i7WHx7cA5gSZ9WB6jSVLvQ/m+NTZ/ftCHD/3A254r63WaX8Peg7Pz0Xk3VMpToQ9bIESRp5sy61H4NRy7RKBCovLHSphqfb4Fqph2mQGNez3qfKomAlm3oKkv68H+EktRuWM8KQJPOD9YAbWjdronlvpPV2Vdw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011); SRVR:VI1PR0801MB1998; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1998; X-Forefront-PRVS: 0515208626 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400002)(346002)(376002)(366004)(189003)(199004)(50466002)(47776003)(69596002)(3846002)(25786009)(55236003)(97736004)(36756003)(16526018)(51416003)(6116002)(478600001)(6512007)(48376002)(76176011)(6486002)(52116002)(16586007)(316002)(6506006)(2950100002)(305945005)(5660300001)(68736007)(8676002)(7736002)(107886003)(50226002)(86362001)(6916009)(2361001)(2351001)(4326008)(81156014)(53416004)(2906002)(53936002)(6666003)(105586002)(8936002)(66066001)(81166006)(33646002)(106356001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1998; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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; VI1PR0801MB1998; 23:Vw2+N7zFZmpJwetuknviVOHQGhbMlqPwv/Z4MG2?= =?us-ascii?Q?ba+Ng0HYC4tnOFlmWMUHyISkv1ymgdMUKE5SEbds6uXSu2B84Ol5Dkr2P5Ux?= =?us-ascii?Q?7y/igJlxgfyTYXUx80BR3u3i4WjT9f3B2JUKhtsOrK6f04CSpic+XK0lOEzt?= =?us-ascii?Q?zJoSIVCAnmo4EZIW8DX4Scw83e9YNNZWTH2sdG7idO9ut+8gdB92AdjrF1PY?= =?us-ascii?Q?CU0Aj+iJY7NBlPT3XrmrwKFZVNt+hmoiYRqKs3RRgyo95TP947fTlZHs3GmZ?= =?us-ascii?Q?wFaJbvV/F8IuV94KKuOf3fywzpFOGE+WzaJpG8faoCRo2DUaDgX+v7VOzS9V?= =?us-ascii?Q?2Wq8QIu1L0AEIREihS0bR1wBJKAHVBz6Zb1B9LUjrtXvqBGzPkS90QJpSNZY?= =?us-ascii?Q?lSgtghZAxpSMV0jTsmqoBAhWJdwyX2/RHmbfKSVklXXc9Id2LluzCA4o2xFR?= =?us-ascii?Q?gGc/dQ6/3shBXoqTGNhov0VeHxeP3VgHNXYQYeeeaS8oBvg+LZUye91VrifQ?= =?us-ascii?Q?8YNIjNTM+YufaBPlK5gXKRwK5z02wvMpz+C24KL4XPPjxlMNnn1hGJtiSVfT?= =?us-ascii?Q?MGXBh7BuQ6thIkBpMH9FfA5Fu6ZSFN0+5iCDWkCjvzbmF+g70CxWgo0Q5aJQ?= =?us-ascii?Q?CqdTDsMisVGq3f5C35AktmRFOniEMk9S4QcxJx+X/BOp1+dvjcwujVeGdGcq?= =?us-ascii?Q?5CXW7e/uBdsYaLypnW/Z7xEXf0erCWuJ2xphZLTZcm77QApLACaJLOLlJNRc?= =?us-ascii?Q?M2Cg7PaGG9bR98h2Tc6J0EVTFezrc7+0Uj3ZEgSlNW/X1AovUMFLo4dpOiM5?= =?us-ascii?Q?pjShqhp6GQH/qy18R+hpjgSF/UxGlpLL6ESpBbubEVvj6I81DSzsyegKKugl?= =?us-ascii?Q?GB8vDI3VjvQA7Vgk0VU+wJOvTjc+DdBGA6ZgSWbi+oxlFB6TwC1xbraghP4R?= =?us-ascii?Q?UvxboKxBeYfkw6iyF6B0Jg9DLUGGQmdpkxi9UKhBAWYYYdpq5bBYFv72wvTF?= =?us-ascii?Q?mjjKoROFAiGrwy5Mrpc4JxSR4CYIh90ErEjzeEFUSj5hLWJJCgy8lmSqRZH7?= =?us-ascii?Q?z7WBS9JjFpN+2WYMG+nZMc7iSQZyJBmCgqIB4F/ofTZ04d6Hm31LfE2qRX0Y?= =?us-ascii?Q?SUjsNBar9No/s6uzCOcNQ4TObGbZbSXMlrCWNcRzQ1FvV94zSlsPAhA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 6:rqtZKsBPy/rLhqxkC9LKqMu8IWvIMV5D22ABnGzznB8M2BSNd1TAmPU3XI3OU17odtCsmGxLpSpMKxKSiZobMOJiLxT1DBZKo5jQzw2x88+wfOqvERtyPrnBLPwrj+H75D6Tbn8e3dUbew8Rt8XwUOCGzaR4S/drM/lHjj658tPx6PgWyivS6ANeUZ+eAn3VdGjKrelAebYc91RaLvbIgy70nhjrLPPoYNS1/GFz1IWDO49Udv2hgbchUZF55681TfG/lOIm49mdClxcI59r6HZ8BMvI6YZvlKPu/6f6G5Bho4S3nttgBKyKsMRGq3CaA5VJBZZiNOdxVgbHu613rSA28wGXYXA/x+XvmuNaHfk=; 5:2w1PkxxvggMsPjIKLasDQJa7ykE9+DXldtx2D7YZAIO9TbbrCOD7ZBT7kcwENLYmXJYw7ypmTDeBrM8IqdrbT6RtR+0I4aJjOgzqqZmxImKEEvg+gCs+Kc42hyif34NA6h8UdKnYfD+o6+AsEMoGHXi94EKz9EcV5t9qteRfKe8=; 24:VvVQK3OZAnzPFODXlm41sCxokI7O4yIFkKoFpL2dIssQXyrkauh4IRHkUHxWWgnJbFerTHe4K87Xun+qGdfgtdMIWgvC2124tGuPVm0cspQ=; 7:2nw78HK/qBJnxwHvSlZr9rBXTIWkuyFHkjdkEfQG7tRZ9Ae91I2JID4mPDLCvbbbnYE61/5a0TmCb7U/5c6C2qY3iu82zmUEPtlDxlIGeeqg6OcwZRWrXDeK3p29ONVVNcNtbZxz2g1a3c/14DU1SZZ3TEN3g5HdYCbRp92dCeaIVyEbgwT6M6LpZXX8i/mBIAdPIGuRPbd/Q4pJbm8jWyAbx2Xeij0TvvjV7c0DMB1xJKzaoY4NFQH4hrSGZgun SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 20:pnNttM7wLv6gBALh30xldSMkXtiKLQmsSC4lJuRm5pPTlxuAZ9jeG/wAujiE4n1GE0YF2vtH/twQrSC9t8wSB9qc2SgQxSOye7x3jLriF/KbWIpMaRNHHV56/wGX0IoqSYbjNnJtokHAsiu4jPlpWC2UNe4Uiq7o2tJosULXBIQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 12:11:43.6581 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdddd35b-66f5-4e0b-502f-08d53e34d8dc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1998 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.0.126 Subject: [Qemu-devel] [PATCH 2/3] ide: move ide_sect_range_ok() up 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: Anton Nefedov , jsnow@redhat.com, qemu-block@nongnu.org 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_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" to use it without a forward declaration in the commit to follow Signed-off-by: Anton Nefedov --- hw/ide/core.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 02a6b2c..23c71fa 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -381,6 +381,18 @@ static void ide_set_signature(IDEState *s) } } =20 +static bool ide_sect_range_ok(IDEState *s, + uint64_t sector, uint64_t nb_sectors) +{ + uint64_t total_sectors; + + blk_get_geometry(s->blk, &total_sectors); + if (sector > total_sectors || nb_sectors > total_sectors - sector) { + return false; + } + return true; +} + typedef struct TrimAIOCB { BlockAIOCB common; IDEState *s; @@ -604,18 +616,6 @@ static void ide_rw_error(IDEState *s) { ide_set_irq(s->bus); } =20 -static bool ide_sect_range_ok(IDEState *s, - uint64_t sector, uint64_t nb_sectors) -{ - uint64_t total_sectors; - - blk_get_geometry(s->blk, &total_sectors); - if (sector > total_sectors || nb_sectors > total_sectors - sector) { - return false; - } - return true; -} - static void ide_buffered_readv_cb(void *opaque, int ret) { IDEBufferedRequest *req =3D opaque; --=20 2.7.4 From nobody Thu May 2 04:27:55 2024 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512735338440755.4592992012982; Fri, 8 Dec 2017 04:15:38 -0800 (PST) Received: from localhost ([::1]:36806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNHYy-0002ZL-0r for importer@patchew.org; Fri, 08 Dec 2017 07:15:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNHVP-0007OZ-5R for qemu-devel@nongnu.org; Fri, 08 Dec 2017 07:11:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNHVL-00044c-1m for qemu-devel@nongnu.org; Fri, 08 Dec 2017 07:11:51 -0500 Received: from mail-he1eur01on0126.outbound.protection.outlook.com ([104.47.0.126]:59386 helo=EUR01-HE1-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 1eNHVK-00043g-PK; Fri, 08 Dec 2017 07:11:46 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1998.eurprd08.prod.outlook.com (2603:10a6:800:8a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Fri, 8 Dec 2017 12:11:45 +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=tTDBl6KiJuJQjnK0rkmnRW8IBt0Qe5KlpTAnXa/7QSs=; b=G006sobMDMHfJ0kHBvdtTRWtHjjcPs8ZezstGNqHZsn/vE1pOEtmR2mc/k6Z9DrfXtMkEHjzOYXto1q+7JvsxOPKjeo8bKOnwE6xD2RajVNmKd2KSc8HYTLAEI9HUH8K+uJumHyJfnhpfUo116iRODtO/rvrb3aSQ26x0W1Crjs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 8 Dec 2017 15:10:34 +0300 Message-Id: <1512735034-35327-4-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512735034-35327-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1512735034-35327-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM5PR0602CA0015.eurprd06.prod.outlook.com (2603:10a6:203:a3::25) To VI1PR0801MB1998.eurprd08.prod.outlook.com (2603:10a6:800:8a::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42e208e5-dc7e-493f-a624-08d53e34d9f5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:VI1PR0801MB1998; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 3:ibE9AVgxZJCwH4PRavHzAO5t24YrJREBc4MXkS66eGN5CbrCxSXCXJ3bu2QfLx9NoSxQmpLdPQx/hXvhxQJ7OKDoTZxazqgj0P0mSCOQCI9l014vlfg62L4G+MGEe5YiPZubtiDUBBop5kSpj6Pwg1tE9FA/nUBFTzheZ5Ocpd/PLFSJB8mSVyRvre5CCKolpEdZVIxGf6LvPpWG/foPpX0qShCQKtVIwmEabz1vUtkr48fzOlRE6I4fjUdDNrCc; 25:zVErb4QbRPk2nw/dTtGRyelvzAvr5TavaI9pqDUWDkjsDzQuzF1qj44n+PKFFv4kXt3U7wBO2qom4YHkrfBfAyST+imDXvE0FRz0wnm0EuMpFuQ/mg5d1ljabgyVGcgR9AgF6Rn6XrnuNtaDX09znohsYE6KfGJtazppAX+SNjONT27Xl7DGdM90bnmdC+iHt42NqmmAFlDuFN8YkzC4agD7/jpS0Gc3qL4f8OfAoJR/4l/4WZ861TP9O249yOxfrAhj+NsJcntRxScJ0LMXg+gQxZVJ9spmfRPf7xRVKVnHwn/Z6HATHO2oxuCcJk1VAI4or5K42bjpqv+3zlXCWA==; 31:C7x/YzlH1XlEGUPsPKuZMi8O7RES1FNw4lbh/vHho97p2YaN2Bi+EcjVuZRH/nircpvf4hc6xddxvLcY7zCMWlFQcb8/VPYV282XvJpphJRp6c6udFE53vQqAdjyxEp+EuwgOfUTo8iU7kDpzYS35mBAeq2O7a6btsXbvN8tYOGasBzXMMiLZ2N3k6n9PEnTXoRzE4EMYbTyqG6WQzAPx7n0r7JSoaPc1FxtzvYW644= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1998: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 20:J6VHKQYboB9Y0/n05Mi0f3aSwZhv6jvZgd96OqD/PsmWW6A0QE8l1qjpPzyECkWTUkVooru+N8PET0uqff79eFoNA3kaEQx3FfOy8Qw/e0fN8JkwapUepbf7DkyFfttjCR+Z+Pa48ZAVlJlVrIxafnyZNr75q50KtAX82NHecNvP3sp28RZuOmEGOu773BS6/co1Dndtk6ULdWHANFzWN5AVg0L/k3oEEeZMOVzSdv6dSLzhelZlUn2VaO7mAIjq8FgR4MGKqmmTSIS+uH7UtXk3iFgEhMKPi3Vld5w9hEUFT0hkxQ4W3F/mBlsrkMMBw5TXg84ITEYr5XZwvQEYUzhiDdfeFH25r5QfaLUhn1NBeKE+vA6esFN/Kg/cSiAERbuMSzLygzXs2wFYC+6+Ox523TCS+srGn1AQ2VCbYAQ=; 4:x5wnhBozSgzzlvh/6DtjXmBCtol3AXp/NVwxDFEKHtmP1jJ6StXuUzk4TQt2tchi2WeT589bJ+UxKFFuANx94o9vhIcKvq3rWneNS+t8IxGt/bKhX/tZPIt0xfJvEAjtqj98TnspZZiGu0qcwbk1KdW8Zdk9pm7SWFUigxFa9maP05N1BDg6bw0/D7AZObXHbamMXMzXsyPpR0MRtZ5B+P7nfTUqFegcY/xl0a2+57X7BqThTDBNQN7J8xvtJxTCZKKUnZxDo1DmX6rwZegnag== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011); SRVR:VI1PR0801MB1998; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1998; X-Forefront-PRVS: 0515208626 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400002)(346002)(376002)(366004)(189003)(199004)(50466002)(47776003)(69596002)(3846002)(25786009)(55236003)(97736004)(36756003)(16526018)(51416003)(6116002)(478600001)(6512007)(48376002)(76176011)(6486002)(52116002)(16586007)(316002)(6506006)(2950100002)(305945005)(5660300001)(68736007)(8676002)(7736002)(107886003)(50226002)(86362001)(6916009)(2361001)(2351001)(4326008)(81156014)(53416004)(2906002)(53936002)(6666003)(105586002)(8936002)(66066001)(81166006)(33646002)(106356001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1998; H:xantnef-ws.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; VI1PR0801MB1998; 23:EMkt5QaWrjmYR6/28MBbzo4+5JZfrWGDT0ItqhQ?= =?us-ascii?Q?81AmhKwOUGCcPMGd84que965YzyL2XqAYbp2nQ7ND22QOm474BJMRG/0k/xE?= =?us-ascii?Q?L5/bFjlH1N/rJlZQfAzrDiqtxxR4xN4vskftjnfZ9r8DURSrrgLiSw7KKI7e?= =?us-ascii?Q?6gy+9QJCTL/AVzoS/7LHYxX1SWxuHS/1JPA+sy0uAiWGH/8tqqNVPPUOwRjw?= =?us-ascii?Q?DYClfUPUxZXp1mPHorU6X1zv90aynwOstNZqke5Un/5VpagQQJ8SAXiXgAZW?= =?us-ascii?Q?ZKFik4pkkJ6DyN4MKEop8U0QmCwcpKG8peJict3/dcLjPE6kdJdPWoBi6so2?= =?us-ascii?Q?j9z5PQcJXUXV9tb2TKlzPd9kB5wUvVAj9cVBf+0CJ25sRMQYEl1cutV+14R5?= =?us-ascii?Q?mUqHM2HFLpoEqrxxzS2rm6f8qovV8dD8t58Pxjce7t+tihAQV2KT1G553fvb?= =?us-ascii?Q?3SDVAoo86xNQD3YR2lUc4kXFq2Yg/CV5s1OGXPZ/7HReA/vmvU5TyRB+ArKB?= =?us-ascii?Q?TxYhrTusj8m6/vYDKvAAyUhUrouteZXrh7Z/jJ7a7ZxnkNGhhC0dhAB+MIvk?= =?us-ascii?Q?7ZKXUNZVwcJSj2XytjJpbX5FKfFPJQ6L9V8B+92JXozRt7yfRGw7ThBz3hOs?= =?us-ascii?Q?fgYnPsfl560lSimuUw3P52m34dsH58dJpTlH05b1OdKTHoZkcA3ri9rzY1S1?= =?us-ascii?Q?hMgZyXCm7cj70wwPa8zOVWtiECIpST13Z62ATHuRqH2U6hZ8OyKMhz6G7++J?= =?us-ascii?Q?GF/y5MOAjOGDM41EokGVZHO5bQvHeriXfR/3zXhjmkGGV23IdWHGkryLaBw1?= =?us-ascii?Q?BoTUMJE4D3U5+z+3ktOXgU9WexEjjOEfSZ25plSd9mH6QKoKdK8Gf0Xx+BgC?= =?us-ascii?Q?zr7XilvtHhbjEKQg3dUVma8jl9TiaIzN5F+HYw8G946HZ7ifjNqt3bXDkG0U?= =?us-ascii?Q?R4jp10sbDzErV0Zq7Qq3Pg1UBhitLxgMfOsm6QhcEcfjv7hYu2LwHiz4Cf7w?= =?us-ascii?Q?QlfnTKU04e0KK7B84TLmoxucZKbwJ+VE/FGdHVkI0yEqnPojgb03C4bxAGQ8?= =?us-ascii?Q?uFIeMGtcNVBjgew6/rC/bko1n5DJI7aj3w7x7YUUeq26gKXPxBcq+/SHJ/bb?= =?us-ascii?Q?fQtSMIjSgBYW5eQdrnotcjdzmTjy4kNrijL0yxJfC2+FsUXZOWXIMyA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 6:vy58pgm5MzAqjuJbGP0DLs9TdNOBGHCtx+Wkn2K29G9ZyA9ZhHn+Q6FZ3JW38PZK2+JbsARcqnioLdJ4UdYzrQpjmGg8Yhx10ltUBTwOs+djd7mrHc6XujWKGyHLGYy3Cr226zLVXh9PdWbthP7GxxHTOI30Qr/V857L4DAeQ2pbZAMarYVB2v4tNXv7AIIRDpATJfrCzbxUDxxWv+0eiJMHJl7nacA6WGFTdyOhNfjjuHNn0Tkb8vHJro+SN8gDsQVbF9JZjNM8XVOsZC48yib5Csj3AZVDS116Vqdb1OXtb3+P9vBNRNKzYQUsDCtLmrPMKygJqR/m2fAcSr8LugvdmiEQtw+hTcJP7d/mKO8=; 5:ELRWiIEGyBSySk0nRE0U13ctMvHk2m0Ffse8wjTSvefrPFKVfxeshZzqeI1td4aFuaY4DqCwtO5Oms0rDN74eHYgbkuUufXVtCd1/SWx+w2rNr4AdKymYGmH/gqhNxyQGOUwkQeXbYvC4SEvz3d69EaE8PKOsPSkY6ngV7sZwCs=; 24:FCGlyvV8c8oPuUWg3x92YEJNaYJ7xE3oyzjw9mU8nqZ/4NUTjHwvLucxMMskMXMWT3ivVyKrFIasPsiT3Hn9phjz5yRE4HlJJp1kz+NtNUA=; 7:Xh4+byrL3YFsoaijV6bqEdSByymUCDRKZ2vhxZDBdN5YX2FoD4y/ek58I9Vpa4mmYyzt8z1MikeIM3ouiqoJ2/5wHbGfctFYkSou3Rb7DaukKbk0z2QfKFgEUswOttD/oEUC1VnpsEMnx9b8hDd0U8FIhnH+VWtBfhQ8ocWwKyy7D3CL4nchOFBFVglScddkndQHTP8n0DIfDKShAduDshSc/QXm3Zov1SziWqAHm4cBwhbE4k2hn65m6Sjj7C2S SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1998; 20:ssxM31oeI0H/EZkTRG/RYvrQE89Nigjl4Kkqh6/ZzI6heN89KIlQx6JVEvqVbR5OzJTBWtmmoGm+aSN+t/ExARJPLoque7jV8298iL+AtGP2n9x1SSXczHMD18qvTAEbpZpNurpOzeMFyUh3V+VE2M2cn9+OSXcn8y+tlXd2RhI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 12:11:45.4863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42e208e5-dc7e-493f-a624-08d53e34d9f5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1998 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.0.126 Subject: [Qemu-devel] [PATCH 3/3] ide: abort TRIM operation for invalid range 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: Anton Nefedov , jsnow@redhat.com, qemu-block@nongnu.org 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" ATA8-ACS3, 7.9 DATA SET MANAGEMENT - 06h, DMA 7.9.5 Error Outputs If the Trim bit is set to one and: a) the device detects an invalid LBA Range Entry; or b) count is greater than IDENTIFY DEVICE data word 105 (see 7.16.7.55), then the device shall return command aborted. A device may trim one or more LBA Range Entries before it returns command aborted. See table 209. This check is not in the common ide_dma_cb() as the range for TRIM is harder to reach: it is not in LBA/count registers and the buffer has to be parsed first. Signed-off-by: Anton Nefedov Reviewed-by: John Snow --- hw/ide/core.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 23c71fa..3d1494f 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -401,6 +401,7 @@ typedef struct TrimAIOCB { QEMUIOVector *qiov; BlockAIOCB *aiocb; int i, j; + bool is_invalid; } TrimAIOCB; =20 static void trim_aio_cancel(BlockAIOCB *acb) @@ -428,8 +429,11 @@ static void ide_trim_bh_cb(void *opaque) { TrimAIOCB *iocb =3D opaque; =20 - iocb->common.cb(iocb->common.opaque, iocb->ret); - + if (iocb->is_invalid) { + ide_dma_error(iocb->s); + } else { + iocb->common.cb(iocb->common.opaque, iocb->ret); + } qemu_bh_delete(iocb->bh); iocb->bh =3D NULL; qemu_aio_unref(iocb); @@ -456,6 +460,11 @@ static void ide_issue_trim_cb(void *opaque, int ret) continue; } =20 + if (!ide_sect_range_ok(s, sector, count)) { + iocb->is_invalid =3D true; + goto done; + } + /* Got an entry! Submit and exit. */ iocb->aiocb =3D blk_aio_pdiscard(s->blk, sector << BDRV_SECTOR_BITS, @@ -471,6 +480,7 @@ static void ide_issue_trim_cb(void *opaque, int ret) iocb->ret =3D ret; } =20 +done: iocb->aiocb =3D NULL; if (iocb->bh) { qemu_bh_schedule(iocb->bh); @@ -491,6 +501,7 @@ BlockAIOCB *ide_issue_trim( iocb->qiov =3D qiov; iocb->i =3D -1; iocb->j =3D 0; + iocb->is_invalid =3D false; ide_issue_trim_cb(iocb, 0); return &iocb->common; } --=20 2.7.4