From patchwork Tue Aug 18 00:40:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 508321 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 B7B29140293 for ; Tue, 18 Aug 2015 23:53:55 +1000 (AEST) Received: from localhost ([::1]:57239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRhKr-00069Z-H6 for incoming@patchwork.ozlabs.org; Tue, 18 Aug 2015 09:53:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRUww-0004nR-Oe for qemu-devel@nongnu.org; Mon, 17 Aug 2015 20:40:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRUwr-0002nE-GT for qemu-devel@nongnu.org; Mon, 17 Aug 2015 20:40:22 -0400 Received: from mail-by2on0079.outbound.protection.outlook.com ([207.46.100.79]:55458 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRUwr-0002ms-6R for qemu-devel@nongnu.org; Mon, 17 Aug 2015 20:40:17 -0400 Received: from BY2FFO11HUB047.protection.gbl (10.1.15.227) by BY2FFO11HUB029.protection.gbl (10.1.14.114) with Microsoft SMTP Server (TLS) id 15.1.243.9; Tue, 18 Aug 2015 00:40:15 +0000 Received: from BY2FFO11FD012.protection.gbl (10.1.14.34) by BY2FFO11HUB047.protection.gbl (10.1.15.227) with Microsoft SMTP Server (TLS) id 15.1.243.9; Tue, 18 Aug 2015 00:40:14 +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; 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 BY2FFO11FD012.mail.protection.outlook.com (10.1.14.130) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Tue, 18 Aug 2015 00:40:14 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:46445 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZRUwo-000890-40; Mon, 17 Aug 2015 17:40:14 -0700 Received: from [127.0.0.1] (port=35859 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZRUwn-0000Ll-Tt; Mon, 17 Aug 2015 17:40:13 -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 t7I0ZUW5009291; Mon, 17 Aug 2015 17:35:30 -0700 Received: from [172.19.5.153] (port=51647 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZRUwm-0000Lh-7C; Mon, 17 Aug 2015 17:40:12 -0700 From: Alistair Francis To: , , Date: Mon, 17 Aug 2015 17:40:12 -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-21750.005 X-TM-AS-Result: No--6.265-7.0-31-10 X-imss-scan-details: No--6.265-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; BY2FFO11FD012; 1:1FUZHf6JaMHn7GN9RsQ4SvTBafVwsB+Hup7uvRGPc2buPY5/efM3fPABDa/OKsBuScgjkzZHlUGGNmKDSO5S9MN6CWjzmvRIUqYOby2kOBO6Y7O0NvKK1Wx+nXNJ6wKNVu7poTOR8IwS+sI4/DASVO/ouUE/woqYm9db7mOhcoA4F7hYtCAoy75edaRpzRSeObqw+BLpG6wtJkVlr/G7AKrlg0wZdMrBhpaXESXYaTus7M3tkfQTbPrgQeeg02atdhy1qk+rFoz7kcEAYMGHxjQYT+TXzsYMVU9cHjfBqxH/og6glO+kTNkvZ6si8Rz6pil3N4uemj8TcfUFcZmld6p1SB3HOrhgC3mbI7WfW0LW5jOsHrBaWq8CGYz3YQRy X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(3050300001)(339900001)(199003)(189002)(92566002)(71366001)(229853001)(5001770100001)(105606002)(81156007)(62966003)(19580405001)(64026002)(47776003)(87936001)(5001830100001)(5001960100002)(36756003)(77156002)(2950100001)(64706001)(5001860100001)(4001540100001)(76176999)(33646002)(50986999)(50466002)(77096005)(118296001)(5003600100002)(19580395003)(86362001)(106466001)(46102003)(5003940100001)(85426001)(6806004)(189998001)(48376002)(2201001)(50226001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB047; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB047; 2:AvTwdYLcg4ds8zlKRnGn3ADUOL3rajajTlOD5E1X+eg5iFLDLPNUaFwhLePFruSR0CfDuizzqb/TR09Hp+N9dL7Aksa078vQ4AEu9yr0eokdEOnuKDo74pU2TS7shwBbyo2FrUk6SsFf6KNcPWhxVHPfRnRdkRBOqIY535g1hxU=; 3:YzG1a8EwHQ8PLiGEDHJbFegGkQzATzlX0O0JD5l+M61IW5PCR9U269LtaypQVFJ8onZIuDfg6dmzIYE8EpZUAx44RLYIEIWSWBOpSRZo5GgIefxXIF1HzjIHrdHKc1mQmeF/eGvtdbPW8EqWu9h4D4G+tb2mtZ/35kH0dAq+nsfCfa8fDMqOkwUWG8ZmcVsumKLnaqlakeNAoTVSQN/0K1Ey6II5bKTY7p4olgwanxI=; 25:LJvNVxQCmHZbn3h27lD/ZzcofWTegZAXy7FOCHBHHJZvrs3g6ZPyc7EyWQ7AdTLykpJsrub+ICBmIrMb5OLFLnvHh4F5DhLBaCuMTeSfrarHR6mW3zrGfFCZ3rycWwTCugKcKeZUAgiEg7VwqNwPO4pdQqow3FAeqEW92qIDOyNU3VZ6BJWru0iDgAo+eJ9bjFIfF+CxLDcBpaHDDnMWF/8nnWYh/11nAE/U/NHoYLtCjgS4CFHZQYvY6JHxDAyjKS6PFw/ypnWOdAPxJdY1Gg== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB047; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB029; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB047; 20:k834IYABQToci+N1Qb9LyFgw2WwJlsx44weGhaC9vLwPa/iea4+8N4fgBmKklIdgsMvmdfjyh1CLcakBkhPgUACwjQRMO5nCB3qM2OmhAdX9l1tho8UNzXYxaJf+9pqS8CZfXIR9NnUXunH1RcrJwJXJrw2f6CykAtjbyWnjtkFt/2n22yiqga6w5LWBpYHtkfehJlk+MPFfZGZB/6xm3szUa56IbvDZBzJTfiv/09Iwvdc1NBWlCOfa1bKkuDySdi4J6sYTKZ/CoxMKS0FmGjWqdES/n1S8cEEPcBm0iZfMJWeAbfCR7Zg9XwMDGN4Jv6zv/bv0jna+daLaUoIzG/Uh8RY1A5oZ0KnUApz3/fmKZASHdGnk1dgLTscAeR8U/U+hD2STfUP8LmgsZLHCFj7jKnX/sJ6OAy24Uu44NlVHOU5bNaUisyqi1d6F5J+/a4ponItYiSPDxawNB60BqDtqd6DV4D1Y22R6gpuynUWJeiY+EZcx5CdTmrekXKTB; 4:FMcEJVA0ckF3SpdVF7+S1J5SdCiQmdhekx7ygj8act9RG0Xcz7TmroooZt72hYj18ABCZ5g/YHyZxvRaXOXXSuJjvQymmkVXNf5wGBLTON1biEBdDqglIp7p3SgMrgXu+rYIxYw/0yB5iX5LeUBrgi17tvehYItMYTebMQ98b1vaMBo8HDx/6aomV4zWndYT1e2V8mm9Z0sDX+25R+NnNjfRZbCWad9yCr9k0IrBqvLsxlo49vWI8VGREy5UQkhR0Y+0K4kASmvDKRHrjFF9GH9HQWS2lWNhj9EDa1sf2TOkx/5VM2EH5I3g4ys/56oDhfDYmRjdsKL/L+B3NUj//SFmhpbWZS81epSvl4FmP+ikZCiparg2KhmQww9XonTg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(8121501016)(8121501027)(5005006)(3002001); SRVR:BY2FFO11HUB047; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB047; X-Forefront-PRVS: 067270ECAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB047; 23:D3DwaSe4dwRBFoe6BZN9JF2dkxVmN2bjdqPSnbhO?= =?us-ascii?Q?cRr2UaevRHa567R0VZaEZ2PKxA39+yMT8dBNzpLLYOQyAy+Zb6mm5NTVAvH/?= =?us-ascii?Q?573bThAl2TWt34s4MsbeMwZ4GH8+EBbvH3Wm+HRLk5D+6VA6nFt47ezpgr8h?= =?us-ascii?Q?W/hMpLknIhqJMfH6uWXrlRTTop1Br6irOP0YKZpllfypj5RlLYn8iQ98SD/V?= =?us-ascii?Q?mf1VpilKRQkLbmD5atnkWmHuAvDgkIANChUq4bVZLLQnLVaIAsJ3GYOW/uRT?= =?us-ascii?Q?xlUNZbVCaWRpzpeZ1/0DVsJGaTFFtfAjSFQnbQ2CDU3GTpcfhYyp3rx2IOMa?= =?us-ascii?Q?McYQRIntXf4GKLgVY6ovydqj2vgAmFurzjS53VKeRHlR38qm2RnQ+P9BMuGY?= =?us-ascii?Q?zEsq9wYW5LUfc/xC76S1dtkQCrcfhsA2ZfvKEc091it6yabe5tad4TSGzMSm?= =?us-ascii?Q?YnL5Kt9pVxIoyYHt56Wb9Nqzpcny02GXH5Jl+AlXuQvEqAL+BNmqL9nLzQ0i?= =?us-ascii?Q?KINjBHy8qzmr7q9PGB/AC0T/Cp2aGF117EZUKosUTk34ZGOvx7YBYBo5nKfS?= =?us-ascii?Q?TabKQxxK/5dxZs26YpMDsfd0Cnrl1GtOAxs1rg5QyDm+9/IltSeTFrIWAcQ0?= =?us-ascii?Q?LItcR/QrZOhgN/2sqOXVNAStzWtwgpSrJ/Vdc9T9Q/rW+CvhrGMpmOWSCStL?= =?us-ascii?Q?id5akDocT4hffoyZNPU6LBFb6RgjYUQM0NuwIbb447qiH9cZImv0uhWM56PF?= =?us-ascii?Q?Ho9pn23pxv+DzN7+K4dmyQTPtcujXLoTNXrwD0zjhgwKsGGg9goFlhdYPxvs?= =?us-ascii?Q?OdmdQsx275DgTPC0+Wr5rVFuuR4VSRSBEUBdd6ZsnWL3C1oh1iAcWvs4AQB/?= =?us-ascii?Q?Bxm+QljW11HQrCeArwsomLWBaaBYnMdoWej7eM5M0KOLbmDTav6emTDJ4BFL?= =?us-ascii?Q?25mQHyBshXTBS8Pr4qJ/AgIu7FS36kFFiLgNAay96mTYtT51yJEyUD35IHmz?= =?us-ascii?Q?dGLTBdPlyMRBgHqjdE6Kr+7HSA7njmIIWnOhiAv0xVwBR1BJ8cJrk+gZcuWl?= =?us-ascii?Q?P+aLHogXiuNrRVDicJ2osUrdzAYNaRNAgCfWHeXzCiGOfAwBuJIpthyAhR4D?= =?us-ascii?Q?JweOOXTa9N4EMrv0JEJcQVfM8BF3DRIGMMr1c2o3r/U0HdWYVJYDAOovtNSm?= =?us-ascii?Q?dD+O+7hhKzufdTOhCfn7hn+Jh+WSdqwFJgRs?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB047; 5:If60D5e7VX9ICRLsveJtlM4vRHeIxetSl7ZjGEN6aFqzFDOd81EZ+ZIpWfe09al7SAjmSLHOVQ5gByPoto/IV67DJxnDNcPkdDNdEb+MztEVStlEbjAj7XujFpJS++ENpNI1A6K2WeoGk4G9+B6y2w==; 24:Q5ySm3OTC4UeWdn/sTuQjc4v4DCPEbn8jTouUsid4Ohb+WOui9KT6QwpQdUn9KuxT53PmUmmNwOTl05v2d6YQTYZl8DN6kkgPwZ1MsgwuPc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2015 00:40:14.4244 (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: BY2FFO11HUB047 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB029; 2:C2ajgQ7U5LXS5o2I675w9DeETDeM61CUo2oud7SQaYOshdzUo0p9BoRch+gHgI3BgaVeZw0WapRQr9mVFF8sdxJiJWWmqSAHyFOgmnQsYqz2SN20oQOcpiYdkQ+kQowNTmb7PnH1ZqSO0Lt0gXIBLFJg4tg7hzejA2hsYYDkqV8=; 3:hbY8I6q/esclykuL+XgsIuX0ZkQmoFAbdkmLTkSzjz+UeswtXKb3Ex/MY58pmbcni09aWfsng9ybiKOID1TmikPMhImNZc+7Zd2Wk5ZyOedVzQztON+FJWkTIiwycV1TTkpCPOLZIyOxKg6tZMZNXt7kIsNtevDs1C+dnZgPTmXv5wVl82rckM6YNcJNqMRWbc/MQ4yTHQ4eO90e95zxVLHYcTaptjn73mfLiPno73s=; 25:TbXiUvKwiTtW6MHagz1XXEm9ubd8ywlkno85uT5m3v6gn6lPTak2ej2Q6wW2Di8qDx2pZLtE9EM6SEvdTU0ICkMtQC5OIl5ySaZaoKcg5HcZ4kSPAMQRkjqDLiHXcwBzZUg3guGKgADuigHXYYxUNw8ltzXkkNvxY4rJtJa9g2YeAcK2Nih8vDYKo24owSTX3bf1/7ys4r6tdoI3U6yxrRSRPmkg4KeEOgl8k9K/kKu1jKUGYd1w5Dtt371OInBp8HUD5ry7XyjaqobApgtEKQ==; 23:ecsck5+mv/uyIbDIlXbT9NVCWvS1qdvAvBS0BhZji3ZGp64x0rEwPXVg7W/HeXjLrqnR9GE7iOvvzCs/kg/4v3IwDymRpORjH8nMZmNGLERkXOnie6s6PzXylQhBwLdJmgcqO/lZ42bsJuW7zMmU5umBEX2ptf0ZAmWxRBPZQagdYYqdg/xfSco+0mwclx16 X-OriginatorOrg: xilinx.com X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.79 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v2 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 Acked-by: John Snow --- 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 */