qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] ae4a2b: s390x: Replace unchecked qdev_init()


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] ae4a2b: s390x: Replace unchecked qdev_init() by qdev_init_...
Date: Mon, 16 Mar 2015 06:30:06 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ae4a2bd759d647dd6146d45e4a59a01cf34d6a4d
      
https://github.com/qemu/qemu/commit/ae4a2bd759d647dd6146d45e4a59a01cf34d6a4d
  Author: Markus Armbruster <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hw/intc/s390_flic.c

  Log Message:
  -----------
  s390x: Replace unchecked qdev_init() by qdev_init_nofail()

s390_flic_init() is a helper to create and realize either
"s390-flic-kvm" or "s390-flic-qemu".  When qdev_init() fails, it
complains to stderr and succeeds.

Except it can't actually fail, because the "s390-flic-qemu" is a dummy
without a realize method, and "s390-flic-kvm"'s realize can't fail,
even when the kernel device is really unavailable.  Odd.

Replace qdev_init() by qdev_init_nofail() to make "can't fail" locally
obvious, and get rid of the unreachable error reporting.

Cc: Christian Borntraeger <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 3f9e59bb5358cd020c5be919129281d202a24058
      
https://github.com/qemu/qemu/commit/3f9e59bb5358cd020c5be919129281d202a24058
  Author: Jason J. Herne <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

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

  Log Message:
  -----------
  s390x/kvm: Guest Migration TOD clock synchronization

Synchronizes the guest TOD clock across a migration by sending the guest TOD
clock value to the destination system. If the guest TOD clock is not preserved
across a migration then the guest's view of time will snap backwards if the
destination host clock is behind the source host clock. This will cause the
guest to hang immediately upon resuming on the destination system.

Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Jason J. Herne <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>

Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7d45285fc9f75e0a85533ada8fd3aeda48d5d71a
      
https://github.com/qemu/qemu/commit/7d45285fc9f75e0a85533ada8fd3aeda48d5d71a
  Author: Cornelia Huck <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

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

  Log Message:
  -----------
  virtio-ccw: assure BE accesses

All fields in structures transmitted by ccws are big endian; assure
we handle them as such.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>


  Commit: d0a073a186e4a81ae81435bd5b7286b657a69bfd
      
https://github.com/qemu/qemu/commit/d0a073a186e4a81ae81435bd5b7286b657a69bfd
  Author: Dominik Dingel <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M include/sysemu/kvm.h
    M kvm-all.c

  Log Message:
  -----------
  kvm: encapsulate HAS_DEVICE for vm attrs

More and more virtual machine specifics between kvm and qemu will be
transferred with vm attributes.
So we encapsulate the common logic in a generic function.

Additionally we need only to check during initialization if kvm supports
virtual machine attributes.

Cc: Paolo Bonzini <address@hidden>
Suggested-by: Thomas Huth <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Dominik Dingel <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 2b147555f78c3c20080b201fd1506467fa0ddf43
      
https://github.com/qemu/qemu/commit/2b147555f78c3c20080b201fd1506467fa0ddf43
  Author: Dominik Dingel <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: make use of generic vm attribute check

By using the new introduced generic interface we
can remove redundancies and clean up.

Reviewed-by: Thomas Huth <address@hidden>
Suggested-by: Thomas Huth <address@hidden>
Signed-off-by: Dominik Dingel <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 2eb1cd0768af18fb2398ee7b590e4b81e0e504f9
      
https://github.com/qemu/qemu/commit/2eb1cd0768af18fb2398ee7b590e4b81e0e504f9
  Author: Tony Krowiak <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M qemu-options.hx
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x: CPACF: Handle key wrap machine options

Check for the aes_key_wrap and dea_key_wrap machine options and set the
appropriate KVM device attribute(s) to tell the kernel to enable or disable
the AES/DEA protected key functions for the guest domain.

This patch introduces two new machine options for indicating the state of
AES/DEA key wrapping functions.  This controls whether the guest will
have access to the AES/DEA crypto functions.

