From nobody Fri Dec 19 20:34:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=openvz.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648684630644647.4186822628812; Wed, 30 Mar 2022 16:57:10 -0700 (PDT) Received: from localhost ([::1]:55678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZiBZ-0003B4-LE for importer@patchew.org; Wed, 30 Mar 2022 19:57:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZftB-0008KZ-Al for qemu-devel@nongnu.org; Wed, 30 Mar 2022 17:30:01 -0400 Received: from [2a00:1450:4864:20::135] (port=37766 helo=mail-lf1-x135.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZft8-0003QM-EN for qemu-devel@nongnu.org; Wed, 30 Mar 2022 17:30:00 -0400 Received: by mail-lf1-x135.google.com with SMTP id k21so38085737lfe.4 for ; Wed, 30 Mar 2022 14:29:57 -0700 (PDT) Received: from fedora.. ([185.215.60.153]) by smtp.gmail.com with ESMTPSA id y3-20020a056512044300b0044a9bda3242sm1057573lfk.90.2022.03.30.14.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 14:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DxCdasig0fJ4n01/i66Jn14r/3aai7V7kYErzb5HENY=; b=Xq85pPWXlaA5ecgWisPoFGqqqsP9cb+PVK3RFJlfpUsuYCJv8xk3gCQf4fo3pOxErP /l6vZ7ZPm6gMHuKoWd8U2YHq6FciKZ0tYxl5IumXR4nHomkiwAY9sTB+QMlcIgO2FGvx vB0MuuCyNqpXVamNeuQYKSxFtoRfIjPbW+BGo2BEGscX5tRqcdSz3L7G2eZebq+Un0a+ jeU84iRVXtzhwSkg6XsC1aLDCylUHftA22+FtzEDuB2+brBTWfXpOXyurGoQGrHiC7Em 7VR010XQQAEM6LHiH/MuJPkStVjOuhi21lF3y2peRZ7423a8LowfmDTzc36uEm28fdus SQTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DxCdasig0fJ4n01/i66Jn14r/3aai7V7kYErzb5HENY=; b=Ht484U4lGHohzjjqa8YT6kF9zr2EfrJA0KFKcRyn+f7MhOpfeZ7FeIt0hFvf60klgg 7P3EAs6Uy11/+zNb5luqoniY6DmUEO8yXXqW7ZS69F6gFlSz/8j3c6CvkXhj086j8Grq 9vPAnzosTiCthXxIL3wPbkuFBY7QmQXnFP5t1CDX6jx1NL0o6//IV+hGyNvM8mdw08Se /npu7eOSf8vpRy1uzzGa3mVsLmZerJL2hrMkpNrPRqfm/8TykpDXNrQ7PwH96Kvzs4mD kyzq2ar6EX+Gyf6fDAobub2B/SmqYQBmiQ2An1MH9asaae4HmRlnVnu/7O/B66xn5EfF 09rQ== X-Gm-Message-State: AOAM531mt17e6zwwzv0GM9mQgqUYwcDzrhCvWRP4tmOiHuomeyl3/6kg fZbChETCLrFz3ftGbtxm+ZsDPg== X-Google-Smtp-Source: ABdhPJwxKn7V1HKVuaPM/eKCSun+NDbYnXgLfNmx5RC3e9XwVnkKBHdfbHQK/vtgN8vg7X3v1IArUg== X-Received: by 2002:a05:6512:3094:b0:44a:6dcc:42da with SMTP id z20-20020a056512309400b0044a6dcc42damr8383232lfd.454.1648675795914; Wed, 30 Mar 2022 14:29:55 -0700 (PDT) From: Vladimir Sementsov-Ogievskiy X-Google-Original-From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v5 39/45] block: bdrv_get_xdbg_block_graph(): report export ids Date: Thu, 31 Mar 2022 00:28:56 +0300 Message-Id: <20220330212902.590099-40-vsementsov@openvz.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220330212902.590099-1-vsementsov@openvz.org> References: <20220330212902.590099-1-vsementsov@openvz.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::135 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=vladimir.sementsov-ogievskiy@openvz.org; helo=mail-lf1-x135.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 30 Mar 2022 19:17:26 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, v.sementsov-og@mail.ru, qemu-devel@nongnu.org, hreitz@redhat.com, vsementsov@openvz.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648684631256100001 Content-Type: text/plain; charset="utf-8" Currently for block exports we report empty blk names. That's not good. Let's try to find corresponding block export and report its id. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 4 ++++ block/export/export.c | 13 +++++++++++++ include/block/export.h | 1 + stubs/blk-exp-find-by-blk.c | 9 +++++++++ stubs/meson.build | 1 + 5 files changed, 28 insertions(+) create mode 100644 stubs/blk-exp-find-by-blk.c diff --git a/block.c b/block.c index efe0ec0f00..40f54fe121 100644 --- a/block.c +++ b/block.c @@ -6147,7 +6147,11 @@ XDbgBlockGraph *bdrv_get_xdbg_block_graph(Error **er= rp) for (blk =3D blk_all_next(NULL); blk; blk =3D blk_all_next(blk)) { char *allocated_name =3D NULL; const char *name =3D blk_name(blk); + BlockExport *exp =3D blk_exp_find_by_blk(blk); =20 + if (!*name && exp) { + name =3D exp->id; + } if (!*name) { name =3D allocated_name =3D blk_get_attached_dev_id(blk); } diff --git a/block/export/export.c b/block/export/export.c index 66e62f0074..a9f935f772 100644 --- a/block/export/export.c +++ b/block/export/export.c @@ -54,6 +54,19 @@ BlockExport *blk_exp_find(const char *id) return NULL; } =20 +BlockExport *blk_exp_find_by_blk(BlockBackend *blk) +{ + BlockExport *exp; + + QLIST_FOREACH(exp, &block_exports, next) { + if (exp->blk =3D=3D blk) { + return exp; + } + } + + return NULL; +} + static const BlockExportDriver *blk_exp_find_driver(BlockExportType type) { int i; diff --git a/include/block/export.h b/include/block/export.h index 7feb02e10d..172c180819 100644 --- a/include/block/export.h +++ b/include/block/export.h @@ -80,6 +80,7 @@ struct BlockExport { =20 BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp); BlockExport *blk_exp_find(const char *id); +BlockExport *blk_exp_find_by_blk(BlockBackend *blk); void blk_exp_ref(BlockExport *exp); void blk_exp_unref(BlockExport *exp); void blk_exp_request_shutdown(BlockExport *exp); diff --git a/stubs/blk-exp-find-by-blk.c b/stubs/blk-exp-find-by-blk.c new file mode 100644 index 0000000000..2fc1da953b --- /dev/null +++ b/stubs/blk-exp-find-by-blk.c @@ -0,0 +1,9 @@ +#include "qemu/osdep.h" +#include "sysemu/block-backend.h" +#include "block/export.h" + +BlockExport *blk_exp_find_by_blk(BlockBackend *blk) +{ + return NULL; +} + diff --git a/stubs/meson.build b/stubs/meson.build index 9924810a23..af60dd9778 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -2,6 +2,7 @@ stub_ss.add(files('bdrv-next-monitor-owned.c')) stub_ss.add(files('blk-commit-all.c')) stub_ss.add(files('blk-exp-close-all.c')) stub_ss.add(files('blk-by-qdev-id.c')) +stub_ss.add(files('blk-exp-find-by-blk.c')) stub_ss.add(files('blockdev-close-all-bdrv-states.c')) stub_ss.add(files('change-state-handler.c')) stub_ss.add(files('cmos.c')) --=20 2.35.1