1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From a730d5ea4a0445a8c694b56583dd06bd000fae74 Mon Sep 17 00:00:00 2001
From: Vikram Garhwal <vikram.garhwal@amd.com>
Date: Wed, 4 Jan 2023 23:05:25 +0000
Subject: [PATCH 16/16] xen_arm: Add "accel = xen" and drop extra interface
openings
In order to use virtio backends we need to make sure that Xen accelerator
is enabled (xen_enabled() returns true) as the memory/cache systems
check for xen_enabled() to perform specific actions. Without that
the xen-mapcache (which is needed for mapping guest memory) is not in use.
Also drop extra interface opening as this is already done in xen-all.c
(so drop xen_init_ioreq() completely) and skip virtio/tpm initialization
if device emulation is not available.
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
---
hw/arm/xen_arm.c | 29 ++---------------------------
1 file changed, 2 insertions(+), 27 deletions(-)
diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
index fde919df29..4ac425a3c5 100644
--- a/hw/arm/xen_arm.c
+++ b/hw/arm/xen_arm.c
@@ -137,30 +137,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
{
}
-static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
-{
- xen_dmod = xendevicemodel_open(0, 0);
- xen_xc = xc_interface_open(0, 0, 0);
-
- if (xen_xc == NULL) {
- perror("xen: can't open xen interface\n");
- return -1;
- }
-
- xen_fmem = xenforeignmemory_open(0, 0);
- if (xen_fmem == NULL) {
- perror("xen: can't open xen fmem interface\n");
- xc_interface_close(xen_xc);
- return -1;
- }
-
- xen_register_ioreq(state, max_cpus, xen_memory_listener);
-
- xenstore_record_dm_state(xenstore, "running");
-
- return 0;
-}
-
static void xen_enable_tpm(void)
{
#ifdef CONFIG_TPM
@@ -198,9 +174,7 @@ static void xen_arm_init(MachineState *machine)
xen_init_ram(machine);
- if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
- return;
- }
+ xen_register_ioreq(xam->state, machine->smp.cpus, xen_memory_listener);
xen_create_virtio_mmio_devices(xam);
@@ -218,6 +192,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 1;
/* Set explicitly here to make sure that real ram_size is passed */
mc->default_ram_size = 0;
+ mc->default_machine_opts = "accel=xen";
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
}
--
2.17.1
|
