From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv6g-0004dp-85 for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEv6b-0007mO-5t for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:54 -0400 Received: from mga01.intel.com ([192.55.52.88]:48322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv6b-0007m7-1i for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:49 -0400 From: Tiejun Chen Date: Wed, 6 Aug 2014 14:50:33 +0800 Message-Id: <1407307835-9692-4-git-send-email-tiejun.chen@intel.com> In-Reply-To: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> References: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> Subject: [Qemu-devel] [v4][PATCH 3/5] I440FX_PCI_DEVICE: add pci_type to index List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com We need to use this index to reuse this macro later Signed-off-by: Tiejun Chen --- 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