Skip to contentSkip to conversation

drivers/s390/virtio: Remove the old KVM virtio transport

PATCH In review Thomas Huth 5 participants 13 messages Sep 27, 2017 – Sep 28, 2017

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/s390/virtio: Remove the old KVM virtio transport

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

---
 arch/s390/Kconfig                |  13 -
 drivers/s390/virtio/Makefile     |   3 -
 drivers/s390/virtio/kvm_virtio.c | 515 ---------------------------------------
 3 files changed, 531 deletions(-)
 delete mode 100644 drivers/s390/virtio/kvm_virtio.c
arch/s390/Kconfig +0 -13
index 48af970..a0a40dd 100644
@@ -929,17 +929,4 @@ config S390_GUEST
 	  Select this option if you want to run the kernel as a guest under
 	  the KVM hypervisor.
 
-config S390_GUEST_OLD_TRANSPORT
-	def_bool y
-	prompt "Guest support for old s390 virtio transport (DEPRECATED)"
-	depends on S390_GUEST
-	help
-	  Enable this option to add support for the old s390-virtio
-	  transport (i.e. virtio devices NOT based on virtio-ccw). This
-	  type of virtio devices is only available on the experimental
-	  kuli userspace or with old (< 2.6) qemu. If you are running
-	  with a modern version of qemu (which supports virtio-ccw since
-	  1.4 and uses it by default since version 2.4), you probably won't
-	  need this.
-
 endmenu
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)
drivers/s390/virtio/kvm_virtio.c deleted +0 -515

515 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#1 lore raw

drivers/s390/virtio/Makefile line 10

Quoted 12 lines · Thomas Huth
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

Would you mind to simplify the Makefile to just the single line

obj-$(CONFIG_S390_GUEST) += virtio_ccw.o

while you are touching it anyway?

#2 lore raw
Quoted 16 lines · Heiko Carstens

drivers/s390/virtio/Makefile line 10

Quoted 12 lines · Thomas Huth
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

Would you mind to simplify the Makefile to just the single line

Quoted 3 lines

obj-$(CONFIG_S390_GUEST) += virtio_ccw.o

while you are touching it anyway?

Sure ... I'll send a v2 ... or do you rather want to fix it when picking up the patch?

Thomas

#3 lore raw
Quoted 17 lines · Thomas Huth
Quoted 16 lines · Heiko Carstens

drivers/s390/virtio/Makefile line 10

Quoted 12 lines · Thomas Huth
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

Would you mind to simplify the Makefile to just the single line

Quoted 6 lines
Quoted 3 lines

obj-$(CONFIG_S390_GUEST) += virtio_ccw.o

while you are touching it anyway?

Sure ... I'll send a v2 ... or do you rather want to fix it when picking up the patch?

I will change it accordingly.

#4 lore raw
In reply to Thomas Huth
Quoted 17 lines · Thomas Huth
Quoted 16 lines · Heiko Carstens

drivers/s390/virtio/Makefile line 10

Quoted 12 lines · Thomas Huth
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

Would you mind to simplify the Makefile to just the single line

Quoted 6 lines
Quoted 3 lines

obj-$(CONFIG_S390_GUEST) += virtio_ccw.o

while you are touching it anyway?

Sure ... I'll send a v2 ... or do you rather want to fix it when picking up the patch?

I will change it accordingly.

#5 lore raw
In reply to Heiko Carstens
Quoted 16 lines · Heiko Carstens

drivers/s390/virtio/Makefile line 10

Quoted 12 lines · Thomas Huth
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

Would you mind to simplify the Makefile to just the single line

Quoted 3 lines

obj-$(CONFIG_S390_GUEST) += virtio_ccw.o

while you are touching it anyway?

Sure ... I'll send a v2 ... or do you rather want to fix it when picking up the patch?

Thomas

#6 lore raw
In reply to Thomas Huth

drivers/s390/virtio/Makefile line 10

Quoted 12 lines · Thomas Huth
drivers/s390/virtio/Makefile +0 -3
index df40692..d9942e0 100644
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

Would you mind to simplify the Makefile to just the single line

obj-$(CONFIG_S390_GUEST) += virtio_ccw.o

