From patchwork Mon Jul 27 18:37:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 500538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 6B5BD140318 for ; Tue, 28 Jul 2015 04:38:43 +1000 (AEST) Received: from localhost ([::1]:54998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJnIP-0007Ly-Kj for incoming@patchwork.ozlabs.org; Mon, 27 Jul 2015 14:38:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJnHf-0005uX-B8 for qemu-devel@nongnu.org; Mon, 27 Jul 2015 14:37:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJnHc-0007ZI-6H for qemu-devel@nongnu.org; Mon, 27 Jul 2015 14:37:55 -0400 Received: from mail-by2on0092.outbound.protection.outlook.com ([207.46.100.92]:21544 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJnHb-0007Ye-EQ for qemu-devel@nongnu.org; Mon, 27 Jul 2015 14:37:52 -0400 Received: from BL2FFO11FD049.protection.gbl (10.173.160.33) by BL2FFO11HUB024.protection.gbl (10.173.161.48) with Microsoft SMTP Server (TLS) id 15.1.231.11; Mon, 27 Jul 2015 18:37:48 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; suse.de; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with Microsoft SMTP Server (TLS) id 15.1.231.11 via Frontend Transport; Mon, 27 Jul 2015 18:37:47 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:47619 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZJnHV-0000BR-MF; Mon, 27 Jul 2015 11:37:45 -0700 Received: from [127.0.0.1] (port=37033 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZJnHV-0006fc-Fn; Mon, 27 Jul 2015 11:37:45 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t6RIXAlE001154; Mon, 27 Jul 2015 11:33:10 -0700 Received: from [172.19.5.153] (port=55417 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZJnHU-0006fZ-JM; Mon, 27 Jul 2015 11:37:44 -0700 From: Alistair Francis To: , Date: Mon, 27 Jul 2015 11:37:44 -0700 Message-ID: X-Mailer: git-send-email 2.1.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21706.005 X-TM-AS-Result: No--6.498-7.0-31-10 X-imss-scan-details: No--6.498-7.0-31-10 X-TMASE-MatchedRID: hZoMPmZo0JT+MzVaeoq/RXQIOMndeKgEmyqQJWNsuklcKZwALwMGs+gY WcI4QZwHXJfh7apDc9QPMrmisRKp8RLmJd2F/yFuSHCU59h5KrGuiRuR9mCaugqiCYa6w8tv4Zm ES/3DA4kbS/LaVLRVhLSrXUB6/In2lwV2iaAfSWcURSScn+QSXt0H8LFZNFG7hqz53n/yPnqsYr Pn1fQmErJzgEOIo5inezgb/FHUJUx/j/ku3q0NS1mfL6Hn8hgy X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD049; 1:HQS4ZfrxkS8MMu5GOej55o6XbI5by2al1XBePQSW2ZSGLue1mMDnSjEzlRLZMe0XwlFIe9qEmPdDKj1XRuwR98sDuzcQ1b9DsQaHc9R0Lqh29Tqe9/SyMq+1NPBEaO8i4ekraj5FwZmydrecs4M7NIj3S+4DcP7a2omBog9O1eLsCyoSbY9HrJuR2mVPHAz1k3kvG1EC/XNskfZzpn2wBVDxrkkyY7lx20RT5h3auGXMBxpwfvgfn2Cgr90qtCtwEOJaeFtluHLZEvlkr+4rGNGEcAZeXQSFLx0v4/qxBnkDISJRXKuoM+aJRlVvt/LB X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(189002)(199003)(5003940100001)(85426001)(64026002)(86362001)(36756003)(105606002)(64706001)(19580405001)(19580395003)(47776003)(229853001)(6806004)(62966003)(5001770100001)(189998001)(5001960100002)(77156002)(5003600100002)(71366001)(33646002)(118296001)(50466002)(50986999)(50226001)(106466001)(2950100001)(76176999)(48376002)(77096005)(46102003)(92566002)(87936001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB024; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:nov; MX:1; A:1; PTR:unknown-60-96.xilinx.com; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB024; 2:uRGYISmrl+A6o8tRXn62KDQS3SNXwLrbrGwgb/cPbM9iu5+sSIGUyxl+5vhT2nB7l2mhO2KfpX0AObU7XpswXwjoqClb6/j7YQUWUEkOaqKSHuTOJ27BVCtOWr5XIrau4DToFQU8EMui3f0jNoGwTcSwyYdTJDo8C9Kod+HTnUY=; 3:MB3Dd8bLudO08q6oyHmOXCrmmX0KykcsEV3i2j2KDMSdBnf1Z8e/+pS3zYgUkOOHjFkx+H9itdOQ3haWZga0d2IevGCR/LRsiM1MqQ29ZKZg5SDWXymPwLptR6RYowJmiz0rboTvOwueu7PWMa6uKTE3/jmDPV0pbBkJXGSYXmy10FrCjT7TNAu5ga1V3S6EmKTDgfEfVbqspDmZHDOXD5/xdMLHvYPQRJGxN+baJbA=; 25:g26N48UmlhzIk91wuxzXQJBPt94e5jPVW3dp7tyMHLhB87IRVx6f4kjlCk1ybRsp2Rq+WOLyNKEtCQCl8kKahJaOXv0/Tqws/sdEy5FSCymJqQfiWFAfcWQ4eY/69Themu5xnHGmemSjyHOwweaix0GSAFQfChwDL72RFk+uC3ovIfcGYtK/PtV1LXBblVuv9kbtFLKXmFmtQteA970bnsiksw0U9r4wtx12SDoRDAM0ZmqhSoAWrgwcW1YQR+dFedflm105obe6YfQx8Iv/cg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2FFO11HUB024; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB024; 20:H0rjKm1sJadETWixEzq7MIQBgr8Z6sYXWNPfeuZ78rFMKpABd8OxB3U/Vvtw9x/HiAVou8JWXuB9k7SXCRC/1lcI5w+gdTzuFOBjc7DOy4FpaZzsTeGZQZayes7kopqg6yHKcL0Sax4XxRDx06UDn715EX/X4LNBxu+O9imNT14tReZtZQ95ieB4qwCvJDDMtS/A58fVCZ3QQFm4Z9NtIZJ6c18UjVjWXLPDcUKGz1TjljQ3pU8rOAIpKZml/aKdMlFmszsRYx6cJI4ZYEzbmyHnzmuwgyU7kUJyUx8Bs2vHPch95vbJHCd5C57p6Ux/GiY9aD0pfi6pMSNyiclIwcq6LXqYeeAvfA+MSJai35TtfXwdL8mgmUgmwKtT8sbsg2F6F18e0QezcR4luUbZmyTK1GISHnJ4fg21ea4wvKdZIpr/lUuUZuIAEHhAahqX/6dpMjMk+ijbo3VAJDfCFZmZRSabYme1F/OqAPh/2sajh/zKlPFPLPqk5tgbjNqB; 4:Dn5kvoWx0HxewVHytjK6c85EA4vJAPM4eMQfDpjiYP/4VbAG/uBAFFHW20EYrX+xLgSKVEGySrPVys0SBL1PfyQas9Eyu/zBieak7mO5pGl7r+ZkOle4VAJYc2dQc9aEwhXvLKxN1wSbII6g5rWAVb242aSAMAKvVynoSGF5XI9ZKmZWiuWz3xBDldwjea77gxsnRYpmhs1VMzFoZ18RuGJg3jjs+uHQVuSr/DaZieH2cmOOPaH/azt2LPAsLnNKbQQPA7DK+FSyh5QI+iyxNd3eZzfgMdsw7SPccZrcLAw= BL2FFO11HUB024: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BL2FFO11HUB024; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB024; X-Forefront-PRVS: 0650714AAA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11HUB024; 23:tr5D7fipTgPDDIpFeabNbVBwI6FQFXMkZr4yuLvt?= =?us-ascii?Q?oyUq8yQZ76txhfVOF57c0fAJBZYmhtom61Bojf89Iz5wYVn8WEN2dK6jiTYD?= =?us-ascii?Q?RwcypVKqnwthm9eXoD1AfESgr1IYF3pWY2dCJJb2nHlJEXbb8170AgcevUzB?= =?us-ascii?Q?Pgq9Rbu9kCSeRI7pLhrCE9+2YN1Z1d/Tqjbx8xYKVTlReR7UVH61H3Nb8Hdz?= =?us-ascii?Q?6zK7prz2S5tkLFYIHsnb3Ci5DpYvmPtgJGI2DVJyk9tw8Bb1zUccmkAOaROz?= =?us-ascii?Q?juo6666RWdfqAgyXggcvoi5rt2dtnGqCBdAGHrjRyY7OnU8u+t7oXUPTb3VK?= =?us-ascii?Q?R4VzNI4EOM70KfkevylSqZFtdQwhsrjyVNc6F6jE4+O/DhR48WmNvGbDeO7E?= =?us-ascii?Q?rxj/WWwjZQovsTYToRVauKqh66HNrEjCGEgiA0t04EfAKbjVzrXuAO0DKeDs?= =?us-ascii?Q?SEVnKYHRkAxr4mmyXSoBhVRvacs0suTT3JqI2Bs32Ykv3/wbPMXe5nPDD51D?= =?us-ascii?Q?hfNv6iWwsAF12IwgTiRjULTcQSIuYXtxyCz2YKB2DTJ2fz6K/nFA0PgtOMNN?= =?us-ascii?Q?L6iwfb5aNYkHvd2b2Z6+lwyxedDRfEcx3pbfrvz+IZT7PLFnr0/eKes2/0fP?= =?us-ascii?Q?kRiQcbaZpo7fsGjowOoQ7wH/UBtb3wWvw2XB3qJUjcZm/8IvnBRG/PhVkDKp?= =?us-ascii?Q?kmsCvHEYar1hvHyd7r33TX/IcTJoLN3IQOcGE8oWvrNrHlftpPkCCi/AWcbq?= =?us-ascii?Q?wMq4YLN0CdDhMzEL50vyTd6FSRxss3326HFyCzv+I8c9MwbWkv5ZvcflKbNQ?= =?us-ascii?Q?CVeP9u9VATCm91A+OTSEtOAT5Ug/iiIymcxi5bpv9AOmT1HM/Rd5JkN7jUSs?= =?us-ascii?Q?pjQqWPACwMPWZpukXtwA9R6mNPsghNp5jlw1tv6sFRt7VcK/4BdAkOe+oOMT?= =?us-ascii?Q?xSFk4ZWBpdavGdHyqZsUoLOaWXw6O4FbghsUpdeP1X3oNPex7/7qLRsF/Rci?= =?us-ascii?Q?nNrOtttfsU63V8+m43RgpDxwhcvXgDeog1uSdANnhzqfVQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB024; 5:AkNJA8xAZTzkFxjEMZJm5l671wNE+E+EnaemnIcRHMyo3U6P9HE3Q47g1EX+TsbRRI/ukdk8hTkCzclM7Svx2bHC8Spw1B77H+P1AgofZ6rFdYOfJ/kFuRno3Rt5C4QhZxgX8jg6Trfuli2wFaK9WA==; 24:l/LEYPu0CYBj8RDDA0r/91azyBwrCzu/oZw5EqXJXEqkRCElyjfWgr4ENUdYdvzgCHG7kWJrQ4Vc+vLnj1BxjGrmXujI9c0xRTfVhBMQTb0= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2015 18:37:47.3100 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2FFO11HUB024 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.92 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v1 1/3] ahci: Separate the AHCI state structure into the header X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Pull the AHCI state structure out into the header. This allows other containers to access the struct. This is required to add the device to modern SoC containers. Signed-off-by: Alistair Francis Reviewed-by: Sai Pavan Boddu Reviewed-by: Peter Crosthwaite Reviewed-by: Peter Crosthwaite --- hw/ide/ahci.c | 13 ------------- hw/ide/ahci.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 48749c1..02d85fa 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "qemu/error-report.h" #include "sysemu/block-backend.h" @@ -1625,18 +1624,6 @@ const VMStateDescription vmstate_ahci = { }, }; -#define TYPE_SYSBUS_AHCI "sysbus-ahci" -#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI) - -typedef struct SysbusAHCIState { - /*< private >*/ - SysBusDevice parent_obj; - /*< public >*/ - - AHCIState ahci; - uint32_t num_ports; -} SysbusAHCIState; - static const VMStateDescription vmstate_sysbus_ahci = { .name = "sysbus-ahci", .fields = (VMStateField[]) { diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 68d5074..5ab8ea4 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -24,6 +24,8 @@ #ifndef HW_IDE_AHCI_H #define HW_IDE_AHCI_H +#include + #define AHCI_MEM_BAR_SIZE 0x1000 #define AHCI_MAX_PORTS 32 #define AHCI_MAX_SG 168 /* hardware max is 64K */ @@ -369,4 +371,16 @@ void ahci_reset(AHCIState *s); void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd); +#define TYPE_SYSBUS_AHCI "sysbus-ahci" +#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI) + +typedef struct SysbusAHCIState { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + AHCIState ahci; + uint32_t num_ports; +} SysbusAHCIState; + #endif /* HW_IDE_AHCI_H */