aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2012-12-14 11:02:18 -0500
committerGleb Natapov <gleb@redhat.com>2012-12-18 07:37:13 -0500
commit7e64e0597fd67c975bfa3e76401bfbcdd5ae0ff9 (patch)
tree8af50236372d9db8679e9cbf10fad40766fedf4e /arch/s390
parent0abbe448eddb2263db3fb776757f480b34accd88 (diff)
KVM: s390: Add a channel I/O based virtio transport driver.
Add a driver for kvm guests that matches virtual ccw devices provided by the host as virtio bridge devices. These virtio-ccw devices use a special set of channel commands in order to perform virtio functions. Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com> Reviewed-by: Alexander Graf <agraf@suse.de> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/irq.h1
-rw-r--r--arch/s390/kernel/irq.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index e6972f85d2b0..aa6d0d74cec9 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -35,6 +35,7 @@ enum interruption_class {
35 IOINT_CSC, 35 IOINT_CSC,
36 IOINT_PCI, 36 IOINT_PCI,
37 IOINT_MSI, 37 IOINT_MSI,
38 IOINT_VIR,
38 NMI_NMI, 39 NMI_NMI,
39 NR_IRQS, 40 NR_IRQS,
40}; 41};
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index bf24293970ce..a9806ea3ebd7 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -60,6 +60,7 @@ static const struct irq_class intrclass_names[] = {
60 [IOINT_CSC] = {.name = "CSC", .desc = "[I/O] CHSC Subchannel"}, 60 [IOINT_CSC] = {.name = "CSC", .desc = "[I/O] CHSC Subchannel"},
61 [IOINT_PCI] = {.name = "PCI", .desc = "[I/O] PCI Interrupt" }, 61 [IOINT_PCI] = {.name = "PCI", .desc = "[I/O] PCI Interrupt" },
62 [IOINT_MSI] = {.name = "MSI", .desc = "[I/O] MSI Interrupt" }, 62 [IOINT_MSI] = {.name = "MSI", .desc = "[I/O] MSI Interrupt" },
63 [IOINT_VIR] = {.name = "VIR", .desc = "[I/O] Virtual I/O Devices"},
63 [NMI_NMI] = {.name = "NMI", .desc = "[NMI] Machine Check"}, 64 [NMI_NMI] = {.name = "NMI", .desc = "[NMI] Machine Check"},
64}; 65};
65 66