diff options
| author | Marcel Apfelbaum <marcel.a@redhat.com> | 2014-12-16 16:58:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-12-22 23:12:27 +0000 |
| commit | 49d2e648e8087d154d8bf8b91f27c8e05e79d5a6 (patch) | |
| tree | d28e8b57acf83aa1fbf107cdc15852f477a31d78 /hw/i386/pc.c | |
| parent | 60fb1a87b47b14e4ea67043aa56f353e77fbd70a (diff) | |
| download | qemu-49d2e648e8087d154d8bf8b91f27c8e05e79d5a6.zip qemu-49d2e648e8087d154d8bf8b91f27c8e05e79d5a6.tar.gz qemu-49d2e648e8087d154d8bf8b91f27c8e05e79d5a6.tar.bz2 | |
machine: remove qemu_machine_opts global list
QEMU has support for options per machine, keeping
a global list of options is no longer necessary.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Greg Bellows <greg.bellows@linaro.org>
Message-id: 1418217570-15517-2-git-send-email-marcel.a@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/pc.c')
| -rw-r--r-- | hw/i386/pc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1ec7290..a3ddb5e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1805,17 +1805,24 @@ static void pc_machine_initfn(Object *obj) object_property_add(obj, PC_MACHINE_MEMHP_REGION_SIZE, "int", pc_machine_get_hotplug_memory_region_size, NULL, NULL, NULL, NULL); + pcms->max_ram_below_4g = 1ULL << 32; /* 4G */ object_property_add(obj, PC_MACHINE_MAX_RAM_BELOW_4G, "size", pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g, NULL, NULL, NULL); + object_property_set_description(obj, PC_MACHINE_MAX_RAM_BELOW_4G, + "Maximum ram below the 4G boundary (32bit boundary)", + NULL); pcms->vmport = ON_OFF_AUTO_AUTO; object_property_add(obj, PC_MACHINE_VMPORT, "OnOffAuto", pc_machine_get_vmport, pc_machine_set_vmport, NULL, NULL, NULL); + object_property_set_description(obj, PC_MACHINE_VMPORT, + "Enable vmport (pc & q35)", + NULL); pcms->enforce_aligned_dimm = true; object_property_add_bool(obj, PC_MACHINE_ENFORCE_ALIGNED_DIMM, |