From nobody Sat Feb 7 06:20:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603214722; cv=none; d=zohomail.com; s=zohoarc; b=ctqOXAP045kwAloA5RzzfXs9hB5nnzMVQ9BTS8kj2ZpaLLfMF/D59g8Xraj+7aUmlajhOIsBqGlfEZME3YplO8Kbl3MWuAd3wCotFwpeM2zJuzk17mwX7NDuTy47oGt+vthZyeT9qncBrbcVRw/Y3QeSOp+ZtHFxK8Zc9WTDR0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603214722; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=mi5DaGV/dUkNCqis66cfyN2SFYA8ra8zeOd97LUT8kU=; b=IIEuz7j4Gy6eHptGHzFQoE54/Q8OvL2HOlG6HKrRxCXb2oT2Eas19EMZlkaz4yqxh/ohAygXd7LH0ztP9URGLt7tAGnk9EYs9oTqfVnz1d8GNgzqHIcjMwUNLOuX1Bd64icIl+aNlxU+FcjKEFhBLcXejM8EDfOKhkqWYVTCl2Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603214722113511.0130875076791; Tue, 20 Oct 2020 10:25:22 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-zeycUr3mOgiP8s4_JNV4Cw-1; Tue, 20 Oct 2020 13:25:17 -0400 Received: by mail-wr1-f69.google.com with SMTP id 33so1057752wrf.22 for ; Tue, 20 Oct 2020 10:25:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id u15sm3424259wml.21.2020.10.20.10.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 10:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603214721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mi5DaGV/dUkNCqis66cfyN2SFYA8ra8zeOd97LUT8kU=; b=SV4xCyqdYawFeIKecED8HM0xKnj4vy8+WD5YBM/TeOFH/2wCk8Ou9F5rlGhefd1W6O+BIa pAgdtq7U0EYpv8x6NackK13j99k9Q2oFMLzv8kwAXaLNQm7zsqySumFpHA/WJp1FF2FFAW +GKX+XTnl7BcPCBVE3ctAleK+Knz4hI= X-MC-Unique: zeycUr3mOgiP8s4_JNV4Cw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mi5DaGV/dUkNCqis66cfyN2SFYA8ra8zeOd97LUT8kU=; b=MwZNiMIkTame8sg9Khxp/Rn1BzFeRvogKCt4wOiX2jmMZHCd6xohTCluSjJgs9mZrJ pFiCujiBdJpL7RBoYeuJ2cDgQp+cVuPHmyJrjSv2384hiDg6Yw0n7VK9fyOJkQbf8q4R RCH4rvLZ93g3XA/4HDXLVpePWI90Qd52qFd70dTo+os/ziuQakhAAXjwZ7UlcZdkaSpD rt3LXSqPrxtMt/LphtUDkNz9Wf3XU3+4jMl0ulqrlcBWhEKfZE8isDCpHqYjr1Rgewz5 9s0CcJMaKW5ZvijlYfNUcnlggj7Df5bq697FYv1xM4hZn5tCayMbRlV+L7t5E3EzgdYB wO7g== X-Gm-Message-State: AOAM530q2sX0rU9E4tdffXCpjcEOaQa8l02p8LcA/47+L194q3ZHCxeH wdqj/+qm78+9pl6oDm2gLbs4Kw1kNRKdtA0hH/uAh1vszzk+Ibt4SbrBvWjA4o18rgLsf9RtzWH 291QI3G2MwnjoOQ== X-Received: by 2002:a5d:424e:: with SMTP id s14mr5132810wrr.149.1603214716591; Tue, 20 Oct 2020 10:25:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG9hQMQCJr8oW3+wIRBf+VgqLQBPOtr895Dwm9KyVx/mzvfA40fqLkQga0OZhK2VjPwQnJZw== X-Received: by 2002:a5d:424e:: with SMTP id s14mr5132786wrr.149.1603214716352; Tue, 20 Oct 2020 10:25:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alex Williamson , Stefan Hajnoczi , Max Reitz , Fam Zheng , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to trace events Date: Tue, 20 Oct 2020 19:24:21 +0200 Message-Id: <20201020172428.2220726-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020172428.2220726-1-philmd@redhat.com> References: <20201020172428.2220726-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The QEMU_VFIO_DEBUG definition is only modifiable at build-time. Trace events can be enabled at run-time. As we prefer the latter, convert qemu_vfio_dump_mappings() to use trace events instead of fprintf(). Reviewed-by: Fam Zheng Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi --- util/vfio-helpers.c | 19 ++++--------------- util/trace-events | 1 + 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 98a377a01a8..6a5100f4892 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -551,23 +551,12 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device,= size_t *min_page_size, return s; } =20 -static void qemu_vfio_dump_mapping(IOVAMapping *m) -{ - if (QEMU_VFIO_DEBUG) { - printf(" vfio mapping %p %" PRIx64 " to %" PRIx64 "\n", m->host, - (uint64_t)m->size, (uint64_t)m->iova); - } -} - static void qemu_vfio_dump_mappings(QEMUVFIOState *s) { - int i; - - if (QEMU_VFIO_DEBUG) { - printf("vfio mappings\n"); - for (i =3D 0; i < s->nr_mappings; ++i) { - qemu_vfio_dump_mapping(&s->mappings[i]); - } + for (int i =3D 0; i < s->nr_mappings; ++i) { + trace_qemu_vfio_dump_mapping(s->mappings[i].host, + s->mappings[i].iova, + s->mappings[i].size); } } =20 diff --git a/util/trace-events b/util/trace-events index c396ef4d622..3c36def9f30 100644 --- a/util/trace-events +++ b/util/trace-events @@ -80,6 +80,7 @@ qemu_mutex_unlock(void *mutex, const char *file, const in= t line) "released mutex qemu_vfio_dma_reset_temporary(void *s) "s %p" qemu_vfio_ram_block_added(void *s, void *p, size_t size) "s %p host %p siz= e 0x%zx" qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p s= ize 0x%zx" +qemu_vfio_dump_mapping(void *host, uint64_t iova, size_t size) "vfio mappi= ng %p to iova 0x%08" PRIx64 " size 0x%zx" qemu_vfio_find_mapping(void *s, void *p) "s %p host %p" qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_= t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64 qemu_vfio_do_mapping(void *s, void *host, uint64_t iova, size_t size) "s %= p host %p <-> iova 0x%"PRIx64 " size 0x%zx" --=20 2.26.2