From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Eduardo Habkost <ehabkost@redhat.com>,
Eric Blake <eblake@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Pankaj Gupta <pagupta@redhat.com>,
Luiz Capitulino <lcapitul@redhat.com>,
Xiao Guangrong <xiaoguangrong.eric@gmail.com>,
David Gibson <david@gibson.dropbear.id.au>,
Alexander Graf <agraf@suse.de>,
Auger Eric <eric.auger@redhat.com>,
David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PATCH v5 05/16] memory-device: use memory device terminology in error messages
Date: Fri, 5 Oct 2018 11:20:13 +0200 [thread overview]
Message-ID: <20181005092024.14344-6-david@redhat.com> (raw)
In-Reply-To: <20181005092024.14344-1-david@redhat.com>
While we rephrased most error messages, we missed these.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/mem/memory-device.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 0624184c40..87369ef2e1 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -87,7 +87,7 @@ static void memory_device_check_addable(MachineState *ms, uint64_t size,
memory_device_used_region_size(OBJECT(ms), &used_region_size);
if (used_region_size + size > ms->maxram_size - ms->ram_size) {
error_setg(errp, "not enough space, currently 0x%" PRIx64
- " in use of total hot pluggable 0x" RAM_ADDR_FMT,
+ " in use of total space for memory devices 0x" RAM_ADDR_FMT,
used_region_size, ms->maxram_size - ms->ram_size);
return;
}
@@ -145,12 +145,12 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
if (hint) {
new_addr = *hint;
if (new_addr < address_space_start) {
- error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64
+ error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" PRIx64
"] before 0x%" PRIx64, new_addr, size,
address_space_start);
return 0;
} else if ((new_addr + size) > address_space_end) {
- error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64
+ error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" PRIx64
"] beyond 0x%" PRIx64, new_addr, size,
address_space_end);
return 0;
--
2.17.1
next prev parent reply other threads:[~2018-10-05 9:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-05 9:20 [Qemu-devel] [PATCH v5 00/16] memory-device: complete refactoring David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 01/16] memory-device: fix alignment error message David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 02/16] memory-device: fix error message when hinted address is too small David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 03/16] memory-device: improve "range conflicts" error message David Hildenbrand
2018-10-08 2:05 ` David Gibson
2018-10-09 10:59 ` Philippe Mathieu-Daudé
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 04/16] pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug David Hildenbrand
2018-10-05 9:20 ` David Hildenbrand [this message]
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 06/16] memory-device: introduce separate config option David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 07/16] memory-device: forward errors in get_region_size()/get_plugged_size() David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 08/16] memory-device: document MemoryDeviceClass David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 09/16] memory-device: add and use memory_device_get_region_size() David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 10/16] memory-device: factor out get_memory_region() from pc-dimm David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 11/16] memory-device: drop get_region_size() David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 12/16] memory-device: add device class function set_addr() David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 13/16] memory-device: complete factoring out pre_plug handling David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 14/16] memory-device: complete factoring out plug handling David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 15/16] memory-device: complete factoring out unplug handling David Hildenbrand
2018-10-05 9:20 ` [Qemu-devel] [PATCH v5 16/16] memory-device: trace when pre_plugging/plugging/unplugging David Hildenbrand
2018-10-09 9:32 ` [Qemu-devel] [PATCH v5 00/16] memory-device: complete refactoring David Hildenbrand
2018-10-11 17:44 ` Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181005092024.14344-6-david@redhat.com \
--to=david@redhat.com \
--cc=agraf@suse.de \
--cc=armbru@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=imammedo@redhat.com \
--cc=lcapitul@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pagupta@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
--cc=xiaoguangrong.eric@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).