From nobody Mon Feb 9 23:14:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1592825404; cv=none; d=zohomail.com; s=zohoarc; b=Tz5sRmAuaR0Exw1DsL6s/l6eo/yL7a5Q5bycUV8s2HSYiburZdYX95WMiBSwf1z8UqoBLOTKACIorGd2ho08tLNGZnq1zVqmDZmJPImaNgc9QtFS7D1ri+UK1i8/wNoE9wMoee0YoRgMspiubNzqOKlzvUkAJtB35Txa4BYzTfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592825404; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1Q7npfp7pBdZV5AqIfLpiFnKGUenub9kzRD4QTal6XE=; b=B0uZIVd1wLDcZVro5O+Od7x28Mexf6omaWXP6afNRBb4G2SFsPvzzA3Z5ErIB2N9onkwAaxvRfUHOE3A3v5q4V01fxfibhw/gPWNupY37qn+4acgWfCcN8RQbJJH1fkwZGeHjUPQDvkxUblOvsBQ0/8qzZgv/ddCkGMX6cT3l3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1592825404942411.81742959528844; Mon, 22 Jun 2020 04:30:04 -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-211-eCgexd1bPZ2ke3Mr59kNYA-1; Mon, 22 Jun 2020 07:29:44 -0400 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 3A9A68018AC; Mon, 22 Jun 2020 11:29:39 +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 19FB426E44; Mon, 22 Jun 2020 11:29:39 +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 E0C73833AB; Mon, 22 Jun 2020 11:29:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MBTSwq019541 for ; Mon, 22 Jun 2020 07:29:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 975C07167C; Mon, 22 Jun 2020 11:29:28 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 317277166A; Mon, 22 Jun 2020 11:29:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 96F469D7C; Mon, 22 Jun 2020 13:29:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592825403; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1Q7npfp7pBdZV5AqIfLpiFnKGUenub9kzRD4QTal6XE=; b=afKHAGA0Rk+9lPvjyKSsr1VELt4XbaQgkYT7lCQifLK/T7ppSIQjN3pP128F0fztIWVKYQ 5ssJRIcwxy89nnlVipQTopXg+kPxwZ9gLDgN250Yy+k9tOtxl8P4eR80Mo3t8Ykf+yvRmL hNF/rRIG1wngtoXylnEKpm338qiMBRg= X-MC-Unique: eCgexd1bPZ2ke3Mr59kNYA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 14/19] pc_basic_device_init: drop has_pit arg Date: Mon, 22 Jun 2020 13:29:09 +0200 Message-Id: <20200622112914.30454-15-kraxel@redhat.com> In-Reply-To: <20200622112914.30454-1-kraxel@redhat.com> References: <20200622112914.30454-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , "Michael S. Tsirkin" , libvir-list@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , Marcel Apfelbaum , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now that we pass pcms anyway, we don't need the has_pit arg any more. No functional change. Signed-off-by: Gerd Hoffmann --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 3 +-- hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9b94926410c0..3512dcfd3d27 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -165,7 +165,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, - bool has_pit, uint32_t hpet_irqs); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_cmos_init(PCMachineState *pcms, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 9afb003dfc21..dfe8ba07e982 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1181,7 +1181,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, - bool has_pit, uint32_t hpet_irqs) { int i; @@ -1232,7 +1231,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, =20 qemu_register_boot_set(pc_boot_set, *rtc_state); =20 - if (!xen_enabled() && has_pit) { + if (!xen_enabled() && pcms->pit_enabled) { if (kvm_pit_in_kernel()) { pit =3D kvm_pit_init(isa_bus, 0x40); } else { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 605252fe7936..1242ed811804 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -236,7 +236,7 @@ static void pc_init1(MachineState *machine, =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true, - (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, + (pcms->vmport !=3D ON_OFF_AUTO_ON), 0x4); =20 pc_nic_init(pcmc, isa_bus, pci_bus); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index e4b15f27227a..25dc40896673 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -276,7 +276,7 @@ static void pc_q35_init(MachineState *machine) =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_fl= oppy, - (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, + (pcms->vmport !=3D ON_OFF_AUTO_ON), 0xff0104); =20 /* connect pm stuff to lpc */ --=20 2.18.4