From nobody Mon Feb 9 02:52:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1623423066; cv=none; d=zohomail.com; s=zohoarc; b=l8q3yzLvFvYOYiATVvdsrQCud9D3o+TAc36Y+zL8PniUABMmWA96HDLl6oOjwUWX1bJtlOR744KE51B0FT2kaH+iQhYhPMjW0QxwjcU51hyfxxRSZDaW7s6QebZIa0iZqAmCbDpKaqNNsM85wlQZ7olMUNXEu4Uf+62nWIER2bE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423066; 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=BR2YEyhWUY4vElJNoaGuC/pCYm7ctKWlVJeQndcQ8W0=; b=cpsN9b61krFAc59rflXZFOtNdg5/2dkltw5hhSKUFKrIsxmZkvYFdzIwySpTUg7u+PtC8ULtGzumrpSCOFAmwpAlvR/4UcieGFwTx84OdFGZxEzFSx+AM18pnV7ab/Io8TzCVCVXkE2WI0tAWHS62IIkRay4t6S6OvHHVVgQ9rc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 16234230664731015.6059135007697; Fri, 11 Jun 2021 07:51:06 -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-451-0N7nZUpxOO6qz-puKmhA5g-1; Fri, 11 Jun 2021 10:50:52 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90DB3801B14; Fri, 11 Jun 2021 14:50:46 +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 716715C224; Fri, 11 Jun 2021 14:50:46 +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 3DD2346F5D; Fri, 11 Jun 2021 14:50:46 +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 15BEnRoC007703 for ; Fri, 11 Jun 2021 10:49:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id CCD8860FC2; Fri, 11 Jun 2021 14:49:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F5A160C05 for ; Fri, 11 Jun 2021 14:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423065; 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=BR2YEyhWUY4vElJNoaGuC/pCYm7ctKWlVJeQndcQ8W0=; b=ZizfedSYFho9hUfU2EsXtBncMIQZyvigEVjH91oEFsDi47mU8K6I9VGtABgKCGwa6Rerhe 5/hOPPVhAcTmxJm8sWed2GcDgLyBpqiho340/purrJI4EbkZ+MpYJAu12l/ocYBZ8MywgC h9CQ6qLw/7qShC0ci5w584X8o7+o35g= X-MC-Unique: 0N7nZUpxOO6qz-puKmhA5g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/22] qemu: capabilities: Remove probing of 'virtio-*-s390' devices Date: Fri, 11 Jun 2021 16:49:03 +0200 Message-Id: <6955d330b8fce271e99aed12e1b82bf6ff38e37b.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.16 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" QEMU commit 7b3fdbd9a826791bd98e649cf44c0a6129a44179 released in 2.6 dropped the legacy s390 virtio machine and it's devices. Remove our probing based on the devices. The probing of properties of the appropriate devices will be removed subsequently. Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 75dd01f06e..e5f2283971 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1204,12 +1204,10 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectType= s[] =3D { { "usb-redir", QEMU_CAPS_USB_REDIR }, { "usb-hub", QEMU_CAPS_USB_HUB }, { "ich9-ahci", QEMU_CAPS_ICH9_AHCI }, - { "virtio-blk-s390", QEMU_CAPS_VIRTIO_S390 }, { "virtio-blk-ccw", QEMU_CAPS_VIRTIO_CCW }, { "sclpconsole", QEMU_CAPS_DEVICE_SCLPCONSOLE }, { "lsi53c895a", QEMU_CAPS_SCSI_LSI }, { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, - { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, @@ -1221,7 +1219,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA }, { "usb-serial", QEMU_CAPS_DEVICE_USB_SERIAL }, { "virtio-rng-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG }, - { "virtio-rng-s390", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-ccw", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "virtio-rng-device", QEMU_CAPS_DEVICE_VIRTIO_RNG }, { "rng-random", QEMU_CAPS_OBJECT_RNG_RANDOM }, @@ -1250,7 +1247,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "e1000", QEMU_CAPS_DEVICE_E1000 }, { "virtio-net-pci", QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-net-ccw", QEMU_CAPS_DEVICE_VIRTIO_NET }, - { "virtio-net-s390", QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-net-device", QEMU_CAPS_DEVICE_VIRTIO_NET }, { "virtio-gpu-pci", QEMU_CAPS_DEVICE_VIRTIO_GPU }, { "virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU }, --=20 2.31.1