History

virtio/s390: deprecate old transport

There only ever have been two host implementations of the old s390-virtio (pre-ccw) transport: the experimental kuli userspace, and qemu. As qemu switched its default to ccw with 2.4 (with most users having used ccw well before that) and removed the old transport entirely in 2.6, s390-virtio probably hasn't been in active use for quite some time and is therefore likely to bitrot. Let's start the slow march towards removing the code by deprecating it. Note that this also deprecates the early virtio console code, which has been causing trouble in the guest without being wired up in any relevant hypervisor code.

Cornelia Huck committed 10 years ago

Commit 3b2fbb31 parent 2ab0d563 files · +20 −1Browse files

Unified · Split

3 files
  1. arch/s390/Kconfig +13 −0
  2. drivers/s390/virtio/Makefile +5 −1
  3. drivers/s390/virtio/kvm_virtio.c +2 −0
arch/s390/Kconfig+13−0
@@ -871,4 +871,17 @@ config S390_GUEST · 870 unmodified lines
871 Select this option if you want to run the kernel as a guest under871 Select this option if you want to run the kernel as a guest under
872 the KVM hypervisor.872 the KVM hypervisor.
873 873
874config S390_GUEST_OLD_TRANSPORT
875 def_bool y
876 prompt "Guest support for old s390 virtio transport (DEPRECATED)"
877 depends on S390_GUEST
878 help
879 Enable this option to add support for the old s390-virtio
880 transport (i.e. virtio devices NOT based on virtio-ccw). This
881 type of virtio devices is only available on the experimental
882 kuli userspace or with old (< 2.6) qemu. If you are running
883 with a modern version of qemu (which supports virtio-ccw since
884 1.4 and uses it by default since version 2.4), you probably won't
885 need this.
886
874endmenu887endmenu
drivers/s390/virtio/Makefile+5−1
@@ -6,4 +6,8 @@ · 5 unmodified lines
6# it under the terms of the GNU General Public License (version 2 only)6# it under the terms of the GNU General Public License (version 2 only)
7# as published by the Free Software Foundation.7# as published by the Free Software Foundation.
8 8
9obj-$(CONFIG_S390_GUEST) += kvm_virtio.o virtio_ccw.o9s390-virtio-objs := virtio_ccw.o
10ifdef CONFIG_S390_GUEST_OLD_TRANSPORT
11s390-virtio-objs += kvm_virtio.o
12endif
13obj-$(CONFIG_S390_GUEST) += $(s390-virtio-objs)
drivers/s390/virtio/kvm_virtio.c+2−0
@@ -458,6 +458,8 @@ static int __init kvm_devices_init(void) · 457 unmodified lines
458 if (test_devices_support(total_memory_size) < 0)458 if (test_devices_support(total_memory_size) < 0)
459 return -ENODEV;459 return -ENODEV;
460 460
461 pr_warn("The s390-virtio transport is deprecated. Please switch to a modern host providing virtio-ccw.\n");
462
461 rc = vmem_add_mapping(total_memory_size, PAGE_SIZE);463 rc = vmem_add_mapping(total_memory_size, PAGE_SIZE);
462 if (rc)464 if (rc)
463 return rc;465 return rc;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t