[Qemu-commits] [qemu/qemu] ba3ecd: ppc: Add/Re-introduce MMU model definitions needed...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ba3ecda05e933acf6fff618716b6f6d2ed6a5a07
      
https://github.com/qemu/qemu/commit/ba3ecda05e933acf6fff618716b6f6d2ed6a5a07
  Author: Bharata B Rao <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M target-ppc/cpu.h
    M target-ppc/mmu_helper.c

  Log Message:
  -----------
  ppc: Add/Re-introduce MMU model definitions needed by PR KVM

Commit aa4bb5875231 (ppc: Add mmu_model defines for arch 2.03 and 2.07)
removed the mmu_model definition POWERPC_MMU_2_06a which is needed by
PR KVM. Reintroduce it and also add POWERPC_MMU_2_07a.

This fixes QEMU crash (qemu: fatal: Unknown MMU model) during booting
of PR KVM guest.

Signed-off-by: Bharata B Rao <address@hidden>
Cc: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 121048195860f0320a7e1cd5a4b86356082eb9c7
      
https://github.com/qemu/qemu/commit/121048195860f0320a7e1cd5a4b86356082eb9c7
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pc-bios/README
    M pc-bios/slof.bin
    M roms/SLOF

  Log Message:
  -----------
  pseries: Update SLOF firmware image to qemu-slof-20151103

The changes are:
1. supports recent binutils;
2. 64bit BARs behind PCI bridges supported;
3. Many fixes for USB keyboard support - keys, XHCI;
4. virtio-vga support.

This image was built with:
gcc version 4.8.3 20140911 (Red Hat 4.8.3-7) (GCC)
GNU ld version 2.23.2

The full changelog is:
  > version: update to 20151103
  > documentation: Add a clause about signing off
  > qemu/js2x/client: Support binutils >= 2.25.1
  > Fix special keys on USB
  > Fix function keys on USB
  > pci-scan: program 64-bit mem bar range in pci-bridge bar
  > Allow to build SLOF on Little Endian host
  > usb-xhci: add keyboard support
  > usb-xhci: ready the link trb early
  > usb-xhci: scan usb high speed ports
  > usb-xhci: bulk improve event handling loop
  > usb-xhci: return on allocation failure
  > usb-xhci: add delay in shutdown path
  > usb-xhci: event trbs does not need link trb
  > usb-hid: refactor usb key reading
  > takeover: Fix header includes
  > board-js2x: Add missing file dma-function.fs
  > vga: Add support for virtio-vga
  > qemu-vga: Use MMIO BAR instead of legacy IO ports
  > slof: Change call_c() function to a proper assembler function

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: a3166f8f6e9d3928d0b863c7f0dac1cf24b6c004
      
https://github.com/qemu/qemu/commit/a3166f8f6e9d3928d0b863c7f0dac1cf24b6c004
  Author: Bharata B Rao <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M target-ppc/kvm_ppc.h

  Log Message:
  -----------
  ppc: Let kvmppc_reset_htab() return 0 for !CONFIG_KVM

The !CONFIG_KVM implementation of kvmppc_reset_htab() returns -1
by default. Change this to return 0 so that we fall back to user space
HTAB allocation for emulated guests.

This fixes the make check failures for ppc64 emulated target.

Signed-off-by: Bharata B Rao <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: b41d320fef705289d2b73f4949731eb2e189161d
      
https://github.com/qemu/qemu/commit/b41d320fef705289d2b73f4949731eb2e189161d
  Author: Bharata B Rao <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Handle failure of KVM_PPC_ALLOCATE_HTAB ioctl

KVM_PPC_ALLOCATE_HTAB ioctl can return -ENOMEM for KVM guests and QEMU
never handled this correctly. But this didn't cause any problems till
now as KVM_PPC_ALLOCATE_HTAB ioctl returned with smaller than requested
HTAB when enough contiguous memory wasn't available in the host.
After the proposed kernel change: https://patchwork.ozlabs.org/patch/530501/,
KVM_PPC_ALLOCATE_HTAB ioctl will not fallback to lower sized HTAB
allocation and will fail if requested HTAB size can't be met.

Check for such failures in QEMU and abort appropriately. This will
prevent guest kernel from hanging/freezing during early boot by doing
graceful exit when host is unable to allocate requested HTAB.

Signed-off-by: Bharata B Rao <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 3c07587d49458341510360557c849e93e9afaf59
      
https://github.com/qemu/qemu/commit/3c07587d49458341510360557c849e93e9afaf59
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/ppc/spapr.c
    M pc-bios/README
    M pc-bios/slof.bin
    M roms/SLOF
    M target-ppc/cpu.h
    M target-ppc/kvm_ppc.h
    M target-ppc/mmu_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-next-20151111' into 
staging

ppc patch queue - 2015-11-11

Highlights:
  - Updated SLOF version for "pseries machine
  - Bugfix / cleanup for KVM hash page table allocation

# gpg: Signature made Wed 11 Nov 2015 02:30:51 GMT using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-next-20151111:
  spapr: Handle failure of KVM_PPC_ALLOCATE_HTAB ioctl
  ppc: Let kvmppc_reset_htab() return 0 for !CONFIG_KVM
  pseries: Update SLOF firmware image to qemu-slof-20151103
  ppc: Add/Re-introduce MMU model definitions needed by PR KVM

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


Compare: https://github.com/qemu/qemu/compare/d93ae5b69621...3c07587d4945