From patchwork Thu Jan 5 17:38:26 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: 639325 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp346273pvb; Thu, 5 Jan 2023 09:39:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXtTJPHb9azaCEI3Z9uBC0428Vu2ip4gBhkC6//HLy4G3cHXsGvU5OBtQY7gmXnYED910cRw X-Received: by 2002:a05:6122:f88:b0:3b5:a9:2907 with SMTP id br8-20020a0561220f8800b003b500a92907mr24771583vkb.13.1672940389337; Thu, 05 Jan 2023 09:39:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672940389; cv=none; d=google.com; s=arc-20160816; b=iIhIDxAotg2ibNJYEKA7g+ScSGsiEhG6iulf2U6moEWL3FVHFoiGFRRdUfon/GtSlV QJAFNw4xSVgIFiin8Eps/E9HY3fkRxkEnOraEvtpeniB162GBvggViJf62l7JCEuvAv7 9MfVPw8xFDrcU3Ns45ljMLm//m7pdsibOekj077i0RqZGlZRTy5Ztdp6pKeseyCbGpB/ lq8SKv8FkzGjNmA7SeYKLbeGLJ+3rV2yfxrNnB3qNO+IQy248fGhc0nPHjX3ZrM7k/HT 8IXFy/GHXyzZ1x7viIaK9fyFJT3rUFpAvsbV1DyqSoKXbaC9TvYJ8YB2t3F9wenVs2OS tO4Q== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=KQ17OhOko7hPWDzJpQWUm7VE4a4l3d5cAGIgcTVHWzk=; b=fXaKMGH8TNuNHkuWUJmx8pSjmJwhB5eKASKTB0ArKL7muJBUfYeYvUgfs3d9wkgofU 2TSCGwSnDbKnciegroSauIQBI9JQfIr4GaDwkJNNfykCTehb/M9i0Vvkftl6wIvahSIX K4DnD3o59+0Aee71IdelEicwxHT1WyhxIMhag64wqyt3At2YjKw+KlT/Rq+EiNCkgE0e JQCe7d0fIt69OgEM4nt0GtABTz9fEQzttsL+pKye8rOITzei5SCs4IZLO1xPKklPz98b y5nf/+DIN6O6Fao/FkcbTVcz4PqSL3Rlmp7i5TYvF/5r1C5vM5Q+aVY9cDPI2Bmk1216 IKsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m0bvoVe4; 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 c25-20020a05620a201900b006fb9da740casi18672341qka.339.2023.01.05.09.39.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jan 2023 09:39:49 -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=m0bvoVe4; 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 1pDUCM-0002UK-HE; Thu, 05 Jan 2023 12:38:38 -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 1pDUCG-0002SE-RV for qemu-devel@nongnu.org; Thu, 05 Jan 2023 12:38:33 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDUCF-0006VQ-5W for qemu-devel@nongnu.org; Thu, 05 Jan 2023 12:38:32 -0500 Received: by mail-wr1-x435.google.com with SMTP id bk16so23639438wrb.11 for ; Thu, 05 Jan 2023 09:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KQ17OhOko7hPWDzJpQWUm7VE4a4l3d5cAGIgcTVHWzk=; b=m0bvoVe4Pg6NoduZWJ9YylESH0gk8GNUOOhTm2Y4anYIxOU/2BbYgKwXyELz13zcJw uYEsZ/BFPSVE4NU5kbXpVGyPnBUF+gUAlwi5sxMr+LFjll1scAerM+B2uiC7eIAaX0j/ CRIXr9nGqAKDd96U7WEz9fovTksCH96ZNbAEIUhbX1pgo0Prg7vpFAcLaJDga+k3Qqvu QCWmMevCz3POXqeyAaNy3cVgan5QPty2Mkj0goD17IYDR6+zOxoHqf3pQtMjhX50drL/ T+n5+CV5EFdjRW5xQd/oadLqYnPl6Gb4RPKForWsF+16Z3tj/5NCUVx26SJ5KthwnvRu IJVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KQ17OhOko7hPWDzJpQWUm7VE4a4l3d5cAGIgcTVHWzk=; b=s97aBxErxBsHUcscRTLyZX33WQ9ZTBTWAO15iV5PzDIC6Op5lMFmaML1/6I1RRQ7gO ww1NtTxI8PnC9zaZgkwpnRQzQLd6lrSZlg8VJ5MJHWXpU2BzyvJXy29wJ6ONToARp8ZL FzrIaGq9aNJY6tkDxHLa2Ld/Y5KOISaEguelg7qIU+z1dfwGfogmOZ2L1eHat5HQd1uV OfVTzListFdAD6/Y2nP1ebH5XVuzJK3cOe67Dc8CHBrIIQmAPuJ0pok8JfBNVsQJRpaM Z+mNOvFEoqAKe1RumtnUQAajbvEyXMrbVrw2OSRU/lJz2las0cppJl2Pk+whBUSHQhSr GqjA== X-Gm-Message-State: AFqh2kr8F6M7IYZMZtM2FEtu3S2Y6w5ObxdUbIq4MXzkcrz4MKfbzsC7 MvaBb3DzwYLJW4POYDV5mfPDTvBD9y91d12w X-Received: by 2002:a5d:6a43:0:b0:242:13bf:29de with SMTP id t3-20020a5d6a43000000b0024213bf29demr31715230wrw.52.1672940309206; Thu, 05 Jan 2023 09:38:29 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id q7-20020adff947000000b002426d0a4048sm36453472wrr.49.2023.01.05.09.38.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 05 Jan 2023 09:38:28 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcel Apfelbaum , Eduardo Habkost , qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init Date: Thu, 5 Jan 2023 18:38:26 +0100 Message-Id: <20230105173826.56748-1-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 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 This argument was added 9 years ago in commit 83d08f2673 ("pc: map PCI address space as catchall region for not mapped addresses") and has never been used since, so remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow --- hw/i386/pc.c | 2 +- hw/pci-host/i440fx.c | 3 +-- hw/pci-host/q35.c | 3 +-- include/hw/i386/pc.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d489ecc0d1..6e592bd969 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -782,7 +782,7 @@ void pc_guest_info_init(PCMachineState *pcms) } /* setup pci memory address space mapping into system address space */ -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, +void pc_pci_as_mapping_init(MemoryRegion *system_memory, MemoryRegion *pci_address_space) { /* Set to lower priority than RAM */ diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index d5426ef4a5..262f82c303 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -272,8 +272,7 @@ PCIBus *i440fx_init(const char *pci_type, IO_APIC_DEFAULT_ADDRESS - 1); /* setup pci memory mapping */ - pc_pci_as_mapping_init(OBJECT(f), f->system_memory, - f->pci_address_space); + pc_pci_as_mapping_init(f->system_memory, f->pci_address_space); /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 20da121374..26390863d6 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -574,8 +574,7 @@ static void mch_realize(PCIDevice *d, Error **errp) } /* setup pci memory mapping */ - pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory, - mch->pci_address_space); + pc_pci_as_mapping_init(mch->system_memory, mch->pci_address_space); /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region", diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 991f905f5d..88a120bc23 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -156,7 +156,7 @@ void pc_guest_info_init(PCMachineState *pcms); #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, +void pc_pci_as_mapping_init(MemoryRegion *system_memory, MemoryRegion *pci_address_space); void xen_load_linux(PCMachineState *pcms);