From patchwork Sat Mar 9 19:21:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 779185 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp853505wrt; Sat, 9 Mar 2024 11:31:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVEOo8SY1o30Hw5ctOn09ZZF7rHov1yFE8ysMFCx52GyV+HF/3SrP2SKdr/E2XhwCgN8BLzj6Jcx99gG6HPOZu/ X-Google-Smtp-Source: AGHT+IHGr5QmKZnXXlfmkMg318Q0c0/8yZyTM9qLbSu3qBoi8TWb1EOiSuhEqi8XvxDSLBkZiEvQ X-Received: by 2002:a05:6358:7516:b0:17c:2ce0:f76 with SMTP id k22-20020a056358751600b0017c2ce00f76mr3134981rwg.20.1710012703623; Sat, 09 Mar 2024 11:31:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1710012703; cv=none; d=google.com; s=arc-20160816; b=fwdfj1sZ6jy4478oZYcVG7T6paP0peAZTibUtW5PawkzUzTsMjYlIQo2x8k1XPYXxU 0GxO9CXsCbYyiWLPBVMVgXN7hVbYaa3B4UoEpj3naeC2sTlcvim8pkBskB2fx7HAmEl0 J6e0mBn7TjL3Y1mfMKp57mpMo3pi0uawKnFPpXFDur93MqMngehwX5+PKePMLBnw5KM8 r4lWN+3B+FWAgTYO5H4+PYCS0nZ+U/TZDVMMhOcVtFdT4+zOST1hs0bqmYjJFueOFB6Y LgiF+dxojv2NeWgtrIcUazS+0MhxFHgw8LJkhGQ9lE5f8NVitoTR6SLQyFhUQwWR/T24 O/Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+fuJ29vWBRe9UmwN0pN4V44UAyM0aAmIqNcBSmPyHVo=; fh=gqx0n3Ue1h09mayLThXsu3fzIoSeqIrGSk2lXDTLc2Y=; b=ccDEpURs1KnrzPTjUBn46MCcXKOKGZsXdH4UJBL4BK/cbIwNXMmPvLGCZaqpWY+wV+ pP4cDhf3o0GjXM0mLzr3MUIPsX3ddmquRao9aFo/GGT0ce/wwmEE4CsaE6h6h2vCIm7u mOamBSbHxgX/c21xliQUI4KDoVvohnAKZ+diSn5Yt53BqTrDr7GjiFUz9aX1Nl1dwDnN s6LPLwpSsOK7VBpYirznbYD/VR5EK1PAZCNef1ezmpoA2IMuncPZQS6OhKGpq365u6xa QwJudzyv+OZyZz3C9AeOshN6OXZ0Dw/3OLnhcwu9HAjQilYNMNfQMOCtsYLsRz6JyJZ1 FgLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TQBRYj9o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f3-20020a05620a20c300b007883f9bb7f8si2081610qka.579.2024.03.09.11.31.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Mar 2024 11:31:43 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TQBRYj9o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rj2J8-0004Uk-3Z; Sat, 09 Mar 2024 14:24:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rj2J6-0004PJ-FU for qemu-devel@nongnu.org; Sat, 09 Mar 2024 14:24:32 -0500 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rj2J3-0002pN-NL for qemu-devel@nongnu.org; Sat, 09 Mar 2024 14:24:32 -0500 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a45ba1f8e89so379418566b.1 for ; Sat, 09 Mar 2024 11:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710012268; x=1710617068; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+fuJ29vWBRe9UmwN0pN4V44UAyM0aAmIqNcBSmPyHVo=; b=TQBRYj9oVVvJad8rlOOGoPAGnUBtBMrNe/KfipJ2jsfgNFLgJxpMGrdpMZv15cBU66 wjguUt/JuktcOw2K0+vt8zScN+6wSx/NBgZHzKVh3KWtKc75qrERDku+w4XSChZfIO2z bleR5uAlL4jsH5ceFZqO54jUW/jiIWkSiXejrD4rlD4dWsCPAkbZ01yZzxH1uookLpdV Z8P9P417ZNiTMOIYk16VQR+EST5v513AththRotSyLW+rE1SBzpjR3NWje0/IRWVDagI //pd4mf7Mn71K+mKquo3XfOoiATSQJRuBVXzuNdpXs+OtT+x+DDp7g8KjDHjCt8D+pQG TFqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710012268; x=1710617068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+fuJ29vWBRe9UmwN0pN4V44UAyM0aAmIqNcBSmPyHVo=; b=vVBqN4H/ReiXN3Qm2rQBB9KclYh0p7SBmO/kW2HSq4UpxmNZMtnzY1F5XMgHzFMWS/ by/vP6kKQgiZSIazJcQC23xDw0JDNB+3si5NGsCJ2L0K6+wlP0Og6IRCqeuv/00mLRMs fKT+od9vCmu0t5F8QgLiWDWAcD3rSnrB31DBIe9WOWwjQe8lSv7JrW/HCPDFjTjem9fa cYhP9TGheZsCux7t3DRwAbu4MGQNJcBc4tvarTnxvuCrOfCM1SOU7U1p+PUguVfSDLKn WZOceVF35YXjYQoVpjjhtF7n8n+2UEXonGg1Z2bIx+Y7qk/T3K2jIIzuRxSXLn0izsjV /h1g== X-Gm-Message-State: AOJu0YyTNsDgCJdUnCYKiFpaJn9V1Sp27gPvgNx3FqRcDJowkzcF7r9y ncBk4aF8/bnY6wnY0b6dglW+FZhq5y/a4FB3hsoIDZFFjkGt9qWlK0IM8JCWSmyMYJXGtrEM65s e X-Received: by 2002:a17:906:52c8:b0:a45:a2cc:eb8d with SMTP id w8-20020a17090652c800b00a45a2cceb8dmr1224240ejn.25.1710012268039; Sat, 09 Mar 2024 11:24:28 -0800 (PST) Received: from m1x-phil.lan ([176.176.181.237]) by smtp.gmail.com with ESMTPSA id bk15-20020a170906b0cf00b00a4617dfc36bsm124195ejb.178.2024.03.09.11.24.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 09 Mar 2024 11:24:27 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Bernhard Beschow , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PULL 22/43] hw/i386/pc: Have pc_init_isa() pass a NULL pci_type argument Date: Sat, 9 Mar 2024 20:21:49 +0100 Message-ID: <20240309192213.23420-23-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240309192213.23420-1-philmd@linaro.org> References: <20240309192213.23420-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=philmd@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The "isapc" machine only provides an ISA bus, not a PCI one, and doesn't instanciate any i440FX south bridge. Its machine class defines PCMachineClass::pci_enabled = false, and pc_init1() only uses the pci_type argument when pci_enabled is true. Since for this machine the argument is not used, passing NULL makes more sense. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow Message-Id: <20240301185936.95175-5-philmd@linaro.org> --- hw/i386/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index e14dce951d..319bc4b180 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -450,7 +450,7 @@ static void pc_compat_2_0_fn(MachineState *machine) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { - pc_init1(machine, TYPE_I440FX_PCI_DEVICE); + pc_init1(machine, NULL); } #endif