From nobody Mon Feb 9 11:51:27 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=1603709759; cv=none; d=zohomail.com; s=zohoarc; b=k2/8ZqfKhwZZadQYrJQ2RcXE/S8cbb1SH27M3Vcgj/bjahGnQoZxgQGM3KhVnFaffWNBeMHjFPOcTgfUnF6eMSO5ywk1n8KodPf8fdHECbcU63CRC+gPXck1N71zB79D3wqqBrN26MBZd9I/+zZ9Eg3OP9H2z/EW+WjCmbMde9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603709759; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=oHVBY2K3BEOh3WYNJplbtMVpgw2LML5s1ozFmG/8CV0=; b=BVCNJA5VYM9dUViNanIURKgi9ccol/JQ4/s13Q9sfgqq8YD9+uvysA3sTkBtM7boeOEQCaHY9az6hB7i77KKbq3ajQwwG7NBReqRtJENUAik9XyYDrXMlDO0KLIADXf7DmtDimM0X6DoWacF6JCTFHexGsC4fdyNqgHRWE8t/Go= 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 1603709759968453.9349599933811; Mon, 26 Oct 2020 03:55:59 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-482-ksuuc6bNOv-llE61apdt_w-1; Mon, 26 Oct 2020 06:55:56 -0400 Received: by mail-wm1-f72.google.com with SMTP id l12so5560315wme.2 for ; Mon, 26 Oct 2020 03:55:56 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id o4sm21504181wrv.8.2020.10.26.03.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603709758; 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=oHVBY2K3BEOh3WYNJplbtMVpgw2LML5s1ozFmG/8CV0=; b=Lqc9LZ04zqZ9H1UtSMf7HhOnPi1xdoXvO8qlBxZXeX7WkS7pGYeJFmBngR0jQodSclZVtO dNMU1ApEXSB+YnWu4SNK62sC1DTJ8tZ2h/XJtywoplmzKPex7d9N45+rrhBDC/apdkjOI1 vkrP9lMe/7/OncZtL7JHu4nQULKivM8= X-MC-Unique: ksuuc6bNOv-llE61apdt_w-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=oHVBY2K3BEOh3WYNJplbtMVpgw2LML5s1ozFmG/8CV0=; b=UzAN9WRYm4LEonPU7AI4Las3dnnG5FvhYxHpT+pJx+ClbZwlp3puAVyA+TUH6Tf34Y VvtILSdz3pheIB2Ql3g2ePjJgsF6hQmb3YP5u1bTGRRZ7gMsgU3FgHs0jdNCOXxppKsq qHxg9e42El4KpWVaSslPGoHsYjZDIIbAX2Fethjs7TkMoFP6Gxq3yRst8DffJVxThE+7 bWcpavM1Ko1C/1jKyUeAYd8mThvpfsyht5sjG385fpbqvB/Nyl+wF5LQsQDuwQVOA0UC 0qA1ZOVT7KMYRPvqasojGrZoE4uKOY+ewCmKqxFZL9qgdNLynhk//Lxo4XAEcjkkBnVu UpVA== X-Gm-Message-State: AOAM530yYaRgyB39ovvm4eOK7qlv6H+PjgYrJiHZUT4BDgJQpo4HdUD/ 1V///o9GjZJYk2jYW4qXgU1nbIare7NSYTjXxlnH6A5Fr+AhlqDL3YQVUGg96SfsIJm9vrMPfIM ijEcWvVi16LuAhg== X-Received: by 2002:a1c:f417:: with SMTP id z23mr14729760wma.57.1603709755328; Mon, 26 Oct 2020 03:55:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCwY2JOp0h6FKsVOdUTCO82Wo6A+ht+zGe4PvsjEl46DKFMTvOXPgQlVs5gWNyFd2CvfrfxQ== X-Received: by 2002:a1c:f417:: with SMTP id z23mr14729747wma.57.1603709755185; Mon, 26 Oct 2020 03:55:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Auger , Alex Williamson , qemu-block@nongnu.org, Fam Zheng , Max Reitz , Stefan Hajnoczi , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 10/19] util/vfio-helpers: Convert vfio_dump_mapping to trace events Date: Mon, 26 Oct 2020 11:54:55 +0100 Message-Id: <20201026105504.4023620-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201026105504.4023620-1-philmd@redhat.com> References: <20201026105504.4023620-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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 c24a510df82..73f7bfa7540 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -521,23 +521,12 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device,= Error **errp) 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 8598066acdb..7faad2a718c 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