From nobody Mon Feb 9 07:32:33 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1711641606; cv=none; d=zohomail.com; s=zohoarc; b=EUbVgxBoEJWFxyS4m755YMyotyNKNXfnzRq6r28iW6ou8vCKLuoNtFLmvwSGDRFdZe9mWnNrMfxNYA0KyLjP22rJ0Cjr5ooSu5Ysls7iYqCJMV6N7MZXdW4BK1MES6ZwNkMIZj2L+zNTnW9fFq3eoCRpHuIQVooFrTLG+A/TfYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711641606; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YADozrynE6WAolQE0PpJsPO9+XRuTB0w7hXGd8JOVMk=; b=O5Xq9/koGLTqtb0voDpOd9cgG6BPEnRl5X63KGjmwCVjpc9EMw1x3IGP3vuPojnqDDC8z/PLQd7EmkSQP7E7P2HYN2wKftOJrMPxaTjJOt6vC8FER6WQ3N/3YVQqyOfC/uJ4Pzh9aROaVYSFdrloPXc1wDrCivrr+Q1IZKtUILk= 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 1711641601154309.81070074633; Thu, 28 Mar 2024 09:00:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rps7c-0005A6-Sf; Thu, 28 Mar 2024 11:56:57 -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 1rps7D-0004Rf-UL for qemu-devel@nongnu.org; Thu, 28 Mar 2024 11:56:35 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rps79-0002Qm-MC for qemu-devel@nongnu.org; Thu, 28 Mar 2024 11:56:30 -0400 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-513e6777af4so1700851e87.2 for ; Thu, 28 Mar 2024 08:56:25 -0700 (PDT) Received: from m1x-phil.lan (pas38-h02-176-184-5-52.dsl.sta.abo.bbox.fr. [176.184.5.52]) by smtp.gmail.com with ESMTPSA id i23-20020a170906265700b00a4749a1de50sm911948ejc.176.2024.03.28.08.56.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 28 Mar 2024 08:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711641383; x=1712246183; darn=nongnu.org; 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=YADozrynE6WAolQE0PpJsPO9+XRuTB0w7hXGd8JOVMk=; b=bNgcRPVC1lAOCjQ3ZlTPi4Rvg7x9ZYCxsNS9xHm8EtSjXq5pBEugDnEORT0gIM+jLz BWwy1RBcbJxvV7INgHFththJF4onONnPSJj4Hg+6l/sSUj0o6bsSg1j7PhR81sIN6THG GAjdctwf6BaQiwpdrKEBu5CBL+H9qYm1s59t0UE5nH/q7ZOBysCHhMtsZ+EHzhysYL2K 7ooQuBXIuoOSfjyPucuzszDAuwHIDznaIm5VCKvrxqAkZocwdhl+l5BsdNZzvz7hZPue JFCEGhkBb/4+0aS4QVQrBaZU7mYx0lLUbDjTjlU/w4cms1D2a7x8UVxSCms9OT5EC2zs VD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711641383; x=1712246183; 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=YADozrynE6WAolQE0PpJsPO9+XRuTB0w7hXGd8JOVMk=; b=vvhRIsEN6bgNDKIwI9mnrrgjJEc9iDbaxWo/7RE6OM76KlyOHyXxg6ElsB7ISpjPFp /stUoElYHMufpDfG4zOF25U42ZHwmx6fWIivKHitSQ2V7cgaxE9em34S3ekYLHVEOhoY YeG18J7DtafZW6dtQfTY5lJFHjOOdVB5r1S5qqtSRfudSPerLzWuTISKcMNNzSog05k8 dEvJwHw8PYeiGqrFgYsphXsY+fUuq5SFUBq2WDDMov8V002g4VM7LDmUfkWDXnfgkiqj JKp+4ND8y3bgkpMXgwpy3eNoPFOcMs2YyWucpQZZ+4Zg+lGWv0Gl9hw1kwxghHfpFhEr rWwQ== X-Gm-Message-State: AOJu0Yw9YZn0qieKd9/zQXp5gOAfv17O0HNtQ6cwWMcLuzJj3qfrgiUy YuBirRvoE1hUmadBV2xGjHr7bekxwcgcUA40Nz8qmjrG/4Pa8UjSVv8Ss27k7JB2f/o1KdJYPMY u X-Google-Smtp-Source: AGHT+IFET2qLkxCYJlLAe5wqUF2LJxJCZxdIrO9Tbo3cYr9nsR7BCDgXHuGLT1xPB8OJyuTlfGMDhg== X-Received: by 2002:a05:6512:78f:b0:513:e643:cd12 with SMTP id x15-20020a056512078f00b00513e643cd12mr2537328lfr.26.1711641383341; Thu, 28 Mar 2024 08:56:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Eduardo Habkost , Stefano Stabellini , xen-devel@lists.xenproject.org, Bernhard Beschow , Thomas Huth , Marcel Apfelbaum , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov , Anthony Perard , Ani Sinha , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH-for-9.1 16/29] hw/i386/pc: Move south-bridge related fields to PcPciMachine Date: Thu, 28 Mar 2024 16:54:24 +0100 Message-ID: <20240328155439.58719-17-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240328155439.58719-1-philmd@linaro.org> References: <20240328155439.58719-1-philmd@linaro.org> 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::130; envelope-from=philmd@linaro.org; helo=mail-lf1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1711641607268100001 South bridge type is only relevant for the i440fx/piix machine, which is PCI-based. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i386/pc.h | 8 ++++---- hw/i386/pc.c | 3 ++- hw/i386/pc_piix.c | 12 ++++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 668347c248..2db2aa03d3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -38,7 +38,6 @@ typedef struct PCMachineState { uint64_t max_ram_below_4g; OnOffAuto vmport; SmbiosEntryPointType smbios_entry_point_type; - const char *south_bridge; =20 bool smbus_enabled; bool sata_enabled; @@ -59,6 +58,7 @@ typedef struct PcPciMachineState { Notifier machine_done; =20 bool acpi_build_enabled; + const char *southbridge_typename; uint64_t max_fw_size; =20 PFlashCFI01 *flash[2]; @@ -88,9 +88,6 @@ typedef struct PcPciMachineState { typedef struct PCMachineClass { X86MachineClass parent_class; =20 - /* Device configuration: */ - const char *default_south_bridge; - /* Compat options: */ =20 /* Default CPU model version. See x86_cpu_set_default_version(). */ @@ -126,6 +123,9 @@ typedef struct PCMachineClass { typedef struct PcPciMachineClass { PCMachineClass parent_class; =20 + /* Device configuration: */ + const char *default_southbridge_typename; + /* ACPI compat: */ int pci_root_uid; } PcPciMachineClass; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5753a3ff0b..dd44df0470 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1667,7 +1667,6 @@ static void pc_machine_initfn(Object *obj) #endif /* CONFIG_VMPORT */ pcms->max_ram_below_4g =3D 0; /* use default */ pcms->smbios_entry_point_type =3D pcmc->default_smbios_ep_type; - pcms->south_bridge =3D pcmc->default_south_bridge; =20 pcms->smbus_enabled =3D true; pcms->sata_enabled =3D true; @@ -1689,9 +1688,11 @@ static void pc_machine_initfn(Object *obj) static void pc_pci_machine_initfn(Object *obj) { PcPciMachineState *ppms =3D PC_PCI_MACHINE(obj); + PcPciMachineClass *ppmc =3D PC_PCI_MACHINE_GET_CLASS(ppms); =20 ppms->acpi_build_enabled =3D true; ppms->max_fw_size =3D 8 * MiB; + ppms->southbridge_typename =3D ppmc->default_southbridge_typename; =20 pc_system_flash_create(ppms); cxl_machine_init(obj, &ppms->cxl_devices_state); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6b3403d0bd..2043a7022a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -243,7 +243,7 @@ static void pc_init1(MachineState *machine, const char = *pci_type) DeviceState *dev; size_t i; =20 - pci_dev =3D pci_new_multifunction(-1, pcms->south_bridge); + pci_dev =3D pci_new_multifunction(-1, ppms->southbridge_typename); object_property_set_bool(OBJECT(pci_dev), "has-usb", machine_usb(machine), &error_abort); object_property_set_bool(OBJECT(pci_dev), "has-acpi", @@ -385,12 +385,12 @@ static const QEnumLookup PCSouthBridgeOption_lookup = =3D { =20 static int pc_get_south_bridge(Object *obj, Error **errp) { - PCMachineState *pcms =3D PC_MACHINE(obj); + PcPciMachineState *ppms =3D PC_PCI_MACHINE(obj); int i; =20 for (i =3D 0; i < PCSouthBridgeOption_lookup.size; i++) { if (g_strcmp0(PCSouthBridgeOption_lookup.array[i], - pcms->south_bridge) =3D=3D 0) { + ppms->southbridge_typename) =3D=3D 0) { return i; } } @@ -401,7 +401,7 @@ static int pc_get_south_bridge(Object *obj, Error **err= p) =20 static void pc_set_south_bridge(Object *obj, int value, Error **errp) { - PCMachineState *pcms =3D PC_MACHINE(obj); + PcPciMachineState *ppms =3D PC_PCI_MACHINE(obj); =20 if (value < 0) { error_setg(errp, "Value can't be negative"); @@ -413,7 +413,7 @@ static void pc_set_south_bridge(Object *obj, int value,= Error **errp) return; } =20 - pcms->south_bridge =3D PCSouthBridgeOption_lookup.array[value]; + ppms->southbridge_typename =3D PCSouthBridgeOption_lookup.array[value]; } =20 /* Looking for a pc_compat_2_4() function? It doesn't exist. @@ -472,7 +472,7 @@ static void pc_i440fx_machine_options(MachineClass *m) PcPciMachineClass *ppmc =3D PC_PCI_MACHINE_CLASS(m); ObjectClass *oc =3D OBJECT_CLASS(m); =20 - pcmc->default_south_bridge =3D TYPE_PIIX3_DEVICE; + ppmc->default_southbridge_typename =3D TYPE_PIIX3_DEVICE; ppmc->pci_root_uid =3D 0; pcmc->default_cpu_version =3D 1; =20 --=20 2.41.0