From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVR8h-00051P-Go for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:43:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVR8g-0001s6-Aa for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:43:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVR8g-0001ro-1H for qemu-devel@nongnu.org; Thu, 25 Apr 2013 14:43:26 -0400 From: Eduardo Habkost Date: Thu, 25 Apr 2013 15:43:03 -0300 Message-Id: <1366915386-14728-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1366915386-14728-1-git-send-email-ehabkost@redhat.com> References: <1366915386-14728-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 4/7] pc: Use separate init functions for pc-*-1.4 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= The pc-*-1.4 machine-types will have some compatibility calls, so make them use different init functions from pc-*-1.5. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 9 +++++++-- hw/i386/pc_q35.c | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 943758a..20708dc 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -235,10 +235,15 @@ static void pc_init_pci(QEMUMachineInitArgs *args) initrd_filename, cpu_model, 1, 1); } +static void pc_init_pci_1_4(QEMUMachineInitArgs *args) +{ + pc_init_pci(args); +} + static void pc_init_pci_1_3(QEMUMachineInitArgs *args) { enable_compat_apic_id_mode(); - pc_init_pci(args); + pc_init_pci_1_4(args); } /* PC machine init function for pc-0.14 to pc-1.2 */ @@ -309,7 +314,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = { static QEMUMachine pc_i440fx_machine_v1_4 = { .name = "pc-i440fx-1.4", .desc = "Standard PC (i440FX + PIIX, 1996)", - .init = pc_init_pci, + .init = pc_init_pci_1_4, .max_cpus = 255, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_4, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6ac1a89..7eb4a75 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -209,6 +209,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_q35_init_1_4(QEMUMachineInitArgs *args) +{ + pc_q35_init(args); +} + static QEMUMachine pc_q35_machine_v1_5 = { .name = "pc-q35-1.5", .alias = "q35", @@ -221,7 +226,7 @@ static QEMUMachine pc_q35_machine_v1_5 = { static QEMUMachine pc_q35_machine_v1_4 = { .name = "pc-q35-1.4", .desc = "Standard PC (Q35 + ICH9, 2009)", - .init = pc_q35_init, + .init = pc_q35_init_1_4, .max_cpus = 255, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_4, -- 1.8.1.4