From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110764; cv=none; d=zohomail.com; s=zohoarc; b=VTZYv8uxKYAoRcE64dcRe+AyO513gNXjeXkO6CahDjxDoHSl9Amk3dO1wlI7N5JAiuS6FSv5weyyXVt8nve9A/dmxCih/y5b8JhLHny1S8r99tVlwVEhLvDH+Y3zQ0gHDfJFhBn0SJWlydLKsyCKup0PN6pU2FJVtCKfSThLto8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110764; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=scUO39qFpFyGdXPS7MAJnaZv6OMhNhlBVyg/wILuYRw=; b=nEsIal3+pxW4J3LSome2aQSCZ8ZKJUd5cEDjrJ3/iMtjCbyvuom6X/KKew1kcY3lMXlHPdwZH0GIlgvXuVr5LxDcdxBOUFjGNXf+GeK8ySwsUtJ1fRko7NnNQOITBXOmnDGhSZ9WX8QT2xi7uslEH0wE+eG1l9d8rkQ7BLqv9QY= 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 16881107646752.741777733509707; Fri, 30 Jun 2023 00:39:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hE-00022Z-KN; Fri, 30 Jun 2023 03:37:36 -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 1qF8hB-00021p-A2 for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:33 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8h9-0005Oy-MA for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:33 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-98e0c1d5289so179347166b.2 for ; Fri, 30 Jun 2023 00:37:30 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110649; x=1690702649; 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=scUO39qFpFyGdXPS7MAJnaZv6OMhNhlBVyg/wILuYRw=; b=Ewh8dJWz70BaKtNgEmV637gkQGL0ml6xjF5ndgqI8bMJIgfWN5wVOByhGPbUyYw8XZ Ktnq7DRFGobZ0RtSUEDzLEZ3tTooXSRyVHECPQFHbdWCpXjxnrWdsenhx4/XwwTNc4bI eSU/yvwNDL7usCQFnWk4qj7Iu4kUgGCbJ1MOpzpNBGNP2lBGbONeavfwYnZ4M5cDWG3q YyL1dCiHfUBCDWLi2II/vzgayM9JZ8HC3/KJ3AT0iY/B6wFrmM0mbI73ouC2AOzoMGlf zijkBCBraEQHwzv9CMh/RNGpKAjLeo5XqWFLvtKLTiJ8NzkauxObn9vOV2cnl1128NcR akqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110649; x=1690702649; 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=scUO39qFpFyGdXPS7MAJnaZv6OMhNhlBVyg/wILuYRw=; b=OSxvLBLHDvtebt6AfPqAFh4iIJ4gicDluLujYBXvmMCjOu9VsKZ3+zysL3zb3DCPHf XnBOrPmh0zG/PGKMUYVzSOAs9nKERZTq646+chnZsNR6i/vS3+ee8JdiLrRZGwunz2+q RnRWZ/E0ELv4s6VVwkgcjXvkiiBn79v4lzqox53qSbBW4JGqrt+M0uVLUgwd4JKdDPBg i8POLnyQ9nZXLt+CApbwR0Kv6U7LD/ifjH3BHhzEGOpDrz0Kto6aiXzWnql323dtpfUT GB6W/hEbzuvTVTyF9pdXUyhUbv+DXVXpPgJm3PS63yFNzzgSoluknCQc/L6M4ujq/odF +KVQ== X-Gm-Message-State: ABy/qLaaVcjfjK0SxrcJ8lXjsRBE0PXpPptoSecmFGQinSuJyP9q4c8P 90NwQPymr+WH7NJBq7h5/scDDW1PwD0= X-Google-Smtp-Source: ACHHUZ7dnjB6lA4TJE7J8VSehqhdQPuddttF5UyiJglqx49BVBvz0cdz/xTivvgU1XqNz4it63/Tsw== X-Received: by 2002:a17:906:81d8:b0:96f:afe9:25c7 with SMTP id e24-20020a17090681d800b0096fafe925c7mr1219175ejx.10.1688110649245; Fri, 30 Jun 2023 00:37:29 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 01/17] hw/i386/pc_q35: Resolve redundant q35_host variable Date: Fri, 30 Jun 2023 09:37:04 +0200 Message-ID: <20230630073720.21297-2-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110766498100003 The variable is redundant to "phb" and is never used by its real type. Signed-off-by: Bernhard Beschow Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_q35.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 11a7084ea1..d9f3764184 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -120,8 +120,7 @@ static void pc_q35_init(MachineState *machine) PCMachineState *pcms =3D PC_MACHINE(machine); PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms =3D X86_MACHINE(machine); - Q35PCIHost *q35_host; - PCIHostState *phb; + Object *phb; PCIBus *host_bus; PCIDevice *lpc; DeviceState *lpc_dev; @@ -207,10 +206,10 @@ static void pc_q35_init(MachineState *machine) } =20 /* create pci host bus */ - q35_host =3D Q35_HOST_DEVICE(qdev_new(TYPE_Q35_HOST_DEVICE)); + phb =3D OBJECT(qdev_new(TYPE_Q35_HOST_DEVICE)); =20 if (pcmc->pci_enabled) { - pci_hole64_size =3D object_property_get_uint(OBJECT(q35_host), + pci_hole64_size =3D object_property_get_uint(phb, PCI_HOST_PROP_PCI_HOLE6= 4_SIZE, &error_abort); } @@ -218,23 +217,23 @@ static void pc_q35_init(MachineState *machine) /* allocate ram and load rom/bios */ pc_memory_init(pcms, system_memory, rom_memory, pci_hole64_size); =20 - object_property_add_child(OBJECT(machine), "q35", OBJECT(q35_host)); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_RAM_MEM, + object_property_add_child(OBJECT(machine), "q35", phb); + object_property_set_link(phb, MCH_HOST_PROP_RAM_MEM, OBJECT(machine->ram), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_PCI_MEM, + object_property_set_link(phb, MCH_HOST_PROP_PCI_MEM, OBJECT(pci_memory), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_SYSTEM_MEM, + object_property_set_link(phb, MCH_HOST_PROP_SYSTEM_MEM, OBJECT(system_memory), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_IO_MEM, + object_property_set_link(phb, MCH_HOST_PROP_IO_MEM, OBJECT(system_io), NULL); - object_property_set_int(OBJECT(q35_host), PCI_HOST_BELOW_4G_MEM_SIZE, + object_property_set_int(phb, PCI_HOST_BELOW_4G_MEM_SIZE, x86ms->below_4g_mem_size, NULL); - object_property_set_int(OBJECT(q35_host), PCI_HOST_ABOVE_4G_MEM_SIZE, + object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, x86ms->above_4g_mem_size, NULL); + /* pci */ - sysbus_realize_and_unref(SYS_BUS_DEVICE(q35_host), &error_fatal); - phb =3D PCI_HOST_BRIDGE(q35_host); - host_bus =3D phb->bus; + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); + host_bus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0")); /* create ISA bus */ lpc =3D pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC), = true, TYPE_ICH9_LPC_DEVICE); --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110671; cv=none; d=zohomail.com; s=zohoarc; b=bRvtmyIYIvz0MfqBhXPFgbOTATDSYvv9ww4RvFL9JekXamRzli/nckpz0PipVfQ9B53R0ZD/gBR+9aoD58v2yYfJ6j/Opu5PRyfpKrJckCAJpYbYfHQY1ge4wFHQgUQ2n02N8UStaDHxlFd9PYRVzQIgYbAnkhUJQQGe6XoyB9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110671; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qYD68kEPFclICXbOLUMz7Z2cY+C5HyXMhNA+XfCtq1g=; b=hU3QPOzQMfjj5vj7teNOIN6WBstN8hYNrqL9lX7or/kevtgRupwagUjCQrPxrIEYtVzr1ePRjAKVbQSjORd4VzauNJkdFF0pLLtcnz+WXtPd0YIXhefrk2Hf3FaHP/WOI2VTWvF/057cIdXHJgc1Q4xggqQKXY4NMGtDTL5baOc= 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 1688110671206471.06334217299684; Fri, 30 Jun 2023 00:37:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hF-00022v-08; Fri, 30 Jun 2023 03:37:37 -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 1qF8hB-00021x-Vt for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:34 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hA-0005P5-5Y for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:33 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-992dcae74e0so57788466b.3 for ; Fri, 30 Jun 2023 00:37:31 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110650; x=1690702650; 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=qYD68kEPFclICXbOLUMz7Z2cY+C5HyXMhNA+XfCtq1g=; b=cMLi8dLimg0ZC1JZPXyyxwpRR+1WfYEOXkOC2Ogr6LgW8r6wvYHigAYQIGwH31+0I3 fJC/Q7r0f5aIN4kKHc/n1Ot6G7tkMfkn++6vhTTf6RmJ241ug2ehqQ8uAcZ3/RVoaljv U0X79FJE0L8K0Yd8N7pgwuJ5pxD8FSh3O8DU/EFTt5Aiqa1RLVU5Jo5yazQ88OFddyVX p0ETk+Gf63JsEmfU14SlqgzFZCg2M0oz3cZTXGEL39T5Vavpj5La38WphLAroXxkA9lJ DVL2a2etpFYSkX6iyrOH2WdPuD9Gay/q8u6ACoBFGXyORCE+ZXGtg+PVobMjm6YyhEfr 5zcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110650; x=1690702650; 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=qYD68kEPFclICXbOLUMz7Z2cY+C5HyXMhNA+XfCtq1g=; b=XuytUKp9c6KPwVzSGu2MhPSE9bN1CfZA8e4hvsdcGgZyy6Z6dEj8bc9EsEw78mf8UE rsDkP+ezxQNSFMJzJ857lOAXI5wCn8aHGfz/QDmz6LBx7yKmiCiXBKak2xIENTrg7jPu 4xMc3a+9INDp/TO/Y726d37HyzKzEBNps2jwC+mmjvsuWcS1LxUX8ng7GMMrBdJn2GVV XD/aZClLSkJQw839PZbFnkoav6vMM/GRd/wpEaFsoFBHC9m4egGUCEx+tw2+SHQsqvX+ wH+ft9FcwQw5Ys93R89t0Yi0SzSf450pRxx1kWTttglvXiXQqf5UsyhGOkDgrpbJ2Yw+ XqJQ== X-Gm-Message-State: ABy/qLYaJHiMdxqhnUEyu3wLSGCmB3Bvzshty4GsQqe0FKOyNciRBS4T Py9PUYncC0w8/KyjrrsMBTrLuEOGWuQ= X-Google-Smtp-Source: APBJJlHFEFXaQXb6sItsxlMy7MR79qaAyUdE10f3o/SGZ9lmNr1Cf75u1UAt8dDWZa1EHMMmRo/FCA== X-Received: by 2002:a17:906:34d5:b0:961:a67:28d with SMTP id h21-20020a17090634d500b009610a67028dmr1203132ejb.22.1688110650461; Fri, 30 Jun 2023 00:37:30 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 02/17] hw/pci-host/q35: Fix double, contradicting .endianness assignment Date: Fri, 30 Jun 2023 09:37:05 +0200 Message-ID: <20230630073720.21297-3-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110673350100006 Fixes the following clangd warning (-Winitializer-overrides): q35.c:297:19: Initializer overrides prior initialization of this subobject q35.c:292:19: previous initialization is here Settle on little endian which is consistent with using pci_host_conf_le_ops. Fixes: bafc90bdc594 ("q35: implement TSEG") Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/q35.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index fd18920e7f..84137b9ad9 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -285,7 +285,6 @@ static void blackhole_write(void *opaque, hwaddr addr, = uint64_t val, static const MemoryRegionOps blackhole_ops =3D { .read =3D blackhole_read, .write =3D blackhole_write, - .endianness =3D DEVICE_NATIVE_ENDIAN, .valid.min_access_size =3D 1, .valid.max_access_size =3D 4, .impl.min_access_size =3D 4, --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110671; cv=none; d=zohomail.com; s=zohoarc; b=Hh4EsAgxMMvQc0H2ymZ5PDMn7e/34ZLnPquwy0V7+icm4zLtgSfeXOUfqTdSura9dLKH2btBJ1vgKoDgVO7dYAet0oJ9+nPXI0B8N/2CDqgfHdAJw535iBXtTdjhMe0g+cHqCzW/BYxVDZqYM5HmCTWUx3LxRrYfPKHNtmLKRXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110671; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CCVk7jdt1nDqHH6A+S2BbR5/KvJS5BvxayG0t6p+t7Q=; b=P4/sjUanzC8LewGc3y6PvQfquHZvc/VWtqJosDFCdn6bLr0Rv9+R9Czu603dA+TWCMbL97uS2Gnz2hgPHfW41sXWCa+HNgmZke8LB1+LbpVUjV0ruhfR0LCXwtTqpjpAk3bkYly7nkg4mvbtjq+RMBleImgRAPIHAs9Hn/D5A6g= 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 1688110671291340.9745974394815; Fri, 30 Jun 2023 00:37:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hG-000239-TS; Fri, 30 Jun 2023 03:37:38 -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 1qF8hD-00022O-8p for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:35 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hB-0005PB-HI for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:35 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-51d8fa4dbf9so1586616a12.1 for ; Fri, 30 Jun 2023 00:37:33 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110651; x=1690702651; 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=CCVk7jdt1nDqHH6A+S2BbR5/KvJS5BvxayG0t6p+t7Q=; b=hTppHVQGOEUngTr52TFcZrzfdnuHUo0PBL4R0G9ssJqHaVsUIUJ9CtTnB9Xwwm1dWe Q/kuYRVZL2DpQZibwVIHn2MeZxYyfb7metyPB+YaJloiHE1llRVjXenaTjYOrL5JyV+D aEqPvPT5GGFr9Qz7W2y9gulQvaQp0Lj0Sie3hSnzi+DSjr2rlZFXr6drQais1xG4pA97 o2xHyrXHIz8Q/kCiT8cbEU0+uNafRginZMvNUeGWxnzGSphj2J7MSG9SG4ZOwVIu+wkS KDsIDVpYuUQh3jjVyNlBcv5H+164Y3+vdmicMbtmxIj+sMUmhNIrRRMWDKngyEGlQ4vu LSBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110651; x=1690702651; 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=CCVk7jdt1nDqHH6A+S2BbR5/KvJS5BvxayG0t6p+t7Q=; b=a6onf5uBcRFStDMveJ4tP7fsITRiuxynU5lLwEByLnky6fLugHH8WjoLSA8Ys09JXv mIEOPRgF2OiitPphvLvfx6S+p1cj54U/ggd/0QT7+ElEha+ItlH0FOtmiGKgzWGPG6Y8 iYZAp5CaLCF4lCQhRbx3Xu+d1P2TWPsknNyWfXoLRJZ7XYEVKb2p0AnTFBTS7JXFWlIe iPR7qkS2dibCdBVBoZPuqiV1FfT6ynYEFg/mIMUjTEa/TdiMiZshbK5wdAWUUvhMU0Qp FSa5EconmikFofQsMfP/keZpea7ux1SP4T4faQ6xa832SzouUNOF1g8SxRdxe0o2ChWU /CnA== X-Gm-Message-State: ABy/qLb5Vz3TXFQmmUS6kyVCcqBE2nDBc4VzNve8wwr+Z2jKYxIwQfDY m+adGfPlrvor5VFrl2TWtQpgHlxjIKA= X-Google-Smtp-Source: APBJJlFEA0slv+JHK/ul+yRyGLnTlAdASNaFkBxxn3UtZmjPeJVOPlPD/yrjgVlNYRkGIt3o0fEB0A== X-Received: by 2002:a17:906:f196:b0:96f:d345:d0f7 with SMTP id gs22-20020a170906f19600b0096fd345d0f7mr1045888ejb.62.1688110651565; Fri, 30 Jun 2023 00:37:31 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 03/17] hw/pci-host/q35: Initialize PCMachineState::bus in board code Date: Fri, 30 Jun 2023 09:37:06 +0200 Message-ID: <20230630073720.21297-4-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::535; envelope-from=shentey@gmail.com; helo=mail-ed1-x535.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110673343100005 The Q35 PCI host currently sets the PC machine's PCI bus attribute through global state, thereby assuming the machine to be a PC machine. The Q35 machine code already holds on to Q35's pci bus attribute, so can easily set its own property while preserving encapsulation. Signed-off-by: Bernhard Beschow Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_q35.c | 4 +++- hw/pci-host/q35.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d9f3764184..4edc0b35f4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -230,10 +230,12 @@ static void pc_q35_init(MachineState *machine) x86ms->below_4g_mem_size, NULL); object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, x86ms->above_4g_mem_size, NULL); + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); =20 /* pci */ - sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); host_bus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0")); + pcms->bus =3D host_bus; + /* create ISA bus */ lpc =3D pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC), = true, TYPE_ICH9_LPC_DEVICE); diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 84137b9ad9..0604464074 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -66,7 +66,6 @@ static void q35_host_realize(DeviceState *dev, Error **er= rp) s->mch.pci_address_space, s->mch.address_space_io, 0, TYPE_PCIE_BUS); - PC_MACHINE(qdev_get_machine())->bus =3D pci->bus; pci->bypass_iommu =3D PC_MACHINE(qdev_get_machine())->default_bus_bypass_iommu; qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal); --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110754; cv=none; d=zohomail.com; s=zohoarc; b=UOr8gd9eyTSy1oFiA3lN/amZamffzY+wjB+QNv1GI/mitmGsT4e2LkaC4c0gLHvOJTQ1uf3gs0TOT+uq/HHQM/KFMm8FjMrV0c9jO4c/dVOgF3A/Q3hmX8zo5h+v6VSXbvFaPFgfIPH7apoVP62xVIHDnWOP5obiXng0g1GaaZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110754; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3zxuFy1nKO4CI4FNaygwtRvNzJbOGIkhIVlB0FND1xI=; b=PPDvqax7dXz7T0a8RRShX8knaTIq42S9h4ceZphqWLO1z7zyXB0KsRQYr0EXFSuTee/xgKlxE9m4W/AJ+iI/oMqogsU00JOoRkTuvfqvhEv0MijLou50kBNu5lyWx4d6TdxRq+tGrKnAWKLjnHrBLjXa9E4jH/IHA9UZBtZ7t04= 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 1688110754494963.9262628003294; Fri, 30 Jun 2023 00:39:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hK-00023o-ED; Fri, 30 Jun 2023 03:37:42 -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 1qF8hE-00022c-8P for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:36 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hC-0005PN-FP for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:35 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-991f956fb5aso168596866b.0 for ; Fri, 30 Jun 2023 00:37:34 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110652; x=1690702652; 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=3zxuFy1nKO4CI4FNaygwtRvNzJbOGIkhIVlB0FND1xI=; b=Xr3EPxkfgc/aI13yvkPkvJj7vcrFYNIYfIX92iYccNiEANusSUOZj2q3jRVz+VjPwV AJaTgzsOy9151Tglz16uFwMUB1u2irpGB2w39R0aL4a6tBqdetr8WM2JhbeCppkOrQbD Of1Yk8vQNZo329ZCvRTMBscj+2PU1i/NeaCY3k0hgl0eTnnK6gW/yJ8IWwzQuIWQKX5u ihf2nMXDWJghKrebEL+7uJlCpRXSHWraxD4WewDYFbKXZGLVEs6LnNdxNI3I9/CY7QiJ lutBEZrAckARU44+aAzA2subsba+PkfGd5JAe2E0d44VphsMZwuh2yp1XDWV1iXR8vvO Cevg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110652; x=1690702652; 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=3zxuFy1nKO4CI4FNaygwtRvNzJbOGIkhIVlB0FND1xI=; b=DzUCGoSb7gBxkI8F+JmgDgskP6Jp5Mg27OYSy6cTGB43oJItA3UyVPlBu9oJOKjgcb McQHp3JbbgUY+48xjIsTMKFdQQf4v83yxQQax5MLUq92yi/BAuicgc/myMGDVF8vKZCi z+tAriv58CEQtjIY4V5d7wrICvRpR4IPFAzZt7xKF6nkyunS3zIRUR5bM/9WWOFjBKgl nHJCLA+3yunP368YJ5c1wO1mgB6DxOZ51mXjpd7XeRHP3j1oyNkWG32lGU+oF1a/jEV+ RjuE5GxLZMlMTGmpckapJ2tESfDa/pVDg2SBRem/R6nECx3gYdAu7F0vcqo3wD77evpl TfdA== X-Gm-Message-State: ABy/qLZhdIrqK6SGOjqrOhoWra1QOLc7kD7qd2raNjFiNK8NcX9TwpCx QQGBWPuFNHe49Q+5KE3ZP2JluyBmXH0= X-Google-Smtp-Source: APBJJlGZpb7VEK94oJSk+fOZrzfelapHmja8xwo2Qg7UU9vcKxtLN832ZNePWCqah7O/Mi80Pwxtmg== X-Received: by 2002:a17:906:fa89:b0:988:7d1:f5a5 with SMTP id lt9-20020a170906fa8900b0098807d1f5a5mr1231593ejb.28.1688110652512; Fri, 30 Jun 2023 00:37:32 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , Igor Mammedov Subject: [PATCH v3 04/17] hw/pci/pci_host: Introduce PCI_HOST_BYPASS_IOMMU macro Date: Fri, 30 Jun 2023 09:37:07 +0200 Message-ID: <20230630073720.21297-5-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::636; envelope-from=shentey@gmail.com; helo=mail-ej1-x636.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110755676100004 Content-Type: text/plain; charset="utf-8" Introduce a macro to avoid copy and pasting strings which can easily cause typos. Suggested-by: Michael S. Tsirkin Signed-off-by: Bernhard Beschow Reviewed-by: Igor Mammedov --- include/hw/pci/pci_host.h | 2 ++ hw/pci/pci_host.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h index c6f4eb4585..e52d8ec2cd 100644 --- a/include/hw/pci/pci_host.h +++ b/include/hw/pci/pci_host.h @@ -31,6 +31,8 @@ #include "hw/sysbus.h" #include "qom/object.h" =20 +#define PCI_HOST_BYPASS_IOMMU "bypass-iommu" + #define TYPE_PCI_HOST_BRIDGE "pci-host-bridge" OBJECT_DECLARE_TYPE(PCIHostState, PCIHostBridgeClass, PCI_HOST_BRIDGE) =20 diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index dfd185bbb4..7af8afdcbe 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -232,7 +232,7 @@ const VMStateDescription vmstate_pcihost =3D { static Property pci_host_properties_common[] =3D { DEFINE_PROP_BOOL("x-config-reg-migration-enabled", PCIHostState, mig_enabled, true), - DEFINE_PROP_BOOL("bypass-iommu", PCIHostState, bypass_iommu, false), + DEFINE_PROP_BOOL(PCI_HOST_BYPASS_IOMMU, PCIHostState, bypass_iommu, fa= lse), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110757; cv=none; d=zohomail.com; s=zohoarc; b=kJR3uR7LGjG8HOwxVRcFDCCKLzQdS4ijpY5WKlnwpsc4XFcdY372NpHgFvNEDuaL0MGWEZlRxv63ExfmfQwcN6Dta64VwLTryQxIcJ9VArp7dI6+GeHlLCnUIWqu1+659ppOUW2mszyj3v+FP/ew0dsparjIDrWXksRn7sjq2A4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110757; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rtJ3y6eIvCQ3GWIbAZbSOrnzKk4wFNnFByJB8omAiJU=; b=lPS93RC3Bjc6kWiO/6YeJ4fMm95cdqzr6rS7LHuoRRjVvSVrAO3zBrD4ToST18eV5Z/2dmY2oXjnHIA+EoDWUKDtg+7nUdQGJlCDulOaptFA8nccEjsfpDV5xQNsXMUGXdqCVa/OydxSNjP2GEjh3e1pyAdhd14WVHIgRdMlBeg= 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 1688110757140343.89825858183974; Fri, 30 Jun 2023 00:39:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hK-00023q-EE; Fri, 30 Jun 2023 03:37:42 -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 1qF8hF-000232-Co for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:38 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hD-0005Pe-LJ for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:37 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-98df6bc0048so182946966b.1 for ; Fri, 30 Jun 2023 00:37:35 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110653; x=1690702653; 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=rtJ3y6eIvCQ3GWIbAZbSOrnzKk4wFNnFByJB8omAiJU=; b=BYXhWi7zJJ1U515ad4My5PHxjy5vmdg4AfJZS7xKk9IIU4NC3ngdxOSBkIa3FCAr7R sMEl/FBlnRa1WEL5DjTZyZBLct3xEB2kdjBIN3KPbfxou4dso0oOCHB+whMGHS/Q/iBJ U1cpLrmnZFVtngS11egm59hKRpQGoEXgVDZkTEkTT/DWU11rSJD53MWyVo8mQEzkugW7 tU5iQd535wbWKklIMHGAjDExfIY6cqK0PUVA+3vid1LfFdn2gld1+5WiwKCc110slgsB wGKuK1aXU/1LINDZTt6qkjGiTVId7qkfNb+ye8DMh8L+DSDK+f1o+WaEH4kOkCU70a6V 4fqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110653; x=1690702653; 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=rtJ3y6eIvCQ3GWIbAZbSOrnzKk4wFNnFByJB8omAiJU=; b=mBbW/BCN1OHDvEN6hvW2mHI2Fc6FnTRFdkvcb0AAqDhbpC6F68UGnd0/S9rFbpJ0Ko EaXQV42KzAy+8jT5q8udWPmUc9Ha4a+HF+9yB3kICg11hIW0z0mae68ALsydhh6NtN6I N0OSf3jmbrXNadx0vpH7HDOPVmPawIoNuV3WiApoFP/Y6I230sLCwBq5N2CIKI+TEiSw 4mxsAR1NwjGZ1AAuqwzxr04T0WJQ3qe7xBcLQRhh4XBlUgVpeLekrvwlQfGezvnGulkN V2scSb7d7nMugkyNoAwvmtqMOVDiwvUgZvVgONZrEUixG1yBxDcV9w7ghrkv2wWOcWb8 61aw== X-Gm-Message-State: ABy/qLYaM+TKtZV+w4vyssegurjP3Eg0J/SPk6/x8OglqKCbiyMTz0NA Uh++ny1Ej2K6p2i6KY3L1L7Q/H4QV30= X-Google-Smtp-Source: APBJJlEZVfoFTQ9m3q/vjUKcc93qZdylhN3nPdm9tbphub81EuTbE72vI8qSevpgd9GEcMometMjZA== X-Received: by 2002:a17:906:16c9:b0:991:e12e:9855 with SMTP id t9-20020a17090616c900b00991e12e9855mr1213591ejd.12.1688110653503; Fri, 30 Jun 2023 00:37:33 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 05/17] hw/pci-host/q35: Initialize PCI_HOST_BYPASS_IOMMU property from board code Date: Fri, 30 Jun 2023 09:37:08 +0200 Message-ID: <20230630073720.21297-6-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62e; envelope-from=shentey@gmail.com; helo=mail-ej1-x62e.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110757504100009 The Q35 PCI host already has a PCI_HOST_BYPASS_IOMMU property. However, the host initializes this property itself by accessing global machine state, thereby assuming it to be a PC machine. Avoid this by having board code set this property. Signed-off-by: Bernhard Beschow Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_q35.c | 2 ++ hw/pci-host/q35.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4edc0b35f4..852250e8cb 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -230,6 +230,8 @@ static void pc_q35_init(MachineState *machine) x86ms->below_4g_mem_size, NULL); object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, x86ms->above_4g_mem_size, NULL); + object_property_set_bool(phb, PCI_HOST_BYPASS_IOMMU, + pcms->default_bus_bypass_iommu, NULL); sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); =20 /* pci */ diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 0604464074..d2830cee34 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -66,8 +66,7 @@ static void q35_host_realize(DeviceState *dev, Error **er= rp) s->mch.pci_address_space, s->mch.address_space_io, 0, TYPE_PCIE_BUS); - pci->bypass_iommu =3D - PC_MACHINE(qdev_get_machine())->default_bus_bypass_iommu; + qdev_realize(DEVICE(&s->mch), BUS(pci->bus), &error_fatal); } =20 --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110742; cv=none; d=zohomail.com; s=zohoarc; b=mzmuCgE1u7Mj0bv1mITr35Och87y+5ZoNGybqdllpROk4HV6F+KM2r+n9VPd3DRXSB8+ZhjjsWmrfgwWzlKTvrr9moJOlCUuzVaxBlQLWkWj2+bxGpzW5+kWB3clsF7TncIgOJ9f4RGTDtZnjLdKSb4AZC4bTAhqhIs742kRpYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110742; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fWlnycR5wJyTdbj8DEeaQ9aaDr9hN9D3c5m0fZQj8MU=; b=KdpANYnF7PFoscqwYzce0lCuwpFqpJcYG5CKJmiNstjQ7M/q0lml68LhCkgzFFl3mOwcbxux9WVptKFWNyWdk0/NFbj0gnLZheN+zKnXY6XSTji3z8fbSbdLHVOWR6eAE9TQTCKfRhXKklbUXJKHPxyp5Fy+3ARiMm5swF9VaZ4= 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 1688110742607321.5789752893962; Fri, 30 Jun 2023 00:39:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hK-000246-GQ; Fri, 30 Jun 2023 03:37:42 -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 1qF8hG-00023O-T7 for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:38 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hE-0005Pp-Ip for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:38 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-98e1d3be004so179879466b.1 for ; Fri, 30 Jun 2023 00:37:36 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110655; x=1690702655; 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=fWlnycR5wJyTdbj8DEeaQ9aaDr9hN9D3c5m0fZQj8MU=; b=hRhmVuC8Dvp7v47ZZe4b/4JlPQE4gg5OxvhtdnhyZSErQ4AJ2OBNoOCYy3B1RlukzR rgCTDI3Nt2qHYG87MDE5FQwzNpm+GKdbrbHpdk7NjQCvdlfdxfMBRrfzixJ48kVt5GUj k/beSQwnrHuTKD9CO4dZo2En5yWC4KM8AvaVlzqUOrLYjec95wiQsjjHBxIDBI7EVdiw WxiGXx6i6+6xQyOZAfnEwURfkTEgSHm2H9JT+Cxj57ONSXQOJcadQEgcdlKhcAy6rFxo 9eAP1U/tzuNYA+Ln56OuNDiK6YAVsrgdHtc8ZWBPS/8SxN+HJpZPp0Bl2lL/mJoVOh8R 8Ojg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110655; x=1690702655; 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=fWlnycR5wJyTdbj8DEeaQ9aaDr9hN9D3c5m0fZQj8MU=; b=US+wzdKNlqZAtfcRZDUzcgxr3+QQfNygEEpp9GFSvl0IY6Fk3ZSS3NcnhGpnWOsqtR JICA7VbZXsfgPE9qjnOMNXQn4snfgZRlxAEXbBw0Z+Z1VEtDQCF13h3P/zT+sRXQVvab 4fejXGs/yHTVme2yWGv00XJBS6Xjn6FaXLJd4teoztQKOwVEi3NQv6YPFDoKImXEhoBL SI2TmioeBDvnALSq9K57MCCxS4cPHDdApA5V5Dss0yunm8VIvkdnMfph+t19W7WWU1cC weaQ9fx/Y9hxaGFXy7qYoA/rilEbGuyliHoxqvRFLPNfabqu4nBJQROKz1PMI45m02J0 Gv/A== X-Gm-Message-State: ABy/qLaK+PSFtSx/H/eHx6b7AKg75JyunRXvGPMGREv4vt91SFSHn/g5 q5+L3vNKhyfQm1NluFbdo6cWnydlZjs= X-Google-Smtp-Source: APBJJlFgWdsFvmiH6e8hwj3zyJR6A/ulgGjwW4deyE3aexofYRhuCLtL45uumGjb2uYNCU8t3/gZmg== X-Received: by 2002:a17:906:348f:b0:98e:26ae:9b08 with SMTP id g15-20020a170906348f00b0098e26ae9b08mr1191832ejb.58.1688110654754; Fri, 30 Jun 2023 00:37:34 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 06/17] hw/pci-host/q35: Make some property name macros reusable by i440fx Date: Fri, 30 Jun 2023 09:37:09 +0200 Message-ID: <20230630073720.21297-7-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110743521100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Bernhard Beschow --- include/hw/i386/pc.h | 4 ++++ include/hw/pci-host/q35.h | 5 ----- hw/i386/pc_q35.c | 8 ++++---- hw/pci-host/q35.c | 8 ++++---- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6eec0fc51d..c34c698cdd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -146,6 +146,10 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int = level); =20 void pc_guest_info_init(PCMachineState *pcms); =20 +#define PCI_HOST_PROP_RAM_MEM "ram-mem" +#define PCI_HOST_PROP_PCI_MEM "pci-mem" +#define PCI_HOST_PROP_SYSTEM_MEM "system-mem" +#define PCI_HOST_PROP_IO_MEM "io-mem" #define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" #define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" #define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index e89329c51e..1d98bbfe0d 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -74,11 +74,6 @@ struct Q35PCIHost { * gmch part */ =20 -#define MCH_HOST_PROP_RAM_MEM "ram-mem" -#define MCH_HOST_PROP_PCI_MEM "pci-mem" -#define MCH_HOST_PROP_SYSTEM_MEM "system-mem" -#define MCH_HOST_PROP_IO_MEM "io-mem" - /* PCI configuration */ #define MCH_HOST_BRIDGE "MCH" =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 852250e8cb..02dd274276 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -218,13 +218,13 @@ static void pc_q35_init(MachineState *machine) pc_memory_init(pcms, system_memory, rom_memory, pci_hole64_size); =20 object_property_add_child(OBJECT(machine), "q35", phb); - object_property_set_link(phb, MCH_HOST_PROP_RAM_MEM, + object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, OBJECT(machine->ram), NULL); - object_property_set_link(phb, MCH_HOST_PROP_PCI_MEM, + object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, OBJECT(pci_memory), NULL); - object_property_set_link(phb, MCH_HOST_PROP_SYSTEM_MEM, + object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, OBJECT(system_memory), NULL); - object_property_set_link(phb, MCH_HOST_PROP_IO_MEM, + object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, OBJECT(system_io), NULL); object_property_set_int(phb, PCI_HOST_BELOW_4G_MEM_SIZE, x86ms->below_4g_mem_size, NULL); diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index d2830cee34..91c46df9ae 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -240,19 +240,19 @@ static void q35_host_initfn(Object *obj) object_property_add_uint64_ptr(obj, PCIE_HOST_MCFG_SIZE, &pehb->size, OBJ_PROP_FLAG_READ); =20 - object_property_add_link(obj, MCH_HOST_PROP_RAM_MEM, TYPE_MEMORY_REGIO= N, + object_property_add_link(obj, PCI_HOST_PROP_RAM_MEM, TYPE_MEMORY_REGIO= N, (Object **) &s->mch.ram_memory, qdev_prop_allow_set_link_before_realize, 0); =20 - object_property_add_link(obj, MCH_HOST_PROP_PCI_MEM, TYPE_MEMORY_REGIO= N, + object_property_add_link(obj, PCI_HOST_PROP_PCI_MEM, TYPE_MEMORY_REGIO= N, (Object **) &s->mch.pci_address_space, qdev_prop_allow_set_link_before_realize, 0); =20 - object_property_add_link(obj, MCH_HOST_PROP_SYSTEM_MEM, TYPE_MEMORY_RE= GION, + object_property_add_link(obj, PCI_HOST_PROP_SYSTEM_MEM, TYPE_MEMORY_RE= GION, (Object **) &s->mch.system_memory, qdev_prop_allow_set_link_before_realize, 0); =20 - object_property_add_link(obj, MCH_HOST_PROP_IO_MEM, TYPE_MEMORY_REGION, + object_property_add_link(obj, PCI_HOST_PROP_IO_MEM, TYPE_MEMORY_REGION, (Object **) &s->mch.address_space_io, qdev_prop_allow_set_link_before_realize, 0); } --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110754; cv=none; d=zohomail.com; s=zohoarc; b=k5TmkYBnM0kVim/MRayIt2SxETzEKGY3Xa4y/hIWxMolaf8/lcf0nF1WK6GPLV5H1e07gC2iUQQprlt5QL7yFGSqjjG5xeGKDcMwD9BPCdGOQuNoauvDrVvcih5JqVzYH8FcQzjyUDxkeKGzCagZCKR0U1gHc+Tg7oQfpezC7s4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110754; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h9VshA+nEvMeFHx9v6+4HVVvUJImbOd3NSibU4Qf9Cg=; b=HUTAXer7fFq7r3BvYPMmejIWHF5wWrP3PJagyGy+ItiDRRl0Ut+7uU5uoYoQcVqQegTjxoUAWwoVxdaXhTVKIeQqazXK1c17390ytSTeWwjyAiWIcBBlQzgAH7M7UeZPe1ufktz/sxNumGjybneqOgRJwfI7cpfFoZscfA7oT/s= 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 1688110754481209.81146083386648; Fri, 30 Jun 2023 00:39:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hQ-00026t-PU; Fri, 30 Jun 2023 03:37:48 -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 1qF8hI-00023p-5F for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:41 -0400 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 1qF8hG-0005Q1-2R for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:39 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-98df6bc0048so182951866b.1 for ; Fri, 30 Jun 2023 00:37:37 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110656; x=1690702656; 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=h9VshA+nEvMeFHx9v6+4HVVvUJImbOd3NSibU4Qf9Cg=; b=CpatTUw/t7XCQaHdjk52TbqXO/d944AVcGs5NdHCyjIUX0EWqnasKNKvSedClVXptf fwv5L6sRsXcBupjlz5ysn1DyuV7HNaiT4PohWZjPP+FXkiEapEqaMNutVSQBR6yB0Aig jSB0j+s1OUB2ZvZiyJLy15t03Kjlp9EeTiOBX3QB59mUC+6VHMrj/TJcVYmzUp8QtBgy UjCr3AehrRcnam3H+B1sTpwrtvHf/4t/98sK48QKip+nJcXQBulmnCSeIKkBArbW0ErL QVfD0Izfb5pQTUQJyYDyfiUGO7msb5Nh2vb2Ll2AdjYDeEX/8QnRfV4tori87yVRoBGm kmvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110656; x=1690702656; 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=h9VshA+nEvMeFHx9v6+4HVVvUJImbOd3NSibU4Qf9Cg=; b=amlZsqVB7oqb8H8LI+IVBRWPQU7fV2x2NXqikT0RboIYfn9duBwNQWnfp4g+AGeAJj mlLWRz/KwZ+trv8buj4HXdj9yKr5buNBAVJxgq+CTDkHK8r5SM3l0qTxdC7GMDryn8Qh /7M2S9+UiUzArABNdqzAuIVboa+ggLM/rLOLORbwneAquij8pS6/mgN8ISVXMi+rRwoi dRxrQ3Fj+FhGfUNCcH+RX4pfsRKayoHy1oyVOerTV2Cq9nuVOL4ndsay03irFPGm3UXM 9vC1bt7Ae8A/GxDaBpZi5NHSOBoy676wJCpYYOnCz0hYvNIBTo18YLh9asRjbRptIRxp W9nQ== X-Gm-Message-State: ABy/qLZQ+EDBMbo90uO+D4CBfj2RWZ7GTaY1mWtB6kIaVQLUlWKTe6oo nD6JPzcjGoIMYaGGI/IdJWOPCtRCPrE= X-Google-Smtp-Source: APBJJlEjzVnXXE24xd3g0H/KAbmNYInzNBXvLxagqtivVuzMWdmVVWBN5KK5hbwgACl0CmsJWW9ZYA== X-Received: by 2002:a17:906:2c16:b0:992:a0c7:8d2a with SMTP id e22-20020a1709062c1600b00992a0c78d2amr1031920ejh.54.1688110655847; Fri, 30 Jun 2023 00:37:35 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/17] hw/i386/pc_piix: Turn some local variables into initializers Date: Fri, 30 Jun 2023 09:37:10 +0200 Message-ID: <20230630073720.21297-8-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::633; envelope-from=shentey@gmail.com; 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110755662100003 Eliminates an else branch. Suggested-by: Igor Mammedov Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f9947fbc10..6a5b6dad2f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -122,11 +122,11 @@ static void pc_init1(MachineState *machine, BusState *idebus[MAX_IDE_BUS]; ISADevice *rtc_state; MemoryRegion *ram_memory; - MemoryRegion *pci_memory; - MemoryRegion *rom_memory; + MemoryRegion *pci_memory =3D NULL; + MemoryRegion *rom_memory =3D system_memory; ram_addr_t lowmem; - uint64_t hole64_size; - DeviceState *i440fx_host; + uint64_t hole64_size =3D 0; + DeviceState *i440fx_host =3D NULL; =20 /* * Calculate ram split, for memory below and above 4G. It's a bit @@ -205,11 +205,6 @@ static void pc_init1(MachineState *machine, hole64_size =3D object_property_get_uint(OBJECT(i440fx_host), PCI_HOST_PROP_PCI_HOLE64_SI= ZE, &error_abort); - } else { - pci_memory =3D NULL; - rom_memory =3D system_memory; - i440fx_host =3D NULL; - hole64_size =3D 0; } =20 pc_guest_info_init(pcms); --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110715; cv=none; d=zohomail.com; s=zohoarc; b=gFVe/55d8JPtFGmUwpDvlqQi03BmLM7iVnSt815dKKk/6zmLoIls4IqFqqaW1HZoZmKDKtdBzscOtONvKlM1xxjUKrQy7mUhGVJqnQ3M1GvdpMtB2a2PXRQpojJAqVkzFT6uB7lejBSOdjYupkfYbLaophwEk2RvuOTyzL8l8Ok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110715; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WQG3c1JuQ/m1rucP/1PJyI67+DN0jd3fnKoXjuafnIw=; b=Rcrk3/kLlDlx2srAShj2JNdTCUjKeGYpaE8OtOxLPSUtvSJRorhYcmNNZ7mw2H+GCP98jA30Hi3FTXckPPK2ohV+gBB3mOkWRtM4+LXuQhEXMkM/W7pWJbLBSV8/zXDX98TNvdsxyPDSa4L3q4StqD+/0cyvKBgLvrkEzachwwo= 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 1688110715876777.6715665772216; Fri, 30 Jun 2023 00:38:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hb-0002Hm-Oe; Fri, 30 Jun 2023 03:37:59 -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 1qF8hJ-00023w-Qp for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:42 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hH-0005QA-NZ for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:41 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-992ace062f3so173996166b.2 for ; Fri, 30 Jun 2023 00:37:38 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110657; x=1690702657; 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=WQG3c1JuQ/m1rucP/1PJyI67+DN0jd3fnKoXjuafnIw=; b=UiEpxaEVGTEhLOzVh7deuAZVd9uuFCy8bSy1mqyzExduR3mxBduwWIAyvrXkVRWI/x P0LKklwxzMz8+llYatHRD6/6hdHw2LK1+eClKJS6pwg+iRecuwV/9GlyXwLcDlsIv2hg c+Qb3hMYqX3WIPopbc8GC5ElPR+IGzGMxQZmNGGkByjJyeDDkIGSoLGVN3rQFDaaxEUN yMd0wyPeBnWdWQCnriwhlIW1XQAiSuKrnTsfyjqrvIZLr4mNwqZ2xXGxx3CQMF6ErwfO +CCVzZyNnVHwSN4wvvY/f1av01qHQyxAPn8sEAmRg9a/0C+pQeIw82FNYS6vaaS7YGn3 J8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110657; x=1690702657; 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=WQG3c1JuQ/m1rucP/1PJyI67+DN0jd3fnKoXjuafnIw=; b=K2cHAK6gF7AyBWtIr9qE06UAQS+plY4SMwkPw2ZJdbIjFfeyD+SY4AgSE6i2SOOF2Q cHUn0AE+cQJ5XaSGl7nSy71Ku+raLSaDGqdCmkeBQUeFoVdKsyuq5x5wgLEKwVgqhxPy za/q6uz4c6zqstexNC+6OB7wab5NNS4U+7wv+S4kEGVRSHJPZ63u2GjDTZB/JzknlCnU t/UtQmRvqpQJ8cq0XUymZxQ6rHptGTPzrzqBb9oqwAIw9bCXVJMn6CZQOG/2SBx6d1yD rhGminFCHUFIlNZ4f4U7jaWbZ92Vdo2tO0gDccXejoIYO/UzdnpwbVG7M1eqAkM41eXH EH4A== X-Gm-Message-State: ABy/qLbh0u+bgJglgLb602YCs/ZTmiQkLnCcFiv1XyPCDT4zPCwqEIQE t7elruY/WTX3jZBC+xAKHElowjK5j3Q= X-Google-Smtp-Source: APBJJlGhHqhJ3Sm0pBvpu8fuqahP62EnMwp3oenvd5iEb5HlWOXuOCeVT18fSbq/uFk1rLSWJQSZRw== X-Received: by 2002:a17:906:a88b:b0:98b:dc6c:b304 with SMTP id ha11-20020a170906a88b00b0098bdc6cb304mr1403577ejb.38.1688110656824; Fri, 30 Jun 2023 00:37:36 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 08/17] hw/pci-host/i440fx: Add "i440fx" child property in board code Date: Fri, 30 Jun 2023 09:37:11 +0200 Message-ID: <20230630073720.21297-9-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::630; envelope-from=shentey@gmail.com; helo=mail-ej1-x630.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110717679100003 The parent-child relation is usually established near a child's qdev_new().= For i440fx this allows for reusing the machine parameter, thus avoiding qdev_get_machine() which relies on a global variable. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Bernhard Beschow --- hw/i386/pc_piix.c | 2 ++ hw/pci-host/i440fx.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6a5b6dad2f..26e8473a4d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -202,6 +202,8 @@ static void pc_init1(MachineState *machine, memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); rom_memory =3D pci_memory; i440fx_host =3D qdev_new(host_type); + object_property_add_child(OBJECT(machine), "i440fx", + OBJECT(i440fx_host)); hole64_size =3D object_property_get_uint(OBJECT(i440fx_host), PCI_HOST_PROP_PCI_HOLE64_SI= ZE, &error_abort); diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 61e7b97ff4..d95d9229d3 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -259,7 +259,6 @@ PCIBus *i440fx_init(const char *pci_type, b =3D pci_root_bus_new(dev, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS); s->bus =3D b; - object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev)); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 d =3D pci_create_simple(b, 0, pci_type); --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110726; cv=none; d=zohomail.com; s=zohoarc; b=Qkm08gEd6dIRpo2BRAWTf/xVPEOGAv+HD1kmXcPlG2TLvY5aHH1dvOn7tQKRRp5grc2Uzq9nJWGrZNPhvIbK/mmnBO8ac6rEKDP6YCrt9fdcot8vLra1tm9I/1nRs1SKXVWOh8aEN1cm/jMx6yBlLN2N5K/fBWjRb6CT5nh9AqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110726; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K6dApJ7J8Z4QMs7bQhU3KSg7TWWxyrT4m6TvmkjO1Y8=; b=Chpkndwy+9cMgIfPNEwa27+l4pg3XzN7v69uT5sosTE6JOTKgKfxUcrrNGHz1LCggSbJwe7i5qEK+9I19u2YOqiqpPcXz/FHDeYZ81DZIXEGSq1TXW2tdAOh5sWMOWeAma2pLb+JiHf2VQcC171AGmYiBKV2l+f8S56tDGk8GTQ= 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 1688110726511920.6482198619973; Fri, 30 Jun 2023 00:38:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hU-0002BV-Li; Fri, 30 Jun 2023 03:37:53 -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 1qF8hJ-00023v-QR for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:42 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hH-0005QL-Qf for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:41 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-991ef0b464cso272013766b.0 for ; Fri, 30 Jun 2023 00:37:39 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110658; x=1690702658; 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=K6dApJ7J8Z4QMs7bQhU3KSg7TWWxyrT4m6TvmkjO1Y8=; b=hygtFbNm9AFpvmsvBoXOm7U1ibViRW4nhS4YWMP7PRhXKY42EdmXDl+Oeqt/xBrpgG VcvEG8LFCt9qN7J5H4s1Zypzy3E7XZdI4iFogNin96lB/AaxD3s4QQpRGmgUN1agE7Is 4ifANY4uibg9Itk6VERLL57WR+VYM7WSN40ZnuaPCaRTSmKTsqmq0Ca8pok1FWSzQOFF G2DtzY+D8znyweNfG8niKNQJSIgcmd8cWTabknwy3/G6YarpeNEQPIhkHeCP1CKZcYF/ ZzYVWqP6YsKFKyU+X0sGJdiyZ0KsKtiUkssBsNSImnTKq/HyMJfTj8DxedSBLg9s/KnD hbjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110658; x=1690702658; 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=K6dApJ7J8Z4QMs7bQhU3KSg7TWWxyrT4m6TvmkjO1Y8=; b=HdvBQjde30rvz8sG4lsTBaFniAqOu2Pe8lgJl/uP16DtZ2kgNOhQnZGH/Zv0E6D/AW W6d/QCZJtMXpO7eirbyDsvPnK6n7/jVmMXuZki+SxC1fdNG4v027lSe5INSJjTgj0Jua 77bfXH+T84JD80GxRA9fGLu5jbb2VjnmtEOQWsvg6d5dLCwn5XjqHu595JSC5clFrhMg GXvA5tx3eyCeTVGgHxW4JFzOzQbhQvvXQIk+URR4CFtMi6+HH+RbyNbTAyMtfdcMcESY Hcxk7yft/jpISbSFOigo+fS2IO24qMvKoi8+BSyWn42a/vmYnAFTl/7bYmqWy3jSmCpN YG9w== X-Gm-Message-State: ABy/qLYJre8QwFD0R41UszA45FoGVklf4ps9EZjf3a69MXyp/31Onu3B xSrcopacNrWDyIS3D6OXeu6Sv6HyTx8= X-Google-Smtp-Source: APBJJlE63SFsOLGy112X/s8Z8l9Mwq0c53py6g2UROe3d4fDzPlYd9ovfboUurq8QPIouiRMOeo7mg== X-Received: by 2002:a17:906:224a:b0:992:1653:3402 with SMTP id 10-20020a170906224a00b0099216533402mr2786264ejr.25.1688110658263; Fri, 30 Jun 2023 00:37:38 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 09/17] hw/pci-host/i440fx: Replace magic values by existing constants Date: Fri, 30 Jun 2023 09:37:12 +0200 Message-ID: <20230630073720.21297-10-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62a; envelope-from=shentey@gmail.com; helo=mail-ej1-x62a.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110728024100003 Signed-off-by: Bernhard Beschow Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/i440fx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index d95d9229d3..b7c24a4e1d 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -276,8 +276,8 @@ PCIBus *i440fx_init(const char *pci_type, =20 /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", - f->pci_address_space, 0xa0000, 0x20000); - memory_region_add_subregion_overlap(f->system_memory, 0xa0000, + f->pci_address_space, SMRAM_C_BASE, SMRAM_C_S= IZE); + memory_region_add_subregion_overlap(f->system_memory, SMRAM_C_BASE, &f->smram_region, 1); memory_region_set_enabled(&f->smram_region, true); =20 @@ -285,9 +285,9 @@ PCIBus *i440fx_init(const char *pci_type, memory_region_init(&f->smram, OBJECT(d), "smram", 4 * GiB); memory_region_set_enabled(&f->smram, true); memory_region_init_alias(&f->low_smram, OBJECT(d), "smram-low", - f->ram_memory, 0xa0000, 0x20000); + f->ram_memory, SMRAM_C_BASE, SMRAM_C_SIZE); memory_region_set_enabled(&f->low_smram, true); - memory_region_add_subregion(&f->smram, 0xa0000, &f->low_smram); + memory_region_add_subregion(&f->smram, SMRAM_C_BASE, &f->low_smram); object_property_add_const_link(qdev_get_machine(), "smram", OBJECT(&f->smram)); =20 --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110749; cv=none; d=zohomail.com; s=zohoarc; b=DKDOsyAIcLr/pkoLBKlagCSm9u8od0lsr1KawyqH9+DCAx8Z2g6++OtY67sFcrXeyV7Cmrf6qE6UtxWz3zMLvqjYy7njhr9P81EbuT3fh0cdai7hSHTcY5POmyuBe39kQoqCqEBHgED68J7b43vJW7jyA4Ug0jWw/CyTrwUO7ug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110749; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ELMLBs1OW9Di44cgpdfhOSCdcVBvjTZJizwS8W5LbOQ=; b=dj5ToR/gTl4+bLvM5Iy+m0ty9u5SdBm/yiQZRsT4ju3my4lDmzAfWzJluANz/WaP9zgD74RHlgf8I1DN/E7mR0DgHH74qHwzeLpWgiQn17vInsXtxr+l89oMfJNwei0q53NhlrGdXx5YmiiuI0yRT90pVNOlVUbQuq/4j4g8++E= 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 1688110749509331.5867574218918; Fri, 30 Jun 2023 00:39:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hj-0002YV-NU; Fri, 30 Jun 2023 03:38:07 -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 1qF8hL-00024b-EA for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:44 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hJ-0005QW-IM for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:43 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-98e39784a85so269555266b.1 for ; Fri, 30 Jun 2023 00:37:40 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110659; x=1690702659; 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=ELMLBs1OW9Di44cgpdfhOSCdcVBvjTZJizwS8W5LbOQ=; b=np4CIWaaMZb8vaoNdfRlOr12Bxwqa3yb7XDZZv7Xop6QwS0fByO5iBiqKFu/wfIy0A gdIDVuSfjOtCAu4dWyJBlt/lc0Nf0oMT0rtbB0YR4kSNNQTKFlev2ZZePquRYQ3EbRbv c39IrCund+r/ZROX/Geh2W8Ni6wEWfQwlNbzf3VP4cb9Fxj1mIid+cru64MTVHn3cbZ1 WnNjVVMCBuomOyFAolNnL9nJ+mk5lCVoIqj2+XWq41sGiC2yNjeDkRlOx16xrPuR+C6D iADJ3FvZikGuwp7WbPmrOSajxNsEtuYMuuogxAKKXoQkNDMBR13xazae/IDpezPDpB/K +L0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110659; x=1690702659; 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=ELMLBs1OW9Di44cgpdfhOSCdcVBvjTZJizwS8W5LbOQ=; b=cBI0FoecsaKquw0zQUTzkuw+WeKV7kNVua0l8QP0hhiToXv49VLQM9+1oodxdujrnc GkEM0AaSI7/Mlfdue1Z1Kfd+lWBX9/D2Bgr45omjqZc2vot0KCcpROB0mRGDeCRTWnDZ Pieb4hiSWEmNol2vNPU/McMqY90urXkavpjxerjmvG6S4cPQQPE8dnNOPD4FAoA8Y+Ep f8VL5TN0zvgts7eGwRqQ0ehGNursYAfr0mWPSW+F9xlhxAE0UIwN5V4R7TWjdYnzsPOX eP191PQGNuJEnE+W//LcwuIdEZzFOm1eQAly2aPRxakY5cszM8AbdW7YxIcFHJTuUFbj kmqA== X-Gm-Message-State: ABy/qLaPJIVrKulJABb6LNeOzMumZfwgNOxp15v1grrjqmY4bBNnGEFI tVsF73XTOa7zfJpB0r6Nw49YnQrsi4g= X-Google-Smtp-Source: APBJJlHd+O+EjTWgHqGX/+x7Q/xZKzVCoB/VcqYW2/IhCsfiZCyRoxd1WpQI7l0ejs75YZpNtw+qXA== X-Received: by 2002:a17:906:3453:b0:98f:8481:24b3 with SMTP id d19-20020a170906345300b0098f848124b3mr1876765ejb.37.1688110659250; Fri, 30 Jun 2023 00:37:39 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 10/17] hw/pci-host/i440fx: Have common names for some local variables Date: Fri, 30 Jun 2023 09:37:13 +0200 Message-ID: <20230630073720.21297-11-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62b; envelope-from=shentey@gmail.com; helo=mail-ej1-x62b.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110750172100001 `PCIHostState` is often referred to as `phb`, own device state usually as `= s`. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/i440fx.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index b7c24a4e1d..0b76fe71af 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -205,28 +205,28 @@ static void i440fx_pcihost_get_pci_hole64_end(Object = *obj, Visitor *v, =20 static void i440fx_pcihost_initfn(Object *obj) { - PCIHostState *s =3D PCI_HOST_BRIDGE(obj); + PCIHostState *phb =3D PCI_HOST_BRIDGE(obj); =20 - memory_region_init_io(&s->conf_mem, obj, &pci_host_conf_le_ops, s, + memory_region_init_io(&phb->conf_mem, obj, &pci_host_conf_le_ops, phb, "pci-conf-idx", 4); - memory_region_init_io(&s->data_mem, obj, &pci_host_data_le_ops, s, + memory_region_init_io(&phb->data_mem, obj, &pci_host_data_le_ops, phb, "pci-conf-data", 4); } =20 static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) { - PCIHostState *s =3D PCI_HOST_BRIDGE(dev); + PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - memory_region_add_subregion(s->bus->address_space_io, 0xcf8, &s->conf_= mem); + memory_region_add_subregion(phb->bus->address_space_io, 0xcf8, &phb->c= onf_mem); sysbus_init_ioports(sbd, 0xcf8, 4); =20 - memory_region_add_subregion(s->bus->address_space_io, 0xcfc, &s->data_= mem); + memory_region_add_subregion(phb->bus->address_space_io, 0xcfc, &phb->d= ata_mem); sysbus_init_ioports(sbd, 0xcfc, 4); =20 /* register i440fx 0xcf8 port as coalesced pio */ - memory_region_set_flush_coalesced(&s->data_mem); - memory_region_add_coalescing(&s->conf_mem, 0, 4); + memory_region_set_flush_coalesced(&phb->data_mem); + memory_region_add_coalescing(&phb->conf_mem, 0, 4); } =20 static void i440fx_realize(PCIDevice *dev, Error **errp) @@ -248,17 +248,16 @@ PCIBus *i440fx_init(const char *pci_type, MemoryRegion *pci_address_space, MemoryRegion *ram_memory) { + I440FXState *s =3D I440FX_PCI_HOST_BRIDGE(dev); + PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); PCIBus *b; PCIDevice *d; - PCIHostState *s; PCII440FXState *f; unsigned i; - I440FXState *i440fx; =20 - s =3D PCI_HOST_BRIDGE(dev); b =3D pci_root_bus_new(dev, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS); - s->bus =3D b; + phb->bus =3D b; sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 d =3D pci_create_simple(b, 0, pci_type); @@ -267,8 +266,7 @@ PCIBus *i440fx_init(const char *pci_type, f->pci_address_space =3D pci_address_space; f->ram_memory =3D ram_memory; =20 - i440fx =3D I440FX_PCI_HOST_BRIDGE(dev); - range_set_bounds(&i440fx->pci_hole, below_4g_mem_size, + range_set_bounds(&s->pci_hole, below_4g_mem_size, IO_APIC_DEFAULT_ADDRESS - 1); =20 /* setup pci memory mapping */ --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110774; cv=none; d=zohomail.com; s=zohoarc; b=UyjcDawv2s65tNwVNaceJ/0ifd/YB7kN/pCE6hILOfECwbMuX16pCoy+sNGM5rC93BfGb5AbsgNR8K77D5K2bQH0/M+DIFw3i5CUCxhQBtNA/iOEf16gzQoEYJOH0GrfM5bdETjZJkyhtPznsy6VVdFWS8ZYLjDj4JrDkeoFgYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110774; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PMIlHFAMK3fLP5aMHD94wBUzhhT77eW6RaGaDaJaRfk=; b=glJ88kIp65Kw/3qdS3sDfVDFODrDCXO7ZY6tMNuBIXXDcsqKemouUBDRUDISQG3NdfsCBJQ1JhMoiHTRUX0r08XdZib0q7MadwMLOV3QB2/zPBuouaSGhVpw914WjsioRJZaW8SS3qSM9LNfW5DmnrtmRHHOSnhia/unzU80lqA= 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 1688110774036718.4379955183175; Fri, 30 Jun 2023 00:39:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hh-0002QC-6v; Fri, 30 Jun 2023 03:38:05 -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 1qF8hM-00024x-LR for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:46 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hL-0005Qt-0X for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:44 -0400 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2b6a1245542so24947511fa.1 for ; Fri, 30 Jun 2023 00:37:42 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110661; x=1690702661; 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=PMIlHFAMK3fLP5aMHD94wBUzhhT77eW6RaGaDaJaRfk=; b=M55aKhWeFu16q+qPLUg1S7CIyB7lh0ree8lUgDI4DMK5ycy2XwMnOkqJzh28SdkuZG zBt0LlKDFYtjnsrPqzQjtWKzjuR4fxq9PVugFV4/zOVQeY3v9FKjrBe2/NmR65o2E0rO vt+0319ylYZjR/2DrOaiO6e4KsrogF5RSdFz4mkRJh7XC9YIzmHgIM/kJPo8E0NMCJFA 4ICHmHJdUMAoJq9kqd4Vfrjx9rl6qlOVHp97zAf0ZOAGa8ZIVZfA0Q7l25qitJoolBoM N4jLpIKurhvll5t1OZU/Mi0HSpuQcvgzihYbLnDJHBjH6iZA/mGn7fjTGQrYNv1Y3pHF EjyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110661; x=1690702661; 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=PMIlHFAMK3fLP5aMHD94wBUzhhT77eW6RaGaDaJaRfk=; b=YwLXNHxm9xuA/fQDLkhlsRosgvUYjsuDjy4gS3GDFIIWo8+m5B/tN4GGu9cFIbYO3g Zmx11LkYh03F00L6oUbavMDr9B4t3hbypd84WsORc+GV/kXmyNY9u862u8ccZddG4GLH PEill2j5hGW6U/KJabUTuMC87I9fMKt2T5PQE3EVqTJb/giNk8G47M5d3i8eFqgYj4kG UdoAMPvXPfBwEmpZnjncSH3IRJK0kIHwbHgHXOHB4yUmdAeQEZg7y2L1SY7NeR+8e7pd yFBz6Zq6Qm4jwFRwx50O8kvAK0hWYo9+VCM7jjD6DHMoVhXhmS0kLPvh3kMrcFkfNwqX m6qQ== X-Gm-Message-State: ABy/qLb5nhFRGYPMQfDAR9XkB2Unqp9q6gXERVoLT/DrOQkrfomBmZEC nTWFIIiLekZHrAmYcjvswrAyT76quEo= X-Google-Smtp-Source: APBJJlH+mzspbhNFDUDN3/XzGOaGKCqqLaK6LcYWx0Sfmrq2kHWq+vvprZknedJMPOAOtY1xqqz9oQ== X-Received: by 2002:a2e:8756:0:b0:2b6:adc4:aa2d with SMTP id q22-20020a2e8756000000b002b6adc4aa2dmr1484981ljj.18.1688110660487; Fri, 30 Jun 2023 00:37:40 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 11/17] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section Date: Fri, 30 Jun 2023 09:37:14 +0200 Message-ID: <20230630073720.21297-12-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::236; envelope-from=shentey@gmail.com; helo=mail-lj1-x236.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110774551100001 i440fx_realize() realizes the PCI device inside the host bridge (PCII440FXState), but is implemented between i440fx_pcihost_realize() and i440fx_init() which deal with the host bridge itself (I440FXState). Since we want to append i440fx_init() to i440fx_pcihost_realize() later let's move i440fx_realize() out of the way. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/i440fx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 0b76fe71af..e84fcd50b6 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -65,6 +65,15 @@ struct I440FXState { */ #define I440FX_COREBOOT_RAM_SIZE 0x57 =20 +static void i440fx_realize(PCIDevice *dev, Error **errp) +{ + dev->config[I440FX_SMRAM] =3D 0x02; + + if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { + warn_report("i440fx doesn't support emulated iommu"); + } +} + static void i440fx_update_memory_mappings(PCII440FXState *d) { int i; @@ -229,15 +238,6 @@ static void i440fx_pcihost_realize(DeviceState *dev, E= rror **errp) memory_region_add_coalescing(&phb->conf_mem, 0, 4); } =20 -static void i440fx_realize(PCIDevice *dev, Error **errp) -{ - dev->config[I440FX_SMRAM] =3D 0x02; - - if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { - warn_report("i440fx doesn't support emulated iommu"); - } -} - PCIBus *i440fx_init(const char *pci_type, DeviceState *dev, MemoryRegion *address_space_mem, --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110789; cv=none; d=zohomail.com; s=zohoarc; b=BkmQ3/YIuN/gDgXHaTi/xfk/bKe7m/5mcnZssqLaZ/P42AhGcs8a1BP2qzxGHKtcaWlFh6HTF8hMzUmqoAF+G36XuHidvVje106KyA6ISJxD3z9TR4AxFqg80cSKKlXniPa3KfgTiv5xCq+85mVFnBB9Vx9Dl+N8h4nZXqiZ0AU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110789; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H45HpoTt4ez9R+HtnsaKwH+l/LOvWW/C/zvvDDhjp3o=; b=Fo5tINT7Z6U14uTIk7rVtEZuNJySqOTlDpIQ9mrY6dhuNZong0etwgwDZaJzPUa7xWFxePjyMJPE0YfUVs8tVio4/6zJfoeFBytNyTdK3q/hX9HPHSTSPsYMN2K6/KBpr4LmC5b4wYJubeAgTB9lRnOhTkSMTTI+Jztw+k3N0gc= 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 1688110789340981.7004818897833; Fri, 30 Jun 2023 00:39:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hg-0002MT-BD; Fri, 30 Jun 2023 03:38:04 -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 1qF8hN-00024z-CG for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:46 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hL-0005Qx-BF for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:45 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9923833737eso159429566b.3 for ; Fri, 30 Jun 2023 00:37:42 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110661; x=1690702661; 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=H45HpoTt4ez9R+HtnsaKwH+l/LOvWW/C/zvvDDhjp3o=; b=C6wQggqHROaGP1j4qh9pXBufDoFUkV4nKVgseyDxPMHCS4RsflvE1GHFf4lzkTTioL vNpBnstHdM+utEsrM43hVqyAxHq7unc3IF+VQpU41oHv68MSE7rJmFHzLOnX7BQEgmnd IPNeCpUewFTA33PEtRkATjmJAIAtVkc9m5S6LTrvpMnKtxdyQeZOhZ0olhTmuiRX/c/Z TiTJsl0pghcgAkMrFLuct3PojicGoBtHvuetnMflJT6ifpME3OmB24/IlW0WZMVi1jty gJ/k3MR8osmXjR9PWGP80oVCrigFRw8SNs/FIZLxmSWaQ7kh1rT5UXtFQkz8Z4C12jJC n+Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110661; x=1690702661; 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=H45HpoTt4ez9R+HtnsaKwH+l/LOvWW/C/zvvDDhjp3o=; b=Tdz2d1RXywmee349S72qLySn3rnc3O+8gRcazb+pGZigybPMWZy4ixSzwkKtE9VDJy ZowvQ0e3jIVjf1Zoeck95vrx23j5Yy9nzDz2d2nLbWEeM7HAemnQh8QUdruxcme82y4o z4rHaH3oZMLX00Ia8UrxE4casgb7f+NMl3cIiNJ1vHwJdsl58IrQPjDaCcJ31Y+ElpsN b/XIrtJnCf/A/5h9F3K8W/13mC3yXHLWFw7mMiSgJ/eSuyT9EfoqDhJ9d3ITeeiGU25E rCkPaKFy/dk75EuyN8u2WLMId5rLoPylz0HrMC/DwqXme7BbpOrYZhDJjrdkbtPZSQLW bt7Q== X-Gm-Message-State: ABy/qLbr6GcsORllXHnWBWnjHxMEH78zaKnHC0+eFuwQXRRSht01WEJT ipuYXbkosR1HvJmwtYrzTXikOs7tpBk= X-Google-Smtp-Source: APBJJlH1a9Vi7cenTukRpPph15Hh7fjqUQ7OSNXrC48x9IQnVsYhEMDjUVCRpzgJC8zpbkWqEGmCWw== X-Received: by 2002:a17:906:3913:b0:991:7875:454c with SMTP id f19-20020a170906391300b009917875454cmr1233668eje.1.1688110661352; Fri, 30 Jun 2023 00:37:41 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 12/17] hw/pci-host/i440fx: Make MemoryRegion pointers accessible as properties Date: Fri, 30 Jun 2023 09:37:15 +0200 Message-ID: <20230630073720.21297-13-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110790777100001 The goal is to eliminate i440fx_init() which is a legacy init function. This neccessitates the memory regions to be properties, like in Q35, which will = be assigned in board code. Since i440fx needs different PCI devices in Xen mode, and since i440fx shall be self-contained, the PCI device will be created during realization of the host. Thus the pointers need to be moved to the host structure to be usable= as properties. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci-host/i440fx.h | 3 --- hw/pci-host/i440fx.c | 42 +++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index bf57216c78..e3a550021e 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -25,9 +25,6 @@ struct PCII440FXState { PCIDevice parent_obj; /*< public >*/ =20 - MemoryRegion *system_memory; - MemoryRegion *pci_address_space; - MemoryRegion *ram_memory; PAMMemoryRegion pam_regions[PAM_REGIONS_COUNT]; MemoryRegion smram_region; MemoryRegion smram, low_smram; diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index e84fcd50b6..b9530fc3a0 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -47,6 +47,10 @@ OBJECT_DECLARE_SIMPLE_TYPE(I440FXState, I440FX_PCI_HOST_= BRIDGE) =20 struct I440FXState { PCIHostState parent_obj; + + MemoryRegion *system_memory; + MemoryRegion *pci_address_space; + MemoryRegion *ram_memory; Range pci_hole; uint64_t pci_hole64_size; bool pci_hole64_fix; @@ -214,12 +218,25 @@ static void i440fx_pcihost_get_pci_hole64_end(Object = *obj, Visitor *v, =20 static void i440fx_pcihost_initfn(Object *obj) { + I440FXState *s =3D I440FX_PCI_HOST_BRIDGE(obj); PCIHostState *phb =3D PCI_HOST_BRIDGE(obj); =20 memory_region_init_io(&phb->conf_mem, obj, &pci_host_conf_le_ops, phb, "pci-conf-idx", 4); memory_region_init_io(&phb->data_mem, obj, &pci_host_data_le_ops, phb, "pci-conf-data", 4); + + object_property_add_link(obj, PCI_HOST_PROP_RAM_MEM, TYPE_MEMORY_REGIO= N, + (Object **) &s->ram_memory, + qdev_prop_allow_set_link_before_realize, 0); + + object_property_add_link(obj, PCI_HOST_PROP_PCI_MEM, TYPE_MEMORY_REGIO= N, + (Object **) &s->pci_address_space, + qdev_prop_allow_set_link_before_realize, 0); + + object_property_add_link(obj, PCI_HOST_PROP_SYSTEM_MEM, TYPE_MEMORY_RE= GION, + (Object **) &s->system_memory, + qdev_prop_allow_set_link_before_realize, 0); } =20 static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) @@ -255,27 +272,28 @@ PCIBus *i440fx_init(const char *pci_type, PCII440FXState *f; unsigned i; =20 - b =3D pci_root_bus_new(dev, NULL, pci_address_space, + s->system_memory =3D address_space_mem; + s->pci_address_space =3D pci_address_space; + s->ram_memory =3D ram_memory; + + b =3D pci_root_bus_new(dev, NULL, s->pci_address_space, address_space_io, 0, TYPE_PCI_BUS); phb->bus =3D b; sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 d =3D pci_create_simple(b, 0, pci_type); f =3D I440FX_PCI_DEVICE(d); - f->system_memory =3D address_space_mem; - f->pci_address_space =3D pci_address_space; - f->ram_memory =3D ram_memory; =20 range_set_bounds(&s->pci_hole, below_4g_mem_size, IO_APIC_DEFAULT_ADDRESS - 1); =20 /* setup pci memory mapping */ - pc_pci_as_mapping_init(f->system_memory, f->pci_address_space); + pc_pci_as_mapping_init(s->system_memory, s->pci_address_space); =20 /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", - f->pci_address_space, SMRAM_C_BASE, SMRAM_C_S= IZE); - memory_region_add_subregion_overlap(f->system_memory, SMRAM_C_BASE, + s->pci_address_space, SMRAM_C_BASE, SMRAM_C_S= IZE); + memory_region_add_subregion_overlap(s->system_memory, SMRAM_C_BASE, &f->smram_region, 1); memory_region_set_enabled(&f->smram_region, true); =20 @@ -283,17 +301,17 @@ PCIBus *i440fx_init(const char *pci_type, memory_region_init(&f->smram, OBJECT(d), "smram", 4 * GiB); memory_region_set_enabled(&f->smram, true); memory_region_init_alias(&f->low_smram, OBJECT(d), "smram-low", - f->ram_memory, SMRAM_C_BASE, SMRAM_C_SIZE); + s->ram_memory, SMRAM_C_BASE, SMRAM_C_SIZE); memory_region_set_enabled(&f->low_smram, true); memory_region_add_subregion(&f->smram, SMRAM_C_BASE, &f->low_smram); object_property_add_const_link(qdev_get_machine(), "smram", OBJECT(&f->smram)); =20 - init_pam(&f->pam_regions[0], OBJECT(d), f->ram_memory, f->system_memor= y, - f->pci_address_space, PAM_BIOS_BASE, PAM_BIOS_SIZE); + init_pam(&f->pam_regions[0], OBJECT(d), s->ram_memory, s->system_memor= y, + s->pci_address_space, PAM_BIOS_BASE, PAM_BIOS_SIZE); for (i =3D 0; i < ARRAY_SIZE(f->pam_regions) - 1; ++i) { - init_pam(&f->pam_regions[i + 1], OBJECT(d), f->ram_memory, - f->system_memory, f->pci_address_space, + init_pam(&f->pam_regions[i + 1], OBJECT(d), s->ram_memory, + s->system_memory, s->pci_address_space, PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); } =20 --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110765; cv=none; d=zohomail.com; s=zohoarc; b=YTOG6XYz8+mYyphWm2/4hCmnqbK5YDUSPpYUkqdB6MhXl2XA94rYBYl53BcoYoiGQ9i27k9OEJGj1rSCEB/Mp0+Q+JzssktbNQRozg7DYOxHZzaqy9plm22gnS7hFZY/jy2Qrobito+4sR/M6nn7M5HIN2V+uqoDj/iNIP9sA9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110765; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ICnwSANFXOo5k8r+0EJnW98OLBKlIArKIUzIRe4d5Us=; b=UZjCx2eCaKR9NBEMhAQb07O4XkozZy18XojI0Hh7PHGeskMMCgl10x2i53ueAgYin2N46O6rGG9gDi+yeNygaqIln/r/OWiIEH57wvUuZMNBFXGsQORJmNNYzd3wgir0cihebx1uWvOkdZEtTsc4S6EUqFAca1jaaWy8DcB175I= 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 1688110765476209.0487477389862; Fri, 30 Jun 2023 00:39:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hb-0002J6-Us; Fri, 30 Jun 2023 03:38:00 -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 1qF8hO-00026Z-Bt for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:48 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hM-0005R5-9Q for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:46 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-51d7f350758so1871977a12.3 for ; Fri, 30 Jun 2023 00:37:43 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110662; x=1690702662; 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=ICnwSANFXOo5k8r+0EJnW98OLBKlIArKIUzIRe4d5Us=; b=liyawD5GiyRz848ZXiIJKA8UeZCS1AWhhywz7ZvHWuDlEWrOlwBtRzxxlZ/60f5ugb vXTHVrWawo9T79eYT75Sd7tDx+z6LrqcQde7Sx3WihaV8Djdu/Go5Lten6sR7KXfT8tp O5vcpQa1d+LXXMiPuQHRaJBRJOHN/xqT2e0qT9LXeLhozWvdL07R+aPX/J2hO3HgXxwl SD5por1xSQhr87/JIt6zdfARUh5YzNr7v3yG/0xgAmI0vemS1gYc0v7Ii22HLc39NoTm 9KftzjyfdMKKSrZx5WKVGnJpGkMk0z8+hUqc9cJNFOoaLjRgi5Ru6cxPopiTltTr2AE1 u11w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110662; x=1690702662; 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=ICnwSANFXOo5k8r+0EJnW98OLBKlIArKIUzIRe4d5Us=; b=O8YhLSxwonInDliPyXP+WpxFSidEPHioY66242CEUL7mY/WaPJj8TbX+hjbAoph1S5 3eHEWI/koRxJYBql24ggvGI6EWbw0bT659bWvSy8GK6leNSkqlACl1klQQT2TWpdF/Ji dD/geeX5ze5X5lY+nf4VNvRkBX18A1uBsR7BVvDB4qR7aecNictpjStrazIkr0ZsofFe Oys6vjpb4zWlz+aVp2cYz65X0O5Jw2ttUYC0QwsliTnirHPXLzCtvoA5nm+vEKszizAj cx5LHlmW0dyWfAOscni0KAKIt/athUkdNlaE5nFPaj3e0+UBHnHFSk4HX4Q7la+CkgFk NTjg== X-Gm-Message-State: ABy/qLYqDqMf/UI9YayCPcgcF8da/T8e1GaN7ZI2fgCMow4P3vhI9sq1 8mHJ0qmvx0uB2pIgSg+PLp5vWiO+T8k= X-Google-Smtp-Source: APBJJlEL33s/6ohdH8AHnNlaNemQeTal/uaJj18kFXpKLl7aJthPo/9t3MpWxKhP5DR81p9cdb6fHw== X-Received: by 2002:a17:906:3650:b0:974:1d8b:ca5f with SMTP id r16-20020a170906365000b009741d8bca5fmr1385463ejb.9.1688110662235; Fri, 30 Jun 2023 00:37:42 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 13/17] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property Date: Fri, 30 Jun 2023 09:37:16 +0200 Message-ID: <20230630073720.21297-14-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110766502100004 Content-Type: text/plain; charset="utf-8" Introduce the property in anticipation of QOM'ification; Q35 has the same property. Signed-off-by: Bernhard Beschow --- hw/pci-host/i440fx.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index b9530fc3a0..de14c75e95 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -27,7 +27,6 @@ #include "qemu/range.h" #include "hw/i386/pc.h" #include "hw/pci/pci.h" -#include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/i440fx.h" #include "hw/qdev-properties.h" @@ -49,6 +48,7 @@ struct I440FXState { PCIHostState parent_obj; =20 MemoryRegion *system_memory; + MemoryRegion *io_memory; MemoryRegion *pci_address_space; MemoryRegion *ram_memory; Range pci_hole; @@ -237,17 +237,22 @@ static void i440fx_pcihost_initfn(Object *obj) object_property_add_link(obj, PCI_HOST_PROP_SYSTEM_MEM, TYPE_MEMORY_RE= GION, (Object **) &s->system_memory, qdev_prop_allow_set_link_before_realize, 0); + + object_property_add_link(obj, PCI_HOST_PROP_IO_MEM, TYPE_MEMORY_REGION, + (Object **) &s->io_memory, + qdev_prop_allow_set_link_before_realize, 0); } =20 static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) { + I440FXState *s =3D I440FX_PCI_HOST_BRIDGE(dev); PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - memory_region_add_subregion(phb->bus->address_space_io, 0xcf8, &phb->c= onf_mem); + memory_region_add_subregion(s->io_memory, 0xcf8, &phb->conf_mem); sysbus_init_ioports(sbd, 0xcf8, 4); =20 - memory_region_add_subregion(phb->bus->address_space_io, 0xcfc, &phb->d= ata_mem); + memory_region_add_subregion(s->io_memory, 0xcfc, &phb->data_mem); sysbus_init_ioports(sbd, 0xcfc, 4); =20 /* register i440fx 0xcf8 port as coalesced pio */ @@ -273,11 +278,12 @@ PCIBus *i440fx_init(const char *pci_type, unsigned i; =20 s->system_memory =3D address_space_mem; + s->io_memory =3D address_space_io; s->pci_address_space =3D pci_address_space; s->ram_memory =3D ram_memory; =20 b =3D pci_root_bus_new(dev, NULL, s->pci_address_space, - address_space_io, 0, TYPE_PCI_BUS); + s->io_memory, 0, TYPE_PCI_BUS); phb->bus =3D b; sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110774; cv=none; d=zohomail.com; s=zohoarc; b=nwWqcKaK1xScvapNKZ/5NcbUV2Gyprw0EV7SuUi9avnVT0F3dQd+2TA5okG7EqcUl7d2ruO1/9BPpXo445mhyvMFjPAU+WETp45GgmJZNm4HiI4rSbnJ6it8t1Gw2hFLYr09WVws5WDn07QOu53dxbpShLR2VyFbUBAW81m5sZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110774; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9f6N/xpJQAivSQxg1bCJgMWryqgA6B1D7qlruT/MdZI=; b=YlK2wN/rjrc3ik9mOWNFuN5Z6lEaIjkskxuA6vxH24WY3I/K7YxQpObzKFJlZxxHAX14R1I/lFMHopNDqK80Cd5jgneAN4BjBli2uR95ZHZkn5fG/we0tBdnzox2JpLfChwrZgGafNEX33evxDvP6tg80BuwmhGqOJgBayfZPD8= 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 1688110774123404.92518716974905; Fri, 30 Jun 2023 00:39:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hi-0002WO-MX; Fri, 30 Jun 2023 03:38:06 -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 1qF8hQ-000274-Al for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:48 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hO-0005RI-3n for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:47 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-992dcae74e0so57811666b.3 for ; Fri, 30 Jun 2023 00:37:44 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110663; x=1690702663; 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=9f6N/xpJQAivSQxg1bCJgMWryqgA6B1D7qlruT/MdZI=; b=aEvmfv7nHI4s7XeHSMl+hpTrFOD76JZMoh8tYRalKtyLp3WZ3E5Au6BHdwGphsjz6v WCPO1Cn3Bq1N53Bfn3AWBxrmXIPiR/ccw9PT2jRh+2x4rCwotB9DjncLtxANThSWfBQ+ +/rReqOjoBbDT/oJeeoROmjXNydaBEMOyZRLdgt5hYoDCLtyLpNrvr2z5IVy5g28XLVM Pk7R+WeK2od+AnUbiATGO1xZZEj7mqE9bfXFxDyRymxXuMftdJaemHgQ6VA8dlF+EaO3 kkhjA9KYT1Aj0wTdaI6AL82x9DK5H6VY3rFH/MeRs9WXQa4GlXZUcN2CmGTkB0jTZXMp 9YPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110663; x=1690702663; 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=9f6N/xpJQAivSQxg1bCJgMWryqgA6B1D7qlruT/MdZI=; b=kmqyUBVPY7AnS2YyfhM6CIKR2VwpbcYJARNY9uoLyDShIrxus5ecc4xGlLqCLns4JW t9de9mrOSRmiwcSB9bQUgpE1ANQYxtXXrFauQDUUAABAbGE3zYUhB7nU/rrgvbmskA5N 7GZ2FEsGmWeU93x+PzpAv0K/aey8w3bgmXypJEBxk1GkHTm5ENYm1cUi0Q2iuQxBrib9 nJsItZ2y4PTHc2KJbO1M/M2PtIdSztIHVNFjkIgmK2M8dKwiG2LWWbg/VTcRzFhG9NjB FEEpjJyHmiX99kTH0kBpMd21J5zYfSf3nFH2hLyQ+VJmvFPRJQ851ax1UKzNYqDxX7c9 s7MQ== X-Gm-Message-State: ABy/qLaMvYm769Z23YJa+LjOwtyqhVTZ/eTjFa7QojLhXUSO4Tle18P5 zpfVdfn5NlgOCxGvrOKD2n0iDE0CagU= X-Google-Smtp-Source: APBJJlERhgV0Pa1BT6mw8V791PmhuqS69lHR+0istg6bs3yJ43MWYymG6RFPhpjlLPoqBs2p3VAfzA== X-Received: by 2002:a17:906:fa1a:b0:992:6939:2998 with SMTP id lo26-20020a170906fa1a00b0099269392998mr1330479ejb.27.1688110663330; Fri, 30 Jun 2023 00:37:43 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 14/17] hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties Date: Fri, 30 Jun 2023 09:37:17 +0200 Message-ID: <20230630073720.21297-15-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::632; envelope-from=shentey@gmail.com; helo=mail-ej1-x632.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110774585100002 Content-Type: text/plain; charset="utf-8" Introduce the properties in anticipation of QOM'ification; Q35 has the same properties. Note that we want to avoid a "ram size" property in the QOM interface since= it seems redundant to both properties introduced in this change. Thus the remo= val of the ram_size parameter. We assume the invariant of both properties to su= m up to "ram size" which is already asserted in pc_memory_init(). Under Xen the invariant seems to hold as well, so we now also check it there. Signed-off-by: Bernhard Beschow --- include/hw/pci-host/i440fx.h | 1 - hw/i386/pc_piix.c | 5 ++++- hw/pci-host/i440fx.c | 12 ++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index e3a550021e..7e38456ebb 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -36,7 +36,6 @@ PCIBus *i440fx_init(const char *pci_type, DeviceState *dev, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, - ram_addr_t ram_size, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, MemoryRegion *pci_memory, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 26e8473a4d..c36783809f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -224,6 +224,9 @@ static void pc_init1(MachineState *machine, if (!xen_enabled()) { pc_memory_init(pcms, system_memory, rom_memory, hole64_size); } else { + assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + + x86ms->above_4g_mem_size); + pc_system_flash_cleanup_unused(pcms); if (machine->kernel_filename !=3D NULL) { /* For xen HVM direct kernel boot, load linux here */ @@ -239,7 +242,7 @@ static void pc_init1(MachineState *machine, =20 pci_bus =3D i440fx_init(pci_type, i440fx_host, - system_memory, system_io, machine->ram_size, + system_memory, system_io, x86ms->below_4g_mem_size, x86ms->above_4g_mem_size, pci_memory, ram_memory); diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index de14c75e95..8731740a1b 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -52,6 +52,8 @@ struct I440FXState { MemoryRegion *pci_address_space; MemoryRegion *ram_memory; Range pci_hole; + uint64_t below_4g_mem_size; + uint64_t above_4g_mem_size; uint64_t pci_hole64_size; bool pci_hole64_fix; uint32_t short_root_bus; @@ -264,7 +266,6 @@ PCIBus *i440fx_init(const char *pci_type, DeviceState *dev, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, - ram_addr_t ram_size, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, MemoryRegion *pci_address_space, @@ -281,6 +282,8 @@ PCIBus *i440fx_init(const char *pci_type, s->io_memory =3D address_space_io; s->pci_address_space =3D pci_address_space; s->ram_memory =3D ram_memory; + s->below_4g_mem_size =3D below_4g_mem_size; + s->above_4g_mem_size =3D above_4g_mem_size; =20 b =3D pci_root_bus_new(dev, NULL, s->pci_address_space, s->io_memory, 0, TYPE_PCI_BUS); @@ -290,7 +293,7 @@ PCIBus *i440fx_init(const char *pci_type, d =3D pci_create_simple(b, 0, pci_type); f =3D I440FX_PCI_DEVICE(d); =20 - range_set_bounds(&s->pci_hole, below_4g_mem_size, + range_set_bounds(&s->pci_hole, s->below_4g_mem_size, IO_APIC_DEFAULT_ADDRESS - 1); =20 /* setup pci memory mapping */ @@ -321,6 +324,7 @@ PCIBus *i440fx_init(const char *pci_type, PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); } =20 + ram_addr_t ram_size =3D s->below_4g_mem_size + s->above_4g_mem_size; ram_size =3D ram_size / 8 / 1024 / 1024; if (ram_size > 255) { ram_size =3D 255; @@ -380,6 +384,10 @@ static Property i440fx_props[] =3D { DEFINE_PROP_SIZE(PCI_HOST_PROP_PCI_HOLE64_SIZE, I440FXState, pci_hole64_size, I440FX_PCI_HOST_HOLE64_SIZE_DEFAULT), DEFINE_PROP_UINT32("short_root_bus", I440FXState, short_root_bus, 0), + DEFINE_PROP_SIZE(PCI_HOST_BELOW_4G_MEM_SIZE, I440FXState, + below_4g_mem_size, 0), + DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, I440FXState, + above_4g_mem_size, 0), DEFINE_PROP_BOOL("x-pci-hole64-fix", I440FXState, pci_hole64_fix, true= ), DEFINE_PROP_END_OF_LIST(), }; --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110768; cv=none; d=zohomail.com; s=zohoarc; b=G+w9mq0lj9pENXAOlbJsxmUmb1hsWmSMB9Teubbq1BH+6VJB7u6/fqTEBvv4ir8mPUbzdvxcrVafKzx5HqtJOv5jAMbDj+08uvpPnr7SRihFKQUUuErvwx16DE7GVx0NxPml4yuhR4DlaeT/JFv/B5KaZsaZHdGYEx/inOdFOpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110768; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ndPA1FIUJEV2rWOOZalHB3l5NHORSS3qaQKhdqZ2P3s=; b=RutgeayyYquwLF09KDk9SyX7yMjcJGo1ylpotte9FdZw3gU08PM4CIbuh1O8N1IdKhEHuAPgwy7ewmgEPUFKO7NYFwzF8pq9EVXTuQ4bE4LJUr8rywbiX8+NYDn6TBXhj3Jil1hc5tWsd3D3kfw6tCD8MfX4W7EnQoQlsXe4NW0= 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 168811076843830.962097653303317; Fri, 30 Jun 2023 00:39:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hV-0002Bn-Tl; Fri, 30 Jun 2023 03:37:55 -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 1qF8hQ-000273-Af for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:48 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hO-0005Rh-6g for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:47 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-51dd0205b2cso2647758a12.1 for ; Fri, 30 Jun 2023 00:37:45 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110664; x=1690702664; 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=ndPA1FIUJEV2rWOOZalHB3l5NHORSS3qaQKhdqZ2P3s=; b=Osc1Rjku8di3S6eH3U6TYvT3wOqmtSPOx85N1xociVpClwwsn6uIKZ84d+MqbcFfLK NU59oVunwKgGZuHu+dEyl30pStC64yIaFL+M991u4rZIkQqzummmoGQ9Y52cx28QPaIx hRr58C8zIUOUGR7yuy+iORBubZhQQUqX2hj4AJAGXACV+n7pGpTlDuGtXqHetoiqwhG9 x8EdI30t+m5o0e61VVmbfyC0KVXCa9T9B0YbdyAXV1ZuBRhmJAqk3ZCctclTzEht2VrP EV4bo6KOGWV0b7tMsMGqVrG8U5WtRCvtkd2cVUo99m9U7PezEJo3sAaUAKvcYjPjNB/X CicQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110664; x=1690702664; 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=ndPA1FIUJEV2rWOOZalHB3l5NHORSS3qaQKhdqZ2P3s=; b=cjxL7Vgjj3eWZCv65qU14vlHMZxLI6MWATZCefVy2k5IAfR1u4Okk8jPs/hSqQvL1U I2Xz+GflihvsW5/LkCoBrhY6fv0KtA3faZA6+sI+ZWhW+wp4vNaB4pJ326i3KaJE8oBB F26moHGwYn56z37osVMnh1lPEdN31qaS27IFJ4bA3cXzgraHQVs/heIbBQlWvszMHlxV A5Ho434mTXLLifZdSraNxpEQG4WXFOuqaVUHyjDKudi1C+EcJKZTMhgZjGily2Ctfqfj qDbD9o57jxOK+RSe34dKT5cLuuzQFWnc1OSNmQB1O2oEX+8lIgIb8XIwfs5w2WhWSxwu sC7A== X-Gm-Message-State: ABy/qLabw50JhkoFRYzRGmxUPpCPd6VRZYNsyexBkeiKAizXvhqFyNNg g396wh4VlXm6OxedWvhIaJk0b3zDHEM= X-Google-Smtp-Source: APBJJlF6bN/mchyT4AQ3+4fnOVb62EQgIQXK0g8A3tUXvRt4GS9UvngsU+626N59vrcW3A3J6oJ2kQ== X-Received: by 2002:a17:906:10d9:b0:988:b61e:4219 with SMTP id v25-20020a17090610d900b00988b61e4219mr2267805ejv.29.1688110664299; Fri, 30 Jun 2023 00:37:44 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 15/17] hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE property Date: Fri, 30 Jun 2023 09:37:18 +0200 Message-ID: <20230630073720.21297-16-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110770448100001 Content-Type: text/plain; charset="utf-8" I440FX needs a different PCI device model if the "igd-passthru" property is enabled. The type name is currently passed as a parameter to i440fx_init().= This parameter will be replaced by a property assignment once i440fx_init() gets resolved. Signed-off-by: Bernhard Beschow --- include/hw/pci-host/i440fx.h | 2 ++ hw/pci-host/i440fx.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index 7e38456ebb..2d7bae5a45 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -15,6 +15,8 @@ #include "hw/pci-host/pam.h" #include "qom/object.h" =20 +#define I440FX_HOST_PROP_PCI_TYPE "pci-type" + #define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define TYPE_I440FX_PCI_DEVICE "i440FX" =20 diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 8731740a1b..c458987405 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -57,6 +57,8 @@ struct I440FXState { uint64_t pci_hole64_size; bool pci_hole64_fix; uint32_t short_root_bus; + + char *pci_type; }; =20 #define I440FX_PAM 0x59 @@ -284,13 +286,14 @@ PCIBus *i440fx_init(const char *pci_type, s->ram_memory =3D ram_memory; s->below_4g_mem_size =3D below_4g_mem_size; s->above_4g_mem_size =3D above_4g_mem_size; + s->pci_type =3D (char *)pci_type; =20 b =3D pci_root_bus_new(dev, NULL, s->pci_address_space, s->io_memory, 0, TYPE_PCI_BUS); phb->bus =3D b; sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 - d =3D pci_create_simple(b, 0, pci_type); + d =3D pci_create_simple(b, 0, s->pci_type); f =3D I440FX_PCI_DEVICE(d); =20 range_set_bounds(&s->pci_hole, s->below_4g_mem_size, @@ -389,6 +392,7 @@ static Property i440fx_props[] =3D { DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, I440FXState, above_4g_mem_size, 0), DEFINE_PROP_BOOL("x-pci-hole64-fix", I440FXState, pci_hole64_fix, true= ), + DEFINE_PROP_STRING(I440FX_HOST_PROP_PCI_TYPE, I440FXState, pci_type), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110728; cv=none; d=zohomail.com; s=zohoarc; b=WUpw2e/womiOdWadSyGASLSYbO78+Gm4jdjCOuWc5waF63XF3PNQ05ONQPJs8QVzreAtbVZsy+iZHaGCgjpsUQtRQuyLY9WRrVp7kI9uUNe7Gjn3oz8jW2xs/3ouppvaRE6W+Qug7g/xf3Nmw1V2a62s6GWKWQ1Ha7eNg8f9AK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110728; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zD7WAfiiRPEcVDryUR/zQvvkHlVUEwejF/uIZK/1fXo=; b=PKN3TepjrKauf2hPStESVTCVCULDtkOETVoQo27fuUk0EP8Pe3ZFzxEEDoNWv1CiGIE0+0ASkdAVhzhCkb/xngD5urmRAV6SaovShL/tvM6U7CvGMKmvbu3SXyyhHT/rMQ7D5kvcbBxinw405pG76EV7IWoBX2lrTRM6Amg2iS4= 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 1688110728831910.4823330994357; Fri, 30 Jun 2023 00:38:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hb-0002GZ-7U; Fri, 30 Jun 2023 03:37:59 -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 1qF8hR-00027N-Sv for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:51 -0400 Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hQ-0005Rz-1K for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:49 -0400 Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b69e6cce7dso23719851fa.2 for ; Fri, 30 Jun 2023 00:37:47 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110665; x=1690702665; 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=zD7WAfiiRPEcVDryUR/zQvvkHlVUEwejF/uIZK/1fXo=; b=GTgbgU4wuMSLSCf01HhlN4x42O7wpg/+QFB+UucutI8d8eGk3XhpnxPFaS9rto4Nl2 MCkwJkV+RzqEGrw8qHVZpntxR7V0Up15bPecEQydIJslIyRuKqr0Yuh767xyJpUPHBz1 v9KTMRDK4gKibSZhXBtk1g1E5fj4nONubjJPOgM4v6zKqt+JYZC4PIW6DE8Al2bDSB3/ fHf+1o0BAYr9X6MvdUMBkzLLqW/ArMaa1lMQFQ96wOaQsBWVA1KiIQ5+4XZjrHd9+zvT 73CzJsY2GxKK7doq097Nlo47QU1cQT0f4ggjBwIZMSk0esnfFg2BshQjPgjpYX6lEETG LseA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110665; x=1690702665; 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=zD7WAfiiRPEcVDryUR/zQvvkHlVUEwejF/uIZK/1fXo=; b=MKFcVrlGnfdt5hUxOStrZJvP8LJ/V7hQzNxv+Fcr/DEhf0hlClunLgxuFn2TiZ/YZo keeZubd3Zr3DRxhQTTiM2Fiq+zMqSzBi0jNI1/iw/CxfhNaHhZigC7q3RcDWbRKZsUdB HexeFPvm7iKCvUo0dU5HaflreCF8yBxIlcS6KafmKwMkUR0/UPS6B72/5qjGnBhJALm6 r+1nDRcgTz3QJskQOgRODnu+1e/uV7Cdlz9aOdd0SfeeMlWBJkIdieh6TnVAYdMnpd5T U6aXhK89iL4RgQvM92HXI9hyNcutiMPXNadMoAy1x41TX7AMeLLEniz0h6/QeZ+RccLE fN2Q== X-Gm-Message-State: ABy/qLY4G6rhyt9Ea+M7sj/ybxSWtPUGr1Ron5vPHuRj/65gFICNOa9F vhqX88GOCIA0nCQmQVIa6FlYhQfN7lM= X-Google-Smtp-Source: APBJJlGeJJql8TUkBGfNFmZUNb/l611P5R0BLd9ync1+GJimCNNMu0nB4bjjyVUs355+J6/tqrUL3A== X-Received: by 2002:a2e:9b85:0:b0:2b6:c864:5d28 with SMTP id z5-20020a2e9b85000000b002b6c8645d28mr1518552lji.38.1688110665105; Fri, 30 Jun 2023 00:37:45 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 16/17] hw/pci-host/i440fx: Resolve i440fx_init() Date: Fri, 30 Jun 2023 09:37:19 +0200 Message-ID: <20230630073720.21297-17-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::235; envelope-from=shentey@gmail.com; helo=mail-lj1-x235.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110729510100005 Content-Type: text/plain; charset="utf-8" i440fx_init() is a legacy init function. The previous patches worked towards TYPE_I440FX_PCI_HOST_BRIDGE to be instantiated the QOM way. Do this now by transforming the parameters passed to i440fx_init() into property assignmen= ts. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci-host/i440fx.h | 10 ---------- hw/i386/pc_piix.c | 32 +++++++++++++++++++++----------- hw/pci-host/i440fx.c | 33 +++++---------------------------- 3 files changed, 26 insertions(+), 49 deletions(-) diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index 2d7bae5a45..c988f70890 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -34,14 +34,4 @@ struct PCII440FXState { =20 #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" =20 -PCIBus *i440fx_init(const char *pci_type, - DeviceState *dev, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *pci_memory, - MemoryRegion *ram_memory); - - #endif diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c36783809f..62148d7636 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -126,7 +126,7 @@ static void pc_init1(MachineState *machine, MemoryRegion *rom_memory =3D system_memory; ram_addr_t lowmem; uint64_t hole64_size =3D 0; - DeviceState *i440fx_host =3D NULL; + Object *phb =3D NULL; =20 /* * Calculate ram split, for memory below and above 4G. It's a bit @@ -201,10 +201,9 @@ static void pc_init1(MachineState *machine, pci_memory =3D g_new(MemoryRegion, 1); memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); rom_memory =3D pci_memory; - i440fx_host =3D qdev_new(host_type); - object_property_add_child(OBJECT(machine), "i440fx", - OBJECT(i440fx_host)); - hole64_size =3D object_property_get_uint(OBJECT(i440fx_host), + phb =3D OBJECT(qdev_new(host_type)); + object_property_add_child(OBJECT(machine), "i440fx", phb); + hole64_size =3D object_property_get_uint(phb, PCI_HOST_PROP_PCI_HOLE64_SI= ZE, &error_abort); } @@ -240,12 +239,23 @@ static void pc_init1(MachineState *machine, PIIX3State *piix3; PCIDevice *pci_dev; =20 - pci_bus =3D i440fx_init(pci_type, - i440fx_host, - system_memory, system_io, - x86ms->below_4g_mem_size, - x86ms->above_4g_mem_size, - pci_memory, ram_memory); + object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, + OBJECT(ram_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, + OBJECT(pci_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, + OBJECT(system_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, + OBJECT(system_io), &error_fatal); + object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, + x86ms->below_4g_mem_size, &error_fatal); + object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, + x86ms->above_4g_mem_size, &error_fatal); + object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, + pci_type, &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); + + pci_bus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); pci_bus_map_irqs(pci_bus, xen_enabled() ? xen_pci_slot_get_pirq : pc_pci_slot_get_pirq); diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index c458987405..62d6287681 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -249,9 +249,14 @@ static void i440fx_pcihost_initfn(Object *obj) =20 static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); I440FXState *s =3D I440FX_PCI_HOST_BRIDGE(dev); PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + PCIBus *b; + PCIDevice *d; + PCII440FXState *f; + unsigned i; =20 memory_region_add_subregion(s->io_memory, 0xcf8, &phb->conf_mem); sysbus_init_ioports(sbd, 0xcf8, 4); @@ -262,36 +267,10 @@ static void i440fx_pcihost_realize(DeviceState *dev, = Error **errp) /* register i440fx 0xcf8 port as coalesced pio */ memory_region_set_flush_coalesced(&phb->data_mem); memory_region_add_coalescing(&phb->conf_mem, 0, 4); -} - -PCIBus *i440fx_init(const char *pci_type, - DeviceState *dev, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *pci_address_space, - MemoryRegion *ram_memory) -{ - I440FXState *s =3D I440FX_PCI_HOST_BRIDGE(dev); - PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); - PCIBus *b; - PCIDevice *d; - PCII440FXState *f; - unsigned i; - - s->system_memory =3D address_space_mem; - s->io_memory =3D address_space_io; - s->pci_address_space =3D pci_address_space; - s->ram_memory =3D ram_memory; - s->below_4g_mem_size =3D below_4g_mem_size; - s->above_4g_mem_size =3D above_4g_mem_size; - s->pci_type =3D (char *)pci_type; =20 b =3D pci_root_bus_new(dev, NULL, s->pci_address_space, s->io_memory, 0, TYPE_PCI_BUS); phb->bus =3D b; - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 d =3D pci_create_simple(b, 0, s->pci_type); f =3D I440FX_PCI_DEVICE(d); @@ -335,8 +314,6 @@ PCIBus *i440fx_init(const char *pci_type, d->config[I440FX_COREBOOT_RAM_SIZE] =3D ram_size; =20 i440fx_update_memory_mappings(f); - - return b; } =20 static void i440fx_class_init(ObjectClass *klass, void *data) --=20 2.41.0 From nobody Sat Jun 15 08:43: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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1688110762; cv=none; d=zohomail.com; s=zohoarc; b=AiiwAMwjy+Q7itllmQvqS4x7hW3XxpVy4PVw1zeQyItjlwgZV1VZ1043yVt28F58Y26GM/oyZMbXqohVutvz9isbCTiByRFzOM68E6qOweiKTqP50z25Nj3hUtc2DlJWVB3Z1Z9YhdL9mU/Fzoysu3XfSlQ5a4KLC/ViVmgc2oY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688110762; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pOf3K5c1LYvFQTKfHh34pmRh6PTnzPVYs2BYazeElIQ=; b=NYrvDp/XyCz43XsbpRDT7Vfahy01lIj+QZHg6jU/3EWLjDs4OtV8eUzHba4ge96gLxLKAHdY1j7nzqTNf67/r1pFm9NyxINdDT6t1Us3C06iWj2QIx+UOuU0DbvEoahRsXbL6VAi6rRG/BTwL6uMwKFcAfjdfjJ5uEIRwQTGChE= 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 1688110762067223.23255278444208; Fri, 30 Jun 2023 00:39:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8hi-0002U9-7z; Fri, 30 Jun 2023 03:38:06 -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 1qF8hS-00027P-9M for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:51 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8hQ-0005SC-IA for qemu-devel@nongnu.org; Fri, 30 Jun 2023 03:37:50 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2b69f1570b2so25193951fa.0 for ; Fri, 30 Jun 2023 00:37:48 -0700 (PDT) Received: from archlinux.. (dynamic-089-012-131-254.89.12.pool.telefonica.de. [89.12.131.254]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00988b32160dfsm7625578ejg.222.2023.06.30.00.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 00:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688110666; x=1690702666; 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=pOf3K5c1LYvFQTKfHh34pmRh6PTnzPVYs2BYazeElIQ=; b=p3ze413PffepApOROqKyYZbU9VUS2YrMe0Vku/UIGpCJvfpG73SOqcxEEufrqTG8OF 3Srvf6A2lsrsq2YkczhiZ+qp0Dsyb9GKxHs76oKmlbi5N7RvoImqRjOMy/sOqNEVZOmr OPd2NWlvj2YRU3mPriCCyPB54cRzuUcDMWcJLxSxcTs3ZFSll3zhNn+forCxETIxWRrS 0udm14CHXIrxskAdI0A0hz0/zzrmtl0UxoWwsriWNVQIkeShbwUNxDkAyCOdv+0N6Ot5 ysrIiGzhRXx98M8HKuc5bSErf0qVCAq1cZIZXtQoY6175AGgXyI+D/Rkd/IlFhHeYYbr ik1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688110666; x=1690702666; 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=pOf3K5c1LYvFQTKfHh34pmRh6PTnzPVYs2BYazeElIQ=; b=eiOziRhEViJMeQI8GTAzPEIYDFRYz6ci/D1RlNXLfy1lVa4tvG8pRN6j7hl8rBhwyn MQyi3ZnEwy73o2toSSMdxAdmsMH0HIviVovpBGoJ0YAV662NAqte2vnH1ARCdnev4cbB /PYNJSE5eU1gwvnqMy+7Ck8ahrGghP80Iq1t8C/g+jDuLPhzpx/UX7Zv8idwnfXWGrH0 zu6M8/YY66XKDjElnOZmIlehlkcKg3AXG7hlJvnqpwIRvpqVAIevb90nausvqkLtz4iU J+rCrzydRcwFk53VxErEQp4Rsz0b5UF8mZ2I9men52Y12QMrX6k7SSww99ZPuZzUL4yW wurw== X-Gm-Message-State: ABy/qLY0bzxVGFT1XTWGKDLgC1mE5gP+BAHs44Zn8M7aesSXS2HuMHG0 AtEOVqwk1u8dolCjVv4FNxMy/G1Y4ws= X-Google-Smtp-Source: APBJJlE8p3ihtVR/oeVHM6IgahlZ4SDrNm2LssCZ9kzuL+QwCNPb9A3s91sqVXNNKZ8yg431SMYPiA== X-Received: by 2002:a2e:918f:0:b0:2b6:9ed2:f61c with SMTP id f15-20020a2e918f000000b002b69ed2f61cmr1335104ljg.7.1688110666297; Fri, 30 Jun 2023 00:37:46 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Marcel Apfelbaum , Eduardo Habkost , Paolo Bonzini , "Michael S. Tsirkin" , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 17/17] hw/i386/pc_piix: Move i440fx' realize near its qdev_new() Date: Fri, 30 Jun 2023 09:37:20 +0200 Message-ID: <20230630073720.21297-18-shentey@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630073720.21297-1-shentey@gmail.com> References: <20230630073720.21297-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::22f; envelope-from=shentey@gmail.com; helo=mail-lj1-x22f.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1688110763918100003 I440FX realization is currently mixed with PIIX3 creation. Furthermore, it = is common practice to only set properties between a device's qdev_new() and qdev_realize(). Clean up to resolve both issues. Since I440FX spawns a PCI bus let's also move the pci_bus initialization th= ere. Note that when running `qemu-system-x86_64 -M pc -S` before and after this patch, `info mtree` in the QEMU console doesn't show any differences except= that the ordering is different. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 51 ++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 62148d7636..b18443d3df 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -114,7 +114,7 @@ static void pc_init1(MachineState *machine, X86MachineState *x86ms =3D X86_MACHINE(machine); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); - PCIBus *pci_bus; + PCIBus *pci_bus =3D NULL; ISABus *isa_bus; int piix3_devfn =3D -1; qemu_irq smi_irq; @@ -126,7 +126,6 @@ static void pc_init1(MachineState *machine, MemoryRegion *rom_memory =3D system_memory; ram_addr_t lowmem; uint64_t hole64_size =3D 0; - Object *phb =3D NULL; =20 /* * Calculate ram split, for memory below and above 4G. It's a bit @@ -198,11 +197,36 @@ static void pc_init1(MachineState *machine, } =20 if (pcmc->pci_enabled) { + Object *phb; + pci_memory =3D g_new(MemoryRegion, 1); memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); rom_memory =3D pci_memory; + phb =3D OBJECT(qdev_new(host_type)); object_property_add_child(OBJECT(machine), "i440fx", phb); + object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, + OBJECT(ram_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, + OBJECT(pci_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, + OBJECT(system_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, + OBJECT(system_io), &error_fatal); + object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, + x86ms->below_4g_mem_size, &error_fatal); + object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, + x86ms->above_4g_mem_size, &error_fatal); + object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, pci_type, + &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); + + pci_bus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); + pci_bus_map_irqs(pci_bus, + xen_enabled() ? xen_pci_slot_get_pirq + : pc_pci_slot_get_pirq); + pcms->bus =3D pci_bus; + hole64_size =3D object_property_get_uint(phb, PCI_HOST_PROP_PCI_HOLE64_SI= ZE, &error_abort); @@ -239,28 +263,6 @@ static void pc_init1(MachineState *machine, PIIX3State *piix3; PCIDevice *pci_dev; =20 - object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, - OBJECT(ram_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, - OBJECT(pci_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, - OBJECT(system_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, - OBJECT(system_io), &error_fatal); - object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, - x86ms->below_4g_mem_size, &error_fatal); - object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, - x86ms->above_4g_mem_size, &error_fatal); - object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, - pci_type, &error_fatal); - sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); - - pci_bus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); - pci_bus_map_irqs(pci_bus, - xen_enabled() ? xen_pci_slot_get_pirq - : pc_pci_slot_get_pirq); - pcms->bus =3D pci_bus; - pci_dev =3D pci_create_simple_multifunction(pci_bus, -1, true, TYPE_PIIX3_DEVICE); =20 @@ -285,7 +287,6 @@ static void pc_init1(MachineState *machine, rtc_state =3D ISA_DEVICE(object_resolve_path_component(OBJECT(pci_= dev), "rtc")); } else { - pci_bus =3D NULL; isa_bus =3D isa_bus_new(NULL, system_memory, system_io, &error_abort); =20 --=20 2.41.0