diff mbox

[09/16] pci-assign: assignment should fail if we can't read config space

Message ID 1397118285-11715-10-git-send-email-lersek@redhat.com
State New
Headers show

Commit Message

Laszlo Ersek April 10, 2014, 8:24 a.m. UTC 
assigned_initfn()
  get_real_device()
    read()

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 hw/i386/kvm/pci-assign.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Eric Blake April 29, 2014, 7:12 p.m. UTC | #1 
On 04/10/2014 02:24 AM, Laszlo Ersek wrote:
> assigned_initfn()
>   get_real_device()
>     read()
> 
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  hw/i386/kvm/pci-assign.c | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
> index f91d4fb..e89bb6a 100644
> --- a/hw/i386/kvm/pci-assign.c
> +++ b/hw/i386/kvm/pci-assign.c
> @@ -574,10 +574,11 @@ again:
>      if (r < 0) {
>          if (errno == EINTR || errno == EAGAIN) {
>              goto again;
>          }
>          error_report("%s: read failed, errno = %d", __func__, errno);
> +        return 1;
>      }
>  
>      /* Restore or clear multifunction, this is always controlled by qemu */
>      if (pci_dev->dev.cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
>          pci_dev->dev.config[PCI_HEADER_TYPE] |= PCI_HEADER_TYPE_MULTI_FUNCTION;
>
diff mbox

Patch

diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index f91d4fb..e89bb6a 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -574,10 +574,11 @@  again:
     if (r < 0) {
         if (errno == EINTR || errno == EAGAIN) {
             goto again;
         }
         error_report("%s: read failed, errno = %d", __func__, errno);
+        return 1;
     }
 
     /* Restore or clear multifunction, this is always controlled by qemu */
     if (pci_dev->dev.cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
         pci_dev->dev.config[PCI_HEADER_TYPE] |= PCI_HEADER_TYPE_MULTI_FUNCTION;