From cfd690b6380ed6dca9458ff34170a8996b9b0ad1 Mon Sep 17 00:00:00 2001
From: Jakob Naucke <jakob.naucke@ibm.com>
Date: Mon, 14 Jun 2021 15:17:57 +0200
Subject: [PATCH] virtcontainers: Use virtio-blk-ccw on s390x

if virtio-blk-pci were to be used

Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
---
 src/runtime/virtcontainers/hypervisor.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/runtime/virtcontainers/hypervisor.go b/src/runtime/virtcontainers/hypervisor.go
index 53cebe7e3..2c75d7f4a 100644
--- a/src/runtime/virtcontainers/hypervisor.go
+++ b/src/runtime/virtcontainers/hypervisor.go
@@ -510,6 +510,8 @@ func (conf *HypervisorConfig) valid() error {
 
 	if conf.BlockDeviceDriver == "" {
 		conf.BlockDeviceDriver = defaultBlockDriver
+	} else if conf.BlockDeviceDriver == config.VirtioBlock && conf.HypervisorMachineType == "s390-ccw-virtio" {
+		conf.BlockDeviceDriver = config.VirtioBlockCCW
 	}
 
 	if conf.DefaultMaxVCPUs == 0 {