qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5bcfa0: util/qemu-config: fix missing machine

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 5bcfa0: util/qemu-config: fix missing machine command line...
Date: Wed, 21 Oct 2015 09:00:05 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5bcfa0c543b42a560673cafd3b5225900ef617e1
      
https://github.com/qemu/qemu/commit/5bcfa0c543b42a560673cafd3b5225900ef617e1
  Author: Tony Krowiak <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M util/qemu-config.c

  Log Message:
  -----------
  util/qemu-config: fix missing machine command line options

Commit 0a7cf217 ("util/qemu-config: fix regression of
qmp_query_command_line_options") aimed to restore parsing of global
machine options, but missed two: "aes-key-wrap" and
"dea-key-wrap" (which were present in the initial version of that
patch). Let's add them to the machine_opts again.

Fixes: 0a7cf217 ("util/qemu-config: fix regression of
            qmp_query_command_line_options")
CC: Marcel Apfelbaum <address@hidden>
CC: address@hidden
Signed-off-by: Tony Krowiak <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 085b0b055b189e8846ca3108e6774e3b9e60c1ce
      
https://github.com/qemu/qemu/commit/085b0b055b189e8846ca3108e6774e3b9e60c1ce
  Author: Cornelia Huck <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  s390x/virtio-ccw: fix 2.4 virtio compat

Commit 542571d5 ("virtio-ccw: enable virtio-1") missed some virtio
devices for the 2.4 compat handling. Add them.

Fixes: 542571d5 ("virtio-ccw: enable virtio-1")
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>


  Commit: 2ab75df38e34fe9bc271b5115ab52114e6e63a89
      
https://github.com/qemu/qemu/commit/2ab75df38e34fe9bc271b5115ab52114e6e63a89
  Author: Christian Borntraeger <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: Fix vector validity bit in device machine checks

Device hotplugs trigger a crw machine check. All machine checks
have validity bits for certain register types. With vector support
we also have to claim that vector registers are valid.
This is a band-aid suitable for stable. Long term we should
create the full  mcic value dynamically depending on the active
features in the kernel interrupt handler.

Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Cc: address@hidden
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: b080364aedfc294c53c4c4af255efcf007b35d9d
      
https://github.com/qemu/qemu/commit/b080364aedfc294c53c4c4af255efcf007b35d9d
  Author: Cornelia Huck <address@hidden>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M target-s390x/cpu.h
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x: flagify mcic values

Instead of using magic values when building the machine check
interruption code, add some defines as by chapter 11-14 in the PoP.

This should make it easier to catch problems like the missing vector
register validity bit ("s390x/kvm: Fix vector validity bit in device
machine checks"), and less hassle should we want to generate machine
checks beyond the channel reports we currently support.

Acked-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 09c7f58ca9613ccfb1ca13031d0ff3b1794bd782
      
https://github.com/qemu/qemu/commit/09c7f58ca9613ccfb1ca13031d0ff3b1794bd782
  Author: David Hildenbrand <address@hidden>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  s390x: unify device reset during subsystem_reset()

We have to manually reset several devices that are not on a bus: Let's
collect them in an array.

Reviewed-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: feacc6c2c8fff037f67a89402b29923251833425
      
https://github.com/qemu/qemu/commit/feacc6c2c8fff037f67a89402b29923251833425
  Author: David Hildenbrand <address@hidden>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hw/s390x/ipl.c
    M hw/s390x/ipl.h
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  s390x/ipl: we always have an ipl device

Both s390 machines unconditionally create an ipl device, so no need to
handle the missing case.

Now we can also change s390_ipl_update_diag308() to return void.

Reviewed-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: db3b2566e0fb45e2901b6f9b842d91db6963915d
      
https://github.com/qemu/qemu/commit/db3b2566e0fb45e2901b6f9b842d91db6963915d
  Author: David Hildenbrand <address@hidden>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hw/s390x/ipl.c
    M hw/s390x/ipl.h
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/s390-virtio.c
    M hw/s390x/s390-virtio.h

  Log Message:
  -----------
  s390x: machine reset function with new ipl cpu handling

Current implementation depends on the order of resets getting triggered.

If a cpu reset is triggered after the ipl device reset, the CPU is stopped and
the VM will not run. In fact, that hinders us from converting the ipl device
into a TYPE_DEVICE. Let's change that by manually configuring the ipl cpu
during a system reset, so we have full control and can demangle that code.

Also remove the superflous cpu parameter from s390_update_iplstate on the way.

Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4ab729207fe1464b19c6bec609cd545ab717174a
      
https://github.com/qemu/qemu/commit/4ab729207fe1464b19c6bec609cd545ab717174a
  Author: David Hildenbrand <address@hidden>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hw/s390x/s390-virtio.c
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  s390x: reset crypto only on clear reset and QEMU reset

Initializing VM crypto in initial cpu reset has multiple problems

1. We call the exact same function #VCPU times, although one time is enough
2. On SIGP initial cpu reset, we exchange the wrapping key while
   other VCPUs are running. Bad!
3. It is simply wrong. According to the Pop, a reset happens only during a
   clear reset.

So, we have to reset the keys
- on modified clear reset
- on load clear (QEMU reset - via machine reset)
- on qemu start (via machine reset)

Reviewed-by: Christian Borntraeger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 1cd4e0f6f0a6b1978a5868b41d4faae2071dc4ee
      
https://github.com/qemu/qemu/commit/1cd4e0f6f0a6b1978a5868b41d4faae2071dc4ee
  Author: David Hildenbrand <address@hidden>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hw/s390x/s390-virtio.c
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M target-s390x/misc_helper.c

  Log Message:
  -----------
  s390x/cmma: clean up cmma reset

The cmma reset is per VM, so we don't need a cpu object. We can
directly make use of kvm_state, as it is already available when
the reset is called. By moving the cmma reset in our machine reset
function, we can avoid a manual reset handler.

Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 8bfaa25fce2c22060a17501980943538801056de
      
https://github.com/qemu/qemu/commit/8bfaa25fce2c22060a17501980943538801056de
  Author: Peter Maydell <address@hidden>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hw/s390x/ipl.c
    M hw/s390x/ipl.h
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/s390-virtio.c
    M hw/s390x/s390-virtio.h
    M target-s390x/cpu.h
    M target-s390x/kvm.c
    M target-s390x/misc_helper.c
    M util/qemu-config.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151021-v2' into 
staging

More s390x patches. The first ones are fixes: A regression, missed
compat and a missed part of the SIMD support. The others contain
optimizations and cleanup.

# gpg: Signature made Wed 21 Oct 2015 11:24:48 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20151021-v2:
  s390x/cmma: clean up cmma reset
  s390x: reset crypto only on clear reset and QEMU reset
  s390x: machine reset function with new ipl cpu handling
  s390x/ipl: we always have an ipl device
  s390x: unify device reset during subsystem_reset()
  s390x: flagify mcic values
  s390x/kvm: Fix vector validity bit in device machine checks
  s390x/virtio-ccw: fix 2.4 virtio compat
  util/qemu-config: fix missing machine command line options

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


Compare: https://github.com/qemu/qemu/compare/426c0df9e3e6...8bfaa25fce2c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]