From patchwork Thu Dec 7 21:46:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 845886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="juHG2Ah2"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yt8Xn0nZ5z9s7v for ; Fri, 8 Dec 2017 08:59:53 +1100 (AEDT) Received: from localhost ([::1]:34571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN4Ct-0001s3-8K for incoming@patchwork.ozlabs.org; Thu, 07 Dec 2017 16:59:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN409-0004A7-2S for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN407-0006af-Ef for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:41 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:37821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eN407-0006Zo-4q for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:39 -0500 Received: by mail-pg0-x241.google.com with SMTP id y6so5387977pgp.4 for ; Thu, 07 Dec 2017 13:46:39 -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:in-reply-to:references; bh=drB4JsMJ5WldHw1ZoSBgm2HWNZvfE/7Be9hvXPqXCtQ=; b=juHG2Ah26RLVuFoyXSfPvytmxWcgj30egr0nmS1oai+t4lZqqIzwE6jm03P8B6IP/4 OC1sA3sCqUPS0deHcAVLagezpcZ9kY/PqhvLUOjVOiptQmv2V3om+kvXrUqZWNVJ5gIJ 2/BSqVu4+SiKBxDRNUi0KQEWSH8TNB5d9tHeuXJ9Iea89G8SI2hbLosd6IJIfvn9uwvn z2fJnmOzJ3s71u3QH41W/U+RD2+8OcdbkkskYWiCsSpPpopdJxANjNXxe59jfdDJI1+x pw0U6ZVzUqBCgO8ng6KWfdRvxn+EDFnJl9UCQMRVCLG57hfODaLFOLK5aDQjdPosJQDH zgFg== 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 :in-reply-to:references; bh=drB4JsMJ5WldHw1ZoSBgm2HWNZvfE/7Be9hvXPqXCtQ=; b=iq0mEQ6YdnWCVfaSUQRW0fBdtTqIiszv5Vs1VMJoHgplyje6dNzTQ3CScNVBvwmx9I ao5gOg79h98MKIQd6zHWnXGmj7puTliZCmsC6BGkHTu+DKzp5YbvIEEmAgVmzcepIRZF tnU2Am1I25ninHj4MnSmVsll6t7xa9oKXb60Gy1P8wDNAqXR71+N3v4f0yTH2KANZdSb Qf+S67Oy13n/RO/hl4kOfOm2d1Feif3Q9YLhBbPewj0lyWwwLxh4md+Cfdu5JQxaD8wp frSEWAnBlmGogTLlyEmbKX7fEz/yR5+GwFJeNnThkf5EqWcmPclr8R3I9MfrggqhGJSp gfbA== X-Gm-Message-State: AJaThX62AE14fL8RjsredV8WXww2NSYwdpI02TLULxV1hltDve7UrLYY Qt++/qizGDYMoyvL8Q3a3tu99II= X-Google-Smtp-Source: AGs4zMa0Nlzc2Ic0AYTQxUtfexJR4x0EyIKjTG5dqGM5VQO51nXwvk0+yOpg2xxHwQtsDsceo9nS1g== X-Received: by 10.101.80.1 with SMTP id f1mr26910667pgo.262.1512683198058; Thu, 07 Dec 2017 13:46:38 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id u90sm12063760pfg.106.2017.12.07.13.46.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 13:46:35 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 2C19112D6; Thu, 7 Dec 2017 15:46:26 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 9388430236C; Thu, 7 Dec 2017 15:46:23 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 7 Dec 2017 15:46:20 -0600 Message-Id: <1512683181-8420-14-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512683181-8420-1-git-send-email-minyard@acm.org> References: <1512683181-8420-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 13/14] 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 --- 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(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 186545d..51f38b8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2184,42 +2184,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) @@ -2233,9 +2233,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 5e47528..7e87ef0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -237,7 +237,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(isa_bus, pci_bus); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d606004..6e4bf1a 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -230,13 +230,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, @@ -256,7 +256,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 ef438bd..713aa33 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -50,9 +50,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;