diff options
author | Martin Schwidefsky | 2018-12-13 10:44:18 +0100 |
---|---|---|
committer | Martin Schwidefsky | 2018-12-13 10:44:18 +0100 |
commit | ec10574d00da0d8b6ec9d0099410aae8aad4695a (patch) | |
tree | 2d8b2d3a956cf1877f19408f4425640c9af93f28 | |
parent | a7b1868a5f473fb93d912a618883cef0d43653b9 (diff) | |
parent | 4868d2b662f55ff2e27e92c44b14016531a022a0 (diff) |
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
-rw-r--r-- | MAINTAINERS | 4 | ||||
-rw-r--r-- | drivers/s390/cio/vfio_ccw_fsm.c | 7 | ||||
-rw-r--r-- | drivers/s390/cio/vfio_ccw_private.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5d17f568a3b9..2e9d876d65d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c index f94aa01f9c36..cab17865aafe 100644 --- a/drivers/s390/cio/vfio_ccw_fsm.c +++ b/drivers/s390/cio/vfio_ccw_fsm.c @@ -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, diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h index 078e46f9623d..08e9a7dc9176 100644 --- a/drivers/s390/cio/vfio_ccw_private.h +++ b/drivers/s390/cio/vfio_ccw_private.h @@ -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 |