From nobody Mon Feb 9 03:14:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623423075; cv=none; d=zohomail.com; s=zohoarc; b=bmgjTeX4FRBX22QHRFSR7JchVIV/UAfXJwWxIy7X9Jx1buV9QnmwV3fFLE2HGHftPgMlDyn3WgdGHCP/kRn8ev9wym8x+RiPvsfMzchY/QMilQhbrC89Hb4daWUVNMO3G2tL+iLCq+yWC//YrvnV0hh/Cod/pEpBDFOr0Xubqdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423075; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IOYxo/8F5enkq/Ew78ZaMSwZYMtjZq++A8s/vyOr0xk=; b=eJ4xT78VD9jJHUFa9ncPR7ZY+YrO7EMtwRJbI6yc7WDQJ1Z8tFHl8pgLc1/uHNe8skeRyLcXNj2lxhW6S67yNerFQa53HWPNFhg+0FIbtnnbl/z2WoY0luFA7fRmydAfA/Ebjox7z0l+PYpaE6o/pnmadqsppKM4H11g3kpXFuI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162342307538843.4642301828128; Fri, 11 Jun 2021 07:51:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-k75uvrg-OeOXKHLSmCFm_Q-1; Fri, 11 Jun 2021 10:49:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3ACC8100C626; Fri, 11 Jun 2021 14:49:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 136F75D6B1; Fri, 11 Jun 2021 14:49:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D085D46F59; Fri, 11 Jun 2021 14:49:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15BEnajI007781 for ; Fri, 11 Jun 2021 10:49:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA55160FC2; Fri, 11 Jun 2021 14:49:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53B8360C05 for ; Fri, 11 Jun 2021 14:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423074; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IOYxo/8F5enkq/Ew78ZaMSwZYMtjZq++A8s/vyOr0xk=; b=TrjzRAfWeqk4KvCa6rWq3PPtoXWNbXC97qSLZ2FkK41EARKtp+Ga+fJhEtubhYPjPb8sQD tdDZzjphTesgJ6APk4d7F6UAXl6Xdzg7VN4iAUziMhhjSJQ1F1gqvDbppslk1hQUf+ajQv wb319gCdfhJ+Ug+/sE0JcatpsvzYuLM= X-MC-Unique: k75uvrg-OeOXKHLSmCFm_Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/22] qemu: Drop handling of devices with VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 Date: Fri, 11 Jun 2021 16:49:10 +0200 Message-Id: <8db4c8b3a53b988bfb563d6b54c065609c67ede7.1623422565.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 --- 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 7834fc2130..dde4c1ba4e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -524,9 +524,6 @@ qemuBuildVirtioDevStr(virBuffer *buf, break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - implName =3D "s390"; - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: @@ -5296,8 +5293,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *d= ef, } if (dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { /* Check it's a virtio-serial address */ if (dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERI= AL) { 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 =3D=3D - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 || - def->disks[i]->info.type =3D=3D - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) + def->disks[i]->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE= _CCW) continue; /* Also ignore virtio-mmio disks if our machine allows them */ --=20 2.31.1