* [Qemu-devel] [PATCH v4 0/2] Introduce default ram size in MachineClass
@ 2015-03-05 11:56 Nikunj A Dadhania
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class Nikunj A Dadhania
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB Nikunj A Dadhania
0 siblings, 2 replies; 7+ messages in thread
From: Nikunj A Dadhania @ 2015-03-05 11:56 UTC (permalink / raw)
To: qemu-devel
Cc: thuth, nikunj, aik, agraf, armbru, qemu-ppc, marcel.apfelbaum, imammedo
Current DEFAULT_RAM_SIZE(128MB) enforced by QEMU would not work for
all machines. Introduce a default_ram_size as part of MachineClass.
The below patches has following behaviour:
1) If the user does not provide "-m" option, machine's default ram
size will be picked.
2) The default behaviour of "-m" is not changed
On the side note, there are other cleanup of removing ram_size, slots
and maxmem from vl.c. All these are being parsed by generic code. This
can be moved to machine specific property. I will take a stab at it
next.
Nikunj A Dadhania (2):
machine: add default_ram_size to machine class
spapr: override default ram size to 1GB
hw/core/machine.c | 11 +++++++++++
hw/ppc/spapr.c | 2 ++
include/hw/boards.h | 1 +
vl.c | 30 ++++++++++++++++--------------
4 files changed, 30 insertions(+), 14 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class
2015-03-05 11:56 [Qemu-devel] [PATCH v4 0/2] Introduce default ram size in MachineClass Nikunj A Dadhania
@ 2015-03-05 11:56 ` Nikunj A Dadhania
2015-03-05 15:13 ` Marcel Apfelbaum
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB Nikunj A Dadhania
1 sibling, 1 reply; 7+ messages in thread
From: Nikunj A Dadhania @ 2015-03-05 11:56 UTC (permalink / raw)
To: qemu-devel
Cc: thuth, nikunj, aik, agraf, armbru, qemu-ppc, marcel.apfelbaum, imammedo
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.
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
---
hw/core/machine.c | 11 +++++++++++
include/hw/boards.h | 1 +
vl.c | 30 ++++++++++++++++--------------
3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index fbd91be..533a04f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -403,11 +403,22 @@ bool machine_usb(MachineState *machine)
return machine->usb;
}
+/* Default 128 MB as guest ram size */
+#define MACHINE_DEFAULT_RAM_SIZE (1UL << 27)
+
+static void machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->default_ram_size = MACHINE_DEFAULT_RAM_SIZE;
+}
+
static const TypeInfo machine_info = {
.name = TYPE_MACHINE,
.parent = TYPE_OBJECT,
.abstract = true,
.class_size = sizeof(MachineClass),
+ .class_init = machine_class_init,
.instance_size = sizeof(MachineState),
.instance_init = machine_initfn,
.instance_finalize = machine_finalize,
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 3ddc449..b2b4698 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -108,6 +108,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/vl.c b/vl.c
index 801d487..86e81c5 100644
--- a/vl.c
+++ b/vl.c
@@ -120,8 +120,6 @@ int main(int argc, char **argv)
#include "qom/object_interfaces.h"
#include "qapi-event.h"
-#define DEFAULT_RAM_SIZE 128
-
#define MAX_VIRTIO_CONSOLES 1
#define MAX_SCLP_CONSOLES 1
@@ -1306,7 +1304,11 @@ void hmp_usb_del(Monitor *mon, const QDict *qdict)
MachineState *current_machine;
-static void machine_class_init(ObjectClass *oc, void *data)
+/*
+ * Transitional class registration/init used for converting from
+ * legacy QEMUMachine to MachineClass.
+ */
+static void qemu_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
QEMUMachine *qm = data;
@@ -1344,7 +1346,7 @@ int qemu_register_machine(QEMUMachine *m)
TypeInfo ti = {
.name = name,
.parent = TYPE_MACHINE,
- .class_init = machine_class_init,
+ .class_init = qemu_machine_class_init,
.class_data = (void *)m,
};
@@ -2641,13 +2643,13 @@ out:
return 0;
}
-static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size)
+static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
+ MachineClass *mc)
{
uint64_t sz;
const char *mem_str;
const char *maxmem_str, *slots_str;
- const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
- 1024 * 1024;
+ const ram_addr_t default_ram_size = mc->default_ram_size;
QemuOpts *opts = qemu_find_opts_singleton("memory");
sz = 0;
@@ -3763,7 +3765,13 @@ int main(int argc, char **argv, char **envp)
machine_class = machine_parse(optarg);
}
- set_memory_options(&ram_slots, &maxram_size);
+ if (machine_class == NULL) {
+ fprintf(stderr, "No machine specified, and there is no default.\n"
+ "Use -machine help to list supported machines!\n");
+ exit(1);
+ }
+
+ set_memory_options(&ram_slots, &maxram_size, machine_class);
loc_set_none();
@@ -3792,12 +3800,6 @@ int main(int argc, char **argv, char **envp)
}
#endif
- if (machine_class == NULL) {
- fprintf(stderr, "No machine specified, and there is no default.\n"
- "Use -machine help to list supported machines!\n");
- exit(1);
- }
-
current_machine = MACHINE(object_new(object_class_get_name(
OBJECT_CLASS(machine_class))));
if (machine_help_func(qemu_get_machine_opts(), current_machine)) {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB
2015-03-05 11:56 [Qemu-devel] [PATCH v4 0/2] Introduce default ram size in MachineClass Nikunj A Dadhania
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class Nikunj A Dadhania
@ 2015-03-05 11:56 ` Nikunj A Dadhania
2015-03-05 13:09 ` Alexander Graf
1 sibling, 1 reply; 7+ messages in thread
From: Nikunj A Dadhania @ 2015-03-05 11:56 UTC (permalink / raw)
To: qemu-devel
Cc: thuth, nikunj, aik, agraf, armbru, qemu-ppc, marcel.apfelbaum, imammedo
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
hw/ppc/spapr.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 23cde20..c71ee4b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -96,6 +96,7 @@ typedef struct sPAPRMachineState sPAPRMachineState;
#define SPAPR_MACHINE(obj) \
OBJECT_CHECK(sPAPRMachineState, (obj), TYPE_SPAPR_MACHINE)
+#define SPAPR_DEFAULT_RAM_SIZE (1UL << 30)
/**
* sPAPRMachineState:
*/
@@ -1738,6 +1739,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = MAX_CPUS;
mc->no_parallel = 1;
mc->default_boot_order = NULL;
+ mc->default_ram_size = SPAPR_DEFAULT_RAM_SIZE;
mc->kvm_type = spapr_kvm_type;
mc->has_dynamic_sysbus = true;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB Nikunj A Dadhania
@ 2015-03-05 13:09 ` Alexander Graf
2015-03-05 14:39 ` Nikunj A Dadhania
0 siblings, 1 reply; 7+ messages in thread
From: Alexander Graf @ 2015-03-05 13:09 UTC (permalink / raw)
To: Nikunj A Dadhania, qemu-devel
Cc: thuth, aik, armbru, qemu-ppc, marcel.apfelbaum, imammedo
On 05.03.15 12:56, Nikunj A Dadhania wrote:
> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/ppc/spapr.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 23cde20..c71ee4b 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -96,6 +96,7 @@ typedef struct sPAPRMachineState sPAPRMachineState;
> #define SPAPR_MACHINE(obj) \
> OBJECT_CHECK(sPAPRMachineState, (obj), TYPE_SPAPR_MACHINE)
>
> +#define SPAPR_DEFAULT_RAM_SIZE (1UL << 30)
UL is almost always wrong on QEMU land. Please use ULL.
Also I find 1 << 30 pretty hard to read. Can't we just define simple
KB/MB/GB/TB helpers somewhere in a header file and just fold this is
below as ..
> /**
> * sPAPRMachineState:
> */
> @@ -1738,6 +1739,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
> mc->max_cpus = MAX_CPUS;
> mc->no_parallel = 1;
> mc->default_boot_order = NULL;
> + mc->default_ram_size = SPAPR_DEFAULT_RAM_SIZE;
mc->default_ram_size = 1 * GB;
Alex
> mc->kvm_type = spapr_kvm_type;
> mc->has_dynamic_sysbus = true;
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB
2015-03-05 13:09 ` Alexander Graf
@ 2015-03-05 14:39 ` Nikunj A Dadhania
0 siblings, 0 replies; 7+ messages in thread
From: Nikunj A Dadhania @ 2015-03-05 14:39 UTC (permalink / raw)
To: Alexander Graf, qemu-devel
Cc: thuth, aik, armbru, qemu-ppc, marcel.apfelbaum, imammedo
Alexander Graf <agraf@suse.de> writes:
> On 05.03.15 12:56, Nikunj A Dadhania wrote:
>> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
>> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>> ---
>> hw/ppc/spapr.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>> index 23cde20..c71ee4b 100644
>> --- a/hw/ppc/spapr.c
>> +++ b/hw/ppc/spapr.c
>> @@ -96,6 +96,7 @@ typedef struct sPAPRMachineState sPAPRMachineState;
>> #define SPAPR_MACHINE(obj) \
>> OBJECT_CHECK(sPAPRMachineState, (obj), TYPE_SPAPR_MACHINE)
>>
>> +#define SPAPR_DEFAULT_RAM_SIZE (1UL << 30)
>
> UL is almost always wrong on QEMU land. Please use ULL.
>
> Also I find 1 << 30 pretty hard to read. Can't we just define simple
> KB/MB/GB/TB helpers somewhere in a header file and just fold this is
> below as ..
Ok, let me get a appropriate header for these.
>
>> /**
>> * sPAPRMachineState:
>> */
>> @@ -1738,6 +1739,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
>> mc->max_cpus = MAX_CPUS;
>> mc->no_parallel = 1;
>> mc->default_boot_order = NULL;
>> + mc->default_ram_size = SPAPR_DEFAULT_RAM_SIZE;
>
> mc->default_ram_size = 1 * GB;
>
>
> Alex
>
>> mc->kvm_type = spapr_kvm_type;
>> mc->has_dynamic_sysbus = true;
>>
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class Nikunj A Dadhania
@ 2015-03-05 15:13 ` Marcel Apfelbaum
2015-03-05 15:34 ` Nikunj A Dadhania
0 siblings, 1 reply; 7+ messages in thread
From: Marcel Apfelbaum @ 2015-03-05 15:13 UTC (permalink / raw)
To: Nikunj A Dadhania, qemu-devel
Cc: thuth, aik, agraf, armbru, qemu-ppc, imammedo
On 03/05/2015 01:56 PM, Nikunj A Dadhania wrote:
> 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.
>
> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> ---
> hw/core/machine.c | 11 +++++++++++
> include/hw/boards.h | 1 +
> vl.c | 30 ++++++++++++++++--------------
> 3 files changed, 28 insertions(+), 14 deletions(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index fbd91be..533a04f 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -403,11 +403,22 @@ bool machine_usb(MachineState *machine)
> return machine->usb;
> }
>
> +/* Default 128 MB as guest ram size */
> +#define MACHINE_DEFAULT_RAM_SIZE (1UL << 27)
> +
> +static void machine_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> + mc->default_ram_size = MACHINE_DEFAULT_RAM_SIZE;
> +}
> +
> static const TypeInfo machine_info = {
> .name = TYPE_MACHINE,
> .parent = TYPE_OBJECT,
> .abstract = true,
> .class_size = sizeof(MachineClass),
> + .class_init = machine_class_init,
> .instance_size = sizeof(MachineState),
> .instance_init = machine_initfn,
> .instance_finalize = machine_finalize,
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 3ddc449..b2b4698 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -108,6 +108,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/vl.c b/vl.c
> index 801d487..86e81c5 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -120,8 +120,6 @@ int main(int argc, char **argv)
> #include "qom/object_interfaces.h"
> #include "qapi-event.h"
>
> -#define DEFAULT_RAM_SIZE 128
> -
> #define MAX_VIRTIO_CONSOLES 1
> #define MAX_SCLP_CONSOLES 1
>
> @@ -1306,7 +1304,11 @@ void hmp_usb_del(Monitor *mon, const QDict *qdict)
>
> MachineState *current_machine;
>
> -static void machine_class_init(ObjectClass *oc, void *data)
> +/*
> + * Transitional class registration/init used for converting from
> + * legacy QEMUMachine to MachineClass.
> + */
> +static void qemu_machine_class_init(ObjectClass *oc, void *data)
> {
> MachineClass *mc = MACHINE_CLASS(oc);
> QEMUMachine *qm = data;
> @@ -1344,7 +1346,7 @@ int qemu_register_machine(QEMUMachine *m)
> TypeInfo ti = {
> .name = name,
> .parent = TYPE_MACHINE,
> - .class_init = machine_class_init,
> + .class_init = qemu_machine_class_init,
> .class_data = (void *)m,
> };
>
> @@ -2641,13 +2643,13 @@ out:
> return 0;
> }
>
> -static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size)
> +static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
> + MachineClass *mc)
> {
> uint64_t sz;
> const char *mem_str;
> const char *maxmem_str, *slots_str;
> - const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
> - 1024 * 1024;
> + const ram_addr_t default_ram_size = mc->default_ram_size;
> QemuOpts *opts = qemu_find_opts_singleton("memory");
>
> sz = 0;
> @@ -3763,7 +3765,13 @@ int main(int argc, char **argv, char **envp)
> machine_class = machine_parse(optarg);
> }
>
> - set_memory_options(&ram_slots, &maxram_size);
> + if (machine_class == NULL) {
> + fprintf(stderr, "No machine specified, and there is no default.\n"
> + "Use -machine help to list supported machines!\n");
> + exit(1);
> + }
> +
> + set_memory_options(&ram_slots, &maxram_size, machine_class);
You could directly pass default_ram_size instead of machine_class
to set_memory_options, but this is not enough to justify
a new version by itself. (You may consider it if you prepare another version)
Anyway:
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Thanks,
Marcel
>
> loc_set_none();
>
> @@ -3792,12 +3800,6 @@ int main(int argc, char **argv, char **envp)
> }
> #endif
>
> - if (machine_class == NULL) {
> - fprintf(stderr, "No machine specified, and there is no default.\n"
> - "Use -machine help to list supported machines!\n");
> - exit(1);
> - }
> -
> current_machine = MACHINE(object_new(object_class_get_name(
> OBJECT_CLASS(machine_class))));
> if (machine_help_func(qemu_get_machine_opts(), current_machine)) {
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class
2015-03-05 15:13 ` Marcel Apfelbaum
@ 2015-03-05 15:34 ` Nikunj A Dadhania
0 siblings, 0 replies; 7+ messages in thread
From: Nikunj A Dadhania @ 2015-03-05 15:34 UTC (permalink / raw)
To: marcel, qemu-devel; +Cc: thuth, aik, agraf, armbru, qemu-ppc, imammedo
Marcel Apfelbaum <marcel.apfelbaum@gmail.com> writes:
> On 03/05/2015 01:56 PM, Nikunj A Dadhania wrote:
>> 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.
>>
>> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
>> ---
>> hw/core/machine.c | 11 +++++++++++
>> include/hw/boards.h | 1 +
>> vl.c | 30 ++++++++++++++++--------------
>> 3 files changed, 28 insertions(+), 14 deletions(-)
>>
>> diff --git a/hw/core/machine.c b/hw/core/machine.c
>> index fbd91be..533a04f 100644
>> --- a/hw/core/machine.c
>> +++ b/hw/core/machine.c
>> @@ -403,11 +403,22 @@ bool machine_usb(MachineState *machine)
>> return machine->usb;
>> }
>>
>> +/* Default 128 MB as guest ram size */
>> +#define MACHINE_DEFAULT_RAM_SIZE (1UL << 27)
>> +
>> +static void machine_class_init(ObjectClass *oc, void *data)
>> +{
>> + MachineClass *mc = MACHINE_CLASS(oc);
>> +
>> + mc->default_ram_size = MACHINE_DEFAULT_RAM_SIZE;
>> +}
>> +
>> static const TypeInfo machine_info = {
>> .name = TYPE_MACHINE,
>> .parent = TYPE_OBJECT,
>> .abstract = true,
>> .class_size = sizeof(MachineClass),
>> + .class_init = machine_class_init,
>> .instance_size = sizeof(MachineState),
>> .instance_init = machine_initfn,
>> .instance_finalize = machine_finalize,
>> diff --git a/include/hw/boards.h b/include/hw/boards.h
>> index 3ddc449..b2b4698 100644
>> --- a/include/hw/boards.h
>> +++ b/include/hw/boards.h
>> @@ -108,6 +108,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/vl.c b/vl.c
>> index 801d487..86e81c5 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -120,8 +120,6 @@ int main(int argc, char **argv)
>> #include "qom/object_interfaces.h"
>> #include "qapi-event.h"
>>
>> -#define DEFAULT_RAM_SIZE 128
>> -
>> #define MAX_VIRTIO_CONSOLES 1
>> #define MAX_SCLP_CONSOLES 1
>>
>> @@ -1306,7 +1304,11 @@ void hmp_usb_del(Monitor *mon, const QDict *qdict)
>>
>> MachineState *current_machine;
>>
>> -static void machine_class_init(ObjectClass *oc, void *data)
>> +/*
>> + * Transitional class registration/init used for converting from
>> + * legacy QEMUMachine to MachineClass.
>> + */
>> +static void qemu_machine_class_init(ObjectClass *oc, void *data)
>> {
>> MachineClass *mc = MACHINE_CLASS(oc);
>> QEMUMachine *qm = data;
>> @@ -1344,7 +1346,7 @@ int qemu_register_machine(QEMUMachine *m)
>> TypeInfo ti = {
>> .name = name,
>> .parent = TYPE_MACHINE,
>> - .class_init = machine_class_init,
>> + .class_init = qemu_machine_class_init,
>> .class_data = (void *)m,
>> };
>>
>> @@ -2641,13 +2643,13 @@ out:
>> return 0;
>> }
>>
>> -static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size)
>> +static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
>> + MachineClass *mc)
>> {
>> uint64_t sz;
>> const char *mem_str;
>> const char *maxmem_str, *slots_str;
>> - const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
>> - 1024 * 1024;
>> + const ram_addr_t default_ram_size = mc->default_ram_size;
>> QemuOpts *opts = qemu_find_opts_singleton("memory");
>>
>> sz = 0;
>> @@ -3763,7 +3765,13 @@ int main(int argc, char **argv, char **envp)
>> machine_class = machine_parse(optarg);
>> }
>>
>> - set_memory_options(&ram_slots, &maxram_size);
>> + if (machine_class == NULL) {
>> + fprintf(stderr, "No machine specified, and there is no default.\n"
>> + "Use -machine help to list supported machines!\n");
>> + exit(1);
>> + }
>> +
>> + set_memory_options(&ram_slots, &maxram_size, machine_class);
> You could directly pass default_ram_size instead of machine_class
> to set_memory_options, but this is not enough to justify
> a new version by itself. (You may consider it if you prepare another version)
I did change that before sending, but then considering addition of
slots/maxmem as part of machine_class, have kept machine_class there.
>
> Anyway:
> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Regards
Nikunj
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-05 15:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-05 11:56 [Qemu-devel] [PATCH v4 0/2] Introduce default ram size in MachineClass Nikunj A Dadhania
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 1/2] machine: add default_ram_size to machine class Nikunj A Dadhania
2015-03-05 15:13 ` Marcel Apfelbaum
2015-03-05 15:34 ` Nikunj A Dadhania
2015-03-05 11:56 ` [Qemu-devel] [PATCH v4 2/2] spapr: override default ram size to 1GB Nikunj A Dadhania
2015-03-05 13:09 ` Alexander Graf
2015-03-05 14:39 ` Nikunj A Dadhania
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.