From: Pavel Fedin <p.fedin@samsung.com>
To: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: Christoffer Dall <christoffer.dall@linaro.org>,
Marc Zyngier <marc.zyngier@arm.com>
Subject: [PATCH 1/2] Fix NULL pointer dereferences if KVM is used without in-kernel irqchip
Date: Tue, 07 Jul 2015 14:11:00 +0300 [thread overview]
Message-ID: <46c62639f325ef935c4ca24c5fc9d5eb2b4a0979.1436264839.git.p.fedin__39902.5920000442$1436267506$gmane$org@samsung.com> (raw)
In-Reply-To: <cover.1436264839.git.p.fedin@samsung.com>
In-Reply-To: <cover.1436264839.git.p.fedin@samsung.com>
Makes qemu working again with kernel-irqchip=off option
Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
---
virt/kvm/arm/vgic.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 78fb820..3420657 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -100,6 +100,9 @@ static bool queue_sgi(struct kvm_vcpu *vcpu, int irq)
int kvm_vgic_map_resources(struct kvm *kvm)
{
+ if (!kvm->arch.vgic.vm_ops.map_resources)
+ return 0;
+
return kvm->arch.vgic.vm_ops.map_resources(kvm, vgic);
}
@@ -1637,7 +1640,7 @@ static int vgic_vcpu_init_maps(struct kvm_vcpu *vcpu, int nr_irqs)
*/
int kvm_vgic_get_max_vcpus(void)
{
- return vgic->max_gic_vcpus;
+ return vgic ? vgic->max_gic_vcpus : KVM_MAX_VCPUS;
}
void kvm_vgic_destroy(struct kvm *kvm)
--
2.4.4
next prev parent reply other threads:[~2015-07-07 11:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 10:38 [PATCH 0/2] Allow to use KVM without in-kernel irqchip Pavel Fedin
2015-07-07 10:38 ` [PATCH 1/2] Fix NULL pointer dereferences if KVM is used " Pavel Fedin
2015-07-09 11:11 ` Christoffer Dall
2015-07-07 10:38 ` [PATCH 2/2] Detect vGIC presence at runtime Pavel Fedin
2015-07-09 11:37 ` Christoffer Dall
2015-07-09 12:50 ` Pavel Fedin
2015-07-09 13:25 ` Christoffer Dall
2015-07-09 13:47 ` Pavel Fedin
2015-07-07 11:11 ` Pavel Fedin [this message]
2015-07-07 11:11 ` Pavel Fedin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='46c62639f325ef935c4ca24c5fc9d5eb2b4a0979.1436264839.git.p.fedin__39902.5920000442$1436267506$gmane$org@samsung.com' \
--to=p.fedin@samsung.com \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=marc.zyngier@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.