diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-07-07 05:41:01 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-07-07 07:27:06 -0400 |
commit | 1b568d934eec1c5c99565c41f6c8ca66e9743e96 (patch) | |
tree | ad8b38dbbc858d8b2e620765f5b8c7de9e5b2e15 | |
parent | f2dbda3b4fc2833f0a6240ac28b0e3a17f09893b (diff) |
virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio
This more accurately reflects what these drivers actually do.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | drivers/s390/Makefile | 2 | ||||
-rw-r--r-- | drivers/s390/virtio/Makefile (renamed from drivers/s390/kvm/Makefile) | 0 | ||||
-rw-r--r-- | drivers/s390/virtio/kvm_virtio.c (renamed from drivers/s390/kvm/kvm_virtio.c) | 0 | ||||
-rw-r--r-- | drivers/s390/virtio/virtio_ccw.c (renamed from drivers/s390/kvm/virtio_ccw.c) | 0 |
5 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 280a5681d5b2..fbef7d0a4dd5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -10577,7 +10577,7 @@ L: linux-s390@vger.kernel.org | |||
10577 | L: virtualization@lists.linux-foundation.org | 10577 | L: virtualization@lists.linux-foundation.org |
10578 | L: kvm@vger.kernel.org | 10578 | L: kvm@vger.kernel.org |
10579 | S: Supported | 10579 | S: Supported |
10580 | F: drivers/s390/kvm/ | 10580 | F: drivers/s390/virtio/ |
10581 | 10581 | ||
10582 | VIRTIO HOST (VHOST) | 10582 | VIRTIO HOST (VHOST) |
10583 | M: "Michael S. Tsirkin" <mst@redhat.com> | 10583 | M: "Michael S. Tsirkin" <mst@redhat.com> |
diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile index 95bccfd3f169..e5225ad9c5b1 100644 --- a/drivers/s390/Makefile +++ b/drivers/s390/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the S/390 specific device drivers | 2 | # Makefile for the S/390 specific device drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/ | 5 | obj-y += cio/ block/ char/ crypto/ net/ scsi/ virtio/ |
6 | 6 | ||
7 | drivers-y += drivers/s390/built-in.o | 7 | drivers-y += drivers/s390/built-in.o |
8 | 8 | ||
diff --git a/drivers/s390/kvm/Makefile b/drivers/s390/virtio/Makefile index 241891a57caf..241891a57caf 100644 --- a/drivers/s390/kvm/Makefile +++ b/drivers/s390/virtio/Makefile | |||
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c index dd65c8b4c7fe..dd65c8b4c7fe 100644 --- a/drivers/s390/kvm/kvm_virtio.c +++ b/drivers/s390/virtio/kvm_virtio.c | |||
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c index 6f1fa1773e76..6f1fa1773e76 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c | |||