diff options
| author | Peter Maydell | 2018-11-27 10:55:05 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-27 10:55:05 +0100 |
| commit | d5d31c9a8ab5e87db4230602a6fd5da8eb13135c (patch) | |
| tree | 223c558ddddc4cf211267dd522a0e63207e1e828 /hw/hyperv/hyperv.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20181126'... (diff) | |
| parent | hw/hyperv: fix NULL dereference with pure-kvm SynIC (diff) | |
| download | qemu-d5d31c9a8ab5e87db4230602a6fd5da8eb13135c.tar.gz qemu-d5d31c9a8ab5e87db4230602a6fd5da8eb13135c.tar.xz qemu-d5d31c9a8ab5e87db4230602a6fd5da8eb13135c.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request' into staging
x86 fixes for -rc3
* Fix SynIC crash
* Fix x86 crash on MSR code on AMD hosts
# gpg: Signature made Mon 26 Nov 2018 20:58:34 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-for-3.1-pull-request:
hw/hyperv: fix NULL dereference with pure-kvm SynIC
kvm: Use KVM_GET_MSR_INDEX_LIST for MSR_IA32_ARCH_CAPABILITIES support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/hyperv/hyperv.c')
| -rw-r--r-- | hw/hyperv/hyperv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index a28e7249d8..8758635227 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -136,7 +136,11 @@ void hyperv_synic_add(CPUState *cs) void hyperv_synic_reset(CPUState *cs) { - device_reset(DEVICE(get_synic(cs))); + SynICState *synic = get_synic(cs); + + if (synic) { + device_reset(DEVICE(synic)); + } } static const TypeInfo synic_type_info = { |