All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: kvm@vger.kernel.org
Cc: alex.williamson@redhat.com
Subject: [PATCH 2/3] device-assignment: Be consistent and use DO_UPCAST everywhere
Date: Thu, 24 Feb 2011 22:56:19 +0100	[thread overview]
Message-ID: <0d8942ce74505199d57779de84263faa499adff0.1298584362.git.quintela@redhat.com> (raw)
In-Reply-To: <cover.1298584362.git.quintela@redhat.com>
In-Reply-To: <cover.1298584362.git.quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/device-assignment.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 115df19..dc70b80 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -246,7 +246,7 @@ static void assigned_dev_iomem_map_slow(PCIDevice *pci_dev, int region_num,
                                         pcibus_t e_phys, pcibus_t e_size,
                                         int type)
 {
-    AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *r_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     AssignedDevRegion *region = &r_dev->v_addrs[region_num];
     PCIRegion *real_region = &r_dev->real_device.regions[region_num];
     int m;
@@ -270,7 +270,7 @@ static void assigned_dev_iomem_map_slow(PCIDevice *pci_dev, int region_num,
 static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num,
                                    pcibus_t e_phys, pcibus_t e_size, int type)
 {
-    AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *r_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     AssignedDevRegion *region = &r_dev->v_addrs[region_num];
     PCIRegion *real_region = &r_dev->real_device.regions[region_num];
     int ret = 0;
@@ -304,7 +304,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,
                                     pcibus_t addr, pcibus_t size, int type)
 {
-    AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *r_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     AssignedDevRegion *region = &r_dev->v_addrs[region_num];
     int first_map = (region->e_size == 0);
     CPUState *env;
@@ -350,7 +350,7 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num,

 static uint32_t assigned_dev_pci_read(PCIDevice *d, int pos, int len)
 {
-    AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev);
+    AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d);
     uint32_t val;
     ssize_t ret;
     int fd = pci_dev->real_device.config_fd;
@@ -377,7 +377,7 @@ static uint8_t assigned_dev_pci_read_byte(PCIDevice *d, int pos)

 static void assigned_dev_pci_write(PCIDevice *d, int pos, uint32_t val, int len)
 {
-    AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev);
+    AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d);
     ssize_t ret;
     int fd = pci_dev->real_device.config_fd;

@@ -430,7 +430,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);
+    AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d);

     DEBUG("(%x.%x): address=%04x val=0x%08x len=%d\n",
           ((d->devfn >> 3) & 0x1F), (d->devfn & 0x7),
@@ -477,7 +477,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);
+    AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d);

     if (address >= PCI_CONFIG_HEADER_SIZE && d->config_map[address]) {
         val = assigned_device_pci_cap_read_config(d, address, len);
@@ -1079,7 +1079,7 @@ void assigned_dev_update_irqs(void)
 static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
 {
     struct kvm_assigned_irq assigned_irq_data;
-    AssignedDevice *assigned_dev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     uint8_t ctrl_byte = pci_dev->config[ctrl_pos];
     int r;

@@ -1144,7 +1144,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos)
 #ifdef KVM_CAP_DEVICE_MSIX
 static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev)
 {
-    AssignedDevice *adev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *adev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     uint16_t entries_nr = 0, entries_max_nr;
     int pos = 0, i, r = 0;
     uint32_t msg_addr, msg_upper_addr, msg_data, msg_ctrl;
@@ -1235,7 +1235,7 @@ static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev)
 static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos)
 {
     struct kvm_assigned_irq assigned_irq_data;
-    AssignedDevice *assigned_dev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     uint16_t *ctrl_word = (uint16_t *)(pci_dev->config + ctrl_pos);
     int r;

@@ -1384,7 +1384,7 @@ static void assigned_device_pci_cap_write_config(PCIDevice *pci_dev,

 static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
 {
-    AssignedDevice *dev = container_of(pci_dev, AssignedDevice, dev);
+    AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
     PCIRegion *pci_region = dev->real_device.regions;
     int ret, pos;

-- 
1.7.4


  parent reply	other threads:[~2011-02-24 21:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela
2011-02-24 21:56 ` [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() Juan Quintela
2011-02-24 21:56 ` Juan Quintela [this message]
2011-02-24 21:56 ` [PATCH 3/3] device-assignment: remove qemu_mallocz() test Juan Quintela
2011-02-24 22:04 ` [PATCH 0/3] device-assigment: cleanup Alex Williamson
2011-03-01 20:31 ` Marcelo Tosatti

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0d8942ce74505199d57779de84263faa499adff0.1298584362.git.quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.