From patchwork Tue May 23 06:12:06 2023 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: 684885 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1549152wrt; Mon, 22 May 2023 23:13:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kK2TnZQ9yJ46pg2NeuYjHn70Prrfac4Z6Jf/KbXxzMQXu+j2kwaUVaXPTw0WNQUH27tRT X-Received: by 2002:a05:6214:500a:b0:5ee:e4f8:c7e5 with SMTP id jo10-20020a056214500a00b005eee4f8c7e5mr19962714qvb.41.1684822432969; Mon, 22 May 2023 23:13:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684822432; cv=none; d=google.com; s=arc-20160816; b=KmzrvIgMXJ0MPF+SdhtzY3Cp2aix9/jJmtANR9XLWXbibpUc7+d1FUi0y3FNKxoE3w j/QbFB3yfCTSQzmyxAIpogAJRsK/JetW5BERIJVCFbAI8qDM5VQmxrxmfIcUsp7Iznbj mr4Y+p57oniayzCAoLRvvG66Gj0BLpYWlptkz4IHx2iSdhbLyFOQL4gaoXQ0U7Cnxj6/ 320zqBhJDfUmFxzz4/XyrT5Am2yQnDvjetLlPvPUyEoIl4l1Yxr1llOlHNUx2OeTaiKM j3m/GHlrW1o7su0YnHWLJ47CcE/93DZfJ3CX4r+DFsn/P1Cdw2uhMc64C/h4cmAYzXMR KbMA== 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=COK8ArK9HCGV7dddfTJnezNiZomsbkwCtC2egyZo1Mg=; b=HfQnDvp6cjzJ3CUX6NnIRVtztYxr18N9LUjj5Xfv5aTlCAheUgdNWPKVzkn0r9Co/X bX6U0368kqFRDnrh0gUcabb0G881c3qvRo+jkDiE+aWhWyX+MozqSTwxdK4F+SDPjC2D C9P2/gCF6Ipid2whCGR51mZzNgBVGRYrQjBAZTgaCuufvs/pjRBIlCEbXBYiB/oRVD0K iO6uMQy7Sk6d3gYlWmgbkEmXzNk6inprX/XBRrMo7SoCi2S+ZDeHzJLLOzH8pQayp2K/ SHYI9okc5TqAKtOF/XoRHdBSnD8CEG3iD6u/mJpFde/Q5XHKL2XXoFtfMncyD9PDRS5k wesg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Yq3/SmwS"; 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 jn10-20020ad45dea000000b0061b75442085si4451809qvb.40.2023.05.22.23.13.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 May 2023 23:13:52 -0700 (PDT) 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="Yq3/SmwS"; 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 1q1LGU-0000KU-PV; Tue, 23 May 2023 02:12:58 -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 1q1LG3-000084-Df for qemu-devel@nongnu.org; Tue, 23 May 2023 02:12:34 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1LG1-0005HY-46 for qemu-devel@nongnu.org; Tue, 23 May 2023 02:12:30 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-309d3e8777cso2206946f8f.0 for ; Mon, 22 May 2023 23:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684822347; x=1687414347; 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=COK8ArK9HCGV7dddfTJnezNiZomsbkwCtC2egyZo1Mg=; b=Yq3/SmwS4ficbNhmaVHY92cqgGJxycWoEDAN0RmwiKiWSlLO2G22aYs++YYfZdxd1Z mRgkISUri+Q6vwNFoV4CYDXTJXHWLLPeG9zXLop/2FzB0bLmALSYLYmxpoKfHkEVd05f rh5MispZtv2jMlgniLg1sJTmqtsQ+2Sh8ICUmCcBvDelVFZ9IUqXqjvc5Av/rhyvDGXA CHJEk3sIAwnvYT65vAWpLb9zWU1oOs1gdUpxzodcQN2uJr6dVnUoUKq2rMNfc5YkbgEE B45v1bDoJ6HXvoKyVkyAjk3TEKW8NW6bZZ6yv9jW8kPC7+v/yJaiSv5vdI/qvSJ0ObaE WdTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684822347; x=1687414347; 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=COK8ArK9HCGV7dddfTJnezNiZomsbkwCtC2egyZo1Mg=; b=XBxovRV1+i8vEHxETvfXuwApW+KBiqlCY4SXp8WZ3kwCzx6xSmm28oXv1xFHnxeYWc t1CsCcXV+Wke5CtlJt1ICVEJWE60BDg4F+vaPivMoR0YHJwsXLyWMlDQn1LV1MQd3yzL asg3psC8GIxGji+DsEt/1teWcW+VkC161eSZcUAgZBV1e8CECZbC6HQhWJNDTCgDwlpg 4maUhl+XcZ7+cJbl/NYElvX8DRZV6HXq2eG4iF+RPNVQIOCWPrhz6rbuZjNKnZbHYI9c GL2UtbveXN/hWtdr7wkxaHd/xkmgS9fhqRvrXPCV4cc1swed85GyIb9B5JHKxUnLBDPA bSpg== X-Gm-Message-State: AC+VfDw647fqI7bhhZrdcStdsSmILi+gJSLImJYpX+vL9/+/tmEYFMlv uAl089ic7PcZBIxq1M9+9oDAisD4Fbusf62Gc7o= X-Received: by 2002:a5d:4204:0:b0:307:7d1a:20fd with SMTP id n4-20020a5d4204000000b003077d1a20fdmr10396367wrq.12.1684822347356; Mon, 22 May 2023 23:12:27 -0700 (PDT) Received: from localhost.localdomain (vil69-h02-176-184-48-94.dsl.sta.abo.bbox.fr. [176.184.48.94]) by smtp.gmail.com with ESMTPSA id o9-20020adfeac9000000b0030647d1f34bsm10031319wrn.1.2023.05.22.23.12.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 May 2023 23:12:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Sergio Lopez , "Michael S. Tsirkin" , Eduardo Habkost , qemu-trivial@nongnu.org, Richard Henderson , Gerd Hoffmann , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 3/4] hw/pci/pci: Simplify pci_bar_address() using MACHINE_GET_CLASS() macro Date: Tue, 23 May 2023 08:12:06 +0200 Message-Id: <20230523061207.48818-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230523061207.48818-1-philmd@linaro.org> References: <20230523061207.48818-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 Remove unnecessary intermediate variables. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/pci/pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1cc7c89036..a2cb6071cb 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1444,9 +1444,7 @@ pcibus_t pci_bar_address(PCIDevice *d, { pcibus_t new_addr, last_addr; uint16_t cmd = pci_get_word(d->config + PCI_COMMAND); - Object *machine = qdev_get_machine(); - ObjectClass *oc = object_get_class(machine); - MachineClass *mc = MACHINE_CLASS(oc); + MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); bool allow_0_address = mc->pci_allow_0_address; if (type & PCI_BASE_ADDRESS_SPACE_IO) {