From patchwork Sat Jun 10 06:57:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 691159 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1172281wru; Fri, 9 Jun 2023 23:59:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6opv28qGJABHLxJkSaFYIe8sA+SZM3sN+0SGWMw0sKyENOQ1Mr6dEHcv2bBZcFHBo6/Pdu X-Received: by 2002:ad4:5aeb:0:b0:62b:4590:78d6 with SMTP id c11-20020ad45aeb000000b0062b459078d6mr4187471qvh.25.1686380365739; Fri, 09 Jun 2023 23:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686380365; cv=none; d=google.com; s=arc-20160816; b=NNbOFdYS7+niaN+2WI0Gyu7fs50dSY81s6OZTJKeFVEA/jjF29x5QPxot159Vz/PbP V+eDsAU+rYEikKVHpoTOs9R1Wpzx9z59PyZCoNACoa2QhT7Lk33Jqwhu7pQkPheAfX+u 2V/AkFsccYPAutiHGdaKw8goBdWx1QSjSfBz1m/H4WoZyxIWU39kRHcoP9ihK37zfh0K esTVgUjVr2qlwPvKC+450mkAlWyjgbTW3axlca491qyH2IAAI003sMUlF5ykQXU8s3aD nJw9fr74+xVaWW19uaPijG31pJSKj42hgVWDpHcp+KI2uQKeYbihK2xNHt34lXKb03K+ nNPg== 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; bh=EKctaWaPUx8z+IdN2jTOqV27tsVr+xUuritqnoueOkk=; b=gNNM1SH4hVWPcQ0IDrEvDxeszoyOKtPxinzwRslZW88WymGNGd8Qy38doQrYXRKlla lvgDfQyiCr3SnvU9t95ufD6sHP0gkk5clV8BD8V6qzN3Ag0Z0fOND270Qd2+Of1H3/cF aOigl6DQKbMQ5Ex3bBR1nUXPxHEE6MTd3lWxeUx/oAXA2/JhtbDugr9G97UzmrraSZTY I8Kf3L/RT6/WhrsYWc6Sg7NvavPlRBY/9vbM0oOO5ZA90WTQJGNomBOic5s9o2Y1kTqV 3ElWcYYuqTWgqvDKLpJ0RCFDz8k3RqV/qmoHgjXBChcfC8E9wYmLfkkjqM64zJL6Bavi JpBg== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o7-20020ad45c87000000b0062576870bd1si3634107qvh.498.2023.06.09.23.59.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Jun 2023 23:59:25 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7sYj-0002si-Ru; Sat, 10 Jun 2023 02:58:49 -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 1q7sYJ-0002lh-NW; Sat, 10 Jun 2023 02:58:25 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7sYH-0005xD-54; Sat, 10 Jun 2023 02:58:22 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 344FDBE2A; Sat, 10 Jun 2023 09:58:01 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id C73FFB297; Sat, 10 Jun 2023 09:58:00 +0300 (MSK) Received: (nullmailer pid 1107523 invoked by uid 1000); Sat, 10 Jun 2023 06:57:58 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Richard Henderson , Michael Tokarev Subject: [PULL 10/16] hw/pci/pci: Simplify pci_bar_address() using MACHINE_GET_CLASS() macro Date: Sat, 10 Jun 2023 09:57:48 +0300 Message-Id: <271233f21f66c10194a45c1bff1db61fe2694a22.1686379708.git.mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Remove unnecessary intermediate variables. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- 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 9b7b4d7c18..bf38905b7d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1446,9 +1446,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) {