Fix a bug introduced in the refactoring.

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEw9DWbcNiT/aowBjO3s9rk8bwL68FAl0e6lESHGNvaHVja0By
 ZWRoYXQuY29tAAoJEN7Pa5PG8C+v7fQP/2/oj/sIz2/8Yh6VzULJ08x40iPIFn8+
 9HBpOInhJPZge5E+DbB7vxtZsryf5gepDbFFRlt1w0mNMnr5tOUf5FaZaU6ZSaez
 0bgqiMzx8OJZBAq/XHRIgVckJbbFD4nCIvgmflt53hdRq4AqgJvu+VpPsax12Jtk
 gONzfnt/VgpegVLpMM+1J98aQq1sT5LrA0ObI1lVNO4z7+vfy0CI+E/fWcdRWeeq
 lKt1oI3qlQGOUZzMTUzkHBw9qjp8DGo6ftQ6QjwjH+lJQipk2Xd62PUBLXBljXyM
 cIIEfVDmyUEGjmUDo8uzW8uvLp2sYMgnb7tv5fbytJK9oZH7bImKkcPFxv0VID5M
 il87F9Xnc078c9KHO4xEB5mUuFe8r1I1fDGDPRQ94RM6q/De65/ITMOLGfjzfB4C
 T0YLyyOVL3xZXztC7Tr/VVAqvlKo8IavuWk2DELcck81LIsEmOxiEo+Hz2/u1wUf
 GOggkTpl4eMyTczlsRBKBOMuGfkizf/475PXWsmjRjUhsqtCn5lASuaemCoBN8kM
 8eLOQkhmkmSqqz8ypr6ufOpAknA7Kyb6sxgCelnO8j6ENEaUBWoAlw9z22eXMwQW
 0Bqp8bX2DrCPTSALfhnKSu/qxunlaQjIJgwCHZTTAsUgatQaZ/Gjj++OMMVlL4O+
 U26R0mqibCPV
 =GIyq
 -----END PGP SIGNATURE-----

Merge tag 'vfio-ccw-20190705' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features

Fix a bug introduced in the refactoring.

* tag 'vfio-ccw-20190705' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw:
  vfio-ccw: Fix the conversion of Format-0 CCWs to Format-1

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Vasily Gorbik 2019-07-05 13:39:22 +02:00
commit 555827c28a

View File

@ -431,7 +431,7 @@ static int ccwchain_handle_ccw(u32 cda, struct channel_program *cp)
/* Convert any Format-0 CCWs to Format-1 */
if (!cp->orb.cmd.fmt)
convert_ccw0_to_ccw1(cp->guest_cp, len);
convert_ccw0_to_ccw1(cp->guest_cp, CCWCHAIN_LEN_MAX);
/* Count the CCWs in the current chain */
len = ccwchain_calc_length(cda, cp);