Commit ec10574d authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

Merge tag 'vfio-ccw-20181213' of... 

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

Pull vfio-ccw from Cornelia Huck with the following changes:
 - remove unneeded BOXED state
 - maintainership changes
parents a7b1868a 4868d2b6

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -13021,7 +13021,9 @@ F: drivers/pci/hotplug/s390_pci_hpc.c 


S390 VFIO-CCW DRIVER

M:	Cornelia Huck <cohuck@redhat.com>

M:	Halil Pasic <pasic@linux.ibm.com>

M:	Farhan Ali <alifm@linux.ibm.com>

M:	Eric Farman <farman@linux.ibm.com>

R:	Halil Pasic <pasic@linux.ibm.com>

L:	linux-s390@vger.kernel.org

L:	kvm@vger.kernel.org

S:	Supported

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