From patchwork Wed Nov 7 15:24:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 150410 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5298899ljp; Wed, 7 Nov 2018 07:25:08 -0800 (PST) X-Google-Smtp-Source: AJdET5fVXUKfO7zF0870M73yiGVk4eqNP2uJySpSdjDiR0wBTQ70tm0BWYAQRT6DUhLGyl2MB7vq X-Received: by 2002:a17:906:a301:: with SMTP id j1-v6mr435198ejz.188.1541604307751; Wed, 07 Nov 2018 07:25:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541604307; cv=none; d=google.com; s=arc-20160816; b=l+DkuNUzEW1ZJ3qtehDt3DV1zLMYnWuZ+o7V6cNPJ9Ibf/Uvl8semNWWP1Ft9abm0m 2IqIBkYhJA4gF5PnClcfa9BxZZ4zG4+XomrEzMUSj6waKCCN30gfYSfbJXMECnKGib41 DJdnzR/8ZK4TfNdKfjwbK8VzPI4hGVXbg+uHtjY9gIomOHJ4WAO1Cll7yn2DeL1t5G1z 5Ao1oiHYxg14UAmLKKKrIOITfIr005jam+ZqLv/32QrNWQ/Y1uetaDTVu+zIqhV2XPHb +XY0nnRAKbHAMwMWMMUSSQVa1c/XsKUqSn4flNNHEeFIRi6lhm3F2jcfqdRQcxjgUqov RK1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :dkim-signature; bh=1+BuE35pKySQpA77M2M4ZtG3mfIegMwlwd5o2kpPTl4=; b=ESRqvZD0xgrnHj5tkLktuRJUS7n+n6O5LsFhLXC2opAZh7PjyTbEnWQjyOfC++J2Ea 8YL2sDi6hFRz8PtOTgZVloWg6jH+xlr3of5ihW1l4C+xN8UDZ4ZMKelg84/KlyFhRfQo X9WKij3wEiv2t0MbEUCPckDFXFXgfk2ikhxM/OhAsxzmdEGAXwjRh4s73FBsVQuMnLMr 3GHCOaBzK40e8k7YFLTLVnaPXe17Qgb4h1dJYLJRNNzVkkq0Ujvw6etcYSPddeSikIDm jvrTPfK+RGTKmsImcHtA1I4RlLp0wY37DMuRz+xPYqMUb9b7rPaaYRcVt1gDQYUpUvO2 LnQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=eKbN2Uc4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z1-v6si561312edi.394.2018.11.07.07.25.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Nov 2018 07:25:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=eKbN2Uc4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:48925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKPha-0004q8-Jy for patch@linaro.org; Wed, 07 Nov 2018 10:25:06 -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) 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-Received: by 2002:aca:3cc5:: with SMTP id j188-v6mr333525oia.203.1541604280628; Wed, 07 Nov 2018 07:24:40 -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) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- 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. -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 = PC_MACHINE(obj); - return pcms->smbus; + return pcms->smbus_enabled; } static void pc_machine_set_smbus(Object *obj, bool value, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); - pcms->smbus = value; + pcms->smbus_enabled = value; } static bool pc_machine_get_sata(Object *obj, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); - return pcms->sata; + return pcms->sata_enabled; } static void pc_machine_set_sata(Object *obj, bool value, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); - pcms->sata = value; + pcms->sata_enabled = value; } static bool pc_machine_get_pit(Object *obj, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); - return pcms->pit; + return pcms->pit_enabled; } static void pc_machine_set_pit(Object *obj, bool value, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); - pcms->pit = value; + pcms->pit_enabled = value; } static void pc_machine_initfn(Object *obj) @@ -2271,9 +2271,9 @@ static void pc_machine_initfn(Object *obj) pcms->acpi_nvdimm_state.is_enabled = false; /* acpi build is enabled by default if machine supports it */ pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build; - pcms->smbus = true; - pcms->sata = true; - pcms->pit = true; + pcms->smbus_enabled = true; + pcms->sata_enabled = true; + pcms->pit_enabled = true; } 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, /* init basic PC hardware */ pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, true, - (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit, 0x4); + (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled, + 0x4); pc_nic_init(pcmc, isa_bus, pci_bus); 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) /* init basic PC hardware */ pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy, - (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit, + (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled, 0xff0104); /* connect pm stuff to lpc */ ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms)); - if (pcms->sata) { + if (pcms->sata_enabled) { /* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci = 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); } - 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_FUNC), 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; bool acpi_build_enabled; - bool smbus; - bool sata; - bool pit; + bool smbus_enabled; + bool sata_enabled; + bool pit_enabled; /* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size;