From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 879D9C4332F for ; Thu, 3 Nov 2022 16:22:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwi-0005V2-0q; Thu, 03 Nov 2022 12:20:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcva-0001Ys-Ko; Thu, 03 Nov 2022 12:18:56 -0400 Received: from mail-mw2nam10on2076.outbound.protection.outlook.com ([40.107.94.76] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcvY-0008IS-Oc; Thu, 03 Nov 2022 12:18:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hi7inmLrzsQkqiWRYlm54N8AssePMpSS16rnuO09wOpmXOAHU662jQJUVnv7FHJUGriiUDljiVOg0Ta2AfpvoV0DXHkMh3lT7TMGYRsknsIg1DxvQ0zygRtjo8D08AFoee2N28hzq3TRAijNBkTOyJxFw2b4K5b2xu+zqjcI9Lzq2a9q7VUqHzFLQ2WuyhCDMzT7b2G6aBpH7USvMSjfEnQbXqbdf9pcDjKy5LNLZuXOvDmkgsT3WrOVWN108uyfsIzmfB8DI3MLC5WshFTVxV76eHiNBWzOFzq8eHg1jmT5fFnOLdlkpz0lBC2DcP3ER5m7pil8FGycssxiiNUBlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=67k9XJXT/vlKcWf+8i7haH9uebtBGQ3rwwwCyvPBOtw=; b=JqYtvHI/HgmnEJpNvoZI2IUec91H4PFaF11n/NA4+pOqgJdxZzFzk9taYTw0xJJo70vVe696PDfELzmIaaXQvFZBH8BV43C7xFG9lFLqkjp+o7daOx2h9HfmGedYSJjrT/KW6FY6D0Gav5/ytIxjaATpGttOXM3PDj0FcOwO0ugD4RqzdnGlMW6pLTRv7Jd9E2+LsVOQD+nLe1mf9vpsXSciQC0Z2Q18+tS7ro4mEAj2NWv75Ra1lBZSLI0HX5fju7ENUIBWoI/E/L0pyJJIk6d4i9DuMs0IMF2gE/m6JbKvBU3FRGHQtqXsu6FLxvtXyE6jlhQHbWFqtCAZQT+teg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=nongnu.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=67k9XJXT/vlKcWf+8i7haH9uebtBGQ3rwwwCyvPBOtw=; b=nwdjuvaFg8FWkD/QLo6mFjo1BMcesZYrhgGS5Hx8cQGjqwzJVWvEItLOlBKPZjtkAMYY2CIxaWeZzL2hZDGI/OwsoNB5KKVKTqjMNK6KmMH9wOyb9L9saaY6nhGKdGwSbaQcBzG/gLq8yPDp7la3N+4Kz3d004DpJ5tQTGGesrvOAuV2LN+h4Jvo7ErenoDGCu8ww+vSrvLe9ZzJ7e6HUY/xi8YUqJqMRmkI4+qKtk0ALXyWyoDQbmGjRto+LsEmTSDShf9zEgHK3RPlGmSxkyEecgYpzJ2X2XG7BTglx8gy6YwB3LL1+R1fl2CE1yWMg4AS4AtlGT2YNP8xK2Z+nQ== Received: from MW4PR03CA0137.namprd03.prod.outlook.com (2603:10b6:303:8c::22) by DM6PR12MB4434.namprd12.prod.outlook.com (2603:10b6:5:2ad::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Thu, 3 Nov 2022 16:18:36 +0000 Received: from CO1NAM11FT092.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8c:cafe::53) by MW4PR03CA0137.outlook.office365.com (2603:10b6:303:8c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22 via Frontend Transport; Thu, 3 Nov 2022 16:18:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CO1NAM11FT092.mail.protection.outlook.com (10.13.175.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20 via Frontend Transport; Thu, 3 Nov 2022 16:18:35 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Thu, 3 Nov 2022 09:18:24 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 3 Nov 2022 09:18:24 -0700 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 3 Nov 2022 09:18:17 -0700 From: Avihai Horon To: CC: Alex Williamson , Halil Pasic , Christian Borntraeger , Eric Farman , Richard Henderson , David Hildenbrand , "Ilya Leoshkevich" , Thomas Huth , "Juan Quintela" , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Stefan Hajnoczi , Fam Zheng , Eric Blake , Vladimir Sementsov-Ogievskiy , John Snow , , , Kunkun Jiang , "Zhang, Chen" , Yishai Hadas , Jason Gunthorpe , Maor Gottlieb , Shay Drory , Avihai Horon , Kirti Wankhede , Tarun Gupta , Joao Martins Subject: [PATCH v3 15/17] vfio: Alphabetize migration section of VFIO trace-events file Date: Thu, 3 Nov 2022 18:16:18 +0200 Message-ID: <20221103161620.13120-16-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20221103161620.13120-1-avihaih@nvidia.com> References: <20221103161620.13120-1-avihaih@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT092:EE_|DM6PR12MB4434:EE_ X-MS-Office365-Filtering-Correlation-Id: f496a91b-f4d5-4791-607e-08dabdb70f5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qYHIijfokfKXRKyyJYb73FKpDe2E5cAiLSC3IXkPI6n6cYkpVeQBLqFGNpiIuhazV4m9bAmPsOaoLNz5syZsHsPnVHeWlAgCCGaQUHu5n3bmWr36lekrYg3P8g4lpCTzhMcx5X36G57oMP/xBaAaHbVWV5MK4gLE6oQ1Qi2H2OlW+QNN55bO8ljBv0D7MVsCubm/mvmTNMJWVPqWE+L9s7bQCPxMVlsYBCUCmMcJdmPyGFIcVQr251nJmh3PpMUVXKcQv63Rl+EtjrluMSWan1DRayyO8WCR6YqqhteHsPexnmxKUJ94tb/PtXKplgJk4WoE1i5SmJk55NM0gVritd31cvwsOSK3UCRmKCVyMbJ1xVLcVAkHIPQAyq4uluY1SENloFpPJ1HTuJmarbPpxOZo2RnOd2Mj23APkUJLraaMeYd6hFBiwbMgN6+gDvQkU1aauPJbzGRAMgAzM1J7hUuUX/9bC0dLevNi4SqWe6yaHfPjPi3xJCrsjrl950QwvWfz4jgVtfkPKMiYzo0qwj5d8XPllkZRGOwzJ66H0gehU6fj3rbIOxXNvWExnmsVwAQ8xwaxvotQMDaDJF0o7wPko7Yml+zyX9rIiUGBrv6hXem6n7vOYx0iUmtrRf8ROsIR1/+GHEykOs00n8XpG/VRPMdlb26pOJNCwTZJHKslOtDTLrPRSS9yYqpY8TWiBfmuLd29cWLI66j4kEOpuu6uQCGjnV925YWkjLAu9T7YmUZrqn65KNj3gZMb/8FEir6kbv7weWh3YHJSlntcyg== X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(396003)(376002)(136003)(346002)(39860400002)(451199015)(36840700001)(40470700004)(46966006)(2616005)(186003)(82740400003)(26005)(7696005)(36860700001)(426003)(336012)(47076005)(40460700003)(2906002)(7416002)(40480700001)(1076003)(316002)(8936002)(54906003)(70586007)(6916009)(478600001)(82310400005)(4326008)(5660300002)(41300700001)(8676002)(70206006)(356005)(83380400001)(36756003)(7636003)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 16:18:35.9917 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f496a91b-f4d5-4791-607e-08dabdb70f5e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT092.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4434 Received-SPF: softfail client-ip=40.107.94.76; envelope-from=avihaih@nvidia.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.047, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sort the migration section of VFIO trace events file alphabetically and move two misplaced traces to common.c section. Signed-off-by: Avihai Horon --- hw/vfio/trace-events | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index cbd6590dd9..59f48af4ee 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -119,6 +119,8 @@ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Devic vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]" vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8" vfio_dma_unmap_overflow_workaround(void) "" +vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start) "container fd=%d, iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64 +vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 # platform.c vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d" @@ -148,19 +150,17 @@ vfio_display_edid_update(uint32_t prefx, uint32_t prefy) "%ux%u" vfio_display_edid_write_error(void) "" # migration.c +vfio_load_cleanup(const char *name) " (%s)" +vfio_load_device_config_state(const char *name) " (%s)" +vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64 +vfio_load_state_device_data(const char *name, uint64_t data_size) " (%s) size 0x%"PRIx64 vfio_migration_probe(const char *name) " (%s)" vfio_migration_set_state(const char *name, const char *state) " (%s) state %s" -vfio_vmstate_change(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s" vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s" -vfio_save_setup(const char *name) " (%s)" +vfio_save_block(const char *name, int data_size) " (%s) data_size %d" vfio_save_cleanup(const char *name) " (%s)" +vfio_save_complete_precopy(const char *name) " (%s)" vfio_save_device_config_state(const char *name) " (%s)" vfio_save_pending(const char *name, uint64_t precopy, uint64_t postcopy) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64 -vfio_save_complete_precopy(const char *name) " (%s)" -vfio_load_device_config_state(const char *name) " (%s)" -vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64 -vfio_load_state_device_data(const char *name, uint64_t data_size) " (%s) size 0x%"PRIx64 -vfio_load_cleanup(const char *name) " (%s)" -vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start) "container fd=%d, iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64 -vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 -vfio_save_block(const char *name, int data_size) " (%s) data_size %d" +vfio_save_setup(const char *name) " (%s)" +vfio_vmstate_change(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s" -- 2.21.3