From nobody Mon Feb 9 07:38:20 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=1623423019; cv=none; d=zohomail.com; s=zohoarc; b=eukGcPEsekpXwHfeP/G+OhZusr7fkZghRnCGEWcOXNH+lHetI6yaqfOhDTXxfjxEJe74+27Y5xT5usGHAvpbY7kIT02438rLVmPzQ7HmccgCGH9v6KkYHjRFtjksIVuZe4YNW+O7jxEL/fxzSl+QnweZSuIfctyvk1QUTKUFtv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423019; 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=LaCWLwZ2fuvxlsvFIJZoYsStmBzM2/CElDpOdNYLmo4=; b=XdlQs6zMYMEVMaJ7SAGv6pixWmrFp6v8/rT3LE7j5r1GdNBvPQzHOSghlG2lFH7l/JECzK+YRSYPjR4mt0jU09IpapvRsDiStGDtSicrujkLZkO9MM0HnGEy3Fp7UBkTszyP3f8m8Hekm7l7lHY6ubS6apW5F8kt70UDj/ORzww= 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 1623423019654220.39211558881573; Fri, 11 Jun 2021 07:50:19 -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-1-CK0-XSDwNv-LbYI39_RyTQ-1; Fri, 11 Jun 2021 10:49:50 -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 01F631084F6A; Fri, 11 Jun 2021 14:49:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B00C25D720; Fri, 11 Jun 2021 14:49:43 +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 6DA9F1809CAE; Fri, 11 Jun 2021 14:49:43 +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 15BEnXOj007753 for ; Fri, 11 Jun 2021 10:49:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id CC7A160FC2; Fri, 11 Jun 2021 14:49:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 319EC60C05 for ; Fri, 11 Jun 2021 14:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423018; 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=LaCWLwZ2fuvxlsvFIJZoYsStmBzM2/CElDpOdNYLmo4=; b=GPlIUJsLjG0yF0KwDbN0zyTNioWWICw4pvj67XCRP1Da17hIHUDSlsTy3mZYCa74MLJAVL IjONrcMLuBU9TzLh8gBUkXDtT9l7qJwBdrREPHDRABCAEgCOAqB0ky3coesxhjZ37M20ga hzGtgCdgx6mMhC/rUmuBG9lMTuhKxRA= X-MC-Unique: CK0-XSDwNv-LbYI39_RyTQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/22] qemu: Remove last uses of QEMU_CAPS_VIRTIO_S390 Date: Fri, 11 Jun 2021 16:49:07 +0200 Message-Id: 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" Modify the code in the last two instances in the code to behave as if the flag is not asserted. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 10 ++++------ src/qemu/qemu_hotplug.c | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 18b5403974..d0dd1ce995 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10666,12 +10666,10 @@ qemuDomainCheckCCWS390AddressSupport(const virDom= ainDef *def, return false; } } else if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S39= 0) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio S390 address type is not supported by= " - "this QEMU")); - return false; - } + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio S390 address type is not supported by " + "this QEMU")); + return false; } return true; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0640cdd9f7..38eca0144d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1246,10 +1246,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (virDomainCCWAddressAssign(&net->info, ccwaddrs, !net->info.addr.ccw.assigned) < 0) goto cleanup; - } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-s390 net device cannot be hotplugged.")); - goto cleanup; } else if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) { goto cleanup; } --=20 2.31.1