From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zelbg-0007cO-1T for qemu-devel@nongnu.org; Wed, 23 Sep 2015 11:05:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zelbc-0008By-1U for qemu-devel@nongnu.org; Wed, 23 Sep 2015 11:05:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35790) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zelbb-0008Bo-Te for qemu-devel@nongnu.org; Wed, 23 Sep 2015 11:05:11 -0400 From: Eduardo Habkost Date: Wed, 23 Sep 2015 12:04:49 -0300 Message-Id: <1443020689-5370-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH] pc: Set broken_reserved_end on pc-*-2.4, not 2.5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , Richard Henderson , Jason Wang , "Michael S. Tsirkin" Version 1 of the pc-*-2.5 machine class series was applied to the PCI tree instead of v3 (which was rebased after the broken_reserved_end patch by Igor was included). This patch includes the missing hunks from v3, to make sure broken_reserved_end is set at the right machine class. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index caa4edc..3ffb05f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -466,9 +466,7 @@ static void pc_i440fx_machine_options(MachineClass *m) static void pc_i440fx_2_5_machine_options(MachineClass *m) { - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); - pcmc->broken_reserved_end = true; m->alias = "pc"; m->is_default = 1; } @@ -479,9 +477,11 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, static void pc_i440fx_2_4_machine_options(MachineClass *m) { + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_2_5_machine_options(m); m->alias = NULL; m->is_default = 0; + pcmc->broken_reserved_end = true; SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 506b6bf..1b7d3b6 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -372,9 +372,7 @@ static void pc_q35_machine_options(MachineClass *m) static void pc_q35_2_5_machine_options(MachineClass *m) { - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); - pcmc->broken_reserved_end = true; m->alias = "q35"; } @@ -383,8 +381,10 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, static void pc_q35_2_4_machine_options(MachineClass *m) { + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_2_5_machine_options(m); m->alias = NULL; + pcmc->broken_reserved_end = true; SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); } -- 2.1.0