{"id":2225815,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2225815/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421161132.99878-7-kwolf@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260421161132.99878-7-kwolf@redhat.com>","list_archive_url":null,"date":"2026-04-21T16:11:31","name":"[6/7] ide-test: Factor out wait_dma_completion()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"38374b1d27ddb7dd69fdaf89580d8b85ce881484","submitter":{"id":2714,"url":"http://patchwork.ozlabs.org/api/1.2/people/2714/?format=json","name":"Kevin Wolf","email":"kwolf@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421161132.99878-7-kwolf@redhat.com/mbox/","series":[{"id":500847,"url":"http://patchwork.ozlabs.org/api/1.2/series/500847/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500847","date":"2026-04-21T16:11:27","name":"ide: Fix deadlock between TRIM and drain","version":1,"mbox":"http://patchwork.ozlabs.org/series/500847/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225815/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225815/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=gS1v2tlp;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0S8W5dgrz1yJG\n\tfor ; Wed, 22 Apr 2026 02:13:47 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFDiK-0001VQ-Tj; Tue, 21 Apr 2026 12:12:41 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFDi5-0001QQ-82\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:12:26 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFDi2-0000KW-I1\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:12:24 -0400","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-209-cg502Py8Nmq9YH2O1fJSLg-1; Tue,\n 21 Apr 2026 12:12:16 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 0BEAA1800352; Tue, 21 Apr 2026 16:12:15 +0000 (UTC)","from merkur.fritz.box (unknown [10.44.49.173])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 401A91800668; Tue, 21 Apr 2026 16:12:13 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776787941;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=mo+0Coln0FK96aKgSWdEDvcPO1Jn4n93jIREd0aBy5Y=;\n b=gS1v2tlp7+5pKdGh+AsNyzK83ZYxxRASnfAFOkz+e843yZ2WDbqLdrQqa6uR1P8E99aMWj\n pYWPQ3rrcLuSHGYhHdifXCSkQoh5eGr+6RrhupoOoj7NtFU7CwIZsLhhoA88iAMpKwnuTV\n jvDxtC+G+Yyt+sF/eI+3ECi211zvvV0=","X-MC-Unique":"cg502Py8Nmq9YH2O1fJSLg-1","X-Mimecast-MFC-AGG-ID":"cg502Py8Nmq9YH2O1fJSLg_1776787935","From":"Kevin Wolf ","To":"qemu-block@nongnu.org","Cc":"kwolf@redhat.com, hreitz@redhat.com, jsnow@redhat.com,\n qemu-devel@nongnu.org, qemu-stable@nongnu.org","Subject":"[PATCH 6/7] ide-test: Factor out wait_dma_completion()","Date":"Tue, 21 Apr 2026 18:11:31 +0200","Message-ID":"<20260421161132.99878-7-kwolf@redhat.com>","In-Reply-To":"<20260421161132.99878-1-kwolf@redhat.com>","References":"<20260421161132.99878-1-kwolf@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","Received-SPF":"pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Signed-off-by: Kevin Wolf \n---\n tests/qtest/ide-test.c | 48 +++++++++++++++++++++++++-----------------\n 1 file changed, 29 insertions(+), 19 deletions(-)","diff":"diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c\nindex ceee444a9ec..c6dcb2c0745 100644\n--- a/tests/qtest/ide-test.c\n+++ b/tests/qtest/ide-test.c\n@@ -200,6 +200,34 @@ static uint64_t trim_range_le(uint64_t sector, uint16_t count)\n return cpu_to_le64(((uint64_t)count << 48) + sector);\n }\n \n+static uint8_t wait_dma_completion(QTestState *qts, QPCIDevice *dev,\n+ QPCIBar bmdma_bar, QPCIBar ide_bar)\n+{\n+ uint8_t status;\n+\n+ /* Wait for the DMA transfer to complete */\n+ do {\n+ status = qpci_io_readb(dev, bmdma_bar, bmreg_status);\n+ } while ((status & (BM_STS_ACTIVE | BM_STS_INTR)) == BM_STS_ACTIVE);\n+\n+ g_assert_cmpint(qtest_get_irq(qts, IDE_PRIMARY_IRQ), ==,\n+ !!(status & BM_STS_INTR));\n+\n+ /* Check IDE status code */\n+ assert_bit_set(qpci_io_readb(dev, ide_bar, reg_status), DRDY);\n+ assert_bit_clear(qpci_io_readb(dev, ide_bar, reg_status), BSY | DRQ);\n+\n+ /* Reading the status register clears the IRQ */\n+ g_assert(!qtest_get_irq(qts, IDE_PRIMARY_IRQ));\n+\n+ /* Stop DMA transfer if still active */\n+ if (status & BM_STS_ACTIVE) {\n+ qpci_io_writeb(dev, bmdma_bar, bmreg_cmd, 0);\n+ }\n+\n+ return status;\n+}\n+\n static int send_dma_request(QTestState *qts, int cmd, uint64_t sector,\n int nb_sectors, PrdtEntry *prdt, int prdt_entries,\n void(*post_exec)(QPCIDevice *dev, QPCIBar ide_bar,\n@@ -280,25 +308,7 @@ static int send_dma_request(QTestState *qts, int cmd, uint64_t sector,\n qpci_io_writeb(dev, bmdma_bar, bmreg_cmd, 0);\n }\n \n- /* Wait for the DMA transfer to complete */\n- do {\n- status = qpci_io_readb(dev, bmdma_bar, bmreg_status);\n- } while ((status & (BM_STS_ACTIVE | BM_STS_INTR)) == BM_STS_ACTIVE);\n-\n- g_assert_cmpint(qtest_get_irq(qts, IDE_PRIMARY_IRQ), ==,\n- !!(status & BM_STS_INTR));\n-\n- /* Check IDE status code */\n- assert_bit_set(qpci_io_readb(dev, ide_bar, reg_status), DRDY);\n- assert_bit_clear(qpci_io_readb(dev, ide_bar, reg_status), BSY | DRQ);\n-\n- /* Reading the status register clears the IRQ */\n- g_assert(!qtest_get_irq(qts, IDE_PRIMARY_IRQ));\n-\n- /* Stop DMA transfer if still active */\n- if (status & BM_STS_ACTIVE) {\n- qpci_io_writeb(dev, bmdma_bar, bmreg_cmd, 0);\n- }\n+ status = wait_dma_completion(qts, dev, bmdma_bar, ide_bar);\n \n free_pci_device(dev);\n \n","prefixes":["6/7"]}