[Qemu-commits] [qemu/qemu] 2f448e: hw: fix some debug message format strings

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2f448e415f364d0ec4c5556993e44ca183e31c5c
      
https://github.com/qemu/qemu/commit/2f448e415f364d0ec4c5556993e44ca183e31c5c
  Author: Alyssa Milburn <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/nvram/mac_nvram.c
    M hw/pci-host/uninorth.c

  Log Message:
  -----------
  hw: fix some debug message format strings

Signed-off-by: Alyssa Milburn <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: b7f0bbd2590a22be4c707e27f85e2334158e83aa
      
https://github.com/qemu/qemu/commit/b7f0bbd2590a22be4c707e27f85e2334158e83aa
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M target-ppc/kvm_ppc.h

  Log Message:
  -----------
  target-ppc: Remove unused kvmppc_update_sdr1() stub

This KVM stub implementation isn't used anywhere.

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


  Commit: 808bc3b069fdb5fc660f89e6bc7774eeefdc97ea
      
https://github.com/qemu/qemu/commit/808bc3b069fdb5fc660f89e6bc7774eeefdc97ea
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M target-ppc/translate.c

  Log Message:
  -----------
  target-ppc: Include missing MMU models for SDR1 in info registers

The HMP command "info registers" produces somewhat different information on
different ppc cpu variants.  For those with a hash MMU it's supposed to
include the SDR1, DAR and DSISR registers related to the MMU.  However,
the switch is missing a couple of MMU model variants, meaning we will
miss out this information on certain CPUs which should have it.

This patch corrects the oversight.  (Really these MMU model IDs need a big
cleanup, but we might as well fix the bug in the interim).

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


  Commit: 715c54071a43ab978dc12b9da22a5016203ed284
      
https://github.com/qemu/qemu/commit/715c54071a43ab978dc12b9da22a5016203ed284
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr.c
    M include/hw/ppc/spapr.h

  Log Message:
  -----------
  pseries: Simplify handling of the hash page table fd

When migrating the 'pseries' machine type with KVM, we use a special fd
to access the hash page table stored within KVM.  Usually, this fd is
opened at the beginning of migration, and kept open until the migration
is complete.

However, if there is a guest reset during the migration, the fd can become
stale and we need to re-open it.  At the moment we use an 'htab_fd_stale'
flag in sPAPRMachineState to signal this, which is checked in the migration
iterators.

But that's rather ugly.  It's simpler to just close and invalidate the
fd on reset, and lazily re-open it in migration if necessary.  This patch
implements that change.

This requires a small addition to the machine state's instance_init,
so that htab_fd is initialized to -1 (telling the migration code it
needs to open it) instead of 0, which could be a valid fd.

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


  Commit: 8dfe8e7f4facef400ef1c220f29196ae5cfc526c
      
https://github.com/qemu/qemu/commit/8dfe8e7f4facef400ef1c220f29196ae5cfc526c
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Add helper to calculate recommended hash page table size

At present we calculate the recommended hash page table (HPT) size for a
pseries guest just once in ppc_spapr_init() before allocating the HPT.
In future patches we're going to want this calculation in other places, so
this splits it out into a helper function.  While we're at it, change the
calculation to use ctz() instead of an explicit loop.

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


  Commit: c5f54f3e31bf693f70a98d4d73ea5dbe05689857
      
https://github.com/qemu/qemu/commit/c5f54f3e31bf693f70a98d4d73ea5dbe05689857
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Move hash page table allocation to reset time

At the moment the size of the hash page table (HPT) is fixed based on the
maximum memory allowed to the guest.  As such, we allocate the table during
machine construction, and just clear it at reset.

However, we're planning to implement a PAPR extension allowing the hash
page table to be resized at runtime.  This will mean that on reset we want
to revert it to the default size.  It also means that when migrating, we
need to make sure the destination allocates an HPT of size matching the
host, since the guest could have changed it before the migration.

This patch replaces the spapr_alloc_htab() and spapr_reset_htab() functions
with a new spapr_reallocate_hpt() function.  This is called at reset and
inbound migration only, not during machine init any more.

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


  Commit: fa48b4328c39b2532e47efcfcba6d4031512f514
      
https://github.com/qemu/qemu/commit/fa48b4328c39b2532e47efcfcba6d4031512f514
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr.c
    M target-ppc/mmu-hash64.h

  Log Message:
  -----------
  target-ppc: Remove hack for ppc_hash64_load_hpte*() with HV KVM

With HV KVM, the guest's hash page table (HPT) is managed by the kernel and
not directly accessible to QEMU.  This means that spapr->htab is NULL
and normally env->external_htab would also be NULL for each cpu.

However, that would cause ppc_hash64_load_hpte*() to do the wrong thing in
the few cases where QEMU does need to load entries from the in-kernel HPT.
Specifically, seeing external_htab is NULL, they would look for an HPT
within the guest's address space instead.

To stop that we have an ugly hack in the pseries machine type code to
set external htab to (void *)1 instead.

