From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgAZ-0003tO-P1 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:36:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYgAX-0005RN-3N for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:36:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYgAW-0005RJ-U3 for qemu-devel@nongnu.org; Wed, 24 Feb 2016 15:36:21 -0500 Date: Wed, 24 Feb 2016 22:36:16 +0200 From: "Michael S. Tsirkin" Message-ID: <1456343639-3471-21-git-send-email-mst@redhat.com> References: <1456343639-3471-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456343639-3471-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 20/23] machine: Remove no_tco field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Markus Armbruster , Paolo Bonzini , Igor Mammedov , Laszlo Ersek , Richard Henderson From: Eduardo Habkost The field is always set to zero, so it is not necessary anymore. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Laszlo Ersek Reviewed-by: Markus Armbruster Reviewed-by: Igor Mammedov --- include/hw/boards.h | 1 - hw/i386/pc_q35.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 0f30959..de3b3bd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -84,7 +84,6 @@ struct MachineClass { no_cdrom:1, no_sdcard:1, has_dynamic_sysbus:1, - no_tco:1, pci_allow_0_address:1; int is_default; const char *default_machine_opts; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 2974912..3ba0c38 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -225,7 +225,7 @@ static void pc_q35_init(MachineState *machine) (pcms->vmport != ON_OFF_AUTO_ON), 0xff0104); /* connect pm stuff to lpc */ - ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms), !mc->no_tco); + ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms), true); /* ahci and SATA device, for q35 1 ahci controller is built-in */ ahci = pci_create_simple_multifunction(host_bus, @@ -280,7 +280,6 @@ static void pc_q35_machine_options(MachineClass *m) m->default_machine_opts = "firmware=bios-256k.bin"; m->default_display = "std"; m->no_floppy = 1; - m->no_tco = 0; } static void pc_q35_2_6_machine_options(MachineClass *m) -- MST