diff options
| author | Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> | 2015-05-07 15:33:57 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-06-03 23:56:55 +0200 |
| commit | 076b35b5a56bca57c4aa41044ed304fe9c45d6c5 (patch) | |
| tree | 63c490a27907a8d0f055aa5c0578ad6340a980d4 /include | |
| parent | c5bc152bc399ae7ec8ac5227762e4320d0fd2d1c (diff) | |
| download | focaccia-qemu-076b35b5a56bca57c4aa41044ed304fe9c45d6c5.tar.gz focaccia-qemu-076b35b5a56bca57c4aa41044ed304fe9c45d6c5.zip | |
machine: add default_ram_size to machine class
Machines types can have different requirement for default ram size. Introduce a member in the machine class and set the current default_ram_size to 128MB. For QEMUMachine types override the value during the registration of the machine and for MachineClass introduce the generic class init setting the default_ram_size. Add helpers [K,M,G,T,P,E]_BYTE for better readability and easy usage Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 1 | ||||
| -rw-r--r-- | include/qemu-common.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index ff79797ce4..6379901528 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -106,6 +106,7 @@ struct MachineClass { const char *default_display; GlobalProperty *compat_props; const char *hw_version; + ram_addr_t default_ram_size; HotplugHandler *(*get_hotplug_handler)(MachineState *machine, DeviceState *dev); diff --git a/include/qemu-common.h b/include/qemu-common.h index 6b373ff7e3..d52d09cfb8 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -186,6 +186,12 @@ int64_t strtosz(const char *nptr, char **end); int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix); int64_t strtosz_suffix_unit(const char *nptr, char **end, const char default_suffix, int64_t unit); +#define K_BYTE (1ULL << 10) +#define M_BYTE (1ULL << 20) +#define G_BYTE (1ULL << 30) +#define T_BYTE (1ULL << 40) +#define P_BYTE (1ULL << 50) +#define E_BYTE (1ULL << 60) /* used to print char* safely */ #define STR_OR_NULL(str) ((str) ? (str) : "null") |