From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50591)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dgilbert@redhat.com>) id 1fvImw-00061S-1N
	for qemu-devel@nongnu.org; Thu, 30 Aug 2018 04:58:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dgilbert@redhat.com>) id 1fvIms-0006vT-2Q
	for qemu-devel@nongnu.org; Thu, 30 Aug 2018 04:58:49 -0400
Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33338 helo=mx1.redhat.com)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <dgilbert@redhat.com>) id 1fvImr-0006tD-N0
	for qemu-devel@nongnu.org; Thu, 30 Aug 2018 04:58:45 -0400
Date: Thu, 30 Aug 2018 09:58:37 +0100
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Message-ID: <20180830085836.GC2380@work-vm>
References: <20180829153624.12299-1-david@redhat.com>
	<20180829153624.12299-3-david@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180829153624.12299-3-david@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 02/20] memory-device: use memory device
 terminology in error messages
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: David Hildenbrand <david@redhat.com>
Cc: qemu-devel@nongnu.org, "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) wrote:
> While we rephrased most error messages, we missed these.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@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
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK