From patchwork Fri Nov 24 15:24:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 746805 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1568112wru; Fri, 24 Nov 2023 07:25:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IETRVg0z1PgRUmokqjfbj+uWAiJ8OAiuykyEJrkLACFkXgrURVZbqoLt3L9Pqt//g0kUOp4 X-Received: by 2002:ac8:66c5:0:b0:423:9b3d:ed4b with SMTP id m5-20020ac866c5000000b004239b3ded4bmr1558704qtp.16.1700839528397; Fri, 24 Nov 2023 07:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700839528; cv=none; d=google.com; s=arc-20160816; b=PYAkb2vICgB21Sl8ZUmZWfKrlRWBDnUKo9TV3lzwQYaAmE8+pb1CcWzA6s5Z+u/Qtf Tq5n3eCi2ltdg2D+ZN3WnjnE9WgDz6gUHLhqUvynscUhfy5701TTguEPmbDBvWSAYJRH +y4qwtbLh6zQIF549UPlyUA8ZO6tImYzne9cFeLRw6uONnMEVvIvH1LTVwIGtvZIW8F3 D3ob4jNlKOqMWRI1AC5PiH3PPibWDcN1RXmN8+9j2a/lGIlUP4WIkL7inMe6wXHinUPG hyPJ9RHZPAS/JdQPUZ/iyC1N9CFGU0iCvHC9mZy18pbZ/R+6dE9S3bY1jFqNw2mwr5em I6Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; fh=ZPR09covlcbtubK+B/IxAJDTsr3z+SxvqcAu9nSyJBE=; b=y1pErYibQIQZnXzzDDHYsaH8bNUA7h5Zfw9xrg82hhBpLzWf51ZJLClYI2MVZvj9P0 H3oQTdF5I88KoaYruHE1e3/MprSqJF2duZm4inlXVOhoKwrEG//H1vZQ9TFCk6N6xxZP r6GNZAjhPC1K8I+CZ+EZapFOb5cYJ+NR6bBsPmJo4jb11E4FaSjoJJG4RfDNz5pX8YFW 1gxJYtEjVTV37ia6iOfLFG+ERyb9p/EPc4m8OP9Zh1x2njt7Sxhp1+ekIs28zDQ2lYKZ DqKrN/9i8QK3MvuvV6li/AkRuPbUp/KbFBbnmJhYwINWtr3qso1DZ9nG1iFCEe6MmVIj 1GpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HdWafBQF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p1-20020a05622a00c100b004236e7feca6si3614478qtw.156.2023.11.24.07.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Nov 2023 07:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HdWafBQF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Y2m-0004iS-3I; Fri, 24 Nov 2023 10:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2k-0004ht-C6 for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6Y2j-0004BZ-0U for qemu-devel@nongnu.org; Fri, 24 Nov 2023 10:24:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700839472; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=HdWafBQFZCj7/0pvN+VXxylIsVf8mpf+ZvkzvvE9D6EP1xvXhYIycUQuW9zcnFkAORXSW5 98ybxhtUsxXUyDdFb8aXkFmHYs2PYA0CygeIcCArX+dAE/Ez/KOrOxT16mv880UZw7Cmcv FKx+9KkZpTC5qafI/ngjxjnnd05ltWY= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-tCqq2nQpOOibu2h8-ChDOQ-1; Fri, 24 Nov 2023 10:24:31 -0500 X-MC-Unique: tCqq2nQpOOibu2h8-ChDOQ-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-77d6854a3f9so217927385a.3 for ; Fri, 24 Nov 2023 07:24:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700839470; x=1701444270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YmHH4Lq7wXhVn5H+D0xjFuHkteZqE8fy6RhYHDV9pGE=; b=fm8udLjHXE6g/360ba7OXmyo0G3K/6mrrvuSG9yI7v1WvKu2U4FKTdjIEoB6lrgJgu U/HkWLnXenJmV7nnQ+TqlRw+Or8vtXGZ6QMBpNvEHYBs3gNFqjDBMvu79NgGcIAbQydp VoKLnJcLuV8izU0nmGy3olFtEzICNUCZKcFNQZI+FAPLO5VTz7VUXfhmUoNL5N/Wvrh5 Z/EWOulHj5MzmTzjrF2nLTm8pxkR0qvZ/TpTbaCHHwDO5fRB7kfXo/HcJ3ZId661y1bS GnaQSD8Sl8GrD0+Zno32PWqsV5HIj4fIfyUXXYZI0DmD/JAD+lKEYJ/iI9WliS0bf5ex 1bEg== X-Gm-Message-State: AOJu0YyDHXpkPQYNPNVMirknGVdEkoOMZqNCwJ6KXMyEs9eVpTxRNAcF Vz0zGJ8W6Nu/O+7EubUDt6gG2iTkZ5EgDxk2lePr6UXzcOeTsZ4hhQltow3+0Lj37c5qYqIWF/0 67IINXsjW0UBzud4pdFHy8E18dD/sFCCj8l//zX6lixlHd70xIj03dCaxdDIiJZoL4PaDUMFnst w= X-Received: by 2002:a05:620a:839b:b0:77d:7610:7962 with SMTP id pb27-20020a05620a839b00b0077d76107962mr3735099qkn.41.1700839470163; Fri, 24 Nov 2023 07:24:30 -0800 (PST) X-Received: by 2002:a05:620a:839b:b0:77d:7610:7962 with SMTP id pb27-20020a05620a839b00b0077d76107962mr3735063qkn.41.1700839469828; Fri, 24 Nov 2023 07:24:29 -0800 (PST) Received: from [10.201.49.108] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id z17-20020a05620a261100b0077d85b1d45dsm159875qko.72.2023.11.24.07.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 07:24:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , David Hildenbrand Subject: [PULL 08/10] system: Use &error_abort in memory_region_init_ram_[device_]ptr() Date: Fri, 24 Nov 2023 16:24:06 +0100 Message-ID: <20231124152408.140936-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com> References: <20231124152408.140936-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé If an unexpected error condition happens, we have to abort (&fatal_error is meant for expected errors). Suggested-by: Paolo Bonzini Suggested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Reviewed-by: Markus Armbruster Message-ID: <20231120133112.82447-1-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- system/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/memory.c b/system/memory.c index 304fa843ea1..4d9cb0a7fff 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1692,7 +1692,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); - mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } void memory_region_init_ram_device_ptr(MemoryRegion *mr, @@ -1711,7 +1711,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); - mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } void memory_region_init_alias(MemoryRegion *mr,