diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-31 14:10:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-05 17:36:39 +0200 |
| commit | fe6567d5fddfb7501a352c5e080a9eecf7b89177 (patch) | |
| tree | 218595cffdd4f6c5119d454ee99273987b290e76 /include | |
| parent | 2001d0cd6d55e5efa9956fa8ff8b89034d6a4329 (diff) | |
| download | qemu-fe6567d5fddfb7501a352c5e080a9eecf7b89177.tar.gz qemu-fe6567d5fddfb7501a352c5e080a9eecf7b89177.tar.bz2 qemu-fe6567d5fddfb7501a352c5e080a9eecf7b89177.zip | |
hw/i386: add a separate region that tracks the SMRAME bit
This region is exported at /machine/smram. It is "empty" if
SMRAME=0 and points to SMRAM if SMRAME=1. The CPU will
enable/disable it as it enters or exits SMRAM.
While touching nearby code, the existing memory region setup was
slightly inconsistent. The smram_region is *disabled* in order to open
SMRAM (because the smram_region shows the low VRAM instead of the RAM
at 0xa0000). Because SMRAM is closed at startup, the smram_region must
be enabled when creating the i440fx or q35 devices.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/pci-host/q35.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 96d4cdc713..4c9eacc587 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -53,6 +53,7 @@ typedef struct MCHPCIState { MemoryRegion *address_space_io; PAMMemoryRegion pam_regions[13]; MemoryRegion smram_region; + MemoryRegion smram, low_smram; PcPciInfo pci_info; uint8_t smm_enabled; ram_addr_t below_4g_mem_size; |