[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH-for-5.2] hw/i386/q35: Remove unreachable Xen code on Q35 mach
From: |
Paolo Bonzini |
Subject: |
Re: [PATCH-for-5.2] hw/i386/q35: Remove unreachable Xen code on Q35 machine |
Date: |
Wed, 16 Sep 2020 18:55:48 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 |
On 22/07/20 10:25, Philippe Mathieu-Daudé wrote:
> Xen accelerator requires specific changes to a machine to be able
> to use it. See for example the 'Xen PC' machine configure its PCI
> bus calling pc_xen_hvm_init_pci(). There is no 'Xen Q35' machine
> declared. This code was probably added while introducing the Q35
> machine, based on the existing PC machine (see commit df2d8b3ed4
> "Introduce q35 pc based chipset emulator"). Remove the unreachable
> code to simplify this file.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/i386/pc_q35.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index a3e607a544..12f5934241 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -34,9 +34,7 @@
> #include "sysemu/arch_init.h"
> #include "hw/i2c/smbus_eeprom.h"
> #include "hw/rtc/mc146818rtc.h"
> -#include "hw/xen/xen.h"
> #include "sysemu/kvm.h"
> -#include "sysemu/xen.h"
> #include "hw/kvm/clock.h"
> #include "hw/pci-host/q35.h"
> #include "hw/qdev-properties.h"
> @@ -179,10 +177,6 @@ static void pc_q35_init(MachineState *machine)
> x86ms->below_4g_mem_size = machine->ram_size;
> }
>
> - if (xen_enabled()) {
> - xen_hvm_init(pcms, &ram_memory);
> - }
> -
> x86_cpus_init(x86ms, pcmc->default_cpu_version);
>
> kvmclock_create();
> @@ -208,10 +202,7 @@ static void pc_q35_init(MachineState *machine)
> }
>
> /* allocate ram and load rom/bios */
> - if (!xen_enabled()) {
> - pc_memory_init(pcms, get_system_memory(),
> - rom_memory, &ram_memory);
> - }
> + pc_memory_init(pcms, get_system_memory(), rom_memory, &ram_memory);
>
> /* create pci host bus */
> q35_host = Q35_HOST_DEVICE(qdev_new(TYPE_Q35_HOST_DEVICE));
> @@ -271,7 +262,7 @@ static void pc_q35_init(MachineState *machine)
>
> assert(pcms->vmport != ON_OFF_AUTO__MAX);
> if (pcms->vmport == ON_OFF_AUTO_AUTO) {
> - pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
> + pcms->vmport = ON_OFF_AUTO_ON;
> }
>
> /* init basic PC hardware */
>
Queued, thanks.
Paolo
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH-for-5.2] hw/i386/q35: Remove unreachable Xen code on Q35 machine,
Paolo Bonzini <=