|
 |
cbdfe66 |
From af483cb870ad81dce8e10215e0add284fcc38da4 Mon Sep 17 00:00:00 2001
|
|
|
cbdfe66 |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
cbdfe66 |
Date: Wed, 24 Feb 2010 21:09:45 +0200
|
|
|
cbdfe66 |
Subject: [PATCH] msix: migration fix
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
Be careful to match mask/unmask callbacks from msix.
|
|
|
cbdfe66 |
Fixes crash during migration.
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
cbdfe66 |
---
|
|
|
cbdfe66 |
hw/msix.c | 16 +++++++++++++---
|
|
|
cbdfe66 |
1 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
diff --git a/hw/msix.c b/hw/msix.c
|
|
|
cbdfe66 |
index 3fcf3a1..fafaf09 100644
|
|
|
cbdfe66 |
--- a/hw/msix.c
|
|
|
cbdfe66 |
+++ b/hw/msix.c
|
|
|
cbdfe66 |
@@ -614,9 +614,19 @@ int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
|
|
|
cbdfe66 |
if (vector >= dev->msix_entries_nr || !dev->msix_entry_used[vector])
|
|
|
cbdfe66 |
return 0;
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
- if (dev->msix_mask_notifier)
|
|
|
cbdfe66 |
- r = dev->msix_mask_notifier(dev, vector, opaque,
|
|
|
cbdfe66 |
- msix_is_masked(dev, vector));
|
|
|
cbdfe66 |
+ if (dev->msix_mask_notifier && !msix_is_masked(dev, vector)) {
|
|
|
cbdfe66 |
+ /* Mask previous notifier if any */
|
|
|
cbdfe66 |
+ if (dev->msix_mask_notifier_opaque[vector]) {
|
|
|
cbdfe66 |
+ r = dev->msix_mask_notifier(dev, vector,
|
|
|
cbdfe66 |
+ dev->msix_mask_notifier_opaque[vector],
|
|
|
cbdfe66 |
+ 1);
|
|
|
cbdfe66 |
+ assert(r >= 0);
|
|
|
cbdfe66 |
+ }
|
|
|
cbdfe66 |
+ /* Unmask new notifier, assumed to be masked at start */
|
|
|
cbdfe66 |
+ if (opaque) {
|
|
|
cbdfe66 |
+ r = dev->msix_mask_notifier(dev, vector, opaque, 0);
|
|
|
cbdfe66 |
+ }
|
|
|
cbdfe66 |
+ }
|
|
|
cbdfe66 |
if (r >= 0)
|
|
|
cbdfe66 |
dev->msix_mask_notifier_opaque[vector] = opaque;
|
|
|
cbdfe66 |
return r;
|
|
|
cbdfe66 |
--
|
|
|
cbdfe66 |
1.6.6.1
|
|
|
cbdfe66 |
|