Patchwork [1/8] iommu: Fix compile error in ioapic.c

login
register
mail settings
Submitter David Gibson
Date May 13, 2013, 10:54 a.m.
Message ID <1368442465-14363-2-git-send-email-david@gibson.dropbear.id.au>
Download mbox | patch
Permalink /patch/243376/
State New
Headers show

Comments

David Gibson - May 13, 2013, 10:54 a.m.
The iommu tree introduced a build bug into hw/i386/kvm/ioapic.c.  Looks
like a messed up copy and paste.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/i386/kvm/ioapic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Paolo Bonzini - May 13, 2013, 12:14 p.m.
Il 13/05/2013 12:54, David Gibson ha scritto:
> The iommu tree introduced a build bug into hw/i386/kvm/ioapic.c.  Looks
> like a messed up copy and paste.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  hw/i386/kvm/ioapic.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
> index e3c29da..fe24d26 100644
> --- a/hw/i386/kvm/ioapic.c
> +++ b/hw/i386/kvm/ioapic.c
> @@ -108,7 +108,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s)
>          abort();
>      }
>  
> -    memory_region_unref(mrs.mr);
> +    memory_region_unref(&s->io_memory);
>  }
>  
>  static void kvm_ioapic_reset(DeviceState *dev)
> 

Squashed, thanks.

Paolo

Patch

diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index e3c29da..fe24d26 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -108,7 +108,7 @@  static void kvm_ioapic_put(IOAPICCommonState *s)
         abort();
     }
 
-    memory_region_unref(mrs.mr);
+    memory_region_unref(&s->io_memory);
 }
 
 static void kvm_ioapic_reset(DeviceState *dev)