From patchwork Mon Apr 19 19:27:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1468064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=irrelevant.dk header.i=@irrelevant.dk header.a=rsa-sha256 header.s=fm2 header.b=yFXmmDTu; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm2 header.b=IUBJoRJH; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FPHRZ0StQz9t2g for ; Tue, 20 Apr 2021 05:48:10 +1000 (AEST) Received: from localhost ([::1]:37528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYZsN-0002B4-TU for incoming@patchwork.ozlabs.org; Mon, 19 Apr 2021 15:48:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYZZ5-0000FL-9e; Mon, 19 Apr 2021 15:28:11 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:55155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYZZ2-0005Ew-Oo; Mon, 19 Apr 2021 15:28:11 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 3A1EC18B4; Mon, 19 Apr 2021 15:28:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 19 Apr 2021 15:28:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=fukgXEAdAmkIfklJMHEFfyp8k6 0VcUWU0ThXfQ2aoBc=; b=yFXmmDTu5OtgJH9/glaa4GiHw3ZQC5fjepZSRkI4It OugWodqoDe0b2XiFgxUF/P5vOSWA3kPlSuNhXWWJjoCebsg+nern5/tDSkeBB25d Flly825apQWM0e/h/d1S0LSktaT1FAUOHDvOMejuHU54RJEWXvK95UlAW75d5waa Ks/h3jksLxeoKqqPUELcydGYgCMhTWdmB9mGoWzS2o7gXpCKQ2nOKM7QnjqyALD4 pX7UYhto0NoQaqDDq5aHHwG8N4Qek7YGx5nUgC7pl5q8g+q3HyEAN8AT9gf5YQpD utNn1/iuEGqmXkj1k6Nx50N9X5NF2Qq54L/9GmOOuGBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=fukgXE AdAmkIfklJMHEFfyp8k60VcUWU0ThXfQ2aoBc=; b=IUBJoRJHjhQlWnz0y84DWd vjDPE81TwTk00hk9vswL8MDbsI/EYzT8/DqCBfctquOXDBvMxeuwGGoDZVqwEUh4 DalGtipM+M7OpttcAUOFdrRdfi0ks8gBoa25nZGAQETNxXHFXWSPQWq0rD91JTHM apLykAaMzqf6G23UzDCCud4EUHHZWB+2IRpGV/DNn7XRPEqDO9zaTQyq6V9WJ3po 2MkawuNiriQE6IJYZE6mhZty4MNuO1C1dgDy03W8hCszotbeq2zQ/JUHZrvXOM4L wPgEYi+jjxD1rPN3KtJiRbMovLSJ+x7LvLVvYHQZurlixBszCccivF13+UtLpwuw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddtgedgudeflecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofggtgfgsehtqhertdertdejnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeefudehfedugffhuddttefffeeluedttdetgfduleduuddugfeuhfelueeuuefg gfenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 938D71080067; Mon, 19 Apr 2021 15:28:03 -0400 (EDT) From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH 00/14] hw(/block/)nvme: spring cleaning Date: Mon, 19 Apr 2021 21:27:47 +0200 Message-Id: <20210419192801.62255-1-its@irrelevant.dk> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.21; envelope-from=its@irrelevant.dk; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Klaus Jensen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen This series consists of various clean up patches. The final patch moves nvme emulation from hw/block to hw/nvme. Klaus Jensen (14): hw/block/nvme: rename __nvme_zrm_open hw/block/nvme: rename __nvme_advance_zone_wp hw/block/nvme: rename __nvme_select_ns_iocs hw/block/nvme: consolidate header files hw/block/nvme: cleanup includes hw/block/nvme: remove non-shared defines from header file hw/block/nvme: replace nvme_ns_status hw/block/nvme: cache lba and ms sizes hw/block/nvme: add metadata offset helper hw/block/nvme: streamline namespace array indexing hw/block/nvme: remove num_namespaces member hw/block/nvme: remove irrelevant zone resource checks hw/block/nvme: move zoned constraints checks hw/nvme: move nvme emulation out of hw/block meson.build | 1 + hw/block/nvme-dif.h | 63 --- hw/block/nvme-ns.h | 229 --------- hw/block/nvme-subsys.h | 59 --- hw/block/nvme.h | 266 ----------- hw/nvme/nvme.h | 547 ++++++++++++++++++++++ hw/nvme/trace.h | 1 + hw/{block/nvme.c => nvme/ctrl.c} | 204 ++++---- hw/{block/nvme-dif.c => nvme/dif.c} | 57 +-- hw/{block/nvme-ns.c => nvme/ns.c} | 104 ++-- hw/{block/nvme-subsys.c => nvme/subsys.c} | 13 +- MAINTAINERS | 2 +- hw/Kconfig | 1 + hw/block/Kconfig | 5 - hw/block/meson.build | 1 - hw/block/trace-events | 206 -------- hw/meson.build | 1 + hw/nvme/Kconfig | 4 + hw/nvme/meson.build | 1 + hw/nvme/trace-events | 204 ++++++++ 20 files changed, 928 insertions(+), 1041 deletions(-) delete mode 100644 hw/block/nvme-dif.h delete mode 100644 hw/block/nvme-ns.h delete mode 100644 hw/block/nvme-subsys.h delete mode 100644 hw/block/nvme.h create mode 100644 hw/nvme/nvme.h create mode 100644 hw/nvme/trace.h rename hw/{block/nvme.c => nvme/ctrl.c} (98%) rename hw/{block/nvme-dif.c => nvme/dif.c} (90%) rename hw/{block/nvme-ns.c => nvme/ns.c} (87%) rename hw/{block/nvme-subsys.c => nvme/subsys.c} (85%) create mode 100644 hw/nvme/Kconfig create mode 100644 hw/nvme/meson.build create mode 100644 hw/nvme/trace-events Reviewed-by: Keith Busch