[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 54/57] hw/i386/q35: Remove unreachable Xen code on Q35 machine
From: |
Paolo Bonzini |
Subject: |
[PULL 54/57] hw/i386/q35: Remove unreachable Xen code on Q35 machine |
Date: |
Sat, 19 Sep 2020 11:59:13 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
Message-Id: <20200722082517.18708-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@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 4a37bc3e6d..aa4b6c8e30 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
- [PULL 25/57] hw/char/serial: Make 'wakeup' property boolean, (continued)
- [PULL 25/57] hw/char/serial: Make 'wakeup' property boolean, Paolo Bonzini, 2020/09/19
- [PULL 41/57] oslib: do not call g_strdup from qemu_get_exec_dir, Paolo Bonzini, 2020/09/19
- [PULL 56/57] checkpatch: avoid error on cover letter files, Paolo Bonzini, 2020/09/19
- [PULL 38/57] meson: qtest: set "depends" correctly, Paolo Bonzini, 2020/09/19
- [PULL 44/57] cutils: introduce get_relocated_path, Paolo Bonzini, 2020/09/19
- [PULL 34/57] configure: move malloc_trim/tcmalloc/jemalloc to meson, Paolo Bonzini, 2020/09/19
- [PULL 33/57] meson: extend libmpathpersist test for static linking, Paolo Bonzini, 2020/09/19
- [PULL 39/57] mtest2make: add support for introspected test dependencies, Paolo Bonzini, 2020/09/19
- [PULL 36/57] configure: move cocoa option to Meson, Paolo Bonzini, 2020/09/19
- [PULL 50/57] qemu-bridge-helper: relocate path to default ACL, Paolo Bonzini, 2020/09/19
- [PULL 54/57] hw/i386/q35: Remove unreachable Xen code on Q35 machine,
Paolo Bonzini <=
- [PULL 49/57] vl: relocate path to configuration file, Paolo Bonzini, 2020/09/19
- [PULL 48/57] vl: relocate paths to data directories, Paolo Bonzini, 2020/09/19
- [PULL 57/57] meson: fix installation of keymaps, Paolo Bonzini, 2020/09/19
- [PULL 55/57] exec: Remove MemoryRegion::global_locking field, Paolo Bonzini, 2020/09/19
- [PULL 27/57] scsi-generic: Fix HM-zoned device scan, Paolo Bonzini, 2020/09/19
- [PULL 30/57] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} when XSAVE is not available, Paolo Bonzini, 2020/09/19
- [PULL 46/57] module: relocate path to modules, Paolo Bonzini, 2020/09/19
- [PULL 37/57] configure: do not limit Hypervisor.framework test to Darwin, Paolo Bonzini, 2020/09/19
- [PULL 43/57] oslib-posix: default exec_dir to bindir, Paolo Bonzini, 2020/09/19
- [PULL 51/57] qga: relocate path to default configuration and hook, Paolo Bonzini, 2020/09/19