public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: kvm@vger.kernel.org
Cc: alex.williamson@redhat.com, ddutile@redhat.com, mst@redhat.com,
	chrisw@redhat.com
Subject: [PATCH 4/5] device-assignment: Error checking when adding capabilities
Date: Fri, 03 Dec 2010 12:34:12 -0700	[thread overview]
Message-ID: <20101203193403.3579.52459.stgit@s20.home> (raw)
In-Reply-To: <20101203192343.3579.73722.stgit@s20.home>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

 hw/device-assignment.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 6d6e657..838bf89 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1288,7 +1288,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
 {
     AssignedDevice *dev = container_of(pci_dev, AssignedDevice, dev);
     PCIRegion *pci_region = dev->real_device.regions;
-    int pos;
+    int ret, pos;
 
     /* Clear initial capabilities pointer and status copied from hw */
     pci_set_byte(pci_dev->config + PCI_CAPABILITY_LIST, 0);
@@ -1302,8 +1302,10 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
      * MSI capability is the 1st capability in capability config */
     if ((pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_MSI))) {
         dev->cap.available |= ASSIGNED_DEVICE_CAP_MSI;
-        pci_add_capability(pci_dev, PCI_CAP_ID_MSI, pos,
-                           PCI_CAPABILITY_CONFIG_MSI_LENGTH);
+        if ((ret = pci_add_capability(pci_dev, PCI_CAP_ID_MSI, pos,
+                                      PCI_CAPABILITY_CONFIG_MSI_LENGTH)) < 0) {
+            return ret;
+        }
 
         /* Only 32-bit/no-mask currently supported */
         pci_set_word(pci_dev->config + pos + PCI_MSI_FLAGS,
@@ -1326,8 +1328,10 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         uint32_t msix_table_entry;
 
         dev->cap.available |= ASSIGNED_DEVICE_CAP_MSIX;
-        pci_add_capability(pci_dev, PCI_CAP_ID_MSIX, pos,
-                           PCI_CAPABILITY_CONFIG_MSIX_LENGTH);
+        if ((ret = pci_add_capability(pci_dev, PCI_CAP_ID_MSIX, pos,
+                                      PCI_CAPABILITY_CONFIG_MSIX_LENGTH)) < 0) {
+            return ret;
+        }
 
         pci_set_word(pci_dev->config + pos + PCI_MSIX_FLAGS,
                      pci_get_word(pci_dev->config + pos + PCI_MSIX_FLAGS) &


  parent reply	other threads:[~2010-12-03 19:34 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-03 19:33 [PATCH 0/5] Extra capabilities for device assignment Alex Williamson
2010-12-03 19:33 ` [PATCH 1/5] device-assignment: Fix off-by-one in header check Alex Williamson
2010-12-03 19:33 ` [PATCH 2/5] pci: MSI-X capability is 12 bytes, not 16, MSI is 10 bytes Alex Williamson
2010-12-03 19:37   ` Chris Wright
2010-12-03 19:48     ` Alex Williamson
2010-12-03 19:54       ` Chris Wright
2010-12-03 19:33 ` [PATCH 3/5] pci: Error on PCI capability collisions Alex Williamson
2010-12-03 19:34 ` Alex Williamson [this message]
2010-12-03 19:34 ` [PATCH 5/5] device-assignment: pass through and stub more PCI caps Alex Williamson
2010-12-06 16:21 ` [PATCH v2 0/5] Extra capabilities for device assignment Alex Williamson
2010-12-06 16:22   ` [PATCH v2 1/5] device-assignment: Fix off-by-one in header check Alex Williamson
2010-12-06 16:22   ` [PATCH v2 2/5] pci: Remove PCI_CAPABILITY_CONFIG_* Alex Williamson
2010-12-06 16:22   ` [PATCH v2 3/5] pci: Error on PCI capability collisions Alex Williamson
2010-12-06 16:22   ` [PATCH v2 4/5] device-assignment: Error checking when adding capabilities Alex Williamson
2010-12-06 16:23   ` [PATCH v2 5/5] device-assignment: pass through and stub more PCI caps Alex Williamson
2010-12-06 16:34   ` [PATCH v2 0/5] Extra capabilities for device assignment Avi Kivity
2010-12-06 16:43     ` Alex Williamson
2010-12-06 17:03       ` Avi Kivity
2010-12-09 15:13         ` Markus Armbruster
2010-12-09 15:32           ` Avi Kivity
2010-12-09 16:17             ` Alex Williamson

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=20101203193403.3579.52459.stgit@s20.home \
    --to=alex.williamson@redhat.com \
    --cc=chrisw@redhat.com \
    --cc=ddutile@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox