Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1554509b authored by Pierre Morel's avatar Pierre Morel Committed by Cornelia Huck
Browse files

vfio: ccw: Merge BUSY and BOXED states 



VFIO_CCW_STATE_BOXED and VFIO_CCW_STATE_BUSY have
identical actions for the same events.

Let's merge both into a single state to simplify the code.
We choose to keep VFIO_CCW_STATE_BUSY.

Signed-off-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Message-Id: <1539767923-10539-2-git-send-email-pmorel@linux.ibm.com>
Reviewed-by: default avatarEric Farman <farman@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 5b39fc04

drivers/s390/cio/vfio_ccw_fsm.c

+1 −6
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void fsm_io_request(struct vfio_ccw_private *private, 
	struct mdev_device *mdev = private->mdev;

	char *errstr = "request";



	private->state = VFIO_CCW_STATE_BOXED;

	private->state = VFIO_CCW_STATE_BUSY;



	memcpy(scsw, io_region->scsw_area, sizeof(*scsw));
@@ -216,11 +216,6 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = { 
		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_request,

		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_irq,

	},

	[VFIO_CCW_STATE_BOXED] = {

		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_notoper,

		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_busy,

		[VFIO_CCW_EVENT_INTERRUPT]	= fsm_irq,

	},

	[VFIO_CCW_STATE_BUSY] = {

		[VFIO_CCW_EVENT_NOT_OPER]	= fsm_notoper,

		[VFIO_CCW_EVENT_IO_REQ]		= fsm_io_busy,

drivers/s390/cio/vfio_ccw_private.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ enum vfio_ccw_state { 
	VFIO_CCW_STATE_NOT_OPER,

	VFIO_CCW_STATE_STANDBY,

	VFIO_CCW_STATE_IDLE,

	VFIO_CCW_STATE_BOXED,

	VFIO_CCW_STATE_BUSY,

	/* last element! */

	NR_VFIO_CCW_STATES