From patchwork Fri Dec 16 21:42:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 634450 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1079153pvb; Fri, 16 Dec 2022 14:09:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf6tXaEXbI/GFi2QOrkN/Dp4I4aP7oUHku4XCoCUhu61fVqOQi5uD4kixq3ksXobHV004b+A X-Received: by 2002:a67:2607:0:b0:3ac:faf8:82d1 with SMTP id m7-20020a672607000000b003acfaf882d1mr18762845vsm.29.1671228551639; Fri, 16 Dec 2022 14:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671228551; cv=none; d=google.com; s=arc-20160816; b=JNDwRPOG6+2cfZgan86mb5H3GKuwfpmQpdpN7t/wgnfNiWX4FrQaJrAxYfu9rK34LT niai6dWnXAdTIV4oqcwi77Q5mPdE/8GVmWo2b+xQn56UU9Z4jxixNfUf25upW3xdjdda zzAq7wtNjjdJ5keKaS98A/+TDvRO8aHiSOkP2a0ne6bEq13CXXxkNjMJzYTaq7QQ+bfm yNlp9XJNLchndNYVLrAjuin6kxEUYGqcVVouUhK0GqUC6Rt4+NSba9wDjjo+ePfa/7MI 1lapYsPn3K+Oql77+aZk1h0EnXYg9taMAx//syIGiBM6CRupbh4wJ41QPBJHVeKo+sGh IDnQ== 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:to:from :dkim-signature; bh=ejnwplBuFjPQYjVXN/BBF9M+6FV2TieQ9nezCnNqXI4=; b=BD7Uk6ZB08KBuJbiYikeEoKnAqmMmM5OH0CIocCeD4LYLVPZ0eBx78n7UMMKnt7LUo M8CoWNKNv5ULcADHjLGwyfv0kGU7wGnQnwI4fLt6fHF8w3nIp/M2GDKVU6daEiB623FS 0W4Z6+I9KoKSdstJUeZEn6bCfdN1A/tgk16Kx5Pbb9ExaPqf3e2ekyswMvuUD+tagZQd FwD6asxYRgctYqf/UBKOBUca2Xi9tKy+2gTRlohvJfWkeBlov9ZrrzDh3iABWXDeD0+X 3Xz9hSf+lSQb1/n65pUvgAfMFHku9LO9L5GP1gTrwzResm+/spbWYwFONCsFW8aQXS/v PhGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fpLbppGg; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 130-20020a370a88000000b006ff1ad486b9si1426844qkk.519.2022.12.16.14.09.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Dec 2022 14:09:11 -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=@linaro.org header.s=google header.b=fpLbppGg; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6IUb-0006EN-Fe; Fri, 16 Dec 2022 16:43:45 -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 1p6ITr-0005wP-T2 for qemu-devel@nongnu.org; Fri, 16 Dec 2022 16:43:05 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6ITn-0000bU-RT for qemu-devel@nongnu.org; Fri, 16 Dec 2022 16:42:58 -0500 Received: by mail-wm1-x336.google.com with SMTP id z8-20020a05600c220800b003d33b0bda11so2965148wml.0 for ; Fri, 16 Dec 2022 13:42:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ejnwplBuFjPQYjVXN/BBF9M+6FV2TieQ9nezCnNqXI4=; b=fpLbppGgUnqCSumlbXT80u7GXnt10v3E6uLy4P6P1PlzaXIAgl+XsmcY4RZWIyh2L8 wf4NSzvhh0SMmjgyeuygbF35SH+UO/4awNeSxHwSinDnVCYoOr196i44Rd+z+Boj3sPn a3COXyrpyDf6fsBF3BF8ibZIyc5GZZXjIn5XOsW2C7VSg3gO+quHkVSaTQZgKMdxrHIp 4F5HH6g1MevTxGAiTNY8y6LIV/nNmK6m5RyhYcZ7HLNea9VBRYzpO+1q3KLrFcxUnyfZ hjdnNF9N07/x4joPojOEXiBQ0mjH8FIK+iz/VMKAcVU/ZHHeE0YSb3+wL/Z6lZisUlMO Ky/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ejnwplBuFjPQYjVXN/BBF9M+6FV2TieQ9nezCnNqXI4=; b=WwQ/OL5ykOb70zbQBP2j2YSvnXNCNoO8BdhzOfclPRUUoN79u2k75fsqRhuhDyjqXZ tEVNIkZJpxv/PlWsNCUvUkmlZqjLiVZM6BU5/LNH7yMbOjUsdhgyxKEKusTCl6fRm1CJ 31IHZebgy1uAZlMI7xqJFLaSNFFjmrvTtAspavNGCtqvhMbR0VwN1RzQdJQqL9CZQ1qN 5xr6bJuM6RZuOxvBm2+Gu4A5a4szaORP/+o1sQG4G+1mLD+Bzf0P5eW2IFAaA0Qb8mhu VeA3FrUDMqxFuoCbHTdMWqxdCEcCZqFWydXRHeO1H2QosR5PfpBxeJJHeXSKTq1PEOwu CM1A== X-Gm-Message-State: ANoB5plqDpXhoVPRL4qUEEcTn8XqvFlKI0Bim9ZuDBQQHjLgmzw8q5g8 ALYpRdWKZ0/Ksgx7eYEXxDer4SJyW1kgARaz X-Received: by 2002:a05:600c:4494:b0:3d2:3d3c:46f7 with SMTP id e20-20020a05600c449400b003d23d3c46f7mr9234052wmo.30.1671226971698; Fri, 16 Dec 2022 13:42:51 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id y7-20020a05600c364700b003d33ab317dasm4135263wmq.14.2022.12.16.13.42.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 13:42:51 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/36] hw: Remove device_legacy_reset() Date: Fri, 16 Dec 2022 21:42:14 +0000 Message-Id: <20221216214244.1391647-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216214244.1391647-1-peter.maydell@linaro.org> References: <20221216214244.1391647-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 The device_legacy_reset() function is now not used anywhere, so we can remove the implementation. Signed-off-by: Peter Maydell --- include/hw/qdev-core.h | 9 --------- hw/core/qdev.c | 10 ---------- hw/core/trace-events | 1 - 3 files changed, 20 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index c7eda169d78..35fddb19a64 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -776,15 +776,6 @@ BusState *sysbus_get_default(void); char *qdev_get_fw_dev_path(DeviceState *dev); char *qdev_get_own_fw_dev_path_from_handler(BusState *bus, DeviceState *dev); -/** - * device_legacy_reset: - * - * Reset a single device (by calling the reset method). - * Note: This function is deprecated and will be removed when it becomes unused. - * Please use device_cold_reset() now. - */ -void device_legacy_reset(DeviceState *dev); - void device_class_set_props(DeviceClass *dc, Property *props); /** diff --git a/hw/core/qdev.c b/hw/core/qdev.c index c5ea0adc713..d759c4602c2 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -868,16 +868,6 @@ void device_class_set_parent_unrealize(DeviceClass *dc, dc->unrealize = dev_unrealize; } -void device_legacy_reset(DeviceState *dev) -{ - DeviceClass *klass = DEVICE_GET_CLASS(dev); - - trace_qdev_reset(dev, object_get_typename(OBJECT(dev))); - if (klass->reset) { - klass->reset(dev); - } -} - Object *qdev_get_machine(void) { static Object *dev; diff --git a/hw/core/trace-events b/hw/core/trace-events index 6da317247f4..56da55bd71d 100644 --- a/hw/core/trace-events +++ b/hw/core/trace-events @@ -2,7 +2,6 @@ loader_write_rom(const char *name, uint64_t gpa, uint64_t size, bool isrom) "%s: @0x%"PRIx64" size=0x%"PRIx64" ROM=%d" # qdev.c -qdev_reset(void *obj, const char *objtype) "obj=%p(%s)" qdev_update_parent_bus(void *obj, const char *objtype, void *oldp, const char *oldptype, void *newp, const char *newptype) "obj=%p(%s) old_parent=%p(%s) new_parent=%p(%s)" # resettable.c