From patchwork Thu Aug 27 20:47:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 511429 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 1187F14012C for ; Fri, 28 Aug 2015 06:48:19 +1000 (AEST) Received: from localhost ([::1]:44615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV45p-0006gv-6s for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2015 16:48:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV45H-0004Ms-E3 for qemu-devel@nongnu.org; Thu, 27 Aug 2015 16:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZV45D-0002UF-DE for qemu-devel@nongnu.org; Thu, 27 Aug 2015 16:47:43 -0400 Received: from mail-by2on0098.outbound.protection.outlook.com ([207.46.100.98]:38720 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV45D-0002U7-0z for qemu-devel@nongnu.org; Thu, 27 Aug 2015 16:47:39 -0400 Received: from BN1BFFO11FD042.protection.gbl (10.58.144.33) by BN1BFFO11HUB005.protection.gbl (10.58.144.152) with Microsoft SMTP Server (TLS) id 15.1.249.14; Thu, 27 Aug 2015 20:47:37 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=none action=none header.from=xilinx.com; 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 BN1BFFO11FD042.mail.protection.outlook.com (10.58.144.105) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Thu, 27 Aug 2015 20:47:36 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:33188 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZV45A-0000R2-6B; Thu, 27 Aug 2015 13:47:36 -0700 Received: from [127.0.0.1] (port=50835 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZV45A-00067R-05; Thu, 27 Aug 2015 13:47:36 -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 t7RKgnho030407; Thu, 27 Aug 2015 13:42:50 -0700 Received: from [172.19.5.100] (port=43500 helo=xsjengdev1.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZV458-00067O-JP; Thu, 27 Aug 2015 13:47:34 -0700 From: Alistair Francis To: , , Date: Thu, 27 Aug 2015 13:47:34 -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-21774.005 X-TM-AS-Result: No--9.582-7.0-31-10 X-imss-scan-details: No--9.582-7.0-31-10 X-TMASE-MatchedRID: CAv9MNEYwNz+MzVaeoq/RXQIOMndeKgEmyqQJWNsuklcKZwALwMGs+gY WcI4QZwHXJfh7apDc9RBBPlf51IMVdqmPT8JRdq4A9lly13c/gEEa8g1x8eqF/NhzIgXtFJVS0e iOsrXcThrBzgvcJadw+7l7MQDYUdT0rly6TajiUmeAiCmPx4NwGmRqNBHmBve38LauI2fxt4qtq 5d3cxkNaB9KJbhZKxYxK1+D7yFkMgMPPLJHKWp0tB/+VTJVWl02c/4t5REH7jAvpLE+mvX8g== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD042; 1:4fF9a6WFI/BVSLWxGW/kxy70KBLNL/6ygZ5E/PAiQ75svnI1mQP5U+BseKeW4N1ZoVk6dugfPa+wC2PGhEBH74fZMRe/S6v5v3i7KDdanq21Da3HEPwIonT5yex1l4xWoTj/kRXtWrLDF4jSRoqr63BeBqURBku71io/Ix/6niBEpfEyaAaBytB5C3EN+iEOhKD1kW8KUO8zmzgF/Otesw00dIPSkZVDJ/Nkl/2lN5RbQsj2C8Xb8iKkSK1tFygQJsjE/WVpXF36yRmNo2d17fvbRGOD7RStkoe1nQT3CLv6e/Y7utlCczg49JxTKdtz2okmVKLLyETBA1VbzqDlMbC0qPUFZ02Bsz5R9+qZGC1f7P8vUHXplJwUQZ0vn8cN X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(3050300001)(339900001)(189002)(199003)(19580395003)(87936001)(118296001)(86362001)(229853001)(50986999)(48376002)(50226001)(2201001)(5007970100001)(92566002)(71366001)(81156007)(6806004)(4001540100001)(19580405001)(2950100001)(50466002)(76176999)(64706001)(85426001)(36756003)(189998001)(5001770100001)(106466001)(47776003)(5003940100001)(64026002)(5001860100001)(77096005)(5001830100001)(105606002)(33646002)(5001960100002)(46102003)(62966003)(5003600100002)(77156002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1BFFO11HUB005; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB005; 2:WS2r7BxnbXFal8MWlEg+7MfqLuWHwSA9loGg0TSrGkl1sSDOr4M60u5A3DCllZzCMVAeh0G9xpWyK/9mu8tKtj4Q8n5efv7KcF9tgOA/qCT3ocvGBEObAcnizht8tgHG5QpCkZRBqibwluv9LrGTIeuaEvkjDlkpUxJNnKM3TZM=; 3:xvE+JV4oJol/dMA1ws//VJIIGaMSxHwBz6QPJmxnkeJIPM21D7DThvL4emFJR62Xot6nj9w1n9TSkzF5Z5dp/bfXEvcXvRLaBCpyREUoq8MrWH7lMXINAdnuzlksmf6xsoZNDttDXlFjY8hrzpJAAztu944iYxyMGtGlrT4Mj3f0+AHg13w8bkbr8tmcmRc5Yi8xua5vPKu13hevbQurBy2xR02f+t35IuiVwr+Fy9A=; 25:TY/7LTXARC7m3KR3hVqEkGNI9ZVEeGF7e01VrkNvA0ygTKu8F8ruB3oUoVyY+NcI43OKhhLVioEm4zQ+QMI900sofpdylcgsMmntPEOS4ovS8xzs0DhhSkLFy/80LR9SgrWhgbs8okvCzQZ4xkMTiNHmlBwHHQW3lk0Rnj1kM9AY8N4MucAu3iKQeHrK2FkPLGFzxRdo7Fs7Bqsa456Swt8Bbaal45/u1r9plJFNKga6GdCqdKjnxesi6T5dOQ5QCP3PxSpQDR8WHqvuPc2k8g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1BFFO11HUB005; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB005; 20:ywegKXCM0VjBvJ17wgdALQiDvkCnvIq78r7EBkW7Y7fVj6e3Xqzs9+UtT+g2NI+RLopLBsQLCcMpl09tGn+zu/+BZOptYjpBt9rFOx+uVPwctihJdxcJxHNm7bqk4dU5ppaiD692XYQFQWpLEkoHYDN6dCp27e13f4yPtWHtzsVEpy95WymiEb1TPYTamF9kuIBiR2ieVGBV3H020jsUcoOOUxpvwSM7zE9R95FKeDibgAdA5sUpCMW8jo04c83bAmiE1picRWYATprB0EHm8onryBaJKDXQ01Uu2gW+iBnuROdoejK6yUShq95YDElqWfO/YoMfox84Mjo69I82f6XphrU7f7tP4+IWAJ03+Zgj2WN8sEhzKbrAV0cF1pYtI09LZCtETcySvsms6N2nMf6hC0Cy9J+BSBseOvrDOp3vW2hTbVuxIlMJTiar7mZWHnjcRLGsClCeT+MjzB3Bwu5mSAXj2RVJ+BA5fwP2J7Kx+4fQjHGlibAuJ+ntCLLM; 4:KZIP09lboYLP5xpVY6zd5YJ80eqMyDaM0cNifDAsHk1WZrEUWZ6Zz05TyaQywli0F7bzcLRtaPATG1ZgQCSC8oFcR6HPDy9Ah40XJIZQghCGlgUnoT+nEAvJXcqIE6yDNaVnezaGGEWlEY4dL47pjM1BsaXJMrytK90hTJyZNEDdJwdG2JDseraMe0dJaGnPNvgY9yAK9KhRq451Q1f7aWzOYnny2k0LGXI85yFj+bUlvOYHamljgqzRN6Ca08wF6DO4tMff6NyKW/LkLtiKZdT2MIKHPFkAgnCAgc4p9507h9r9T+UhneN4DXXOpvxz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:BN1BFFO11HUB005; BCL:0; PCL:0; RULEID:; SRVR:BN1BFFO11HUB005; X-Forefront-PRVS: 06818431B9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11HUB005; 23:zx27jCCqdqUGu1G4OrsOy3s93udvDtAZ13LBqSA?= =?us-ascii?Q?iM+idzSUkJWHMkbAidwrN+RBU40te3n281+2v7p+zgGsCSAlMMiUltlO+lV6?= =?us-ascii?Q?8S6S88FqBT1Z4gjlSmUycr3Tft+TV2rE9gG3CXu4xIaDYVDmhwCdCe3fvBRa?= =?us-ascii?Q?wndk8J7s/UJW232xzA9ITQBxH3CkiDoD8qB/+7QpbVcDckSTtZBIZRu3Qf/a?= =?us-ascii?Q?nIXlrzOCt9qOxeyF9jvj6KCCCeeXrskHJQBv1B/beaVFNDbwjBRmQv0KXPH9?= =?us-ascii?Q?YBQdZzsABwWfvL3JdVfu9lQZeIoFNfIrERdzb85KIlo06a3tfevcBRcqtdXH?= =?us-ascii?Q?X0yhXRr/kq4Hwv0tVzmh5hgpI95nIk6zyrXKTJsZp6KO1lAaGLExH8BKzzEI?= =?us-ascii?Q?ZKrYTorYJLOeT/PG69fWZqKqGIshZAmbIUUDpdwe/paKywMxe1xa32j7iArH?= =?us-ascii?Q?DpTVnfKRTyqsM9jGahr1cQ10frGTdvq1zLig0rzW4n2Cn7rpcu/DMZ5ykbSi?= =?us-ascii?Q?bh04dW0Ke/z14LgYvN7FOT4Qr9TmHN1DBC4DyimpD1hmRC7sWpz7vqUI6zBU?= =?us-ascii?Q?ADJPajRC00h3hI7KLM2snvPfK6OGCmn/UonVNQehO5FGI6DTTStfNhvnumBh?= =?us-ascii?Q?wHLDzxtR0XoH3KLyxcqvvU2mQqsyXzey0qF10Kc3QLXzHFoZZ0j9fNXSGBlo?= =?us-ascii?Q?vwhnRZrn/9akZhrs3XPK2d0L91JbZWdXLKmt7zE1U86SJSDu/gDdSh8en6hm?= =?us-ascii?Q?QlVurePTAUvRWMAgT4oFlwd7d5i3hjhRPLkIdoeeAAxbLfuykV8SHDQMdizq?= =?us-ascii?Q?iTX18tERNqbVbslkkIL8Sj56WBXdzJFUQzcikujfWAlorLSVtr/iTid3UYsr?= =?us-ascii?Q?5PEqqDJjmBGRuku1+fO4LY8c6VguuWLoB4hWS8HH9ykcT6DxjWnivWH4hXIG?= =?us-ascii?Q?rfluvA5oWgUhWMImB+SalhMZcwGUbaeJuP/PEN3g3y3QyLAGXV4EVvvfGX9Q?= =?us-ascii?Q?bwbIZM0kDaIknJIZ6iJFYgcyQpsGCLFcAVOcXy+6ceekamTHC2MGY2pC0a7H?= =?us-ascii?Q?Eo9c0+ipMPzVX9ikOQw69qSrpHSKSESJW13EkZV371ssgaBorwigTyJ/auc8?= =?us-ascii?Q?RO9TOiTjX63gyIwm4udrPW5YfpBd1xtjPjLQx3hDlBH7ZP3t8UoM5FNrO3Uv?= =?us-ascii?Q?w4RgMJrTUnjJZq4Z2CHKxfR8A8I2YnALG2N8QkdU4JudG6EJ85PvUHvXi/w?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB005; 5:etA/7YaKzFKeZNwPK8T+Z/wuJN9zZUmjv2Kj+853qK6qE86Lp7Jjjs4uYF+kzwY0AqMLtSZQzzeFPDV5P8xsH0wZL6Mb58Of5tD46p5LY8CX3misfTE5A1rJ3zRiTCSNInLaRzAsQkxdNS6u18rvfA==; 24:KG3XjkChiUQcqkxGMMjD9fVz+J+vhnqP5e8AQs70Fq6WiB3XeAbJ1DcLruc8ROV2pg9Ga1wT7F+eVL6nxD/HLN+kTXmnrgxh9yVh89bkzrk= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2015 20:47:36.9827 (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: BN1BFFO11HUB005 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.98 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v3 1/4] 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 --- 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 79a463d..c055d6b 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 */