]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge tag 'trivial-branch-for-7.2-pull-request' of https://gitlab.com/laurent_vivier...
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 4 Oct 2022 18:04:18 +0000 (14:04 -0400)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 4 Oct 2022 18:04:18 +0000 (14:04 -0400)
Pull request trivial patches branch 20220930-v2

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmM7XoISHGxhdXJlbnRA
# dml2aWVyLmV1AAoJEPMMOL0/L748D/0QAKbYtTWjhFPeapjZVoTv13YrTvczWrcF
# omL6IZivVq0t7hun4iem0DwmvXJELMGexEOTvEJOzM19IIlvvwvOsI8xnxpcMnEY
# 6GKVbs53Ba0bg2yh7Dll2W9jkou9eX27DwUHMVF8KX7qqsbU+WyD/vdGZitgGt+T
# 8yna7kzVvNVsdB3+DbIatI5RzzHeu4OqeuH/WCtAyzCaLB64UYTcHprskxIp4+wp
# dR+EUSoDEr9Qx4PC+uVEsTFK1zZjyAYNoNIkh6fhlkRvDJ1uA75m3EJ57P8xPPqe
# VbVkPMKi0d4c52m6XvLsQhyYryLx/qLLUAkJWVpY66aHcapYbZAEAfZmNGTQLrOJ
# qIOJzIkOdU6l3pRgXVdVCgkHRc2HETwET2LyVbNkUz/vBlW2wOZQbZFbezComael
# bQ/gNBYqP+eOGnZzeWbKBGHr/9QDBClNufidIMC+sOiUw0iSifzjkFwvH7IElx6K
# EQCOSV6pOhKVlinTpmBbk1XD3xDkQ7ZidiLT9g+P1c8dExrXBhWOnfUHueISb8+s
# KKMozuxQ/6/3c/DP5hwI9cKPEWEbqJfq1kMuxIvEivKGwUIqX2yq4VJ+hSlYJ+CW
# nGjXZldtf4KwH+cTsxyPmdZRR5Q7+ODr5Xo7GNvEKBuDsHs7uUl1c3vvOykQgje9
# +dyJR6TfbQWn
# =aK29
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 03 Oct 2022 18:13:22 EDT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* tag 'trivial-branch-for-7.2-pull-request' of https://gitlab.com/laurent_vivier/qemu:
  docs: Update TPM documentation for usage of a TPM 2
  Use g_new() & friends where that makes obvious sense
  Drop superfluous conditionals around g_free()
  block/qcow2-bitmap: Add missing cast to silent GCC error
  checkpatch: ignore target/hexagon/imported/* files
  mem/cxl_type3: fix GPF DVSEC
  .gitignore: add .cache/ to .gitignore
  hw/virtio/vhost-shadow-virtqueue: Silence GCC error "maybe-uninitialized"

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
1  2 
target/i386/kvm/kvm.c

diff --combined target/i386/kvm/kvm.c
index 9eeee91c2f5c165de26d65a8a67d5f4ca40fe6c2,9603bf265af5f2aa955c85ead4d2d98899a7a120..f2a96492ce422195d65b797faddd5661e4d46aa7
@@@ -157,7 -157,7 +157,7 @@@ bool kvm_has_adjust_clock_stable(void
  {
      int ret = kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK);
  
 -    return (ret == KVM_CLOCK_TSC_STABLE);
 +    return (ret & KVM_CLOCK_TSC_STABLE);
  }
  
  bool kvm_has_adjust_clock(void)
@@@ -2176,15 -2176,11 +2176,11 @@@ int kvm_arch_destroy_vcpu(CPUState *cs
  
      g_free(env->xsave_buf);
  
-     if (cpu->kvm_msr_buf) {
-         g_free(cpu->kvm_msr_buf);
-         cpu->kvm_msr_buf = NULL;
-     }
+     g_free(cpu->kvm_msr_buf);
+     cpu->kvm_msr_buf = NULL;
  
-     if (env->nested_state) {
-         g_free(env->nested_state);
-         env->nested_state = NULL;
-     }
+     g_free(env->nested_state);
+     env->nested_state = NULL;
  
      qemu_del_vm_change_state_handler(cpu->vmsentry);