[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/6] hw/i386/q35: Remove unreachable Xen code on Q35 machine
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 1/6] hw/i386/q35: Remove unreachable Xen code on Q35 machine |
Date: |
Tue, 8 Sep 2020 17:55:25 +0200 |
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>
Acked-by: Anthony PERARD <anthony.perard@citrix.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 0cb9c18cd44..f3506269fe0 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 */
--
2.26.2
- [PATCH v2 0/6] hw/xen: Housekeeping, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 1/6] hw/i386/q35: Remove unreachable Xen code on Q35 machine,
Philippe Mathieu-Daudé <=
- [PATCH v2 2/6] hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc(), Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 3/6] sysemu/xen: Add missing 'exec/cpu-common.h' header for ram_addr_t type, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 4/6] stubs: Split accelerator / hardware related stubs, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 5/6] hw/xen: Split x86-specific declaration from generic hardware ones, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 6/6] typedefs: Restrict PCMachineState to 'hw/i386/pc.h', Philippe Mathieu-Daudé, 2020/09/08
- Re: [PATCH v2 0/6] hw/xen: Housekeeping, Paolo Bonzini, 2020/09/22