Message ID | 20200217173452.15243-75-imammedo@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ilI0Dyqp; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lsf20GbWz9sRY for <incoming@patchwork.ozlabs.org>; Tue, 18 Feb 2020 05:17:30 +1100 (AEDT) Received: from localhost ([::1]:50156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1j3kxT-0007OS-QT for incoming@patchwork.ozlabs.org; Mon, 17 Feb 2020 13:17:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38905) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <imammedo@redhat.com>) id 1j3kK1-0003w5-0k for qemu-devel@nongnu.org; Mon, 17 Feb 2020 12:36:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <imammedo@redhat.com>) id 1j3kK0-0002iP-1U for qemu-devel@nongnu.org; Mon, 17 Feb 2020 12:36:40 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34559 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <imammedo@redhat.com>) id 1j3kJz-0002iC-Tw for qemu-devel@nongnu.org; Mon, 17 Feb 2020 12:36:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581960999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L7LXoExNmpBdheeNqAniqkn04JcDCo9j4BVlvTo+YDI=; b=ilI0Dyqplf5o63r2bZnaSXY/8/98NthYSupHmwJ6JhRW4HSnHSz+yJ4dFMCOUhJpZMFvR/ 6TIysi1IliBEynp6W56PlgDlkuzD72o7oeafoVOsqUefQqrLuQcVyJH5teVJF1XUhZ37ZP TUTLLsQ1nC/jn95raXJdYNBFS3dCFrE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-290-50wj85t7Pz6T52yGeHhPHw-1; Mon, 17 Feb 2020 12:36:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C45B800D53 for <qemu-devel@nongnu.org>; Mon, 17 Feb 2020 17:36:37 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA1B68CCE0; Mon, 17 Feb 2020 17:36:36 +0000 (UTC) From: Igor Mammedov <imammedo@redhat.com> To: qemu-devel@nongnu.org Subject: [PATCH v5 74/79] exec: drop bogus mem_path from qemu_ram_alloc_from_fd() Date: Mon, 17 Feb 2020 12:34:47 -0500 Message-Id: <20200217173452.15243-75-imammedo@redhat.com> In-Reply-To: <20200217173452.15243-1-imammedo@redhat.com> References: <20200217173452.15243-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 50wj85t7Pz6T52yGeHhPHw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list 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: <https://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> Cc: Paolo Bonzini <pbonzini@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
refactor main RAM allocation to use hostmem backend
|
expand
|
On 2/17/20 9:34 AM, Igor Mammedov wrote: > Function will report error that will mention global mem_path, > which was valid the only if legacy -mem-path was used and > only in case of main RAM. > > However it doesn't work with hostmem backends > (for example: > " > qemu: -object memory-backend-file,id=ram0,size=128M,mem-path=foo: > backing store (null) size 0x200000 does not match 'size' option 0x8000000 > ") > and couldn't possibly work in general FD case the function > is supposed to handle. > > Taking in account that main RAM was converted into > memory-backend-foo object, there is no point in printing > file name (from inappropriate place) as failing path is > a part of backend's error message. > > Hence drop bogus mem_path usage from qemu_ram_alloc_from_fd(), > it's a job of its user to add file name to error message if applicable. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > exec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/exec.c b/exec.c index d85a8689d4..6ebff8bd3a 100644 --- a/exec.c +++ b/exec.c @@ -2307,9 +2307,9 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, size = HOST_PAGE_ALIGN(size); file_size = get_file_size(fd); if (file_size > 0 && file_size < size) { - error_setg(errp, "backing store %s size 0x%" PRIx64 + error_setg(errp, "backing store size 0x%" PRIx64 " does not match 'size' option 0x" RAM_ADDR_FMT, - mem_path, file_size, size); + file_size, size); return NULL; }