From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "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>,
David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PATCH v2 02/20] memory-device: use memory device terminology in error messages
Date: Wed, 29 Aug 2018 17:36:06 +0200 [thread overview]
Message-ID: <20180829153624.12299-3-david@redhat.com> (raw)
In-Reply-To: <20180829153624.12299-1-david@redhat.com>
While we rephrased most error messages, we missed these.
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 efacbc2a7d..0d9892b715 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-08-29 15:36 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-29 15:36 [Qemu-devel] [PATCH v2 00/20] memory-device: complete refactoring + virtio-pmem David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 01/20] memory-device: fix error message when hinted address is too small David Hildenbrand
2018-08-30 8:53 ` Dr. David Alan Gilbert
2018-09-03 13:29 ` Igor Mammedov
2018-08-29 15:36 ` David Hildenbrand [this message]
2018-08-30 8:58 ` [Qemu-devel] [PATCH v2 02/20] memory-device: use memory device terminology in error messages Dr. David Alan Gilbert
2018-09-03 13:31 ` Igor Mammedov
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 03/20] memory-device: introduce separate config option David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 04/20] memory-device: get_region_size()/get_plugged_size() might fail David Hildenbrand
2018-09-03 13:40 ` Igor Mammedov
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 05/20] memory-device: convert get_region_size() to get_memory_region() David Hildenbrand
2018-09-13 12:20 ` Igor Mammedov
2018-09-14 14:34 ` Igor Mammedov
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 06/20] memory-device: document MemoryDeviceClass David Hildenbrand
2018-09-13 12:53 ` Igor Mammedov
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 07/20] memory-device: add device class function set_addr() David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 08/20] pc-dimm: implement memory " David Hildenbrand
2018-09-13 12:14 ` Igor Mammedov
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 09/20] memory-device: complete factoring out pre_plug handling David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 10/20] memory-device: complete factoring out plug handling David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 11/20] memory-device: complete factoring out unplug handling David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 12/20] memory-device: trace when pre_assigning/assigning/unassigning addresses David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 13/20] hw/acpi-build: only indicate nvdimm and pc-dimm David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special David Hildenbrand
2018-08-31 10:36 ` Dr. David Alan Gilbert
2018-08-31 10:38 ` Dr. David Alan Gilbert
2018-08-31 10:39 ` David Hildenbrand
2018-08-31 10:43 ` Dr. David Alan Gilbert
2018-08-31 11:18 ` David Hildenbrand
2018-08-31 11:22 ` Dr. David Alan Gilbert
2018-08-31 15:01 ` Eric Blake
2018-08-31 11:23 ` Eduardo Habkost
2018-08-31 11:26 ` David Hildenbrand
2018-08-31 11:41 ` Eduardo Habkost
2018-08-31 11:55 ` David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 15/20] virtio-pmem: prototype David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 16/20] virtio-pci: proxy for virtio-pmem David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 17/20] hmp: handle virtio-pmem when printing memory device infos David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 18/20] numa: handle virtio-pmem in NUMA stats David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 19/20] virtio-pmem: hotplug support functions David Hildenbrand
2018-08-29 15:36 ` [Qemu-devel] [PATCH v2 20/20] pc: support for virtio-pmem David Hildenbrand
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=20180829153624.12299-3-david@redhat.com \
--to=david@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@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=rth@twiddle.net \
/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 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.