From patchwork Tue Feb 9 11:08:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1438280 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=k2ZJG2AA; 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=WqQiHKsw; 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 4DZgD00cBfz9sSC for ; Tue, 9 Feb 2021 22:10:23 +1100 (AEDT) Received: from localhost ([::1]:39806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9QuT-0000mn-Hv for incoming@patchwork.ozlabs.org; Tue, 09 Feb 2021 06:10:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Qsl-0000m0-Uv; Tue, 09 Feb 2021 06:08:36 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:44317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Qsj-0002l3-O5; Tue, 09 Feb 2021 06:08:35 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 1DD4A89D; Tue, 9 Feb 2021 06:08:31 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 09 Feb 2021 06:08:31 -0500 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=MBWHZgLeeCINLILEUviiTpBt+m LZOyfszKJaVssdvKU=; b=k2ZJG2AACC3IELJ00j27LcSHbnj0RJRPeor1KnXGDf 2+YMnmKbXa/AvltbMTKkDKnxmEuW+5gdm3F+Wa+LpLDnqPoApBSt1O1sOyfdYVH4 lnO6ltymIhyrFkmj6XYQQYObFGSheFeVjCczrFSuMUc81e0xF2VySVwR+sMMiwUR zH2xWOoGpJJMKHkVkPPoFEpInM5C8QJ/eV4SkyhM7nCXFosyi9bMXqQMrtmyhBrJ a74DaTP+Yy+ADXGgcFJT4Dq4ZAvoszwHReAtuu/MY6y/rl/nXdIFn7UdB/uBxVCK S6PJA3NSllNFIhOdQ7lU4FZrtm3GuceujwB/H1S6/JeA== 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=MBWHZg LeeCINLILEUviiTpBt+mLZOyfszKJaVssdvKU=; b=WqQiHKsw5ap9wX+5btClai 2t2kL7C2655Lm3utKumHdaUM1lxn2JqwPHlVymvxL6fYCybpGyS1vf3Y+U6Yp49H wDXyWOk5/CH2fwEW9f0ABZjz0u7McPcHxY3incM9o1nLdk4AFpXxp8/SmABcjVtQ fx7QL50tUDWmLZg6ekC4Aq1zTjrooO0EkttSFJtUpC2hFVoRKkv4H2qYWHkPnRYm 5CKUrbGtAesJ+N9TEUPoEriUD6o0DT9aJoI/aGbblCSU+pmJlW+dRpN0nW6KV0nT bKqQnchJKgpZnUs8/Y+HrbzdVvoTgC/MR3LLdfPjf2b43OB5AlHkue/oWX21l1Xw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheehgddvhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofggtgfgsehtqhertdertdejnecuhfhrohhmpefmlhgruhhsucfl vghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtthgvrh hnpeefudehfedugffhuddttefffeeluedttdetgfduleduuddugfeuhfelueeuuefggfen ucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk 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 C34F424005B; Tue, 9 Feb 2021 06:08:28 -0500 (EST) From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH 0/2] hw/nvme: move nvme emulation out of hw/block Date: Tue, 9 Feb 2021 12:08:24 +0100 Message-Id: <20210209110826.585987-1-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.24; envelope-from=its@irrelevant.dk; helo=wout1-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 , Klaus Jensen , Keith Busch Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen With the introduction of the nvme-subsystem device we are really cluttering up the hw/block directory. As suggested by Philippe previously, move the nvme emulation to hw/nvme. Klaus Jensen (2): hw/nvme: move nvme emulation out of hw/block hw/nvme: move device-scoped functions meson.build | 1 + hw/block/nvme-ns.h | 193 -------------------- hw/block/nvme-subsys.h | 32 ---- hw/{block => nvme}/nvme.h | 206 +++++++++++++++------- hw/nvme/trace.h | 1 + hw/{block/nvme.c => nvme/ctrl.c} | 91 +++++++++- hw/{block/nvme-ns.c => nvme/ns.c} | 8 +- hw/{block/nvme-subsys.c => nvme/subsys.c} | 2 +- MAINTAINERS | 2 +- hw/Kconfig | 1 + hw/block/Kconfig | 5 - hw/block/meson.build | 1 - hw/block/trace-events | 180 ------------------- hw/meson.build | 1 + hw/nvme/Kconfig | 4 + hw/nvme/meson.build | 1 + hw/nvme/trace-events | 178 +++++++++++++++++++ 17 files changed, 431 insertions(+), 476 deletions(-) delete mode 100644 hw/block/nvme-ns.h delete mode 100644 hw/block/nvme-subsys.h rename hw/{block => nvme}/nvme.h (51%) create mode 100644 hw/nvme/trace.h rename hw/{block/nvme.c => nvme/ctrl.c} (97%) rename hw/{block/nvme-ns.c => nvme/ns.c} (98%) rename hw/{block/nvme-subsys.c => nvme/subsys.c} (98%) create mode 100644 hw/nvme/Kconfig create mode 100644 hw/nvme/meson.build create mode 100644 hw/nvme/trace-events