From patchwork Wed Aug 6 10:17:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 376977 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 2F0E2140116 for ; Wed, 6 Aug 2014 20:17:59 +1000 (EST) Received: from localhost ([::1]:37916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEyI9-0007Wq-CC for incoming@patchwork.ozlabs.org; Wed, 06 Aug 2014 06:17:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEyHo-0007GP-TI for qemu-devel@nongnu.org; Wed, 06 Aug 2014 06:17:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEyHj-0007Qp-Dz for qemu-devel@nongnu.org; Wed, 06 Aug 2014 06:17:36 -0400 Received: from mga03.intel.com ([143.182.124.21]:5845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEyHj-0007Pf-7Z for qemu-devel@nongnu.org; Wed, 06 Aug 2014 06:17:31 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 06 Aug 2014 03:17:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,811,1400050800"; d="scan'208";a="465546788" Received: from tiejunch-mobl.ccr.corp.intel.com (HELO [10.238.130.56]) ([10.238.130.56]) by azsmga001.ch.intel.com with ESMTP; 06 Aug 2014 03:17:03 -0700 Message-ID: <53E2009E.4080107@intel.com> Date: Wed, 06 Aug 2014 18:17:02 +0800 From: "Chen, Tiejun" User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: "Michael S. Tsirkin" References: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> <1407307835-9692-4-git-send-email-tiejun.chen@intel.com> <20140806094509.GB22307@redhat.com> In-Reply-To: <20140806094509.GB22307@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 143.182.124.21 Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com Subject: Re: [Qemu-devel] [v4][PATCH 3/5] I440FX_PCI_DEVICE: add pci_type to index 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 On 2014/8/6 17:45, Michael S. Tsirkin wrote: > On Wed, Aug 06, 2014 at 02:50:33PM +0800, Tiejun Chen wrote: >> We need to use this index to reuse this macro later >> >> Signed-off-by: Tiejun Chen > > Which index? > Most users don't need to change. > Just open-code OBJECT_CHECK where necessary, or add > a new wrapper. Okay so what about this? hw:pci-host:piix: define I440FX_PCI_DEVICE_FROM_TYPE We need to introduce I440FX_PCI_DEVICE_FROM_TYPE to get object with type, then we can reuse i440fx_init() simply. Signed-off-by: Tiejun Chen f->pci_address_space = pci_address_space; Thanks Tiejun > >> --- >> hw/pci-host/piix.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> v4: >> >> * New patch to extend I440FX_PCI_DEVICE >> >> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c >> index 0cd82b8..4330599 100644 >> --- a/hw/pci-host/piix.c >> +++ b/hw/pci-host/piix.c >> @@ -90,8 +90,8 @@ typedef struct PIIX3State { >> MemoryRegion rcr_mem; >> } PIIX3State; >> >> -#define I440FX_PCI_DEVICE(obj) \ >> - OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE) >> +#define I440FX_PCI_DEVICE(obj, type) \ >> + OBJECT_CHECK(PCII440FXState, (obj), type) >> >> struct PCII440FXState { >> /*< private >*/ >> @@ -155,7 +155,7 @@ static void i440fx_set_smm(int val, void *arg) >> static void i440fx_write_config(PCIDevice *dev, >> uint32_t address, uint32_t val, int len) >> { >> - PCII440FXState *d = I440FX_PCI_DEVICE(dev); >> + PCII440FXState *d = I440FX_PCI_DEVICE(dev, TYPE_I440FX_PCI_DEVICE); >> >> /* XXX: implement SMRAM.D_LOCK */ >> pci_default_write_config(dev, address, val, len); >> @@ -295,7 +295,7 @@ static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) >> >> static int i440fx_initfn(PCIDevice *dev) >> { >> - PCII440FXState *d = I440FX_PCI_DEVICE(dev); >> + PCII440FXState *d = I440FX_PCI_DEVICE(dev, TYPE_I440FX_PCI_DEVICE); >> >> dev->config[I440FX_SMRAM] = 0x02; >> >> @@ -333,7 +333,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, >> qdev_init_nofail(dev); >> >> d = pci_create_simple(b, 0, pci_type); >> - *pi440fx_state = I440FX_PCI_DEVICE(d); >> + *pi440fx_state = I440FX_PCI_DEVICE(d, pci_type); >> f = *pi440fx_state; >> f->system_memory = address_space_mem; >> f->pci_address_space = pci_address_space; >> -- >> 1.9.1 > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 0cd82b8..8c74653 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -93,6 +93,9 @@ typedef struct PIIX3State { #define I440FX_PCI_DEVICE(obj) \ OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE) +#define I440FX_PCI_DEVICE_FROM_TYPE(obj, type) \ + OBJECT_CHECK(PCII440FXState, (obj), type) + struct PCII440FXState { /*< private >*/ PCIDevice parent_obj; @@ -333,7 +336,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, qdev_init_nofail(dev); d = pci_create_simple(b, 0, pci_type); - *pi440fx_state = I440FX_PCI_DEVICE(d); + *pi440fx_state = I440FX_PCI_DEVICE_FROM_TYPE(d, pci_type); f = *pi440fx_state; f->system_memory = address_space_mem;