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

[Qemu-commits] [qemu/qemu] 28e22d: vfio/ccw: allocate irq info with the

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 28e22d: vfio/ccw: allocate irq info with the right size
Date: Tue, 25 Jul 2017 05:01:12 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 28e22d4baed2d10d8ed0640d05e054fecfc71286
      
https://github.com/qemu/qemu/commit/28e22d4baed2d10d8ed0640d05e054fecfc71286
  Author: Jing Zhang <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M hw/vfio/ccw.c

  Log Message:
  -----------
  vfio/ccw: allocate irq info with the right size

When allocating memory for the vfio_irq_info parameter of the
VFIO_DEVICE_GET_IRQ_INFO ioctl, we used the wrong size. Let's
fix it by using the right size.

Reviewed-by: Dong Jia Shi <address@hidden>
Signed-off-by: Jing Zhang <address@hidden>
Signed-off-by: Dong Jia Shi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 6a79dd463164e37aa14f5d24dc8107017a6eeaab
      
https://github.com/qemu/qemu/commit/6a79dd463164e37aa14f5d24dc8107017a6eeaab
  Author: Dong Jia Shi <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M hw/vfio/ccw.c

  Log Message:
  -----------
  vfio/ccw: fix initialization of the Object DeviceState pointer in the common 
base-device

