[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/10] hw/i386/xen: rearrange xen_hvm_init_pc
From: |
Stefano Stabellini |
Subject: |
[PULL 02/10] hw/i386/xen: rearrange xen_hvm_init_pc |
Date: |
Fri, 10 Feb 2023 14:27:21 -0800 |
From: Vikram Garhwal <vikram.garhwal@amd.com>
In preparation to moving most of xen-hvm code to an arch-neutral location,
move non IOREQ references to:
- xen_get_vmport_regs_pfn
- xen_suspend_notifier
- xen_wakeup_notifier
- xen_ram_init
towards the end of the xen_hvm_init_pc() function.
This is done to keep the common ioreq functions in one place which will be
moved to new function in next patch in order to make it common to both x86 and
aarch64 machines.
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/xen/xen-hvm.c | 49 ++++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index b9a6f7f538..1fba0e0ae1 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -1416,12 +1416,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion
**ram_memory)
state->exit.notify = xen_exit_notifier;
qemu_add_exit_notifier(&state->exit);
- state->suspend.notify = xen_suspend_notifier;
- qemu_register_suspend_notifier(&state->suspend);
-
- state->wakeup.notify = xen_wakeup_notifier;
- qemu_register_wakeup_notifier(&state->wakeup);
-
/*
* Register wake-up support in QMP query-current-machine API
*/
@@ -1432,23 +1426,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion
**ram_memory)
goto err;
}
- rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
- if (!rc) {
- DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
- state->shared_vmport_page =
- xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
- 1, &ioreq_pfn, NULL);
- if (state->shared_vmport_page == NULL) {
- error_report("map shared vmport IO page returned error %d
handle=%p",
- errno, xen_xc);
- goto err;
- }
- } else if (rc != -ENOSYS) {
- error_report("get vmport regs pfn returned error %d, rc=%d",
- errno, rc);
- goto err;
- }
-
/* Note: cpus is empty at this point in init */
state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
@@ -1486,7 +1463,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion
**ram_memory)
#else
xen_map_cache_init(NULL, state);
#endif
- xen_ram_init(pcms, ms->ram_size, ram_memory);
qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
@@ -1513,6 +1489,31 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion
**ram_memory)
QLIST_INIT(&xen_physmap);
xen_read_physmap(state);
+ state->suspend.notify = xen_suspend_notifier;
+ qemu_register_suspend_notifier(&state->suspend);
+
+ state->wakeup.notify = xen_wakeup_notifier;
+ qemu_register_wakeup_notifier(&state->wakeup);
+
+ rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
+ if (!rc) {
+ DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
+ state->shared_vmport_page =
+ xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
+ 1, &ioreq_pfn, NULL);
+ if (state->shared_vmport_page == NULL) {
+ error_report("map shared vmport IO page returned error %d
handle=%p",
+ errno, xen_xc);
+ goto err;
+ }
+ } else if (rc != -ENOSYS) {
+ error_report("get vmport regs pfn returned error %d, rc=%d",
+ errno, rc);
+ goto err;
+ }
+
+ xen_ram_init(pcms, ms->ram_size, ram_memory);
+
/* Disable ACPI build because Xen handles it */
pcms->acpi_build_enabled = false;
--
2.25.1
- [PULL 00/10] xenpvh machine, Stefano Stabellini, 2023/02/10
- [PULL 01/10] hw/i386/xen/: move xen-mapcache.c to hw/xen/, Stefano Stabellini, 2023/02/10
- [PULL 03/10] hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState, Stefano Stabellini, 2023/02/10
- [PULL 02/10] hw/i386/xen: rearrange xen_hvm_init_pc,
Stefano Stabellini <=
- [PULL 05/10] include/hw/xen/xen_common: return error from xen_create_ioreq_server, Stefano Stabellini, 2023/02/10
- [PULL 06/10] hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration failure, Stefano Stabellini, 2023/02/10
- [PULL 04/10] xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common, Stefano Stabellini, 2023/02/10
- [PULL 07/10] hw/xen/xen-hvm-common: Use g_new and error_report, Stefano Stabellini, 2023/02/10
- [PULL 08/10] meson.build: do not set have_xen_pci_passthrough for aarch64 targets, Stefano Stabellini, 2023/02/10
- [PULL 10/10] meson.build: enable xenpv machine build for ARM, Stefano Stabellini, 2023/02/10
- [PULL 09/10] hw/arm: introduce xenpvh machine, Stefano Stabellini, 2023/02/10
- Re: [PULL 00/10] xenpvh machine, Peter Maydell, 2023/02/13