[Qemu-commits] [qemu/qemu] a88ae0: pc: Require xen when initializing xenfv machine

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a88ae0d44b6b5830b752641b2198735272f13eaf
      
https://github.com/qemu/qemu/commit/a88ae0d44b6b5830b752641b2198735272f13eaf
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc: Require xen when initializing xenfv machine

Without this check, the xen-platform device will crash on reset
if using the accel option with anything other than xen (e.g.
"-machine xenfv,accel=kvm").

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: dbb7405d8caad0814ceddd568cb49f163a847561
      
https://github.com/qemu/qemu/commit/dbb7405d8caad0814ceddd568cb49f163a847561
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M hw/i386/xen/xen_platform.c

  Log Message:
  -----------
  xen-platform: Ensure xen is enabled when initializing

The xen-platform code crashes on reset if the xen backend is not
initialized, because it calls xc_hvm_set_mem_type(). Ensure xen-platform
won't be created without initializing the xen backend.

The assert can't be triggered by the user because the device is not
hotpluggable, and the only code creating it (at pc_xen_hvm_init())
already checks xen_enabled().

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 26c7be842637ee65a79cd77f96a99c23ddcd90ad
      
https://github.com/qemu/qemu/commit/26c7be842637ee65a79cd77f96a99c23ddcd90ad
  Author: Peter Maydell <address@hidden>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/xen/xen_platform.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into 
staging

Xen 2015-10-19

# gpg: Signature made Mon 19 Oct 2015 11:24:05 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <address@hidden>"

* remotes/sstabellini/tags/2015-10-19-tag:
  xen-platform: Ensure xen is enabled when initializing
  pc: Require xen when initializing xenfv machine

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/526d5809a071...26c7be842637