From nobody Mon Feb 9 11:06:15 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=1604369294; cv=none; d=zohomail.com; s=zohoarc; b=gvkHQT6yzj7JnETntfnYC555zNg888vbvSQzbvqjnI1M3ELwGn7VnK56i8VXHC4UqXDhqrrvEduTvMt1okesv8n5oRC/Bd/gEYLJewNjZ1+zBP9TnPpT2ke9GXKkj+DFDpQRRyxg8MdHFYWlKTDUp04nge28GTiVeK1er0JGDqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604369294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=i5DLckUUyoP1dg/42Pfez6Z6RF3ehTTuZJk5kW+hkoI=; b=Q1E7og287sG5OPC51YuXnTJqQcle5oGHligCF9Sza5WQU0Npw9MyvJydlMz7sQJ8K8xBdZZgVyJNtXMiW6LZTxH9UJKIN28pIJkP9fX/myWf35ZrJkW04si93K+NxuH0xgITR93Cto0Wg6ZA1M4v4Kkv0fayI0o4471ADQiwpBE= 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 1604369294629550.0065542987292; Mon, 2 Nov 2020 18:08:14 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-52-Gi22QPH6MQONfxIxX4rw1A-1; Mon, 02 Nov 2020 21:08:12 -0500 Received: by mail-wr1-f71.google.com with SMTP id 33so7144985wrf.22 for ; Mon, 02 Nov 2020 18:08:11 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o129sm1283042wmb.25.2020.11.02.18.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:08:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604369293; 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=i5DLckUUyoP1dg/42Pfez6Z6RF3ehTTuZJk5kW+hkoI=; b=VwKnLGmSgIcCO14VKWnThgInb4s7Ev1Qit8zdRAmWNA/Asw5UGu6BJh45Lz+YDVoSgRzid FO25PMEFof2rvkPMmbfKo9px3gnaPPf6Fre5uq/KOHtYc/csJCtbgNe/G8EM8Hx7hc3DXy S5eqM2s87mJN1tZvwfsfacjsZU6ERUI= X-MC-Unique: Gi22QPH6MQONfxIxX4rw1A-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=i5DLckUUyoP1dg/42Pfez6Z6RF3ehTTuZJk5kW+hkoI=; b=Kt+HUc6hcSgPQ19pgKv/ov6KAwFwReswoO7IzPk97j4ZKLpr5JiWGrNBOifjhvtVJU qTK12+73IezdnFHjjFbOIAgFARv0FhkoTbuLOuar8912mgwsPdmUxZ5J5C4KvUub6dFL RARs7bcS/qKvE7NvaIcUex8t1a5wQWWqGgLmxgVq+kAnrTlcCjdZMZz6U448L8Hk0Uyg WpcQgFaxK486JGOA4WG9QUolYwj/PVWJU2afPm8rCGqOWDR1JUPF59IMFS9C1Y0Sv8Ir YD0X4t7JWlZnz8ZNTOCoNmzGUJ2pFTdUBtmcO0L+miiAAPo/IFkh47i/IbhHd0vPU4dD Djaw== X-Gm-Message-State: AOAM533SfFXAcpEhVvXTVBa+TdL3CxEIKRQq6fNqmfkqTsb6oK7LWnJt VcHegxApeoHYHkYKf9Sv8O1ylBxq5fJyE+nBHXp2FxiKx3M5qct1QqiJdQDRB8l41bQiaIqmpkg IZmOFVQNZEkdkZw== X-Received: by 2002:a1c:2487:: with SMTP id k129mr979327wmk.86.1604369290363; Mon, 02 Nov 2020 18:08:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyBtmB2NIKAVc3MMmzoovcuJTysX+oxuXirRD39f7lUZ5ixg7t654Ru/gxmLO4+j2OmvMdKLA== X-Received: by 2002:a1c:2487:: with SMTP id k129mr979304wmk.86.1604369290095; Mon, 02 Nov 2020 18:08:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Kevin Wolf , Eric Auger , Max Reitz , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3 6/7] util/vfio-helpers: Convert vfio_dump_mapping to trace events Date: Tue, 3 Nov 2020 03:07:32 +0100 Message-Id: <20201103020733.2303148-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103020733.2303148-1-philmd@redhat.com> References: <20201103020733.2303148-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 08239941cb2..61e0d4bcdfe 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