This patch removes that hack by having ppc_hash64_load_hpte*() explicitly
check kvmppc_kern_htab instead, which makes more sense.

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


  Commit: 378bc21756f016abfde16a0de4977be49f499b1c
      
https://github.com/qemu/qemu/commit/378bc21756f016abfde16a0de4977be49f499b1c
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  migration: ensure htab_save_first completes after timeout

htab_save_first_pass could return without finishing its work due to
timeout. The patch checks if another invocation of it is necessary and
will call it in htab_save_complete if necessary.

Signed-off-by: Jianjun Duan <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
[removed overlong line]
Signed-off-by: David Gibson <address@hidden>


  Commit: 423576f771db8c6dbb944ddb8dc15b472f62de4a
      
https://github.com/qemu/qemu/commit/423576f771db8c6dbb944ddb8dc15b472f62de4a
  Author: Thomas Huth <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr_hcall.c

  Log Message:
  -----------
  hw/ppc/spapr: Add h_set_sprg0 hypercall

This is a very simple hypercall that only sets up the SPRG0
register for the guest (since writing to SPRG0 was only permitted
to the hypervisor in older versions of the PowerISA).

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: af08a58f0ca338eafee855921859a8c1ace0175b
      
https://github.com/qemu/qemu/commit/af08a58f0ca338eafee855921859a8c1ace0175b
  Author: Thomas Huth <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr_hcall.c

  Log Message:
  -----------
  hw/ppc/spapr: Implement h_set_dabr

According to LoPAPR, h_set_dabr should simply set DABRX to 3
(if the register is available), and load the parameter into DABR.
If DABRX is not available, the hypervisor has to check the
"Breakpoint Translation" bit of the DABR register first.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: e49ff266f8ade3f3a21ec48d13ecf4a77b1c8572
      
https://github.com/qemu/qemu/commit/e49ff266f8ade3f3a21ec48d13ecf4a77b1c8572
  Author: Thomas Huth <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr_hcall.c

  Log Message:
  -----------
  hw/ppc/spapr: Implement the h_set_xdabr hypercall

The H_SET_XDABR hypercall is similar to H_SET_DABR, but also sets
the extended DABR (DABRX) register.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: d20efaeb13c95059f07c9d15c512b2e538142471
      
https://github.com/qemu/qemu/commit/d20efaeb13c95059f07c9d15c512b2e538142471
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: add a framework to handle commands

Next commits will port existing CUDA commands to this framework.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 0e8176e80953ada5b255988aa7226e14eb66ff95
      
https://github.com/qemu/qemu/commit/0e8176e80953ada5b255988aa7226e14eb66ff95
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: move unknown commands reject out of switch

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 1cdab104468d900c1ed0a2e689b944ec8e2d12d8
      
https://github.com/qemu/qemu/commit/1cdab104468d900c1ed0a2e689b944ec8e2d12d8
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port AUTOPOLL command to new framework

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 374312e7c5cd04e29a5a6279dd7006a4a94c0f0f
      
https://github.com/qemu/qemu/commit/374312e7c5cd04e29a5a6279dd7006a4a94c0f0f
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c
    M hw/ppc/mac.h

  Log Message:
  -----------
  cuda: port SET_AUTO_RATE command to new framework

Also implement the command, by removing the hardcoded period of 20 ms/50 Hz
and replacing it by the one requested by user.
Update VMState version to store this new parameter.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 216c906e62626acc82427a00e9410ff39d9669a1
      
https://github.com/qemu/qemu/commit/216c906e62626acc82427a00e9410ff39d9669a1
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/input/adb.c
    M hw/misc/macio/cuda.c
    M hw/ppc/mac.h
    M include/hw/input/adb.h

  Log Message:
  -----------
  cuda: port SET_DEVICE_LIST command to new framework

Also implement the command, by taking device list mask into account
when polling ADB devices.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 017da0b568073fd34bce85ec2e2507d45b04aedf
      
https://github.com/qemu/qemu/commit/017da0b568073fd34bce85ec2e2507d45b04aedf
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port POWERDOWN command to new framework

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 54e894442e971667f2a19d4808e8f64a953dbbbc
      
https://github.com/qemu/qemu/commit/54e894442e971667f2a19d4808e8f64a953dbbbc
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port RESET_SYSTEM command to new framework

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: f5b941120e242e10af829c05f20276533dc3bac4
      
https://github.com/qemu/qemu/commit/f5b941120e242e10af829c05f20276533dc3bac4
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port FILE_SERVER_FLAG command to new framework

This command tells if computer should automatically wake-up after a power loss.

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 15b7b09b1d8a6b809f976a1f963923f1fa07d5af
      
https://github.com/qemu/qemu/commit/15b7b09b1d8a6b809f976a1f963923f1fa07d5af
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port SET_POWER_MESSAGES command to new framework

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 547a4d1969ce9d385ecfbda6f0d3ea627b4e5d39
      
https://github.com/qemu/qemu/commit/547a4d1969ce9d385ecfbda6f0d3ea627b4e5d39
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port GET_TIME command to new framework

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: e6473178920685da3215813a959fb747976a2b5f
      
