From nobody Mon Feb 9 12:24:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 153675656128126.314640806737543; Wed, 12 Sep 2018 05:49:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 284FD88316; Wed, 12 Sep 2018 12:49:19 +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 EA2FB20159B8; Wed, 12 Sep 2018 12:49:18 +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 8E8621808872; Wed, 12 Sep 2018 12:49:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8CCn35U016718 for ; Wed, 12 Sep 2018 08:49:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E2CB63A62; Wed, 12 Sep 2018 12:49:03 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3725108785 for ; Wed, 12 Sep 2018 12:49:02 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 12 Sep 2018 14:48:54 +0200 Message-Id: <20180912124854.22723-4-abologna@redhat.com> In-Reply-To: <20180912124854.22723-1-abologna@redhat.com> References: <20180912124854.22723-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] qemu: Drop redundant version checks 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 12 Sep 2018 12:49:19 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We require QEMU 1.5.0 these days, so checking for versions older than that is pointless. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 499befb2cf..96a65046ba 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1724,10 +1724,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuC= aps, * * ref405ep: no pci * taihu: no pci - * bamboo: 1.1.0 + * bamboo: 1.1.0 (<=3D 1.5.0, so basically forever) * mac99: 2.0.0 * g3beige: 2.0.0 - * prep: 1.4.0 + * prep: 1.4.0 (<=3D 1.5.0, so basically forever) * pseries: 2.0.0 * mpc8544ds: forever * virtex-m507: no pci @@ -1749,16 +1749,11 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuC= aps, STREQ(def->os.machine, "ppce500")) return true; =20 - if (qemuCaps->version >=3D 1004000 && - STREQ(def->os.machine, "prep")) - return true; - - if (qemuCaps->version >=3D 1001000 && - STREQ(def->os.machine, "bamboo")) - return true; - - if (STREQ(def->os.machine, "mpc8544ds")) + if (STREQ(def->os.machine, "bamboo") || + STREQ(def->os.machine, "mpc8544ds") || + STREQ(def->os.machine, "prep")) { return true; + } =20 return false; } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list