From nobody Tue Oct 28 21:07:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513610176932277.748717384368; Mon, 18 Dec 2017 07:16:16 -0800 (PST) Received: from localhost ([::1]:46742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQx9E-0007Mk-P2 for importer@patchew.org; Mon, 18 Dec 2017 10:16:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQx75-0005dE-Hr for qemu-devel@nongnu.org; Mon, 18 Dec 2017 10:14:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQx6A-0000mK-Pz for qemu-devel@nongnu.org; Mon, 18 Dec 2017 10:13:55 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:44828) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQx69-0000l8-Qj; Mon, 18 Dec 2017 10:12:57 -0500 Received: by mail-qt0-x244.google.com with SMTP id m59so20312802qte.11; Mon, 18 Dec 2017 07:12:57 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id y16sm8334022qta.48.2017.12.18.07.12.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 07:12:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XVqz6/DEj/tyQp5Lf+oHLUovkmNFkVFks5E1qhgQrM0=; b=eXjvLNXDv06HcJCxWM6bEHJxvrQRJVrZKJWL30RHNi7Quy8n3Q5DbWj/qnpluJgK5D /nba17rzgDoSPDlzOR1kRwPs2S1NjUHvYCvCYRetAReWrZC7IDDEb4DhZIvOfanmmUJ1 wV4CFZnL8hwE/TCqPM0+hqIuVYMbL5Zdcrnx/FSCFOWbJQv3hT8xbLouHASUVZfiUYq7 djqOBKxHIuzboLqeOlfqcEqu4eIRs9uOcJ8DVOG7ipCiTCsonxvrg0krRi2LKdUo1ItN bVPwzJ351ilzz2kkwjzkCJhvrOh6Cg6EHTKdoC3BXKSy0BHemPOVii6oDqGGSooA8BP7 zbQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XVqz6/DEj/tyQp5Lf+oHLUovkmNFkVFks5E1qhgQrM0=; b=db82vrVIXvPyQGWhAnBG8ZmM2zgweZKl7b81/DEavz0Qxij2vGD0Of2zUAdPl85jql 5wKwjGg2muSoNix9nQLPoCr+c2zeWCXmInwl7dnJBIfZH2MZR/nFA8cVgBH5zV4XpGwP hpxhfAt/lFyDCHC6jWZbd2Os4LdmMKqSKcsfMPfIxuHD8iSHHxqmvB57/gxm20c86aqx uHhAGWhWAq+1/zswtp8/Ud+cL/41Kcq3RTMaJJoL2f7njvra3MK4GW6bXXQ5r2Bhb8ib lzTLLU1wvbj2GnmSvc0BXSR+gty72x2nvQTRr7LpEH7/y+Zp3VqLbsmLOnd1JEYtI9Gz kXPw== X-Gm-Message-State: AKGB3mIZ73dy+Q+E0UaZlElP9OBaiu1R9HItdnJFms1kc3X9DW1RVKH1 sOeB53+SUFJchHqaFlB3y34= X-Google-Smtp-Source: ACJfBoshXE7c+ZvYeSNH5c7O7YMV20ZNcbMw8PnOu+/67/GvhnR6vRgRWa32GFlMaQOasVgHJh8kGA== X-Received: by 10.237.37.227 with SMTP id y32mr200072qtc.251.1513609976700; Mon, 18 Dec 2017 07:12:56 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S. Tsirkin" , Marcel Apfelbaum , Eduardo Habkost , Keith Busch Date: Mon, 18 Dec 2017 12:12:41 -0300 Message-Id: <20171218151244.9975-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171218151244.9975-1-f4bug@amsat.org> References: <20171218151244.9975-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 1/4] hw/block/nvme: QOM'ify PCI NVME X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/nvme.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 441e21ed1f..9c5f898da0 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -920,9 +920,9 @@ static const MemoryRegionOps nvme_cmb_ops =3D { }, }; =20 -static int nvme_init(PCIDevice *pci_dev) +static void nvme_realize(PCIDevice *pci, Error **errp) { - NvmeCtrl *n =3D NVME(pci_dev); + NvmeCtrl *n =3D NVME(pci); NvmeIdCtrl *id =3D &n->id_ctrl; =20 int i; @@ -931,30 +931,33 @@ static int nvme_init(PCIDevice *pci_dev) Error *local_err =3D NULL; =20 if (!n->conf.blk) { - return -1; + error_setg(errp, "Block device missing"); + return; } =20 bs_size =3D blk_getlength(n->conf.blk); if (bs_size < 0) { - return -1; + error_setg_errno(errp, -bs_size, "Could not get length of device"); + return; } =20 blkconf_serial(&n->conf, &n->serial); if (!n->serial) { - return -1; + error_setg(errp, "Could not get device serial number"); + return; } blkconf_blocksizes(&n->conf); blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk), false, &local_err); if (local_err) { - error_report_err(local_err); - return -1; + error_propagate(errp, local_err); + return; } =20 - pci_conf =3D pci_dev->config; + pci_conf =3D pci->config; pci_conf[PCI_INTERRUPT_PIN] =3D 1; - pci_config_set_prog_interface(pci_dev->config, 0x2); - pci_config_set_class(pci_dev->config, PCI_CLASS_STORAGE_EXPRESS); + pci_config_set_prog_interface(pci->config, 0x2); + pci_config_set_class(pci->config, PCI_CLASS_STORAGE_EXPRESS); pcie_endpoint_cap_init(&n->parent_obj, 0x80); =20 n->num_namespaces =3D 1; @@ -1046,12 +1049,11 @@ static int nvme_init(PCIDevice *pci_dev) cpu_to_le64(n->ns_size >> id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas)].ds); } - return 0; } =20 -static void nvme_exit(PCIDevice *pci_dev) +static void nvme_exit(PCIDevice *pci) { - NvmeCtrl *n =3D NVME(pci_dev); + NvmeCtrl *n =3D NVME(pci); =20 nvme_clear_ctrl(n); g_free(n->namespaces); @@ -1061,7 +1063,7 @@ static void nvme_exit(PCIDevice *pci_dev) memory_region_unref(&n->ctrl_mem); } =20 - msix_uninit_exclusive_bar(pci_dev); + msix_uninit_exclusive_bar(pci); } =20 static Property nvme_props[] =3D { @@ -1081,7 +1083,7 @@ static void nvme_class_init(ObjectClass *oc, void *da= ta) DeviceClass *dc =3D DEVICE_CLASS(oc); PCIDeviceClass *pc =3D PCI_DEVICE_CLASS(oc); =20 - pc->init =3D nvme_init; + pc->realize =3D nvme_realize; pc->exit =3D nvme_exit; pc->class_id =3D PCI_CLASS_STORAGE_EXPRESS; pc->vendor_id =3D PCI_VENDOR_ID_INTEL; --=20 2.15.1