while you are touching it anyway?

maintainer Reviewed-by on v1 1/1
#7 lore raw
In reply to Thomas Huth
Quoted 5 lines · On Wed, 27 Sep 2017 13:42:01 +0200 Thomas Huth <[email protected]> wrote:

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

It has done its job of uncovering problems in QEMU's tcg code, so I guess we can remove it :)

Quoted 15 lines
---
 arch/s390/Kconfig                |  13 -
 drivers/s390/virtio/Makefile     |   3 -
 drivers/s390/virtio/kvm_virtio.c | 515 ---------------------------------------
 3 files changed, 531 deletions(-)
 delete mode 100644 drivers/s390/virtio/kvm_virtio.c
drivers/s390/virtio/Makefile +0 -0
index df40692..d9942e0 100644

drivers/s390/virtio/Makefile line 10

Quoted 7 lines
drivers/s390/virtio/Makefile +0 -3
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

We could simplify this? Does not really matter, though.

This seems to be all of it (other than the uapi stuff).

I can apply this and submit it through virtio, but as I don't have anything else queued, I would be fine with it going through the s390 architecture tree. In that case,

maintainer Reviewed-by on v1 1/1
#8 lore raw
In reply to Thomas Huth
Quoted 5 lines · On Wed, 27 Sep 2017 13:42:01 +0200 Thomas Huth <[email protected]> wrote:

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

It has done its job of uncovering problems in QEMU's tcg code, so I guess we can remove it :)

Quoted 15 lines
---
 arch/s390/Kconfig                |  13 -
 drivers/s390/virtio/Makefile     |   3 -
 drivers/s390/virtio/kvm_virtio.c | 515 ---------------------------------------
 3 files changed, 531 deletions(-)
 delete mode 100644 drivers/s390/virtio/kvm_virtio.c
drivers/s390/virtio/Makefile +0 -0
index df40692..d9942e0 100644

drivers/s390/virtio/Makefile line 10

Quoted 7 lines
drivers/s390/virtio/Makefile +0 -3
@@ -7,7 +7,4 @@
 # as published by the Free Software Foundation.
 
 s390-virtio-objs := virtio_ccw.o
-ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
-s390-virtio-objs += kvm_virtio.o
-endif
 obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)

We could simplify this? Does not really matter, though.

This seems to be all of it (other than the uapi stuff).

I can apply this and submit it through virtio, but as I don't have anything else queued, I would be fine with it going through the s390 architecture tree. In that case,

Acked-by on v1 1/1
#9 lore raw
In reply to Thomas Huth
Quoted 7 lines · Thomas Huth

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

(with or without the fixup))

Acked-by on v1 1/1
#10 lore raw
In reply to Thomas Huth
Quoted 7 lines · Thomas Huth

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

(with or without the fixup))

Reviewed-by on v1 1/1
#11 lore raw
In reply to Thomas Huth
Quoted 6 lines · Thomas Huth

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

Quoted 7 lines
---
 arch/s390/Kconfig                |  13 -
 drivers/s390/virtio/Makefile     |   3 -
 drivers/s390/virtio/kvm_virtio.c | 515 ---------------------------------------
 3 files changed, 531 deletions(-)
 delete mode 100644 drivers/s390/virtio/kvm_virtio.c

Yup, looks good to me.

Signature · 3 lines
Thanks,

David
Reviewed-by on v1 1/1
#12 lore raw
In reply to Thomas Huth
Quoted 6 lines · Thomas Huth

There is no recent user space application available anymore which still supports this old virtio transport. Additionally, commit 3b2fbb3f06ef ("virtio/s390: deprecate old transport") introduced a deprecation message in the driver, and apparently nobody complained so far that it is still required. So let's simply remove it.

Quoted 7 lines
---
 arch/s390/Kconfig                |  13 -
 drivers/s390/virtio/Makefile     |   3 -
 drivers/s390/virtio/kvm_virtio.c | 515 ---------------------------------------
 3 files changed, 531 deletions(-)
 delete mode 100644 drivers/s390/virtio/kvm_virtio.c

Yup, looks good to me.

Signature · 3 lines
Thanks,

David