qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] b21b75: s390x: add 2.6 compat machine


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] b21b75: s390x: add 2.6 compat machine
Date: Thu, 14 Jan 2016 05:30:04 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b21b75981f0ee6113e1e65374591547da206ded2
      
https://github.com/qemu/qemu/commit/b21b75981f0ee6113e1e65374591547da206ded2
  Author: Cornelia Huck <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390x: add 2.6 compat machine

New qemu version, new machine.

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


  Commit: 3538fb6f89dd9bb2e7e59de2bfad52a45321c744
      
https://github.com/qemu/qemu/commit/3538fb6f89dd9bb2e7e59de2bfad52a45321c744
  Author: Pierre Morel <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390x: remove s390-virtio machine

Remove machine code for the s390-virtio machine, but keep functions
useful for the ccw machine.

Signed-off-by: Pierre Morel <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7b3fdbd9a826791bd98e649cf44c0a6129a44179
      
https://github.com/qemu/qemu/commit/7b3fdbd9a826791bd98e649cf44c0a6129a44179
  Author: Pierre Morel <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    M hw/s390x/Makefile.objs
    R hw/s390x/s390-virtio-bus.c
    R hw/s390x/s390-virtio-bus.h
    M hw/s390x/s390-virtio.c
    M target-s390x/cpu.h
    M target-s390x/helper.c
    M vl.c

  Log Message:
  -----------
  s390x: remove s390-virtio devices

The s390-virtio machine has been removed; remove the associated devices
as well.

hw/s390x/s390-virtio-bus.c and hw/s390x/s390-virtio-bus.h
have been deleted and removed from hw/s390x/Makefile.objs

virtio-size has no more meaning for the modern machine
and has been removed from helper.c and cpu.h

virtio-serial-s390 belonging to the old machine is
being removed from vl.c

Signed-off-by: Pierre Morel <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 3be5c2078bcf3ba1084cd90a191e93cb7ade18a2
      
https://github.com/qemu/qemu/commit/3be5c2078bcf3ba1084cd90a191e93cb7ade18a2
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390x/pci: reject some operations to disabled PCI function

According to the s390 architecture, any mpcifc, pcilg, pcistg,
pcistb and rpcit instructions issued to disabled PCI functions
are rejected, and the instruction completes by setting condition
code 3. In addition, any DMA and MSIX interruption operations
are ignored.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: de37b0b87f9aee78a7181d9ca603e013e08b3f11
      
https://github.com/qemu/qemu/commit/de37b0b87f9aee78a7181d9ca603e013e08b3f11
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390x/pci: code cleanup

Make use of the new FH_ENABLED define in existing code.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: e11f463295d95abab631e236d28d7c886eacc8e1
      
https://github.com/qemu/qemu/commit/e11f463295d95abab631e236d28d7c886eacc8e1
  Author: Cornelia Huck <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390x/virtio: use qemu_check_nic_model()

Switching to the generally used interface changes the output of

s390x-softmmu/qemu-system-s390x -net nic,model=?

from

S390 only supports VirtIO nics

to the rather more useful

qemu: Supported NIC models: virtio

while still giving us a sensible error message for unsupported
models:

s390x-softmmu/qemu-system-s390x -net nic,model=foo
qemu-system-s390x: Unsupported NIC model: foo

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


  Commit: cf87e0a3eea4ccc91fdb84b96cf9b62f399b6f3d
      
https://github.com/qemu/qemu/commit/cf87e0a3eea4ccc91fdb84b96cf9b62f399b6f3d
  Author: Shmulik Ladkani <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390: Introduce CCW_COMPAT_2_5

In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and
PC_COMPAT_2_5 were introduced.

Accordingly, introduce CCW_COMPAT_2_5 that uses HW_COMPAT_2_5.

Signed-off-by: Shmulik Ladkani <address@hidden>
Message-Id: <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 1789f4e37c78d408dfa61655dfd8b397554152f9
      
https://github.com/qemu/qemu/commit/1789f4e37c78d408dfa61655dfd8b397554152f9
  Author: Halil Pasic <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  virtio-ccw: fix sanity check for vector

The commit 8dfbaa6ac ("virtio-ccw: introduce ccw specific queue limit")
did not touch the sanity check for the vector argument of the method
virtio_ccw_notify, despite intended as seen from
https://lists.nongnu.org/archive/html/qemu-devel/2015-04/msg02705.html
To be able to scale number of virtqueues using the constant this sanity
check needs to be altered.

Fixes: 8dfbaa6ac ("virtio-ccw: introduce ccw specific queue limit")
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 88bfa2166ac0b14483a2a2c667499bf3617aebf0
      
https://github.com/qemu/qemu/commit/88bfa2166ac0b14483a2a2c667499bf3617aebf0
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

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

  Log Message:
  -----------
  s390x/pci: return real state during listing PCI

At present, list_pci() shows all PCI devices as being in configured
state. As devices can be deconfigured by the guest, we need to show
the real configuration status instead.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: cd0b19a20b80ccacd0579d83ac29ea36d666e67c
      
https://github.com/qemu/qemu/commit/cd0b19a20b80ccacd0579d83ac29ea36d666e67c
  Author: Peter Maydell <address@hidden>
  Date:   2016-01-14 (Thu, 14 Jan 2016)

  Changed paths:
    M hw/s390x/Makefile.objs
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-inst.c
    R hw/s390x/s390-virtio-bus.c
    R 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 target-s390x/cpu.h
    M target-s390x/helper.c
    M vl.c

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

This first round of s390x patches includes:
- new compat machine
- remove the old s390-virtio machine
- fixes and some cleanup

# gpg: Signature made Wed 13 Jan 2016 14:55:55 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20160113:
  s390x/pci: return real state during listing PCI
  virtio-ccw: fix sanity check for vector
  s390: Introduce CCW_COMPAT_2_5
  s390x/virtio: use qemu_check_nic_model()
  s390x/pci: code cleanup
  s390x/pci: reject some operations to disabled PCI function
  s390x: remove s390-virtio devices
  s390x: remove s390-virtio machine
  s390x: add 2.6 compat machine

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


Compare: https://github.com/qemu/qemu/compare/ed56fdb25692...cd0b19a20b80

reply via email to

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