diff options
| author | Peter Maydell | 2019-01-10 16:33:28 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-10 16:33:28 +0100 |
| commit | d246ff5d3904ea540127228df2bda8af2a294804 (patch) | |
| tree | dfa1bdf78b423fc83ac87954aa3267b94b00ce48 /hw/core/machine.c | |
| parent | Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into st... (diff) | |
| parent | ioapic: use TYPE_FOO MACRO than constant string (diff) | |
| download | qemu-d246ff5d3904ea540127228df2bda8af2a294804.tar.gz qemu-d246ff5d3904ea540127228df2bda8af2a294804.tar.xz qemu-d246ff5d3904ea540127228df2bda8af2a294804.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging
Trivial patches for 4.0 (2019-01-09)
# gpg: Signature made Wed 09 Jan 2019 13:06:58 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-patches-pull-request:
ioapic: use TYPE_FOO MACRO than constant string
trivial: Don't include isa.h if it is not really necessary
hw/audio/marvell: Don't include unnecessary i2c.h header file
qom: Include qemu/fprintf-fn.h in cpu.h
hw/core: fix whitespace in a sentence
typedefs: (Re-)sort entries alphabetically
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index f8563efb86..1a0a9ab111 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -919,7 +919,7 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_add_bool(oc, "dump-guest-core", machine_get_dump_guest_core, machine_set_dump_guest_core, &error_abort); object_class_property_set_description(oc, "dump-guest-core", - "Include guest memory in a core dump", &error_abort); + "Include guest memory in a core dump", &error_abort); object_class_property_add_bool(oc, "mem-merge", machine_get_mem_merge, machine_set_mem_merge, &error_abort); |