From patchwork Fri Aug 28 00:16:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 511727 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 5B733140082 for ; Fri, 28 Aug 2015 10:17:33 +1000 (AEST) Received: from localhost ([::1]:45304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV7MJ-0008KN-Lc for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2015 20:17:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV7Li-0007Pk-R1 for qemu-devel@nongnu.org; Thu, 27 Aug 2015 20:16:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZV7Lf-0004IH-Jn for qemu-devel@nongnu.org; Thu, 27 Aug 2015 20:16:54 -0400 Received: from mail-by2on0093.outbound.protection.outlook.com ([207.46.100.93]:38080 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZV7Lf-0004IA-7W for qemu-devel@nongnu.org; Thu, 27 Aug 2015 20:16:51 -0400 Received: from BN1BFFO11FD029.protection.gbl (10.58.144.34) by BN1BFFO11HUB037.protection.gbl (10.58.144.184) with Microsoft SMTP Server (TLS) id 15.1.249.14; Fri, 28 Aug 2015 00:16:49 +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 BN1BFFO11FD029.mail.protection.outlook.com (10.58.144.92) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Fri, 28 Aug 2015 00:16:48 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:36758 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZV7Lb-0000So-Tx; Thu, 27 Aug 2015 17:16:47 -0700 Received: from [127.0.0.1] (port=54405 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZV7Lb-0001fF-O3; Thu, 27 Aug 2015 17:16:47 -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 t7S0C1Th020514; Thu, 27 Aug 2015 17:12:01 -0700 Received: from [172.19.5.100] (port=43604 helo=xsjengdev1.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZV7La-0001fC-GO; Thu, 27 Aug 2015 17:16:46 -0700 From: Alistair Francis To: , , Date: Thu, 27 Aug 2015 17:16:46 -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; BN1BFFO11FD029; 1:ojxf+94Fgw1nJW892kVDdkNxZvP2dh4cgQw8QQPnOwqedwJQoyzP72c7UXGfFcKmS3HEWsPiAD4T+wa/vaMNIY9efMz8BNmE4DTnI9lyFJj1KQTMp1TMkVdCfbVFLB4cYZCOOt1Hqp7XJenI5ZuNQZvHBQ7mQabVzkZTJ0dq6vKVkrPflIZkiPgvUahSVxMQlrUUSQOFc6tTs7bZHUBiZ6L1oCkDebeR4jiLmy4kYs1qNg3FWwWEz00AEpNvrC9IpHWCuTt3JmGOvTFOkwHFIiF2uPNByFINu5ioLBjMk6fqZlYWsrya2mwy1z8UVRXAf87WecZtOa0WRvJ8W6aeIg/wsYxWHF51lUihFcyacDY21K1YaGWPc622sGFlNlwQS+FIVR1DP3vYPwrEAZQsHw== 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)(5003940100001)(86362001)(2950100001)(77156002)(62966003)(81156007)(106466001)(77096005)(5001960100002)(229853001)(48376002)(5007970100001)(50466002)(105606002)(5001860100001)(4001540100001)(85426001)(92566002)(47776003)(71366001)(2201001)(87936001)(50226001)(64706001)(36756003)(5001920100001)(5001830100001)(64026002)(5001770100001)(6806004)(76176999)(118296001)(33646002)(46102003)(19580395003)(50986999)(19580405001)(5003600100002)(189998001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1BFFO11HUB037; 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; BN1BFFO11HUB037; 2:s/MKWPvP2wBo+swbAK8P43LVd/sNAQHocBV8ZFYYOs3RhbWE+N8wsAqpX4WQoHQxR/cI5tNfF1a6giwbnatHAtLBEIKwXdfGwvAqskG+q+YPR8L03uwCNfjwN5bqB1vmemRPw6nGpyqchPPYBN+HQVwLzqSZPMPseRpVLbZDsBQ=; 3:cAzBDVLSLN+KQJWJ44h6FS1+vWKzM0r7RoBto0d63lPqlL3H6a8oN7PshoeKr73nt8YJEVzDe2X5AbNJnnAWsKa0mwiEf2BF+l/fBT1wJg7ucVc6JfQVCXj19vqTI6zoEdf5v4/sEkn0XAVZgYX/wp/OJ8Gb44jG1C2nScqbU1uwcGe/yPbKIk3LHY2cGCf0OX4SjeBpSgpVzIMVzn7nt8ahk26ZR63V4lfoGP3BtoI=; 25:v/EABoGml+eXTWKNpSWPrVZ7gaV7yAqO6pD+tbEbYoqei7NUJtirYOlXKxY+M3SKikkNIVezSvdtfrXW1tooHN8AaK+920cXW2Cr+93UCocjb1nWQ+DtcbAsx7/XKog9hDeK89fCaUmxXLwfkKsycZqnR62ABzV33tfrVaOWF8/euIGd+GfmOqkcA3bknt9JeXl6ZNVloEpBV0fOfhfWL5emRZEyAx2r9PkfqIdlIsjh7EdSSr/b3/w3gNxRjCORu/9Clkcr9RLMIL5qLt2edQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1BFFO11HUB037; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB037; 20:mtCyfxFQpVCKgr2gQUzG1m9+wA/0DA8A1mw7OjXFvWFhK0yW0J5U8312QCd6gO+OQ/lt5hVBdDdiljIGrFaTspAjZ+6ONN+UUov4Env9xJwqHGrFT+8/qizaa+b9vZOBxmiN5VubuY/YTdd0JTICi1lfsswitbV4jsWhXUoQ7IvWMDaZN+4ggi1TS2a2eOJo/AELjdYsmOHKiXR+yYPHTIWqWU4xhYHTpqcNoUAauyuBdk8J/BP9ooIokm7DUwK9hLv1Vi/UIttvzX5SZPrndaJsor5WDjcb3VXx3j+p8k9jh+cv3/qolXezBTr5uGEOnEdkLUYKNvHNyewPXbJroSuts4PzYWrl8ZbBuypqelXMBFtUn9O6MVIFynrJxWhuHXoYpgi3IVigy2U24nh6dh9F0K0SyDWpMDOorOK0OTG5oqaMgd3ce49olindONs7youOeFVuoJ7tN/6nktdbd/7k3z7KlOItis5ZuDuY/9cqUIJHEGVAasNKVlrI7gtj; 4:gMLT/C2agkBTqzgGrtezX4yi896mhuHPSVg6XJ5Yh7cZL7DC/k6mwnZqOWsqapm+18Gyw4qk4G22QcM86l+/wofPveyDx47Q9ukMZ3/YRMOTblnSOJmaV9E4G5g8AfV4l18PsUhUrC34ZRfCbKi7td4d27bh6WcadyAGbkgAFR0WWMA5Q4kgwleDOhebebnWDbOPSe2DpKcz6WuLTwaa/nfO1W5kG0uU3KKajkGKUVRKLG0Zn590J2wjUPS8sCrWJH37FXTjP14q4/AL/eIYINrVMo5c5+bFE7/sSjdGmywJUAleTE07PSMDLRkULv8c X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:BN1BFFO11HUB037; BCL:0; PCL:0; RULEID:; SRVR:BN1BFFO11HUB037; X-Forefront-PRVS: 0682FC00E8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11HUB037; 23:J40Ym4+PT+IboUnyRISfpgZ27jo5BOtRKdVhPwH?= =?us-ascii?Q?uj3E4Ry3gfbGE4a1qvTTIIGdJz7RuUIloenJ6YN+4tqxrNlDHPOIATj7d/38?= =?us-ascii?Q?AGgbXbLzGKcIXQytPSe4YuoAiRbp2jZBEEzmsBf8JEfmx0aEJwrBIjVKGRNL?= =?us-ascii?Q?zo+SOi4rsBx6p9aCGRNucmEgutp7OUIoj72p0Jn244RM0pB3iyqp7XtOzJld?= =?us-ascii?Q?ouyMd8Rj3tqfxjfdCbcsyKD+Xshyz2fhcNov0GA6RUkdwDCBU8cIWcVMEpuG?= =?us-ascii?Q?OHP7jRAykPweu56mCdrfbbbal3lK/RHeDtQ88ZGU0XmFlSazTS+Omtgt0wA3?= =?us-ascii?Q?lcOLEr0yQNFMQOm8MZk0YKpDzUjLNHkFEk0uTqQ4bptKTgH2UwdsbRro0++x?= =?us-ascii?Q?tIB/GMbLKrGFZHclD9PDqy6bjlSYtInGUG7zS4c+CH9GW7BLKZIBRPlUTbuX?= =?us-ascii?Q?Kx8UJh8IebknvdWeRNjFsbH9kCai3L8po3J0gcTUnBU3Cdh/lNaANcz7VjSl?= =?us-ascii?Q?Y6KHQXNbIfkx6NOyViF2liAnBvasGhfegab/9WU1a+t1x2m0/444cxNPL6Kt?= =?us-ascii?Q?pM8ngkkY27jJawq3jk/fhNBojBfhrml4L0I77yb00jG59BRRTtEkjhv6Qwc8?= =?us-ascii?Q?TkOZP4pGnfhGKErWYxn/SENTpu8Ilzo5W7dLqQX4b0cuIUJEMD1ln7c09o4/?= =?us-ascii?Q?gaS5LBUw41hGYQx7RzjiP3vRSG1DCpxkE9r4pT2rffiuikaQXxNa7ucqSfTa?= =?us-ascii?Q?h+nMt00sH41XTSO/vnb0m2KKi/K7DWBpMS546M8z6b+Coop9k0XhrwEyzfJ/?= =?us-ascii?Q?ReLW7nSV9dkq5NCAo2dAJa5nkYu/kNBi02YDxUOqI8LmBOogNJyYmK+a+kwQ?= =?us-ascii?Q?/6ySnX3b871HTiev+h90GUshI5dvfKUbuN1mfDSWCl6XIT+Yt/Okd8YXcqf7?= =?us-ascii?Q?zHipc0+g0Adh7l0ro2FBIYDp+ESQODGY1ZO3fOTFIndZPFNtltuaaszeZQpc?= =?us-ascii?Q?c3BsBAjEza9TPR5hzLiWNAyKYK/iNCtpT+zHmDD4dGqrvyLWk+NT40BLwWRt?= =?us-ascii?Q?KJjkJ369fVlFRFNrgetJtjiWqTzyHMlMIuZsiTxguycx3jrYkpGRi7R3/qVU?= =?us-ascii?Q?q4I8HOzwBjAJAOOc7vgIrcPgdhm322MREU3PDOhEUkFh44jBecDJIk/IhCn0?= =?us-ascii?Q?Mdrlw/dxwxQjq//rU0I0oZ+pfGearcea6jpa6zuCzvkmBVSw6saiPjmN/o+U?= =?us-ascii?Q?uJCJRfFCL47RTtIqgNZuXCdtUn+aq6x3aPG83WNXa?= X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB037; 5:hlyQ1CNsG6zjc6ajhiRO+ar7HXXha1b/Ab2nVomXeXtSXVURiv6lTnC8IHbOgl8fEVauUwB3uEI6uiFS/Ja3eDVgnwOg0uLZJHYqRLQrLUedHxhI+tCg6gRdfWFDXSNkr7X7HKFn+ACGfzjWl8mVjw==; 24:91/YiDXa1v0li3P0c30iZXANzQnnXWzJXxbqdx+YM9mW365GApxfGrc4AaI0bQEl3gY2QOJEVeEmAXujciFnExtxzVY2q7mio1ayJNblA0Q= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2015 00:16:48.9523 (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: BN1BFFO11HUB037 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.93 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v4 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 */