aes_key_wrap="on | off" is changed to aes-key-wrap="on | off"
dea_key_wrap="on | off" is changed to dea-key-wrap="on | off"

Check for the aes-key-wrap and dea-key-wrap machine options and set the
appropriate KVM device attribute(s) to tell the kernel to enable or disable
the AES/DEA protected key functions for the guest domain.

Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Tony Krowiak <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: eaec461ccc4b308b5718381739afbf9605e47b00
      
https://github.com/qemu/qemu/commit/eaec461ccc4b308b5718381739afbf9605e47b00
  Author: Thomas Huth <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

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

  Log Message:
  -----------
  s390x/virtio-bus: Remove unused function s390_virtio_bus_console()

The function s390_virtio_bus_console() is completely unused and thus
can be removed safely.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Jens Freimann <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7b527b86eb3560d68f41218cec0cdf3d60a38323
      
https://github.com/qemu/qemu/commit/7b527b86eb3560d68f41218cec0cdf3d60a38323
  Author: Dominik Dingel <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hw/s390x/ipl.c

  Log Message:
  -----------
  s390x/ipl: remove dead code

load_image_targphys already checks the max size and will return
an error code. So the follow-on check will never trigger.

Signed-off-by: Dominik Dingel <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: d3321fc7557cbd51fd0c9c0416c81dbe3f4dc32e
      
https://github.com/qemu/qemu/commit/d3321fc7557cbd51fd0c9c0416c81dbe3f4dc32e
  Author: Frank Blaschka <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hw/s390x/s390-pci-bus.c

  Log Message:
  -----------
  s390x/pci: fix length in sei_nt2 event

The sei_nt2 event must contain the length of the event.

Signed-off-by: Frank Blaschka <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: be0b608a5463a834df0e19911356ae93660d3677
      
https://github.com/qemu/qemu/commit/be0b608a5463a834df0e19911356ae93660d3677
  Author: Thomas Huth <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M default-configs/s390x-softmmu.mak

  Log Message:
  -----------
  s390x/config: Do not include full pci.mak

pci.mak includes a lot of devices - and most of them do not make
sense on s390x, like USB controllers or audio cards. These devices
also show up when running "qemu-system-s390x -device help" and thus
could raise the hope for the users that they could use these kind
of devices with qemu-system-s390x. To avoid this confusion, we
should not include pci.mak and rather include the bare minimum
manually instead.

Signed-off-by: Thomas Huth <address@hidden>
Acked-by: Frank Blaschka <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 2dfe7d07e2f40adb18a0b0cd286f3d327692d0fc
      
https://github.com/qemu/qemu/commit/2dfe7d07e2f40adb18a0b0cd286f3d327692d0fc
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M default-configs/s390x-softmmu.mak
    M hw/intc/s390_flic.c
    M hw/s390x/ipl.c
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/s390-virtio-bus.h
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/s390-virtio.c
    M hw/s390x/virtio-ccw.c
    M include/sysemu/kvm.h
    M kvm-all.c
    M qemu-options.hx
    M target-s390x/cpu.h
    M target-s390x/kvm.c

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

Final batch of s390x enhancements/fixes for 2.3:
- handle TOD clock during migration
- CPACF key wrap options
- limit amount of pci device code we build
- ensure big endian accesses for ccws
- various fixes and cleanups

# gpg: Signature made Mon Mar 16 10:01:44 2015 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20150316:
  s390x/config: Do not include full pci.mak
  s390x/pci: fix length in sei_nt2 event
  s390x/ipl: remove dead code
  s390x/virtio-bus: Remove unused function s390_virtio_bus_console()
  s390x: CPACF: Handle key wrap machine options
  s390x/kvm: make use of generic vm attribute check
  kvm: encapsulate HAS_DEVICE for vm attrs
  virtio-ccw: assure BE accesses
  s390x/kvm: Guest Migration TOD clock synchronization
  s390x: Replace unchecked qdev_init() by qdev_init_nofail()

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


Compare: https://github.com/qemu/qemu/compare/f421f05754ac...2dfe7d07e2f4

reply via email to

[Prev in Thread] Current Thread [Next in Thread]