[PATCH stable-1.1] qemu-kvm: virtio: Do not register mask notifiers without in-kernel irqchip support

[Jan Kiszka]

We crash if we registers mask notifiers without backing in-kernel
irqchip. This corresponds to the check in QEMU upstream after 1.1 now.

Signed-off-by: Jan Kiszka jan.kis...@siemens.com
---

Not needed for master as we have upstream logic there already.

 hw/virtio-pci.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index a0c2ca7..5b64356 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -629,7 +629,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, 
bool assign)
 
 /* Must unset mask notifier while guest notifier
  * is still assigned */
-if (!assign) {
+if (kvm_irqchip_in_kernel()  !assign) {
r = msix_unset_mask_notifier(proxy-pci_dev);
 assert(r = 0);
 }
@@ -647,7 +647,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, 
bool assign)
 
 /* Must set mask notifier after guest notifier
  * has been assigned */
-if (assign) {
+if (kvm_irqchip_in_kernel()  assign) {
 r = msix_set_mask_notifier(proxy-pci_dev,
virtio_pci_mask_notifier);
 if (r  0) {
-- 
1.7.3.4
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH stable-1.1] qemu-kvm: virtio: Do not register mask notifiers without in-kernel irqchip support

[Michael S. Tsirkin]

On Mon, Jul 02, 2012 at 10:05:39AM +0200, Jan Kiszka wrote:
 We crash if we registers mask notifiers without backing in-kernel
 irqchip. This corresponds to the check in QEMU upstream after 1.1 now.
 
 Signed-off-by: Jan Kiszka jan.kis...@siemens.com

Acked-by: Michael S. Tsirkin m...@redhat.com

 ---
 
 Not needed for master as we have upstream logic there already.
 
  hw/virtio-pci.c |4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
 index a0c2ca7..5b64356 100644
 --- a/hw/virtio-pci.c
 +++ b/hw/virtio-pci.c
 @@ -629,7 +629,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, 
 bool assign)
  
  /* Must unset mask notifier while guest notifier
   * is still assigned */
 -if (!assign) {
 +if (kvm_irqchip_in_kernel()  !assign) {
   r = msix_unset_mask_notifier(proxy-pci_dev);
  assert(r = 0);
  }
 @@ -647,7 +647,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, 
 bool assign)
  
  /* Must set mask notifier after guest notifier
   * has been assigned */
 -if (assign) {
 +if (kvm_irqchip_in_kernel()  assign) {
  r = msix_set_mask_notifier(proxy-pci_dev,
 virtio_pci_mask_notifier);
  if (r  0) {
 -- 
 1.7.3.4
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html