jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
acpi: has_immutable_rsdp->!rsdp_in_ram
As comment in acpi-build.c notes, RSDP is not really immutable. So it's
really a question of whether it's in RAM, name the variable accordingly.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
+8
-8
+1
-1
hw/i386/acpi-build.c
+1
-1
hw/i386/acpi-build.c
···
1653
1653
fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
1654
1654
tables.tcpalog->data, acpi_data_len(tables.tcpalog));
1655
1655
1656
-
if (guest_info->has_immutable_rsdp) {
1656
+
if (!guest_info->rsdp_in_ram) {
1657
1657
/*
1658
1658
* Keep for compatibility with old machine types.
1659
1659
* Though RSDP is small, its contents isn't immutable, so
+3
-3
hw/i386/pc_piix.c
+3
-3
hw/i386/pc_piix.c
···
60
60
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
61
61
62
62
static bool has_acpi_build = true;
63
-
static bool has_immutable_rsdp;
63
+
static bool rsdp_in_ram = true;
64
64
static int legacy_acpi_table_size;
65
65
static bool smbios_defaults = true;
66
66
static bool smbios_legacy_mode;
···
169
169
170
170
guest_info->isapc_ram_fw = !pci_enabled;
171
171
guest_info->has_reserved_memory = has_reserved_memory;
172
-
guest_info->has_immutable_rsdp = has_immutable_rsdp;
172
+
guest_info->rsdp_in_ram = rsdp_in_ram;
173
173
174
174
if (smbios_defaults) {
175
175
MachineClass *mc = MACHINE_GET_CLASS(machine);
···
312
312
313
313
static void pc_compat_2_2(MachineState *machine)
314
314
{
315
-
has_immutable_rsdp = true;
315
+
rsdp_in_ram = false;
316
316
x86_cpu_compat_set_features("kvm64", FEAT_1_EDX, 0, CPUID_VME);
317
317
x86_cpu_compat_set_features("kvm32", FEAT_1_EDX, 0, CPUID_VME);
318
318
x86_cpu_compat_set_features("Conroe", FEAT_1_EDX, 0, CPUID_VME);
+3
-3
hw/i386/pc_q35.c
+3
-3
hw/i386/pc_q35.c
···
50
50
#define MAX_SATA_PORTS 6
51
51
52
52
static bool has_acpi_build = true;
53
-
static bool has_immutable_rsdp;
53
+
static bool rsdp_in_ram = true;
54
54
static bool smbios_defaults = true;
55
55
static bool smbios_legacy_mode;
56
56
static bool smbios_uuid_encoded = true;
···
155
155
guest_info->isapc_ram_fw = false;
156
156
guest_info->has_acpi_build = has_acpi_build;
157
157
guest_info->has_reserved_memory = has_reserved_memory;
158
-
guest_info->has_immutable_rsdp = has_immutable_rsdp;
158
+
guest_info->rsdp_in_ram = rsdp_in_ram;
159
159
160
160
/* Migration was not supported in 2.0 for Q35, so do not bother
161
161
* with this hack (see hw/i386/acpi-build.c).
···
291
291
292
292
static void pc_compat_2_2(MachineState *machine)
293
293
{
294
-
has_immutable_rsdp = true;
294
+
rsdp_in_ram = false;
295
295
x86_cpu_compat_set_features("kvm64", FEAT_1_EDX, 0, CPUID_VME);
296
296
x86_cpu_compat_set_features("kvm32", FEAT_1_EDX, 0, CPUID_VME);
297
297
x86_cpu_compat_set_features("Conroe", FEAT_1_EDX, 0, CPUID_VME);