From 1f645c10c1195a149e7298a6460a1d26eabf984b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 11 Jun 2021 15:13:31 +0200 Subject: [PATCH] qemu: Drop handling of devices with VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We don't support any qemu which would support the 'virtio-s390' addressing, thus we can drop all code related to it. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 6 +----- src/qemu/qemu_domain_address.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1e90b59d17..e92d543c39 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -486,9 +486,6 @@ qemuBuildVirtioDevStr(virBuffer *buf, break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - implName = "s390"; - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: @@ -5348,8 +5345,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, } if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { /* Check it's a virtio-serial address */ if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 93942be559..8d52f1d884 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2241,10 +2241,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, /* don't touch s390 devices */ if (virDeviceInfoPCIAddressIsPresent(&def->disks[i]->info) || - def->disks[i]->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 || - def->disks[i]->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) + def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) continue; /* Also ignore virtio-mmio disks if our machine allows them */ -- 2.47.2