From patchwork Fri Jan 19 16:35:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 763950 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp535712wrq; Fri, 19 Jan 2024 08:36:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6rHvwCcoLOf4ScgYb9QCErfjIyskparD5aEHtJjWnyJ/SrZv6AuluATQKUleYaRhyAmiI X-Received: by 2002:a05:620a:4ac2:b0:783:18c9:82fd with SMTP id sq2-20020a05620a4ac200b0078318c982fdmr111454qkn.152.1705682198847; Fri, 19 Jan 2024 08:36:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705682198; cv=none; d=google.com; s=arc-20160816; b=iJqym2hvugUc99rH/u8hvCHUUvSInav18yPdD63+zZoNfqltRsFhTbrddlC5U1OP2j 9wfslLRkrhApdwCEm+jC+YgoaiEbc+OzWKN2mKz/4caaaNmz5V1JSmY1OGF+mm685gjI 1ODiHR0lu2lYSs1CauDG1W2jMrXv225Lzm5Hc6hd+EgEfSEmjc90BCGeMlLoe42/6EC5 y30Jd7LbFaHQcHPcJTkXeDqxfCIVx8L/CcBkBRB8wGKQB1wOsOhPDMN99IgJf1uo/XOK 1PIZr44GZG+Db2zn88H0IaeM8BaHgRLPSRlcVPv+uTncJjQpO4gq/lj21jtoflQjFIY+ U1vg== 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=fK9dmAwnACqE12D5kcXMqNrcgKcFC5XpZxT2a1RWnEY=; fh=nxeo78RkLzeDKPAjNj8CYMf+h+JyAlKdAq+qj8OM6yk=; b=meG3XJWS1F6mQbcYrRnUAv9sEkdVbizf1hEVUVx6g2N1VGVRJ7QX4LvoWeoemzpFX4 b1IgztytGW/X0j7AwWWQfgJSVSNbwNTsJvoFUcOJcOhHDAtAWq3ANl05VVesOMaJE2Dw QJ9FYdv7CzkTEY6CYyWBVjwTFex5OccvTdaw1TpZ/Cwekd/fZP76UmzODFs/S7JJGLPB JtyjC0wHv/svthcMDUUx7Y+OcUDYVPKxn/o8bqVstKsK44xND5PZ/h1TzPYWSBOyBRBC zC4UDMCTVYrvCEZVHJXIXtqZEWwiqpuCZKzqJamDFjGDcensHN63mO2zCGWgnHOOYo+t kDpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mcawH57T; 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 v10-20020a05620a0a8a00b007831f4bd3d2si16247780qkg.393.2024.01.19.08.36.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 08:36:38 -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=mcawH57T; 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 1rQrpv-0000lW-V9; Fri, 19 Jan 2024 11:35:19 -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 1rQrpu-0000kd-U3 for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:18 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQrps-0004lq-N3 for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:18 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40e76626170so10240725e9.2 for ; Fri, 19 Jan 2024 08:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705682115; x=1706286915; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fK9dmAwnACqE12D5kcXMqNrcgKcFC5XpZxT2a1RWnEY=; b=mcawH57T7wasvrC5jMvcLjSqtP6YElv/xntYCGznysOzaovoESBbIHMX6tKkkj9lAR 0LDEee8EI1k+qmo6cB/CcBgmLbMAof95XyUPkAo1/j/Y9Kxvafb1PtphyTw5irwF4+YS mpTTOZ1dEAgv4Do/GJHebnIX56WghWgiqqazeusBQmv10ZNoGL0IvOdTR3px8kX01QWl m3meebqpFHV4J6uPLiyCtaR51RY96eXUqXE7dkUbzdudP1shzNFI0akyiE9IEhh19TAT IstpcSCD3q+Vaf4zdP4Mqs9sSI1H278hZzhW1MO4qtVGz4r+sK6tgCppVL2kUeoWK0cS FZtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705682115; x=1706286915; 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=fK9dmAwnACqE12D5kcXMqNrcgKcFC5XpZxT2a1RWnEY=; b=N0DA9kXmz6QKQnki/W5Q7JSBs6DR/nGC+7GaPmOQ5TFFetIzvyzntmEI+s4a/NLeyK bd3LnUUZK+Kppc3iq1ayr2qgNehLAG3R0DYAW/sl9XfsnuJYanttrdE5rXWKYZT+NwxV nrtqU1a0Kdn7ic5OW4DGEYP1PIX2+t9oWlQSFiwjDvtB0K+ZWeWrUkh17LT4Cn8Z+5oO 4palND68hKMLFPk0va2TOHuhJ4i8X3AhY6doKyNZoe9aKx5vr3DQ62qmZ+MldJa8FhD0 q5memufbGcCftgxA/xoreC5Z6NNCJ1FweHHdhALAvuu3YFIXC32NwgMD8fdMsHLNyfGP 7eEw== X-Gm-Message-State: AOJu0Yw8kGEOsKMDon5WgSl7axVKVtk8ps4cwO94xWK36sPQzZt1YksU ZLHldKwZ4ZBPgrPU8CBNp2ySE8RSM/AcEFzItEflFQ581YYq9CYjXz/sgoMAlojZiQxf2eclp9J M X-Received: by 2002:a05:600c:6a82:b0:40e:68a6:7bdb with SMTP id jl2-20020a05600c6a8200b0040e68a67bdbmr18703wmb.62.1705682114742; Fri, 19 Jan 2024 08:35:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id fc11-20020a05600c524b00b0040e86fbd772sm10979260wmb.38.2024.01.19.08.35.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 08:35:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: "Maciej S. Szmigiero" , Mark Cave-Ayland , "Michael S. Tsirkin" , Marcel Apfelbaum , Halil Pasic , Christian Borntraeger , Eric Farman , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] pci: Switch bus reset to 3-phase-reset Date: Fri, 19 Jan 2024 16:35:08 +0000 Message-Id: <20240119163512.3810301-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240119163512.3810301-1-peter.maydell@linaro.org> References: <20240119163512.3810301-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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, 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 Switch the PCI bus from using BusClass::reset to the Resettable interface. This has no behavioural change, because the BusClass code to support subclasses that use the legacy BusClass::reset will call that method in the hold phase of 3-phase reset. Signed-off-by: Peter Maydell Reviewed-by: Zhao Liu --- hw/pci/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 76080af580d..05c2e46bda5 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -64,7 +64,7 @@ bool pci_available = true; static char *pcibus_get_dev_path(DeviceState *dev); static char *pcibus_get_fw_dev_path(DeviceState *dev); -static void pcibus_reset(BusState *qbus); +static void pcibus_reset_hold(Object *obj); static bool pcie_has_upstream_port(PCIDevice *dev); static Property pci_props[] = { @@ -202,13 +202,15 @@ static void pci_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); PCIBusClass *pbc = PCI_BUS_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); k->print_dev = pcibus_dev_print; k->get_dev_path = pcibus_get_dev_path; k->get_fw_dev_path = pcibus_get_fw_dev_path; k->realize = pci_bus_realize; k->unrealize = pci_bus_unrealize; - k->reset = pcibus_reset; + + rc->phases.hold = pcibus_reset_hold; pbc->bus_num = pcibus_num; pbc->numa_node = pcibus_numa_node; @@ -424,9 +426,9 @@ void pci_device_reset(PCIDevice *dev) * Called via bus_cold_reset on RST# assert, after the devices * have been reset device_cold_reset-ed already. */ -static void pcibus_reset(BusState *qbus) +static void pcibus_reset_hold(Object *obj) { - PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus); + PCIBus *bus = PCI_BUS(obj); int i; for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) { From patchwork Fri Jan 19 16:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 763947 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp535262wrq; Fri, 19 Jan 2024 08:35:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvdO2VjpcfuCISypBFLy1L/AAyCLTR/izA3REHZP9hMUl+f5vz38ZU2GvC/gmNreMJHBfg X-Received: by 2002:a9d:4f06:0:b0:6dc:9c6:b060 with SMTP id d6-20020a9d4f06000000b006dc09c6b060mr83987otl.13.1705682130667; Fri, 19 Jan 2024 08:35:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705682130; cv=none; d=google.com; s=arc-20160816; b=xYPtINifAaNLZaOiJsDdZQygGCBc00Hq2zVxD/fvKIAm6soAtTZaEJApLirwxntfrH kU0+0qHq1d8d4n19t8kgKkAe8OQpbUsWsjtT8XSBKhb09FsvkP6ik6hv2T5pme5Mlz85 suQ0aiPW3Jro7BLmYK9z4OpM2FlwaoaW8LRpKqc8vvcYq6b0662K6Uft5wKAf38OkUPk P38Y5zy8kTJlwcl+ribxMXbOdac1yP1gyT9wyfhE7v4DakdWDdFO0jhD1g0HaDZuCnbC ZiHJqyDNVRv4NUNoPcWWs9IRlK9ozekGYUrqmIHW/MrTGMkTkyhdJJlsBHH08BMfNKyX 1jzw== 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=wLWOOCsvWKB0fq6rzd5QzssHwCuxhyOKho4Poa5gytE=; fh=nxeo78RkLzeDKPAjNj8CYMf+h+JyAlKdAq+qj8OM6yk=; b=WGWQrszwQWFlmrmB2eETDQXsS7uQ4qI2wBFY2eneASkNqFo65PFGi0RYqZfhwy/KFE pdL4vZFpIARNty4HOFEur3iJWiL5nVpTXoRPlsbtVtLo3m5vpUmrvyyFc1N0rJVtgcVY ML5mmTe4eS+/FBGOamlkyns5oQwulz56jwS8qzniv1gvGjn+RdC/XrYOI9P/xtazkRe6 0Cr2TGZGmA+DpYcH4mN7iK+vFK3EkP9hrbKVxUvMdQ0L3OGiXO8dwUd0HwJuI+1HxFGz 0iq4z8IkCKVY5ZYhOSNhHoXbLpgSXT6GKbDsXZqKj4rky0xOp3kU7wCJWMCr3K9LxheW K6oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fuEGenAO; 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 w2-20020a05622a190200b00429b8cf9a8esi17114028qtc.11.2024.01.19.08.35.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 08:35:30 -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=fuEGenAO; 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 1rQrpx-0000mC-5h; Fri, 19 Jan 2024 11:35:21 -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 1rQrpu-0000kZ-RJ for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:18 -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 1rQrps-0004lz-OQ for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:18 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40e8801221cso8759375e9.1 for ; Fri, 19 Jan 2024 08:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705682115; x=1706286915; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wLWOOCsvWKB0fq6rzd5QzssHwCuxhyOKho4Poa5gytE=; b=fuEGenAOd7SfKoknSV1TTyD9k1olsYyvQoVkKQn5XJTLgxLOoq9fh2Jqrw/w+waI+V zhyrhQbkg1e6noIgk4oyTAw7dzXwqK4uRNq548ggci5yEi88S+hbC/dAInyxCXtvDiMo NvE87ZbzfyXJ8VUfXJVI5NqWg8CVkuFVZjuJYcGwc9Oqxy0HG1xMasZHkAAul051lcGY g5aZQnVA/9tTiJ3juCbG+R+/cl0buS89XiJW/f7iXxmbY9cTw7ytWfPI7Ee401UHvcZx J03NQA73XquWm3CrV+eSEcPK3RGAGRlLmEL0C+vKdL3If/VDRPoy2tylEEEPX8rEW0Ne o14g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705682115; x=1706286915; 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=wLWOOCsvWKB0fq6rzd5QzssHwCuxhyOKho4Poa5gytE=; b=qcGf3t6552OutJ9RW1+nTJUJS+4e4tH7yAzXw7Q1x9D42v/fwNEJ/mkDDyB30m+KhP aEXu8CvGMKDOwVvpXtAAHU5lqG384/78w2AmcijTw6Y0dS4sy+vsQT2fNnq/KdJpEfVD eqORBLz2YEYwtH06+b1IAg+HAVy4nic7UbIAExA2HvEKVEdwkDriqxS5uAo6E++lYtQ8 XW/XAGGL++R+3jUMnki5bJ9joog3urHjyO7wxJy9mecJOBGAhaB+cSnA3UNLGeXvZWkK X5UnBKWI45wlvEMBoHDCobc1PzxCg5oVMlbxFlClT3wLRbhDL47w+gUfNqG6iLQWXouc ZvpA== X-Gm-Message-State: AOJu0YysRnxSSiqrBEEDuNpDJQU87HtQtXs2FgMb327DdNpb8c9ix16z wYkWb9JLx1yqz1iXD89vCEGNa08ngd1J+fYtiI0T0rZWY+L0V0VZm6G7xhwIQrmBvARkzS0o/oB G X-Received: by 2002:a05:600c:1c06:b0:40e:88be:4ef0 with SMTP id j6-20020a05600c1c0600b0040e88be4ef0mr33004wms.0.1705682115282; Fri, 19 Jan 2024 08:35:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id fc11-20020a05600c524b00b0040e86fbd772sm10979260wmb.38.2024.01.19.08.35.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 08:35:15 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: "Maciej S. Szmigiero" , Mark Cave-Ayland , "Michael S. Tsirkin" , Marcel Apfelbaum , Halil Pasic , Christian Borntraeger , Eric Farman , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] vmbus: Switch bus reset to 3-phase-reset Date: Fri, 19 Jan 2024 16:35:09 +0000 Message-Id: <20240119163512.3810301-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240119163512.3810301-1-peter.maydell@linaro.org> References: <20240119163512.3810301-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, 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 Switch vmbus from using BusClass::reset to the Resettable interface. This has no behavioural change, because the BusClass code to support subclasses that use the legacy BusClass::reset will call that method in the hold phase of 3-phase reset. Signed-off-by: Peter Maydell Acked-by: Maciej S. Szmigiero Reviewed-by: Zhao Liu --- hw/hyperv/vmbus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index c86d1895bae..380239af2c7 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2453,9 +2453,9 @@ static void vmbus_unrealize(BusState *bus) qemu_mutex_destroy(&vmbus->rx_queue_lock); } -static void vmbus_reset(BusState *bus) +static void vmbus_reset_hold(Object *obj) { - vmbus_deinit(VMBUS(bus)); + vmbus_deinit(VMBUS(obj)); } static char *vmbus_get_dev_path(DeviceState *dev) @@ -2476,12 +2476,13 @@ static char *vmbus_get_fw_dev_path(DeviceState *dev) static void vmbus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); k->get_dev_path = vmbus_get_dev_path; k->get_fw_dev_path = vmbus_get_fw_dev_path; k->realize = vmbus_realize; k->unrealize = vmbus_unrealize; - k->reset = vmbus_reset; + rc->phases.hold = vmbus_reset_hold; } static int vmbus_pre_load(void *opaque) From patchwork Fri Jan 19 16:35:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 763949 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp535432wrq; Fri, 19 Jan 2024 08:35:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZySOy8Dqi6NVrQfXwTVZ8ZZrss9czLKLcfDS8sdJutIu4VoZB1s6y0lvGQxPGDz/8UGFJ X-Received: by 2002:a05:6870:3911:b0:1fb:75b:2fbf with SMTP id b17-20020a056870391100b001fb075b2fbfmr39771oap.86.1705682155046; Fri, 19 Jan 2024 08:35:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705682155; cv=none; d=google.com; s=arc-20160816; b=F1s14c2iWLFzi+N384BoLS0Vto/ABANSh7OfMPmQtrEg05t8jo9X5leW8yLm8PUWTL zfAmgs8bRR8p03jqkQOXoC4u46hZ4+HUxR00lAcad0IXCUhBrcJoTwUsgttkstnf82rS 7gLgoiRYc1CLqpu2It9kvMe+r/ARUK7YyPMpm8enm0LirDF9qbSNYuVecAtSXYC/x6Pi RDIkAvJLGcjWTCsbLHLhytiLCj+RY95DGP76L+n5620ay7ppQJgb8/VrLWRJewrKir28 qD4II7kK0Z1kvlBzGrCziX9nsoixTpnMZ59ahOSW2cH3g+hUTPeJLG61YO0MJbkSqPI1 16Mg== 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=MYGIrHOejkd+TofSo5x+fRzzFA+cgX19jZT/zdJeLDM=; fh=nxeo78RkLzeDKPAjNj8CYMf+h+JyAlKdAq+qj8OM6yk=; b=ZT/s6V11jtIyvUXShQpO20bLe+0OCYiIxls3WYPgRzqtBxsc/BtFpZ5tIs55KUMVZj hVWzu+gbSdzQxv0vyigA6dWPw0P1LKEJUP+Na4OKovEgIDrKzHirB7ZyfHjNzYz5pXYc qwHcTOcFLxMukU5LoVNtdj5JVqA019SAjCmBADYW1ewpREc+sE/hamXpsjFBng+FuIhB /VVG7BwFCS45U7UPAKwJCVdmciPCXjrfRrzGGS3FpV1p84T3tzfy+Y61buvcm3iXIcRK czatWfzsxgC0JLDkA7iSv58EfECkxprP4kl0VhsGCjryGTz6pFgHaYKwGybEyL1MDvlT t0zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=egGM0n7W; 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 t5-20020a0cc445000000b0067f2fca6cb7si16701471qvi.22.2024.01.19.08.35.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 08:35:55 -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=egGM0n7W; 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 1rQrpw-0000m1-M1; Fri, 19 Jan 2024 11:35:20 -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 1rQrpv-0000l4-8b for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:19 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQrpt-0004m2-8T for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:18 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40e80046246so6126805e9.1 for ; Fri, 19 Jan 2024 08:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705682115; x=1706286915; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MYGIrHOejkd+TofSo5x+fRzzFA+cgX19jZT/zdJeLDM=; b=egGM0n7W9XpUmX/dzkHLLd8hXL3xw3SFZLTDJVo4v9LF0eqLD0kzyVYc8frJwVewBe pqbHKgKiBp/v5rmbbl/l3pT+qbhi8PwsqF300obrsiqK73CxEzTkWyv1B2Bx8hGDrrMI HNGWLPVU0FMstANtTE2JiiOvMXVWWfm5IPt2G+rnLINGIaeFAXiFRDl6vE/0Ig7Y41jp 7p5C/XHmPmcWerh/qjXQQeTiiP3ZAogaaEEDngF/OcOp70upJZ5Jmy9IoChp3bM2lC8v dr7PX9GYeeySQCQtGOneR16S2D8vKWnQM3ITZhri0x3TY1zB5pOD+zfOM8UjfJxA+vcV EkNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705682115; x=1706286915; 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=MYGIrHOejkd+TofSo5x+fRzzFA+cgX19jZT/zdJeLDM=; b=jhWBS+KEAoIVPAzQzcRK8/MrWXbv3AptlJXYBwCFkUtVLS/CAq1ge1/sW2UqjVh1PK p0MZt5FvoRXjWqLnwZuUy0dRs2HvB8x6DN3c2KpBCIXw/M1UzDpJEOEKb6NsYSsM2Uk9 HqJh+vKhP0+p0lc0Hmf/qjGaAX6pSiacF1QN6ibMqFpJfbMQktxdMPL+tbg+k6ZGeo05 3V0vEDoFN07iIniyT60/R2JtJdFoyQE54eR5GgvV91aGWQvx/04kYqtYD4oPAzlYxoJr 9otZKnTnx8mRt5i/zkLR4fT+KJ6sTLYuhlCRjqOH7VU9qaMxAkiJdh3Qpp7xJxYfixpn IWhw== X-Gm-Message-State: AOJu0YxJIuhQJrJZWKJ7On6tXdObOAjkniot5npVINgQ/5XAH9bhWU2m N9QVHZOV9arib43hDxhKt6KNeakSULMGnDPyLp1kZ0S3X2EwfLJJrqDEoq61pqQI5gohlLtxKJA t X-Received: by 2002:a7b:c3d5:0:b0:40e:59e9:98d0 with SMTP id t21-20020a7bc3d5000000b0040e59e998d0mr91544wmj.154.1705682115808; Fri, 19 Jan 2024 08:35:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id fc11-20020a05600c524b00b0040e86fbd772sm10979260wmb.38.2024.01.19.08.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 08:35:15 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: "Maciej S. Szmigiero" , Mark Cave-Ayland , "Michael S. Tsirkin" , Marcel Apfelbaum , Halil Pasic , Christian Borntraeger , Eric Farman , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] adb: Switch bus reset to 3-phase-reset Date: Fri, 19 Jan 2024 16:35:10 +0000 Message-Id: <20240119163512.3810301-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240119163512.3810301-1-peter.maydell@linaro.org> References: <20240119163512.3810301-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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, 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 Switch the ADB bus from using BusClass::reset to the Resettable interface. This has no behavioural change, because the BusClass code to support subclasses that use the legacy BusClass::reset will call that method in the hold phase of 3-phase reset. Signed-off-by: Peter Maydell Reviewed-by: Mark Cave-Ayland Reviewed-by: Zhao Liu --- hw/input/adb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index 0f3c73d6d00..98f39b4281a 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -231,9 +231,9 @@ static const VMStateDescription vmstate_adb_bus = { } }; -static void adb_bus_reset(BusState *qbus) +static void adb_bus_reset_hold(Object *obj) { - ADBBusState *adb_bus = ADB_BUS(qbus); + ADBBusState *adb_bus = ADB_BUS(obj); adb_bus->autopoll_enabled = false; adb_bus->autopoll_mask = 0xffff; @@ -262,10 +262,11 @@ static void adb_bus_unrealize(BusState *qbus) static void adb_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); k->realize = adb_bus_realize; k->unrealize = adb_bus_unrealize; - k->reset = adb_bus_reset; + rc->phases.hold = adb_bus_reset_hold; } static const TypeInfo adb_bus_type_info = { From patchwork Fri Jan 19 16:35:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 763948 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp535330wrq; Fri, 19 Jan 2024 08:35:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwO5lsVndfRoNHkEaZTvTO46W3enB1Uu8Pmy55eNNh21T6s6j64ZmIuT75/B/ypB5OXXkZ X-Received: by 2002:ad4:5de1:0:b0:681:93fa:3a53 with SMTP id jn1-20020ad45de1000000b0068193fa3a53mr133414qvb.79.1705682141288; Fri, 19 Jan 2024 08:35:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705682141; cv=none; d=google.com; s=arc-20160816; b=QExxM7D7Xa3oPOb16qkj4fzx5KaMBy996hg7nLbaOC+B6zuixyH8Cjqy/5fyJG1RuZ 3l/Hxx7qqg5m+z9YY3Zn2Uajx7SU5PQVDWPNfLNJ3LxOYDrzE3zpYjUq6PbqgFv4fsxo kDtf1Xj9JalOIkWlWEY0weyLDduBmYB7GzB49k7Z/limfjCurnbrwXc8PaOJKIgl80Gq pXXopTmD3kr0U7fFoj4E9+SP+NRJJ61orZCUBml5xo6PKzMvI80b5rnkiq0ZwjU+HL1m 1El9DayNDetXKI3rTWm0yQlBEdUgdq5eBn5Psxxolr2C7DCaVgnZM84OBnZtTypwbGI3 YU6Q== 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=xeQ/bMA7W62y/SM3vuOP/JDUaEJLEfPl9aVZLxbSh4I=; fh=nxeo78RkLzeDKPAjNj8CYMf+h+JyAlKdAq+qj8OM6yk=; b=X4L6OoGHpr/824gCGO00Wg/EzJUCbZedHwpMHk07MHYdA7i6OE8DNZtHd3i2VOJ7MH pPV1zH+vGZCHwj7zjNL2NvC6xiAX0e80fL80MrW7zosTKL2b+1KEj08yZ2U1XMqQUt2m 0/lS82RXvxX6a5RWmS/Uo80eiTTuWl5Ajq0cbNrL6Y5t8NoE0MF3wSEGpUJ+y+euF+QQ pP/Fw+XR2jeNHBoqsnK6AyNaWwb5YpLTiYCHF6yukeLvFrpBgB76FCmh94ceunWn24HL jX3daqa2AZAHmi+IG3x3SSgW5xFsjLML2CqlIkYfrZE3f7DybnfaM0ZKj4IxkuHHrh13 4vOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pmcRm1uS; 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 x1-20020a0ca881000000b0067ef8e49371si16293019qva.297.2024.01.19.08.35.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 08:35:41 -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=pmcRm1uS; 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 1rQrpy-0000nZ-RR; Fri, 19 Jan 2024 11:35:22 -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 1rQrpv-0000lU-Ot for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:19 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQrpt-0004mP-W7 for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:19 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40e7065b692so9795165e9.3 for ; Fri, 19 Jan 2024 08:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705682116; x=1706286916; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xeQ/bMA7W62y/SM3vuOP/JDUaEJLEfPl9aVZLxbSh4I=; b=pmcRm1uSjNu/lfXaFBsMP+btolE9DO33WFu85pGE1RYbTZQZLFYy7hCjDucQqwUqA6 EIR93oD0vvwuc/IBPUaRHXwISEfGdcmZj0r0EKmVwAAanTGm0OtV9PEnRMx0HLhzbZMf 2X1ccdu0+TEEEyZhbg+Wr8t3mCYe2ve5QVDVvTqAMNU2w6ieZ0sNAaALdAwtES3w9X0L 0ylAfXiUuJaFtGaerc0jSEJWY3U7MIR813t6X/mFIVwpsjnygD4EFqZclgUjMUFnvNTJ 0KBwP5GpCV/ivi+IvG6txqi5MfTJe7fmetOHwZkPOVLm8Cxx5G+1hqJvk4/IsK0G3Ahq p6gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705682116; x=1706286916; 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=xeQ/bMA7W62y/SM3vuOP/JDUaEJLEfPl9aVZLxbSh4I=; b=WUuF5ETFqEa8OhqruYUDgOs65Zre3OovXXiIjveLrS/TbcGg+nDZk0t8dBeB1rb0ZI lfn6si2D4e5JrIX1EWXaKo9+n2VPW6Mq7cPHIaTsVul+cCS+iSKi9bFUi+QeZwbkgLKL wLBMbLj7ASgH3q/MAnH5trZGsgED4upv8Ly5XvwAkfF38KapkMc4rPpfeKCVJ7A3N9Om TsOqKJDL+GExy6m3EFpTBvS1nkQJKZ3WPf11isT6FBlLJuvFcKer9WnhXyYen6+njRoY iplFpJu4iiI+9U6C69WRu70k/CiLSSFoVK/1RKryy8++Pl2zzXwlhmWASMcXsn1iHy2u yOSA== X-Gm-Message-State: AOJu0YwTyN0LY38lfyBq+/Ma6Dz2cf6sndtTKzixmzHVhS9iHlf9TqCu 0W8XHEX0Ek2AmyQ1cceD+ApS1p9B8iTPde1sI9thCDXC9X4vPH2WuvuhcAinpn0t3hZxa/ZIrJl u X-Received: by 2002:a05:600c:2194:b0:40e:628f:96fb with SMTP id e20-20020a05600c219400b0040e628f96fbmr10369wme.168.1705682116376; Fri, 19 Jan 2024 08:35:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id fc11-20020a05600c524b00b0040e86fbd772sm10979260wmb.38.2024.01.19.08.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 08:35:16 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: "Maciej S. Szmigiero" , Mark Cave-Ayland , "Michael S. Tsirkin" , Marcel Apfelbaum , Halil Pasic , Christian Borntraeger , Eric Farman , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] hw/s390x/css-bridge: switch virtual-css bus to 3-phase-reset Date: Fri, 19 Jan 2024 16:35:11 +0000 Message-Id: <20240119163512.3810301-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240119163512.3810301-1-peter.maydell@linaro.org> References: <20240119163512.3810301-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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, 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 Switch the s390x virtual-css bus from using BusClass::reset to the Resettable interface. This has no behavioural change, because the BusClass code to support subclasses that use the legacy BusClass::reset will call that method in the hold phase of 3-phase reset. Signed-off-by: Peter Maydell Reviewed-by: Halil Pasic Reviewed-by: Eric Farman Reviewed-by: Zhao Liu --- hw/s390x/css-bridge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index 15d26efc951..34639f21435 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -56,7 +56,7 @@ static void ccw_device_unplug(HotplugHandler *hotplug_dev, qdev_unrealize(dev); } -static void virtual_css_bus_reset(BusState *qbus) +static void virtual_css_bus_reset_hold(Object *obj) { /* This should actually be modelled via the generic css */ css_reset(); @@ -81,8 +81,9 @@ static char *virtual_css_bus_get_dev_path(DeviceState *dev) static void virtual_css_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); - k->reset = virtual_css_bus_reset; + rc->phases.hold = virtual_css_bus_reset_hold; k->get_dev_path = virtual_css_bus_get_dev_path; } From patchwork Fri Jan 19 16:35:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 763951 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp535711wrq; Fri, 19 Jan 2024 08:36:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEd8G4cRTtHs4wGLnMt0LFhgk2JdXqWxGT+7wRTeQ3qOgzRv3SCyWcezlxtxNdpmcNpzzWV X-Received: by 2002:a37:ac17:0:b0:781:aef5:f203 with SMTP id e23-20020a37ac17000000b00781aef5f203mr154218qkm.34.1705682198894; Fri, 19 Jan 2024 08:36:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705682198; cv=none; d=google.com; s=arc-20160816; b=Z5KPkH4EI4gL4mv8du7/nxNtYFgOHJ6COGlP8BRwwXlO5asPndL3FBDr0jo/cdsKMt fwyuJSEpYTItMtSym4rOVOhXA5EOPGqyLKeQwkd67OjCBuyNm0OgGj/Nw+zjlPoGx1lH lwIbUFQnRvwnVC+8lr3ZYgKQvBXPhsE0ZfJoArejZLVHlh8ajiC6GqR8l7srcpMCWLZq Lfb9M2+8cXurLvAMnwcOlu9cBrL80AcPEukFRJjHnsmHKiKSz7fzCmGTMy9LO3fsIdYs VHH6btqaL7zfGYAuiQM9CEJ5ybMnwRzmHhRmic+H0swOmukz/nNpYImRefGYrxcQ0ggy JhdQ== 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=tyBXToJHpERthhZrSNsFcfkP84TYfgOcTgP/HWJh+Ms=; fh=nxeo78RkLzeDKPAjNj8CYMf+h+JyAlKdAq+qj8OM6yk=; b=rlyOTi/G5q6cQggSLR1rZBNe+RvIKMeelcblU3M6UZ5AJq4Qgvpo2wCO24AFrIUE4f SEWz2OLOgLXyBZ08nzNqxwVjQuNYFAxFDgX3niuywaNAVkjPxA6FsUZo592g2R0016Gx +tC5m+IYJ1mcxM/h4EmbQssxuWNCOq3vC3Ojf7WfpLgxwtH98VFJYZ9wMuUi291tiLzg DkB1Px0ePnOIWUMXjsGlqNVJI0NJ+K6KsgFhOLFAzQW7W85N6KJaWPbVfYo6nbsGXp3U ZFMXnq4j9LqaU1VH4e41nqBh/vPRIeMHUHmQ5ef3Me3TAKcjMm2IN2jnp1QwQaJunvZ3 fiwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=n2pa5JkG; 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 cz30-20020a05620a36de00b00783527016d8si12428212qkb.503.2024.01.19.08.36.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 08:36:38 -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=n2pa5JkG; 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 1rQrpx-0000n8-QJ; Fri, 19 Jan 2024 11:35:21 -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 1rQrpw-0000lh-8P for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:20 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQrpu-0004mY-9T for qemu-devel@nongnu.org; Fri, 19 Jan 2024 11:35:19 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40e72a567eeso10739735e9.0 for ; Fri, 19 Jan 2024 08:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705682117; x=1706286917; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tyBXToJHpERthhZrSNsFcfkP84TYfgOcTgP/HWJh+Ms=; b=n2pa5JkGq8zjQAqJNCk1joHUQtV+jYa76KV3WW/EJ8L1UlYF/QE21DlWbGuaPaexHR wz7b9mL7jN5gvR7X/vgSuns5bEfvj3P3mlg1qs0pf+4HMnJg/oCLKilwO6q24+WRRdIQ YUTxdlxS/oPv5RZQk06CC2p4YLnIRSKYnBqs1J1x8mfRfVwXMlODr6viU+80m50vyV0Z E4Hm2+oPzhf9oorb4NvWFf5eXHY5iNwcF4/aPgpCHM3Zrp9OtBSvImlJI2Cw5PrayKKV pgU0a9iNWQtNuCyJZ+z2icO1m2hCpJbxb5S/SFFL62MpwLZkwBuaSq/IyaaT7vwBBJza Z2fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705682117; x=1706286917; 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=tyBXToJHpERthhZrSNsFcfkP84TYfgOcTgP/HWJh+Ms=; b=XR9eg/8tARFM8WLj6Ve0dUvMUE5FYvDQ1gI/6nyVCmL/QPqtluymFWaYXaUc/hsTV1 ZCCztGN73qoQlNDIGAOneg2Dzb/0x53p+jQFYPjH/qGa80/winjcmI3eog0XG6Tc58FN 9wkSqN3HDkwHZKEm5ib5e2xMUPcGe/BAQBD1J+pJ4vKp0SdXlV2iRUW9iWeoPPsR3Anl KOEmBEIzbdakx1JSmdJCeReVV9lMGm0tJMH9i9nkUs0Qxvt4eMATcnKAfPPcb4ioH/mG nD+s3OGhVozHwTMUsqQsmQIXNIFSW7WgxUXnpXNN4Kfo8xl6/TwO2kopTmTAp5uhgnAN 0RRw== X-Gm-Message-State: AOJu0Ywr+hgiShxmmCH6SO7tRxGt3KbuD9I3QtSKzgc/qNfUMAeWslqX n8/aqSAf+1VQMNxDKPlRFifM4wDip3kvVBjtceFxbttWhgXTUa2lysamYF2stxoMFODIDcgneyS P X-Received: by 2002:a05:600c:29a:b0:40e:586b:e980 with SMTP id 26-20020a05600c029a00b0040e586be980mr6365wmk.271.1705682116910; Fri, 19 Jan 2024 08:35:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id fc11-20020a05600c524b00b0040e86fbd772sm10979260wmb.38.2024.01.19.08.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 08:35:16 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: "Maciej S. Szmigiero" , Mark Cave-Ayland , "Michael S. Tsirkin" , Marcel Apfelbaum , Halil Pasic , Christian Borntraeger , Eric Farman , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 5/5] hw/core: Remove transitional infrastructure from BusClass Date: Fri, 19 Jan 2024 16:35:12 +0000 Message-Id: <20240119163512.3810301-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240119163512.3810301-1-peter.maydell@linaro.org> References: <20240119163512.3810301-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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, 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 BusClass currently has transitional infrastructure to support subclasses which implement the legacy BusClass::reset method rather than the Resettable interface. We have now removed all the users of BusClass::reset in the tree, so we can remove the transitional infrastructure. Signed-off-by: Peter Maydell Reviewed-by: Zhao Liu --- include/hw/qdev-core.h | 2 -- hw/core/bus.c | 67 ------------------------------------------ 2 files changed, 69 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 151d9682380..986c924fa55 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -329,8 +329,6 @@ struct BusClass { */ char *(*get_fw_dev_path)(DeviceState *dev); - void (*reset)(BusState *bus); - /* * Return whether the device can be added to @bus, * based on the address that was set (via device properties) diff --git a/hw/core/bus.c b/hw/core/bus.c index c7831b5293b..b9d89495cdf 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -232,57 +232,6 @@ static char *default_bus_get_fw_dev_path(DeviceState *dev) return g_strdup(object_get_typename(OBJECT(dev))); } -/** - * bus_phases_reset: - * Transition reset method for buses to allow moving - * smoothly from legacy reset method to multi-phases - */ -static void bus_phases_reset(BusState *bus) -{ - ResettableClass *rc = RESETTABLE_GET_CLASS(bus); - - if (rc->phases.enter) { - rc->phases.enter(OBJECT(bus), RESET_TYPE_COLD); - } - if (rc->phases.hold) { - rc->phases.hold(OBJECT(bus)); - } - if (rc->phases.exit) { - rc->phases.exit(OBJECT(bus)); - } -} - -static void bus_transitional_reset(Object *obj) -{ - BusClass *bc = BUS_GET_CLASS(obj); - - /* - * This will call either @bus_phases_reset (for multi-phases transitioned - * buses) or a bus's specific method for not-yet transitioned buses. - * In both case, it does not reset children. - */ - if (bc->reset) { - bc->reset(BUS(obj)); - } -} - -/** - * bus_get_transitional_reset: - * check if the bus's class is ready for multi-phase - */ -static ResettableTrFunction bus_get_transitional_reset(Object *obj) -{ - BusClass *dc = BUS_GET_CLASS(obj); - if (dc->reset != bus_phases_reset) { - /* - * dc->reset has been overridden by a subclass, - * the bus is not ready for multi phase yet. - */ - return bus_transitional_reset; - } - return NULL; -} - static void bus_class_init(ObjectClass *class, void *data) { BusClass *bc = BUS_CLASS(class); @@ -293,22 +242,6 @@ static void bus_class_init(ObjectClass *class, void *data) rc->get_state = bus_get_reset_state; rc->child_foreach = bus_reset_child_foreach; - - /* - * @bus_phases_reset is put as the default reset method below, allowing - * to do the multi-phase transition from base classes to leaf classes. It - * allows a legacy-reset Bus class to extend a multi-phases-reset - * Bus class for the following reason: - * + If a base class B has been moved to multi-phase, then it does not - * override this default reset method and may have defined phase methods. - * + A child class C (extending class B) which uses - * bus_class_set_parent_reset() (or similar means) to override the - * reset method will still work as expected. @bus_phases_reset function - * will be registered as the parent reset method and effectively call - * parent reset phases. - */ - bc->reset = bus_phases_reset; - rc->get_transitional_function = bus_get_transitional_reset; } static void qbus_finalize(Object *obj)