From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRlMq-0001Pd-Dp for qemu-devel@nongnu.org; Tue, 18 Aug 2015 14:12:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRlMn-000854-4z for qemu-devel@nongnu.org; Tue, 18 Aug 2015 14:12:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRlMm-00084m-Us for qemu-devel@nongnu.org; Tue, 18 Aug 2015 14:12:09 -0400 References: From: John Snow Message-ID: <55D37574.90201@redhat.com> Date: Tue, 18 Aug 2015 11:12:04 -0700 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/4] ahci: Separate the AHCI state structure into the header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , qemu-devel@nongnu.org, peter.maydell@linaro.org, crosthwaitepeter@gmail.com Cc: saipava@xilinx.com, edgar.iglesias@xilinx.com, afaerber@suse.de On 08/17/2015 05:40 PM, Alistair Francis wrote: > 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 */ > For whomever eventually merges this; if this indeed the preferred flavor as Peter indicated: Acked-by: John Snow