From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzrM-0000yv-Ea for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDzrG-0003NF-Ed for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzrG-0003N3-7b for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:38 -0400 Date: Mon, 26 Aug 2013 19:43:33 +0300 From: "Michael S. Tsirkin" Message-ID: <1377535318-30491-12-git-send-email-mst@redhat.com> References: <1377535318-30491-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1377535318-30491-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 11/14] pc: Create pc_compat_*() functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Anthony Liguori From: Eduardo Habkost Making the older compat functions call the newer compat functions at the beginning allows the older functions undo what's done by newer compat functions. e.g.: pc_compat_1_4() will be able to call pc_compat_1_5() and then set has_pvpanic=false. Signed-off-by: Eduardo Habkost Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- hw/i386/pc_q35.c | 31 ++++++++++++++++++++++++------- 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index dd730b1..a5e5bec 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -236,38 +236,68 @@ static void pc_init_pci(QEMUMachineInitArgs *args) pc_init1(args, get_system_memory(), get_system_io(), 1, 1); } -static void pc_init_pci_1_6(QEMUMachineInitArgs *args) +static void pc_compat_1_6(QEMUMachineInitArgs *args) { has_pci_info = false; rom_file_in_ram = false; - pc_init_pci(args); } -static void pc_init_pci_1_5(QEMUMachineInitArgs *args) +static void pc_compat_1_5(QEMUMachineInitArgs *args) { + pc_compat_1_6(args); has_pvpanic = true; - pc_init_pci_1_6(args); } -static void pc_init_pci_1_4(QEMUMachineInitArgs *args) +static void pc_compat_1_4(QEMUMachineInitArgs *args) { + /* 1.5 was special - it enabled pvpanic in builtin machine */ + pc_compat_1_6(args); x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); - /* 1.5 was special - it enabled pvpanic in builtin machine */ - pc_init_pci_1_6(args); } -static void pc_init_pci_1_3(QEMUMachineInitArgs *args) +static void pc_compat_1_3(QEMUMachineInitArgs *args) { + pc_compat_1_4(args); enable_compat_apic_id_mode(); - pc_init_pci_1_4(args); +} + +/* PC compat function for pc-0.14 to pc-1.2 */ +static void pc_compat_1_2(QEMUMachineInitArgs *args) +{ + pc_compat_1_3(args); + disable_kvm_pv_eoi(); +} + +static void pc_init_pci_1_6(QEMUMachineInitArgs *args) +{ + pc_compat_1_6(args); + pc_init_pci(args); +} + +static void pc_init_pci_1_5(QEMUMachineInitArgs *args) +{ + pc_compat_1_5(args); + pc_init_pci(args); +} + +static void pc_init_pci_1_4(QEMUMachineInitArgs *args) +{ + pc_compat_1_4(args); + pc_init_pci(args); +} + +static void pc_init_pci_1_3(QEMUMachineInitArgs *args) +{ + pc_compat_1_3(args); + pc_init_pci(args); } /* PC machine init function for pc-0.14 to pc-1.2 */ static void pc_init_pci_1_2(QEMUMachineInitArgs *args) { - disable_kvm_pv_eoi(); - pc_init_pci_1_3(args); + pc_compat_1_2(args); + pc_init_pci(args); } /* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */ diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4847f46..f5e0b94 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -215,25 +215,42 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } -static void pc_q35_init_1_6(QEMUMachineInitArgs *args) +static void pc_compat_1_6(QEMUMachineInitArgs *args) { has_pci_info = false; rom_file_in_ram = false; - pc_q35_init(args); } -static void pc_q35_init_1_5(QEMUMachineInitArgs *args) +static void pc_compat_1_5(QEMUMachineInitArgs *args) { + pc_compat_1_6(args); has_pvpanic = true; - pc_q35_init_1_6(args); } -static void pc_q35_init_1_4(QEMUMachineInitArgs *args) +static void pc_compat_1_4(QEMUMachineInitArgs *args) { + /* 1.5 was special - it enabled pvpanic in builtin machine */ + pc_compat_1_6(args); x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); - /* 1.5 was special - it enabled pvpanic in builtin machine */ - pc_q35_init_1_6(args); +} + +static void pc_q35_init_1_6(QEMUMachineInitArgs *args) +{ + pc_compat_1_6(args); + pc_q35_init(args); +} + +static void pc_q35_init_1_5(QEMUMachineInitArgs *args) +{ + pc_compat_1_5(args); + pc_q35_init(args); +} + +static void pc_q35_init_1_4(QEMUMachineInitArgs *args) +{ + pc_compat_1_4(args); + pc_q35_init(args); } static QEMUMachine pc_q35_machine_v1_6 = { -- MST