Commit 7da624e2 ("vfio: Test realized when using VFIOGroup.device_list
iterator") introduced a pointer to the Object DeviceState in the VFIO
common base-device and skipped non-realized devices as we iterate
VFIOGroup.device_list. While it missed to initialize the pointer for
the vfio-ccw case. Let's fix it.

Fixes: 7da624e2 ("vfio: Test realized when using VFIOGroup.device_list
            iterator")

Cc: Alex Williamson <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Dong Jia Shi <address@hidden>
Reviewed-by: Alex Williamson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c1b364ffd7796ca11336d245f08054099fca7e0d
      
https://github.com/qemu/qemu/commit/c1b364ffd7796ca11336d245f08054099fca7e0d
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/cpu_models.c
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390/cpumodel: remove KSS from the default model of z14

The SIE_KSS feature will allow a guest to use KSS for a nested guest.
To create a nested guest the SIE_F2 facility is still necessary.
Since SIE_F2 is not part of the default model it does not make
a lot of sense to provide the SIE_KSS feature in the default model.
Let's also create a dependency check.

Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: Jason J. Herne <address@hidden>
Reviewed-by: Janosch Frank <address@hidden>
Message-Id: <address@hidden>
Acked-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: f026fcd192dbb63925847fad6c301375b2df59f3
      
https://github.com/qemu/qemu/commit/f026fcd192dbb63925847fad6c301375b2df59f3
  Author: David Hildenbrand <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/cpu_features.h

  Log Message:
  -----------
  target/s390x: drop BE_BIT()

Unused and broken, let's just get rid of it.

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


  Commit: cc18f90762412c657a37a17809be9613ac7f0b00
      
https://github.com/qemu/qemu/commit/cc18f90762412c657a37a17809be9613ac7f0b00
  Author: David Hildenbrand <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/cpu_features.c
    M target/s390x/kvm.c

  Log Message:
  -----------
  target/s390x: indicate query subfunction in s390_fill_feat_block

We'll have to do the same for TCG, so let's just move it in there.

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


  Commit: 3d1cfc3c682ffe937526a31a4161735338558985
      
https://github.com/qemu/qemu/commit/3d1cfc3c682ffe937526a31a4161735338558985
  Author: David Hildenbrand <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/cpu_features.c
    M target/s390x/cpu_features.h
    M target/s390x/kvm.c

  Log Message:
  -----------
  target/s390x: introduce (test|set)_be_bit

Using ordinary bitmap operations to set/test bits does not work properly
on architectures !s390x. Let's drop (test|set)_bit_inv and introduce
(test|set)_be_bit instead. These functions work on uint8_t array, not on
unsigned longs arrays and are for now only used in the context of
CPU features.

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


  Commit: e23bc1b20201a3ebfa8db8a77d9e4c084ac0d99c
      
https://github.com/qemu/qemu/commit/e23bc1b20201a3ebfa8db8a77d9e4c084ac0d99c
  Author: David Hildenbrand <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: better comment regarding zPCI feature availability

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


  Commit: 30e82de704574f33b5899c272a9da51d594209fe
      
https://github.com/qemu/qemu/commit/30e82de704574f33b5899c272a9da51d594209fe
  Author: David Hildenbrand <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  target/s390x: improve baselining if certain base features are missing

There are certain features that we put into base models, but that are
not relevant for the actual search. The most famous example are
MSA subfunctions that might be disabled on certain real hardware out
there.

While the kvm host model detection will usually detect the correct model
on such machines (as it will in the common case not pass features to check
for into s390_find_cpu_def()), baselining will fall back to a quite old
model just because some MSA subfunctions are missing.

Let's improve that by ignoring lack of these features while performing
the search for a base model.

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


  Commit: b5bd2e91a6e5c7b87f1ea592c8604af59e87bf37
      
https://github.com/qemu/qemu/commit/b5bd2e91a6e5c7b87f1ea592c8604af59e87bf37
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/helper.c
    M target/s390x/translate.c

  Log Message:
  -----------
  target/s390x: Move s390_cpu_dump_state() to helper.c

translate.c can not be compiled with --disable-tcg, but we need
the s390_cpu_dump_state() in KVM-only builds, too. So let's move
that function to helper.c instead, which will also be compiled
when --disable-tcg has been specified.

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


  Commit: 3d6722051bc7876832003215533f36df9f33cc56
      
https://github.com/qemu/qemu/commit/3d6722051bc7876832003215533f36df9f33cc56
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/Makefile.objs
    A target/s390x/diag.c
    M target/s390x/misc_helper.c

  Log Message:
  -----------
  target/s390x: Move diag helpers to a separate file

misc_helper.c won't be compiled with --disable-tcg anymore, but we
still need the diag helpers in KVM builds, too, so move the helper
functions to a separate file.

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


  Commit: e3cfd926f779ddaff52336431d30519e9386e962
      
https://github.com/qemu/qemu/commit/e3cfd926f779ddaff52336431d30519e9386e962
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/helper.c
    M target/s390x/interrupt.c
    M target/s390x/kvm.c
    M target/s390x/misc_helper.c

  Log Message:
  -----------
  target/s390x: Rework program_interrupt() and related functions

misc_helper.c won't be compiled with --disable-tcg anymore, but we
still need the program_interrupt() function in that case. Move it
to interrupt.c instead, and refactor it to re-use the code from
trigger_pgm_exception() (for TCG) and enter_pgmcheck() (for KVM,
which now got renamed to kvm_s390_program_interrupt() for
clarity).

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


  Commit: cded4014aed15ded9d27079071d9bb1fbe88ad41
      
https://github.com/qemu/qemu/commit/cded4014aed15ded9d27079071d9bb1fbe88ad41
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/Makefile.objs
    M target/s390x/cpu.h
    A target/s390x/excp_helper.c
    M target/s390x/helper.c

  Log Message:
  -----------
  target/s390x: Move exception-related functions to a new excp_helper.c file

These functions can not be compiled with --disable-tcg. But since we
need the other functions from helper.c in the non-tcg build, we can also
not simply remove helper.c from the non-tcg builds. Thus the problematic
functions have to be moved into a separate new file instead that we
can later omit in the non-tcg builds.

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


  Commit: b114588c069b64c5e1a0ec8534d487ee9f0e528a
      
https://github.com/qemu/qemu/commit/b114588c069b64c5e1a0ec8534d487ee9f0e528a
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/Makefile.objs
    M target/s390x/cpu.c

  Log Message:
  -----------
  target/s390x: Add remaining switches to compile with --disable-tcg

Adding some CONFIG_TCG tests to be finally able to compile QEMU
on s390x also without TCG.

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


  Commit: 7e01376daea75e888c370aab521a7d4aeaf2ffd1
      
https://github.com/qemu/qemu/commit/7e01376daea75e888c370aab521a7d4aeaf2ffd1
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M target/s390x/ioinst.c

  Log Message:
  -----------
  s390x/css: fix ilen in IO instruction handlers

When initiating a program check interruption by calling program_interrupt
the instruction length (ilen) of the current instruction is supplied as
the third parameter.

On s390x all the IO instructions are of instruction format S and their
ilen is 4.  The calls to program_interrupt (introduced by commits
7b18aad543 ("s390: Add channel I/O instructions.", 2013-01-24) and
61bf0dcb2e ("s390x/ioinst: Add missing alignment checks for IO
instructions", 2013-06-21)) however use ilen == 2.

This is probably due to a confusion between ilen which specifies the
instruction length in bytes and ILC which does the same but in halfwords.
If kvm_enabled() this does not actually matter, because the ilen
parameter of program_interrupt is effectively unused.

Let's provide the correct ilen to program_interrupt.

Signed-off-by: Halil Pasic <address@hidden>
Fixes:  7b18aad543 ("s390: Add channel I/O instructions.")
Fixes: 61bf0dcb2e ("s390x/ioinst: Add missing alignment checks for IO 
instructions")
Reviewed-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dong Jia Shi <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 5fb203a1991d2a93e47f76f063a7ce3563b91942
      
https://github.com/qemu/qemu/commit/5fb203a1991d2a93e47f76f063a7ce3563b91942
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-25 (Tue, 25 Jul 2017)

  Changed paths:
    M hw/vfio/ccw.c
    M target/s390x/Makefile.objs
    M target/s390x/cpu.c
    M target/s390x/cpu.h
    M target/s390x/cpu_features.c
    M target/s390x/cpu_features.h
    M target/s390x/cpu_models.c
    A target/s390x/diag.c
    A target/s390x/excp_helper.c
    M target/s390x/gen-features.c
    M target/s390x/helper.c
    M target/s390x/interrupt.c
    M target/s390x/ioinst.c
    M target/s390x/kvm.c
    M target/s390x/misc_helper.c
    M target/s390x/translate.c

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

Various changes for the s390x code:
- updates for cpu model handling
- fix compilation with --disable-tcg
- fixes in vfio-ccw and I/O instruction handling

# gpg: Signature made Tue 25 Jul 2017 10:15:37 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170725:
  s390x/css: fix ilen in IO instruction handlers
  target/s390x: Add remaining switches to compile with --disable-tcg
  target/s390x: Move exception-related functions to a new excp_helper.c file
  target/s390x: Rework program_interrupt() and related functions
  target/s390x: Move diag helpers to a separate file
  target/s390x: Move s390_cpu_dump_state() to helper.c
  target/s390x: improve baselining if certain base features are missing
  s390x/kvm: better comment regarding zPCI feature availability
  target/s390x: introduce (test|set)_be_bit
  target/s390x: indicate query subfunction in s390_fill_feat_block
  target/s390x: drop BE_BIT()
  s390/cpumodel: remove KSS from the default model of z14
  vfio/ccw: fix initialization of the Object DeviceState pointer in the common 
base-device
  vfio/ccw: allocate irq info with the right size

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


Compare: https://github.com/qemu/qemu/compare/08cf4b5ed2bc...5fb203a1991d
reply via email to
[Prev in Thread] Current Thread [Next in Thread]