https://github.com/qemu/qemu/commit/e6473178920685da3215813a959fb747976a2b5f
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: port SET_TIME command to new framework

Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: e230d43e80267073e5a405500372a93cb0cf9599
      
https://github.com/qemu/qemu/commit/e230d43e80267073e5a405500372a93cb0cf9599
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: remove GET_6805_ADDR command

It doesn't seem to be used, and operating systems should accept a 'unknown 
command' answer.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: e4d162d72f6202ac50284307cfcab8fb6a996e9f
      
https://github.com/qemu/qemu/commit/e4d162d72f6202ac50284307cfcab8fb6a996e9f
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/misc/macio/cuda.c

  Log Message:
  -----------
  cuda: remove CUDA_GET_SET_IIC/CUDA_COMBINED_FORMAT_IIC commands

We currently don't emulate the I2C bus provided by CUDA.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 1c81003accd70e79f1663ad4429435b4d3300d62
      
https://github.com/qemu/qemu/commit/1c81003accd70e79f1663ad4429435b4d3300d62
  Author: David Gibson <address@hidden>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Include missing pseries-2.5 compat properties in pseries-2.4

Commit 4b23699 "pseries: Add pseries-2.6 machine type" added a new
SPAPR_COMPAT_2_5 macro in the usual way.  However, it didn't add this
macro to the existing SPAPR_COMPAT_2_4 macro so that pseries-2.4
inherits newer compatibility properties which are needed for 2.5 and
earlier.

This corrects the oversight.

Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>


  Commit: 8a9c1b77e9df5b4a9fcc1ffe08b4fcff7b0c791f
      
https://github.com/qemu/qemu/commit/8a9c1b77e9df5b4a9fcc1ffe08b4fcff7b0c791f
  Author: Thomas Huth <address@hidden>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M hw/ppc/spapr_rtas.c

  Log Message:
  -----------
  hw/ppc/spapr: Halt CPU when powering off via RTAS call

The LoPAPR specification defines the following for the RTAS
power-off call: "On successful operation, does not return".
However, the implementation in QEMU currently returns and runs
the guest CPU again for some more cycles. This caused some
trouble with the new ppc implementation of the kvm-unit-tests
recently. So let's make sure that the QEMU implementation
follows the spec, thus stop the CPU to make sure that the
RTAS call does not return to the guest anymore.

Signed-off-by: Thomas Huth <address@hidden>
Tested-by: Andrew Jones <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 339b665c883b209982fa161dc090ffaf242ab12b
      
https://github.com/qemu/qemu/commit/339b665c883b209982fa161dc090ffaf242ab12b
  Author: Peter Maydell <address@hidden>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M hw/input/adb.c
    M hw/misc/macio/cuda.c
    M hw/nvram/mac_nvram.c
    M hw/pci-host/uninorth.c
    M hw/ppc/mac.h
    M hw/ppc/spapr.c
    M hw/ppc/spapr_hcall.c
    M hw/ppc/spapr_rtas.c
    M include/hw/input/adb.h
    M include/hw/ppc/spapr.h
    M target-ppc/kvm_ppc.h
    M target-ppc/mmu-hash64.h
    M target-ppc/translate.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160218' into 
staging

ppc patch queue for 2016-02-18

Currently accumulated patches for target-ppc, pseries machine type and
related devices.
  * Some cleanups to management of SDR1 and the hashed page table
  * Implementations of a number of simple PAPR hypercalls
  * Significant improvements to the Macintosh CUDA device
  * Several bugfixes

# gpg: Signature made Thu 18 Feb 2016 04:16: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-for-2.6-20160218: (26 commits)
  hw/ppc/spapr: Halt CPU when powering off via RTAS call
  pseries: Include missing pseries-2.5 compat properties in pseries-2.4
  cuda: remove CUDA_GET_SET_IIC/CUDA_COMBINED_FORMAT_IIC commands
  cuda: remove GET_6805_ADDR command
  cuda: port SET_TIME command to new framework
  cuda: port GET_TIME command to new framework
  cuda: port SET_POWER_MESSAGES command to new framework
  cuda: port FILE_SERVER_FLAG command to new framework
  cuda: port RESET_SYSTEM command to new framework
  cuda: port POWERDOWN command to new framework
  cuda: port SET_DEVICE_LIST command to new framework
  cuda: port SET_AUTO_RATE command to new framework
  cuda: port AUTOPOLL command to new framework
  cuda: move unknown commands reject out of switch
  cuda: add a framework to handle commands
  hw/ppc/spapr: Implement the h_set_xdabr hypercall
  hw/ppc/spapr: Implement h_set_dabr
  hw/ppc/spapr: Add h_set_sprg0 hypercall
  migration: ensure htab_save_first completes after timeout
  target-ppc: Remove hack for ppc_hash64_load_hpte*() with HV KVM
  ...

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


Compare: https://github.com/qemu/qemu/compare/3fc63c3f339a...339b665c883b