|
 |
9bac43 |
From 1bc2106857269cd428567fed2f8afedd25c2c288 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Auger Eric <eric.auger@redhat.com>
|
|
|
9bac43 |
Date: Tue, 28 Nov 2017 15:14:03 +0100
|
|
|
9bac43 |
Subject: [PATCH 2/9] hw/intc/arm_gicv3_its: Fix the VM termination in
|
|
|
9bac43 |
vm_change_state_handler()
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Auger Eric <eric.auger@redhat.com>
|
|
|
9bac43 |
Message-id: <1511882048-11256-3-git-send-email-eric.auger@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77937
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-ma PATCH 2/7] hw/intc/arm_gicv3_its: Fix the VM termination in vm_change_state_handler()
|
|
|
9bac43 |
Bugzilla: 1513323
|
|
|
9bac43 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Shanker Donthineni <shankerd@codeaurora.org>
|
|
|
9bac43 |
|
|
|
9bac43 |
The commit cddafd8f353d ("hw/intc/arm_gicv3_its: Implement state save
|
|
|
9bac43 |
/restore") breaks the backward compatibility with the older kernels
|
|
|
9bac43 |
where vITS save/restore support is not available. The vmstate function
|
|
|
9bac43 |
vm_change_state_handler() should not be registered if the running kernel
|
|
|
9bac43 |
doesn't support ITS save/restore feature. Otherwise VM instance will be
|
|
|
9bac43 |
killed whenever vmstate callback function is invoked.
|
|
|
9bac43 |
|
|
|
9bac43 |
Observed a virtual machine shutdown with QEMU-2.10+linux-4.11 when testing
|
|
|
9bac43 |
the reboot command "virsh reboot <domain> --mode acpi" instead of reboot.
|
|
|
9bac43 |
|
|
|
9bac43 |
KVM Error: 'KVM_SET_DEVICE_ATTR failed: Group 4 attr 0x00000000000001'
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org>
|
|
|
9bac43 |
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
|
|
9bac43 |
Message-id: 1509712671-16299-1-git-send-email-shankerd@codeaurora.org
|
|
|
9bac43 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
9bac43 |
(cherry picked from commit 3a575cd2c2411f139a95ace4b2523bc1dfd21755)
|
|
|
9bac43 |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/intc/arm_gicv3_its_kvm.c | 4 ++--
|
|
|
9bac43 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
|
|
|
9bac43 |
index 39903d5..9b00ce5 100644
|
|
|
9bac43 |
--- a/hw/intc/arm_gicv3_its_kvm.c
|
|
|
9bac43 |
+++ b/hw/intc/arm_gicv3_its_kvm.c
|
|
|
9bac43 |
@@ -111,13 +111,13 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
|
|
|
9bac43 |
error_free(s->migration_blocker);
|
|
|
9bac43 |
return;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+ } else {
|
|
|
9bac43 |
+ qemu_add_vm_change_state_handler(vm_change_state_handler, s);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
kvm_msi_use_devid = true;
|
|
|
9bac43 |
kvm_gsi_direct_mapping = false;
|
|
|
9bac43 |
kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled();
|
|
|
9bac43 |
-
|
|
|
9bac43 |
- qemu_add_vm_change_state_handler(vm_change_state_handler, s);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
/**
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|