From patchwork Sun Dec 17 20:49:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 849688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; 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=gmail.com header.i=@gmail.com header.b="rdPOJQ3D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z0GX21m8Jz9sDB for ; Mon, 18 Dec 2017 07:50:24 +1100 (AEDT) Received: from localhost ([::1]:55436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQft6-0001HI-7E for incoming@patchwork.ozlabs.org; Sun, 17 Dec 2017 15:50:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQfsG-0001Ev-2D for qemu-devel@nongnu.org; Sun, 17 Dec 2017 15:49:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQfsF-0005Zw-4t for qemu-devel@nongnu.org; Sun, 17 Dec 2017 15:49:28 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:41740) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQfsE-0005ZR-Pi; Sun, 17 Dec 2017 15:49:27 -0500 Received: by mail-qt0-x243.google.com with SMTP id i40so17852597qti.8; Sun, 17 Dec 2017 12:49:26 -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=rdPOJQ3DEBeQzmXu3sImg92ZJBFq7X3li/NSVJdv+Bw+KJ+nQ94Fz5dexDLHDZcA6Z BSBN/hg54OU0zQhNb+D8XkqjpAT437Uj4rFdWqjlx8GCiYDcAicSRB6oA/Lkw581XkVW 5jBq3P9pH4pZMyoeb7FyDmD3iU6vN1k88boOfshDrDnorS97mbIF5cyjbdmx7eCZJ3za FTV7ZRoS/pr7avVSwoa1uYmz/OjnYTdymELuIFHRXASMdRgECVDOghhTXoqDtzCT4TiO vxwrjhBn4JK0Sn5MR+8L1u/vmTQ7RjcooTk7BPcbsyVh0om5NxrI1AzoZDEu9LVGM/Rx vhTQ== 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=SU6C895ZqHZiqsEQk8RskCSUUr/LXxJecdeINu7zFDZjEr0pJQZLBZgrfOEmyjaMKu ndneZpwhD6N/eVT4d2oCMmfPV12vUPJtg6clT3QfM2Dcr4bdMXiqeJFAvj7ETKJFiA7p JMFq0Qhr5/tchf3c55cehy64n8Q3IpObUYRjUQ8fqdO5q1rey+Zld2UBbGXPzKH4pkoZ u1ZmdXTHO+r2REryNuqZmHQkOXjCebJ7EptDwGW2S6gmNk4FCQoSOvtpSu/KOUqmvx0Z Cj0Gs5h4/IiYNZ8d4CjFx6sa3qy28VW6Yy8SmUZwROeq7Di6JJSBAGjH8aUUJ+nRDUbc BFTQ== X-Gm-Message-State: AKGB3mLUBj5Dugw2YOVS9zy8HBq2hEtP3w9/fY0R++3abe4Q2sw62SR1 6/dg3B2vuvZ1+i0qAzZ6/+U= X-Google-Smtp-Source: ACJfBoui9pU4P0wYM7lThEV0iTRtefvSKj5TbaDEAWZzHFa0aa+6BQgzwyjzwmUbIrrzfPLeYqGP3A== X-Received: by 10.200.57.133 with SMTP id v5mr32703796qte.30.1513543766068; Sun, 17 Dec 2017 12:49:26 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id b186sm7296778qka.19.2017.12.17.12.49.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 12:49:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: "Michael S. Tsirkin" , Marcel Apfelbaum , Eduardo Habkost , Keith Busch Date: Sun, 17 Dec 2017 17:49:09 -0300 Message-Id: <20171217204912.12420-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171217204912.12420-1-f4bug@amsat.org> References: <20171217204912.12420-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 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_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- 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 = { }, }; -static int nvme_init(PCIDevice *pci_dev) +static void nvme_realize(PCIDevice *pci, Error **errp) { - NvmeCtrl *n = NVME(pci_dev); + NvmeCtrl *n = NVME(pci); NvmeIdCtrl *id = &n->id_ctrl; int i; @@ -931,30 +931,33 @@ static int nvme_init(PCIDevice *pci_dev) Error *local_err = NULL; if (!n->conf.blk) { - return -1; + error_setg(errp, "Block device missing"); + return; } bs_size = blk_getlength(n->conf.blk); if (bs_size < 0) { - return -1; + error_setg_errno(errp, -bs_size, "Could not get length of device"); + return; } 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; } - pci_conf = pci_dev->config; + pci_conf = pci->config; pci_conf[PCI_INTERRUPT_PIN] = 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); n->num_namespaces = 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; } -static void nvme_exit(PCIDevice *pci_dev) +static void nvme_exit(PCIDevice *pci) { - NvmeCtrl *n = NVME(pci_dev); + NvmeCtrl *n = NVME(pci); 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); } - msix_uninit_exclusive_bar(pci_dev); + msix_uninit_exclusive_bar(pci); } static Property nvme_props[] = { @@ -1081,7 +1083,7 @@ static void nvme_class_init(ObjectClass *oc, void *data) DeviceClass *dc = DEVICE_CLASS(oc); PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc); - pc->init = nvme_init; + pc->realize = nvme_realize; pc->exit = nvme_exit; pc->class_id = PCI_CLASS_STORAGE_EXPRESS; pc->vendor_id = PCI_VENDOR_ID_INTEL;