From patchwork Sat Aug 29 00:04:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 512095 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 A7BF11401C7 for ; Sat, 29 Aug 2015 10:05:06 +1000 (AEST) Received: from localhost ([::1]:50388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVTdo-0000Sq-Pv for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2015 20:05:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVTdI-00085P-Ao for qemu-devel@nongnu.org; Fri, 28 Aug 2015 20:04:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVTdE-0006nn-9B for qemu-devel@nongnu.org; Fri, 28 Aug 2015 20:04:32 -0400 Received: from mail-bn1on0078.outbound.protection.outlook.com ([157.56.110.78]:19136 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVTdE-0006nI-45 for qemu-devel@nongnu.org; Fri, 28 Aug 2015 20:04:28 -0400 Received: from BL2FFO11FD051.protection.gbl (10.173.160.32) by BL2FFO11HUB045.protection.gbl (10.173.161.121) with Microsoft SMTP Server (TLS) id 15.1.256.10; Sat, 29 Aug 2015 00:04:26 +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 BL2FFO11FD051.mail.protection.outlook.com (10.173.161.213) with Microsoft SMTP Server (TLS) id 15.1.256.10 via Frontend Transport; Sat, 29 Aug 2015 00:04:25 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:32891 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZVTdA-0001Ch-Uj; Fri, 28 Aug 2015 17:04:24 -0700 Received: from [127.0.0.1] (port=50538 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZVTdA-0003xy-Op; Fri, 28 Aug 2015 17:04:24 -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 t7SNxcBB010936; Fri, 28 Aug 2015 16:59:38 -0700 Received: from [172.19.5.100] (port=44012 helo=xsjengdev1.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZVTd9-0003xv-Cf; Fri, 28 Aug 2015 17:04:23 -0700 From: Alistair Francis To: , , Date: Fri, 28 Aug 2015 17:04:23 -0700 Message-ID: <8c1d2ab6b46e652ae7ae0b2ef8df694503fc9eb0.1440806501.git.alistair.francis@xilinx.com> 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-21776.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; BL2FFO11FD051; 1:OiWuQdWvddEhHfZpxd+5Bdh0Q7jaO5O4wLtjWVouAVtc8i9J3ze4d5mGHUl4Ny3Hs2SK/cAp4zPJrlkDy+rXFzkz/b7sTAU9IBbFD/t/t6JvpyD+u1mWLwPCrmrblb1mMaP2vJoLvJ8CpywMLTvfc5jAG5YP76LyeRWt5MF8tl9EWLtfOmELBI0HiJiatggoH5R3gJPDavebm1jN5+15CtflWk8imskIVASuG5hy4AiKuxh+DaQaO10EUF3CH1rCMCueNosZthdkv1UTReZctkNHWN0aYyd66pz6uZklmvM3qLwgpO1YOyJSywXQYxt8hESWkelPkTuzxWpP3Ads2h1iIIMKJ2J9+i8sOkh4exFZ+rl7SupNs3g4J/an7C3VDdoZt/YWxBM211VoJbnklg== X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(3050300001)(189002)(199003)(105606002)(85426001)(62966003)(33646002)(5001830100001)(77156002)(71366001)(5003940100001)(77096005)(64706001)(2950100001)(5001960100002)(5007970100001)(189998001)(50226001)(5001860100001)(5001770100001)(64026002)(47776003)(36756003)(81156007)(76176999)(4001540100001)(19580405001)(86362001)(87936001)(50986999)(6806004)(19580395003)(118296001)(5003600100002)(106466001)(229853001)(46102003)(2201001)(48376002)(50466002)(92566002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB045; 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; BL2FFO11HUB045; 2:T+W/RmeQSwovoxIlxqwJOiZyPbNuHKAlRmPaLKgYGRkmCeMIwljWMjiuI5sb2+g4e5vByDGxV1kdi/wLlXxZDGehzIHphZUUt3RU5P4RYNJKKbfkjQceplxa7waHFnEy7vdDrsA+I8UqwD60w/arklIRlpC8p9OvECCFHYMU9IA=; 3:oXL5CugSn7e0jN0VIBHUfF6NUtvBQZwK1UjSoX/49LgGVrgFb7Xj5mVn75s3OYASafmNN7FXBJ9heqrr7Wq7SBAH9w6FK6wwu2OflXv3mdfGY8owAwmLczpe7mhTUz5vyrf/vLCZN6zszeE8yAJaKDssyubMrLMR5lQkyeac6B2vXYvTHosAviUJ18Aa381beJIUQt0bmHMPnWQHIdUZ7go1vCHj10ExNfzIXWmkM+A=; 25:o5Cmls92WvOyHpN2hZNq7pTZyhYQ+DbJKIqtRDi9wbqQzq+M1g8RkRzmhjFuoYs3o1fzAaOvlzavSaAmGyvNFVb2r4+FFo/17P14CEwo2sbLM7IQQMZthtnnB9e6GTvg+1cX7p6awuFyjDtUzG1TSftzpGnzTxa+uAH12UxfHe6Kv9YHofuZHaEb4oePsFsgyP9t0T0t8NeZvDM5ztwnYenaTggCNQIEjNxdOW+adRtg8JGd3It/kGA6mS4TVUhgtjJ1pHh559I825rR6n0flw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2FFO11HUB045; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB045; 20:rLrbpMBt7gaoJXN0nonHt3ecK1Ld8SpN5eusEQjyLJzz55X/t3GpMhvH5nP+/tzLPHpFbDDcclLXxU9JgUvzePNMM23Qii+mKmWNT4pv0vBpkM5lHRTzNTwLIUhPqfQ8vOxBCxbyNKJsAPoOT/Rk1BVbJrPjNWBo56mvm1V8/teTw+zdEpXFrZmks0oPlFGgtmU58d+pA9Fbpwot3THnmZZZ9ZRu+1BgxY8Ekc3sHQg6Fb8PDfVeckhM/CrAhEmwW/1Pn11btkK0aDf6bQVcxNV+dLKZwM0e8ETMu1tVVi9smZQM9a/w4jtALiTJhA4+iYN9tuigfG/x9JSsEzc62vRIzcffXNBjxrO0Z8F8HSbrc2k1PjP2irvg/wd2dmLDZfaT+6Jvpt1P4pQxjuDLxaexetabUQS1/0UvNRN7Nt4HTHwHN/hQBgQimsqfBmslmW01Dw3VjIOgvIsO84o4o8h2a/yk6Vep2VGS95R/un+vJpod6XYz4/GC4QC7lWot; 4:pyIVLR4s5HEMKuz5DAt9NOpzgKexIP2z8mc2GeGgEB5tqVq6ShN5xAnySlfwsvca9tzE95w0SPRCseo4R4eRGPVjgHeDdSx3LlEN3VDPUVCBjtqOSgzyrXrsVrayeHuEP3yDDnZozx8Go8Ol11ByjwS2Clbl8Uf2VYZg/d0tQA92jvSJv9SPf2KjNOQF0i8ER5NltjMOHODEwp+OenzrYsYb7Mk1qsVl1xN1Mo2dZxwvzarFOE5WFEiwmeQ/woBmiBr1sInWpeFq+tKvX6mFHqrvXIFaNS/Rsh2bxMCM91OEzvkIhCckFlklWqX+eMXB 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:BL2FFO11HUB045; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB045; X-Forefront-PRVS: 06833C6A67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11HUB045; 23:0vuAbccfEIYEx/qSTljXpx2GglY/Kht6AXHiZLzh?= =?us-ascii?Q?vdLF8NnMhP5ObJiRH5gdIlQs5wKBpWWk+2obJ5OkaLilQPi7MxApFSCS6bXf?= =?us-ascii?Q?K3RcNhr3ey/IyQtPem6vQLNirKPwJ670v/MOKAz6rTcDyb6k4b253IU4+v5z?= =?us-ascii?Q?jbXAYzJxzGnNVAuWA3WdEtsKtcIgq/7lOEoaOxBFFlQ8z80vWXz82McMyUbb?= =?us-ascii?Q?IzrAe6mWwBy27cdA1Chaw5QUroU3xSZKhhWq9SyUn11J4m+PmRGCdLJtork7?= =?us-ascii?Q?KYBE2EQazgE+ng04d5kHZXblKSQ1+HvGQz0qTq5gEwyjR7OM4FawfQK7MXcg?= =?us-ascii?Q?+Ez2w3ZtN8GKTwexpu1u2/h/Z3sQwO2n6qbVqonmHkzD2Lngd9VIEKVjE01H?= =?us-ascii?Q?48HsuF5SAjigtWsNfDn5UuAtFxbHtPA2Mm3vZo/JB8u7GDDlocYZPLuz8YMC?= =?us-ascii?Q?2PwCHDTot26Qaw9jkPJ6mOFSkincwEhistaGziF58zDP+DFTSaRlmIfSRRDH?= =?us-ascii?Q?WO1/H/cBlS0kUYsd7ByN5lUVOb/9J9dTAVp9CdXxzNSmoaEuWRfKf5/RlGkE?= =?us-ascii?Q?UnVd3samOQ2HQTVnlxByMh94jHUIvhHjclx/8sEXXvqp+IZupY8i/RJUNVxh?= =?us-ascii?Q?JKhIA13ZHcU73YSHkvFP9Zo3F0c4VoNW/cOXyP/IT9h8EpAtBNgUCPZSfhwu?= =?us-ascii?Q?IYR6ZzamxN05/1qlDQQO6lrmcqsJlA6Q3T8ofEKzLTyO7r/4FpA3nbqGxO1X?= =?us-ascii?Q?YsKm4JNKVaWkR3XK4hNVIcBr1946Owwr/SrbrgaQwmUdQNQGDVSMGKrUXKei?= =?us-ascii?Q?SSzIXkqL3TSxk7dnNUbLeYTfu4OdEORxEt+Q5KilMp8cXxNQCGbHUnb8Q1oK?= =?us-ascii?Q?ArnVc7OaS/nukA+3ldimcLgmdnJJhZHY8qnluEKdujOtkHmtpQ+MHOM/FYqs?= =?us-ascii?Q?YX4/l/mFtzcbvGdwbYFgh2RuBEojDsBPa/E/QznYysFCcIINpikREOvW6lOP?= =?us-ascii?Q?6wYtSo+Hz6U8endubCWMxZ2NCijj4+mn67/M0eXJ0YwScWt9R4tRMdNG00E7?= =?us-ascii?Q?7YHGfDAzcELHEOwyPoVqyLPC4zzRO5nPSfPk4phxbz0bvbDHrZLRcgjL5kPb?= =?us-ascii?Q?ku23/aFNi0fY8maqOam5S0HwB9Hd3u3M7CtGPxK/whSxks/GU9xSZyVj11bi?= =?us-ascii?Q?rhPd/JbhVAbuovS/eYsOG6j8worPam0+c4K07hvioKUWcAZDgLRfLFjlrw?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB045; 5:p3hi9fN4mOjTP0YfHVbqUuKeLUkcHfDEpjl2vMMEd1hovh+1hAbum/mb4wo7ZLtDoZaHrQnZlO1yjct0v6G1GpDn20Ya2/CA1YltjQBqLZgBip2gWOv39dx+qwlt9YJ5Meye1/d4TR/14A1zILWHTw==; 24:7NCwQ9qXf/ceRUYC44GEYa+px24vDYzQzg4HL6HBCZXESv7Fl0pHQR9JChueDZq/yagcgMPeNKqqBqOYyBRUkDqBIC3op88OnKfh8f6XcDc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2015 00:04:25.8094 (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: BL2FFO11HUB045 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.110.78 Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, jsnow@redhat.com, afaerber@suse.de, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v6 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 */