From nobody Wed Nov 27 19:37:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697645495; cv=none; d=zohomail.com; s=zohoarc; b=cyxpm/YV/dRpBn8g29V8WdCBxH/wSC57HU4iO3zJU9Tx6zEGju1o6u1za9Q8SXgnMLGr1dXOCft6XQtdY67IDcmuskHCXcmVRDlcL9nFz5vUdv1X3qyL3xkAOVZDSDMWohAOjz2ohYoRk1mvoxXw+5ZQdfWhlpnF3dwDLb08uow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697645495; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Zb7+9uBs0aVVSmIJfkcKx4/iAP+jZ8ER447ZRZ+1lm8=; b=Rbhcwl+RvlGMa5mDfEWVxJ7cSyOBRaWtIPpyfYNtS+CR9iIUyRoSoOOIlR7hn/J0lCNqlxk18vdCLG3ZBfhbQ32LdKzVpWscWIbE7G+VxbDH8n+h3ziBRSmdFwaXX8SCMJ70CWn2PIO7EpcMkxhz/glVsY01xq+MivPLl8i7SdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169764549564695.4331543953972; Wed, 18 Oct 2023 09:11:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt8vM-00069N-8K; Wed, 18 Oct 2023 11:57:32 -0400 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 1qt8v1-0004YQ-JZ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 11:57:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qt8uz-0007DI-1t for qemu-devel@nongnu.org; Wed, 18 Oct 2023 11:57:10 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-577-TeSHBGmtPKe8M52AS_j3xA-1; Wed, 18 Oct 2023 11:57:07 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4055ce1e8c4so36991075e9.0 for ; Wed, 18 Oct 2023 08:57:06 -0700 (PDT) Received: from redhat.com ([2a02:14f:1f2:2037:f34:d61b:7da0:a7be]) by smtp.gmail.com with ESMTPSA id v7-20020adfebc7000000b003196b1bb528sm2387972wrn.64.2023.10.18.08.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 08:57:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697644628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Zb7+9uBs0aVVSmIJfkcKx4/iAP+jZ8ER447ZRZ+1lm8=; b=fyIMJde8eJKmrjbLE31aUZdYrft3ltCHGWvI6z6VhjP8/3rsbLpNI8IHfFTYu4snsTo60t 0XlLmA5ma1RoGAMDyS30t+py8/qDXjtDNfSz+jok2E14iyODUJDtYIsbETj/LYb9J3HE9E 5HIb8ZvmlktcMw/ovw+4F2T2C1iX3Qk= X-MC-Unique: TeSHBGmtPKe8M52AS_j3xA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697644625; x=1698249425; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Zb7+9uBs0aVVSmIJfkcKx4/iAP+jZ8ER447ZRZ+1lm8=; b=R/ueXKeWh3uXTDXU5gNCpjop1tvyaKjfrrB77cdF/+VLk5aba6FuikG44z6uGQp+q1 iiFyHiz52it9Y47lskbRr0fpEw5/bpN2aPU+vcEq1eaIhH32mJAEo1q3STR2n23fYcW2 CDF3R8r74Bi6vcZ7nuc9jm6S5ZF3ZE9JH/c0trTGTwg70PQI7wVAwxX+YpUsmzIakn9T PMssf2dWRRA0Jz6+71RH2iIo7LnSwMDZTCVNdfb+h8kDmH5eWZktvyVJxJcz+3XuQ+XR OzuCdOAcbE3slEJ8w/L32Hc35eKmPt6AhCMRf5gYAouR5yKzY9HMha2myC7sAFdU0SFg 4NsQ== X-Gm-Message-State: AOJu0YwNmv38Rr+E2E1ronSHS9WFEkMnX+9ASRfF2bjTXYJwgxizlxXK khskB6oMjzSrxpRs6pXxZbkrASn6zyRwPNf4u7yeGgCny3r6jrX7wYYzjXxY6q9ZovnoeZWu7/g oXdg3oxOqH7Q0JLUmEL0OByLCcpVc1OqonJsqhDybKRlWJFCQGGY6SqByw+8OD8yIfn49AJ0= X-Received: by 2002:a05:600c:3d14:b0:405:2d29:1648 with SMTP id bh20-20020a05600c3d1400b004052d291648mr5324422wmb.19.1697644625438; Wed, 18 Oct 2023 08:57:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGG8t3Do19EdyXZG8RCuoxvusSgLlINcXxvxXQndb7Cj5OCAh9F7BsUK9YDo408KdxGdCLLxQ== X-Received: by 2002:a05:600c:3d14:b0:405:2d29:1648 with SMTP id bh20-20020a05600c3d1400b004052d291648mr5324397wmb.19.1697644624927; Wed, 18 Oct 2023 08:57:04 -0700 (PDT) Date: Wed, 18 Oct 2023 11:56:59 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Bernhard Beschow , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PULL 48/83] hw/i386/pc_piix: Remove redundant "piix3" variable Message-ID: <16880173d8a76d4423d377dd966a12d1f312d894.1697644299.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697645496143100007 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bernhard Beschow The variable is never used by its declared type. Eliminate it. Signed-off-by: Bernhard Beschow Message-Id: <20231007123843.127151-7-shentey@gmail.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 4dc7298c15..cd6c00c0b3 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -261,13 +261,11 @@ static void pc_init1(MachineState *machine, gsi_state =3D pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); =20 if (pcmc->pci_enabled) { - PIIX3State *piix3; PCIDevice *pci_dev; DeviceState *dev; size_t i; =20 pci_dev =3D pci_new_multifunction(-1, TYPE_PIIX3_DEVICE); - piix3 =3D PIIX3_PCI_DEVICE(pci_dev); dev =3D DEVICE(pci_dev); for (i =3D 0; i < ISA_NUM_IRQS; i++) { qdev_connect_gpio_out_named(dev, "isa-irqs", i, x86ms->gsi[i]); @@ -288,8 +286,8 @@ static void pc_init1(MachineState *machine, XEN_IOAPIC_NUM_PIRQS); } =20 - piix3_devfn =3D piix3->dev.devfn; - isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); + piix3_devfn =3D pci_dev->devfn; + isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0")); rtc_state =3D ISA_DEVICE(object_resolve_path_component(OBJECT(pci_= dev), "rtc")); } else { --=20 MST