motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: move max-ram-below-4g to pc

Browse source 
Move from X86MachineClass to PCMachineClass so it disappears
from microvm machine type property list.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Message-id: 20200529073957.8018-4-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-05-29 09:39:56 +02:00
parent 3235936e30
commit 9a45729d3b
7 changed files with 59 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/hw/i386/pc.h
View file

@ -35,6 +35,7 @@ struct PCMachineState {
PFlashCFI01 *flash[2];
/* Configuration options: */
uint64_t max_ram_below_4g;
OnOffAuto vmport;
bool acpi_build_enabled;
@ -51,6 +52,7 @@ struct PCMachineState {
};
#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"
#define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"
#define PC_MACHINE_DEVMEM_REGION_SIZE "device-memory-region-size"
#define PC_MACHINE_VMPORT "vmport"
#define PC_MACHINE_SMBUS "smbus"

4
include/hw/i386/x86.h
View file

@ -51,9 +51,6 @@ typedef struct {
qemu_irq *gsi;
GMappedFile *initrd_mapped_file;
/* Configuration options: */
uint64_t max_ram_below_4g;
/* RAM information (sizes, addresses, configuration): */
ram_addr_t below_4g_mem_size, above_4g_mem_size;
@ -82,7 +79,6 @@ typedef struct {
AddressSpace *ioapic_as;
} X86MachineState;
#define X86_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"
#define X86_MACHINE_SMM "smm"
#define X86_MACHINE_ACPI "acpi"