From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4eCh-0002xa-1l for qemu-devel@nongnu.org; Mon, 24 Nov 2008 11:22:27 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4eCf-0002w2-F0 for qemu-devel@nongnu.org; Mon, 24 Nov 2008 11:22:26 -0500 Received: from [199.232.76.173] (port=50560 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4dl6-00029z-PD for qemu-devel@nongnu.org; Mon, 24 Nov 2008 10:53:57 -0500 Received: from mga11.intel.com ([192.55.52.93]:22957) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L4a1C-0005Gg-Ta for qemu-devel@nongnu.org; Mon, 24 Nov 2008 06:54:19 -0500 From: Sheng Yang Date: Mon, 24 Nov 2008 19:50:31 +0800 Message-Id: <1227527435-32088-2-git-send-email-sheng@linux.intel.com> In-Reply-To: <1227527435-32088-1-git-send-email-sheng@linux.intel.com> References: <1227527435-32088-1-git-send-email-sheng@linux.intel.com> Subject: [Qemu-devel] [PATCH 1/5] kvm: Replace force type convert with container_of() Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: Sheng Yang , kvm@vger.kernel.org, qemu-devel@nongnu.org Signed-off-by: Sheng Yang --- qemu/hw/device-assignment.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 9a790c6..786b2f0 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -144,7 +144,7 @@ static uint32_t assigned_dev_ioport_readl(void *opaque, uint32_t addr) static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num, uint32_t e_phys, uint32_t e_size, int type) { - AssignedDevice *r_dev = (AssignedDevice *) pci_dev; + AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev); AssignedDevRegion *region = &r_dev->v_addrs[region_num]; uint32_t old_ephys = region->e_physbase; uint32_t old_esize = region->e_size; @@ -172,7 +172,7 @@ static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num, static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { - AssignedDevice *r_dev = (AssignedDevice *) pci_dev; + AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev); AssignedDevRegion *region = &r_dev->v_addrs[region_num]; int first_map = (region->e_size == 0); CPUState *env; @@ -221,6 +221,7 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, { int fd; ssize_t ret; + AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); DEBUG("(%x.%x): address=%04x val=0x%08x len=%d\n", ((d->devfn >> 3) & 0x1F), (d->devfn & 0x7), @@ -242,7 +243,7 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, ((d->devfn >> 3) & 0x1F), (d->devfn & 0x7), (uint16_t) address, val, len); - fd = ((AssignedDevice *)d)->real_device.config_fd; + fd = pci_dev->real_device.config_fd; again: ret = pwrite(fd, &val, len, address); @@ -263,6 +264,7 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, uint32_t val = 0; int fd; ssize_t ret; + AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); if ((address >= 0x10 && address <= 0x24) || address == 0x34 || address == 0x3c || address == 0x3d) { @@ -276,7 +278,7 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, if (address == 0xFC) goto do_log; - fd = ((AssignedDevice *)d)->real_device.config_fd; + fd = pci_dev->real_device.config_fd; again: ret = pread(fd, &val, len, address); @@ -489,16 +491,18 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus) { int r; AssignedDevice *dev; + PCIDevice *pci_dev; uint8_t e_device, e_intx; struct kvm_assigned_pci_dev assigned_dev_data; DEBUG("Registering real physical device %s (bus=%x dev=%x func=%x)\n", adev->name, adev->bus, adev->dev, adev->func); - dev = (AssignedDevice *) - pci_register_device(bus, adev->name, sizeof(AssignedDevice), - -1, assigned_dev_pci_read_config, - assigned_dev_pci_write_config); + pci_dev = pci_register_device(bus, adev->name, + sizeof(AssignedDevice), -1, assigned_dev_pci_read_config, + assigned_dev_pci_write_config); + dev = container_of(pci_dev, AssignedDevice, dev); + if (NULL == dev) { fprintf(stderr, "%s: Error: Couldn't register real device %s\n", __func__, adev->name); -- 1.5.4.5