From nobody Sun Feb 8 19:56:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606999030; cv=none; d=zohomail.com; s=zohoarc; b=jDiyIn2Ecso8lMiOoTXxh+vmCnCZ5CiXF4OeIdqxT//b4o+wfy+ilU71iViZr2W5lMpR8v6XfvCYNthEuBLZz8CqPtDhnH1cF+2kW2RbjFXZO9ykeikwC1tWYQKydIKE5Nasj8hYkbXMhei3B1fj0wkFrQjoBkI7w420UcSG18s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606999030; 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=s6q4Sfm3ACLRd5F1mkjDbncFUlkJ/C4n1bMeP5D/zpA=; b=ZJEiPqxd9uasTSoWOniLeDBQtcPyDltaC0VOLGoF7LOL+0t8DmrPDYAXa+2UNM225sCDjWgmpwOpo6r7eiVu1GQ1R+Oyw3DNxKSe/H4S/j9bpJklJUpsVmUBbs2y4cRwFVjXlJoUQUGAK9RP9aqdDhUTTACXrxLMvCJ2kM6m/r4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606999030745360.74441315967624; Thu, 3 Dec 2020 04:37:10 -0800 (PST) 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-458-NZIZuTtKO2e1WII1fx3k9g-1; Thu, 03 Dec 2020 07:37:07 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1540C1005E73; Thu, 3 Dec 2020 12:37:02 +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 E17901A7D9; Thu, 3 Dec 2020 12:37:01 +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 A63DC50034; Thu, 3 Dec 2020 12:37:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B3Camqc002942 for ; Thu, 3 Dec 2020 07:36:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id C2F2B5C1C2; Thu, 3 Dec 2020 12:36:48 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 442775C1CF for ; Thu, 3 Dec 2020 12:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606999029; 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=s6q4Sfm3ACLRd5F1mkjDbncFUlkJ/C4n1bMeP5D/zpA=; b=XTTH5hlLvnOvsy7UH0GXD/5xegB902QfcoiBIM53aGN4pKk1AxmnOfzAx1FFCa3N1H54Uj ifE5MfwCmf0/2P95XVGo++RAPAO3IxtLHAEuzUoQiyZCLIBXXIbDIMIeYHBEWbwCzaN0Hf 6/kBrv+XP88zbz3aOGjO7YQF1B6qh3Q= X-MC-Unique: NZIZuTtKO2e1WII1fx3k9g-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 05/27] qemu_domain_address: Reformat qemuDomainAssignS390Addresses() Date: Thu, 3 Dec 2020 13:36:08 +0100 Message-Id: <152603685e6f3635231df13e71113efe1cc3ced9.1606998426.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.23 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" Signed-off-by: Michal Privoznik Reviewed-by: Thomas Huth --- src/qemu/qemu_domain_address.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 2788dc7fb3..d872f75b38 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -408,18 +408,16 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, if (qemuDomainIsS390CCW(def) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW)) - qemuDomainPrimeVfioDeviceAddresses( - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); - qemuDomainPrimeVirtioDeviceAddresses( - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); + qemuDomainPrimeVfioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDR= ESS_TYPE_CCW); + + qemuDomainPrimeVirtioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRES= S_TYPE_CCW); =20 if (!(addrs =3D virDomainCCWAddressSetCreateFromDomain(def))) goto cleanup; =20 } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { /* deal with legacy virtio-s390 */ - qemuDomainPrimeVirtioDeviceAddresses( - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390); + qemuDomainPrimeVirtioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRES= S_TYPE_VIRTIO_S390); } =20 ret =3D 0; --=20 2.26.2