From nobody Wed May 1 15:50:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154160435006345.65360643618749; Wed, 7 Nov 2018 07:25:50 -0800 (PST) Received: from localhost ([::1]:48932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKPiG-0005Ds-NT for importer@patchew.org; Wed, 07 Nov 2018 10:25:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKPhH-0004pp-F2 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:24:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKPhD-0004Zv-77 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:24:47 -0500 Received: from mail-oi1-x242.google.com ([2607:f8b0:4864:20::242]:43525) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKPhC-0004Vt-5K for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:24:42 -0500 Received: by mail-oi1-x242.google.com with SMTP id j202-v6so14089030oih.10 for ; Wed, 07 Nov 2018 07:24:41 -0800 (PST) Received: from serve.minyard.net ([47.184.170.128]) by smtp.gmail.com with ESMTPSA id l6sm323899otd.44.2018.11.07.07.24.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 07:24:39 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id A528C850; Wed, 7 Nov 2018 09:24:38 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 4FB38301152; Wed, 7 Nov 2018 09:24:38 -0600 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=1+BuE35pKySQpA77M2M4ZtG3mfIegMwlwd5o2kpPTl4=; b=eKbN2Uc44sRnTpZPZuregt8g3KdwaseuHdQBK71qCzlLqeIfPVfpEIVDx3rFywVeIM G+EdXW0XcioEXAnisn5AE9ntOpWV+gIvTzlIiju7i4G7spScBUB3Mx3UCNcHDfknecjn vJKwSRhvNR6Jm4soQcoz83Cet4p9SMBLTQBorphGMOJGbJ7DTFtb3xYCWrvYOE2SW4nX Lua9rR6ZzMCMkepEEV0CmlN7xDKRxW94azV+wvjHCTqevvVx7Vwceq2nc/XZebIieRJk ZtrAEVObaanjQFoFyjZZqDEl//FtB9qZV7UqY6sf/96TOEPrPosV8LDuPAUC8QUBv9M5 y2bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=1+BuE35pKySQpA77M2M4ZtG3mfIegMwlwd5o2kpPTl4=; b=qoilLt8YUs1aaXjIQvbrwE2rQaluK09FHOss+HThfVeCHpIRarnHg9e2N+pmV+VOvO FNLqrqVPaotQzDxGp+Xjf3B6pSKC30JNYQMpJgzrFsrpXY8K4kEoHUkLqOGzj17lj0+/ 5h3dENWilAiVRZzVxiLqpug6b2Bor56Fi7t6V2lAVKyoK/H+Y5u5kUOeW8ujBx44cXS3 MDdgYAx7fSjbEzygFfCOuvTShv6/xVHBdowwoRB0yXqTqv+o/ahnRkrf4XKyW/foE9Cy ir1ibkPUe2J1FP+P42Ez5Z7rkxdbgL/i6bSt4KdsGwC4HUjFDaBM3kt1xQN+ne9HmMdO VPVQ== X-Gm-Message-State: AGRZ1gIMGyCHKpY0MSzlrDuWr4tgXbCEp5NTiieerZ/3UgpCByjpHGa+ F19o/9vqXThnvcOalZYIRdjp8Go= X-Google-Smtp-Source: AJdET5d8OCwW80eULuP3bBM3WN8m+EVMd3XMYAvrI7SRZdDMXezu9Ttz2ZRw6QIjym/MC1jSgVSV2Q== X-Received: by 2002:aca:3cc5:: with SMTP id j188-v6mr333525oia.203.1541604280628; Wed, 07 Nov 2018 07:24:40 -0800 (PST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 7 Nov 2018 09:24:34 -0600 Message-Id: <20181107152434.22219-1-minyard@acm.org> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::242 Subject: [Qemu-devel] [PATCH] i386: Rename bools in PCMachineState to end in _enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , Richard Henderson , Eduardo Habkost , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Corey Minyard This makes their function more clear and prevents conflicts when adding the actual devices to the machine state, if necessary. Signed-off-by: Corey Minyard Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 18 +++++++++--------- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 6 +++--- include/hw/i386/pc.h | 6 +++--- 4 files changed, 17 insertions(+), 16 deletions(-) I have this change in my tree because I have SMBus ACPI support for an SMBus IPMI device. Thus I need to add the smbus to the PC machine state and it seems better to have the device named "smbus" and the enable named "smbus_enabled". However, I think this change makes the code more consistent and clear. Thus I am sending it separately. diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f095725dba..4cd2fbca4d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2222,42 +2222,42 @@ static bool pc_machine_get_smbus(Object *obj, Error= **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); =20 - return pcms->smbus; + return pcms->smbus_enabled; } =20 static void pc_machine_set_smbus(Object *obj, bool value, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); =20 - pcms->smbus =3D value; + pcms->smbus_enabled =3D value; } =20 static bool pc_machine_get_sata(Object *obj, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); =20 - return pcms->sata; + return pcms->sata_enabled; } =20 static void pc_machine_set_sata(Object *obj, bool value, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); =20 - pcms->sata =3D value; + pcms->sata_enabled =3D value; } =20 static bool pc_machine_get_pit(Object *obj, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); =20 - return pcms->pit; + return pcms->pit_enabled; } =20 static void pc_machine_set_pit(Object *obj, bool value, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); =20 - pcms->pit =3D value; + pcms->pit_enabled =3D value; } =20 static void pc_machine_initfn(Object *obj) @@ -2271,9 +2271,9 @@ static void pc_machine_initfn(Object *obj) pcms->acpi_nvdimm_state.is_enabled =3D false; /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled =3D PC_MACHINE_GET_CLASS(pcms)->has_acpi_buil= d; - pcms->smbus =3D true; - pcms->sata =3D true; - pcms->pit =3D true; + pcms->smbus_enabled =3D true; + pcms->sata_enabled =3D true; + pcms->pit_enabled =3D true; } =20 static void pc_machine_reset(void) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index dc09466b3e..dc7a0d3fa1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -239,7 +239,8 @@ static void pc_init1(MachineState *machine, =20 /* init basic PC hardware */ pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, true, - (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit, 0x= 4); + (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, + 0x4); =20 pc_nic_init(pcmc, isa_bus, pci_bus); =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 532241e3f8..0b65887bbf 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -236,13 +236,13 @@ static void pc_q35_init(MachineState *machine) =20 /* init basic PC hardware */ pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy, - (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit, + (pcms->vmport !=3D ON_OFF_AUTO_ON), pcms->pit_ena= bled, 0xff0104); =20 /* connect pm stuff to lpc */ ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms)); =20 - if (pcms->sata) { + if (pcms->sata_enabled) { /* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci =3D pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_SATA1_DEV, @@ -262,7 +262,7 @@ static void pc_q35_init(MachineState *machine) ehci_create_ich9_with_companions(host_bus, 0x1d); } =20 - if (pcms->smbus) { + if (pcms->smbus_enabled) { /* TODO: Populate SPD eeprom data. */ smbus_eeprom_init(ich9_smb_init(host_bus, PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_F= UNC), diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 136fe497b6..7bb52b4762 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -49,9 +49,9 @@ struct PCMachineState { AcpiNVDIMMState acpi_nvdimm_state; =20 bool acpi_build_enabled; - bool smbus; - bool sata; - bool pit; + bool smbus_enabled; + bool sata_enabled; + bool pit_enabled; =20 /* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size; --=20 2.17.1