From patchwork Wed May 28 10:05:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 892963 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp2114027wrz; Wed, 28 May 2025 03:07:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmQ+CrbaczydpAaq//2q5fx2YgzXqucAEY2J4PALzNBghCYmn6XWpHWHRYZDxw+O7UaavVgw==@linaro.org X-Google-Smtp-Source: AGHT+IEeIcMv45TscsiHOtlkblxP9YBU2MS0KWMPuwI7lhfPhnZoJJwaZ8mXYqAUxh7F062cfSm7 X-Received: by 2002:a05:620a:f05:b0:7ca:f3d0:e7c8 with SMTP id af79cd13be357-7ceecc3ca8emr2314055585a.52.1748426855379; Wed, 28 May 2025 03:07:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748426855; cv=none; d=google.com; s=arc-20240605; b=OZf0gzqcZmfMUWCHBuSF849qg3fXUtbGyYlmbTIt7Uo9GoIZdpzavXts01yt0BjjYJ jGbSxwU5P2JTFSL8I9GghKh6SDjDrzReJzlqiYJIZE5Wyb9grB50jKmoRBBv5dLOAh58 dGe7DBJZqtoRSSrU4r5W6bb6eVI5Y+7iTNSfFROLF1tClLMUe+2vuitZ+cF3Jq8QTsFx zS2h62n1RWnW5YXAc5UCsWWf6rU+r47fEmek9tVo0YKXjGiO1DPpu9yu6bucQX9mVE7Z wJ5IjupuKbwV8SA3RyIGrt/P5GCwsq4+zI6ENxtXLWSHbZ7aHDhnWlT+pPPPfuFuvEYw 4VqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=boKqtfV5mjhcV+igiCQ1wF54BVqNnBj3nxcXDBLUNjM=; fh=7aRxDtZP1Aq9vpCPLaCABi2Dx/PnTfPUrTuYqgFFRwg=; b=I+66IHbfivN2/HjVGmA0nYXo0z+ZIbIJ588QFMasJU8r6DVnY7IBhclrgxlobg0Tyq xoDoh4j3OAghash0SuzeF+Sh6sF4GNlWrUVY7SRlNACsG+18Ec8pIqS7TZNEa8cRbqqz 0vv+IWsV8Az5Fhj+Tk2Rhx91p+1boBc+l/TlvpZeQbEcR3hDS0oSyqZupNHB/LiOKKXn U9H+Ta33z9gABuq9CuqjSRwPXCG8aHZKcl4QP+7t5jKwyouo/6EGfI/1KaoPgPbkUyFO mg7OrNh1KIr2N7gH4LTIyMfojuLlB4z4BaI+1qNVEZglbfO83mgQvxEwzP+689LpUJTY r+RA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Qpw3PSwg; 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=QUARANTINE sp=QUARANTINE 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 af79cd13be357-7cfc5d63582si97566885a.375.2025.05.28.03.07.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 May 2025 03:07:35 -0700 (PDT) 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=Qpw3PSwg; 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=QUARANTINE sp=QUARANTINE 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 1uKDgZ-0005cW-Ix; Wed, 28 May 2025 06:07:00 -0400 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 1uKDgO-0004rF-ID for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:48 -0400 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 1uKDgM-0007Ju-Qq for qemu-devel@nongnu.org; Wed, 28 May 2025 06:06:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748426806; 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=boKqtfV5mjhcV+igiCQ1wF54BVqNnBj3nxcXDBLUNjM=; b=Qpw3PSwgkDsN91Ev1lqVjVQ+yxAsUJuZc/oVrbnn319TWkn+d6x3b3Uv3YHNq2NjMKiX9S Et6Nbi66j77TsTrEdTM/Gn5Wq/JCmyAo1jmsVUGSdgmMoOazALze2BUEu5aBVuwEub5EAR goIOT8r9SJoHuwtRCDgg91b4USwg/vc= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-tWPM_ZkvMBCK34un7kEI_w-1; Wed, 28 May 2025 06:06:42 -0400 X-MC-Unique: tWPM_ZkvMBCK34un7kEI_w-1 X-Mimecast-MFC-AGG-ID: tWPM_ZkvMBCK34un7kEI_w_1748426801 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A5DB0195608B; Wed, 28 May 2025 10:06:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.34.110]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C5E6F180049D; Wed, 28 May 2025 10:06:38 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Zhao Liu , Xiaoyao Li Subject: [PULL 26/27] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit Date: Wed, 28 May 2025 12:05:06 +0200 Message-ID: <20250528100507.313906-27-thuth@redhat.com> In-Reply-To: <20250528100507.313906-1-thuth@redhat.com> References: <20250528100507.313906-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) DKIMWL_WL_HIGH=-2.907, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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é Simplify merging vmxnet3_realize() within vmxnet3_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu Reviewed-by: Xiaoyao Li Message-ID: <20250512083948.39294-20-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/net/vmxnet3.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index d080fe9b38a..7c0ca56b7c0 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2238,6 +2238,7 @@ static void vmxnet3_instance_init(Object *obj) device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", DEVICE(obj)); + PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS; } static void vmxnet3_pci_uninit(PCIDevice *pci_dev) @@ -2463,22 +2464,10 @@ static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), }; -static void vmxnet3_realize(DeviceState *qdev, Error **errp) -{ - VMXNET3Class *vc = VMXNET3_DEVICE_GET_CLASS(qdev); - PCIDevice *pci_dev = PCI_DEVICE(qdev); - VMXNET3State *s = VMXNET3(qdev); - - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - - vc->parent_dc_realize(qdev, errp); -} - static void vmxnet3_class_init(ObjectClass *class, const void *data) { DeviceClass *dc = DEVICE_CLASS(class); PCIDeviceClass *c = PCI_DEVICE_CLASS(class); - VMXNET3Class *vc = VMXNET3_DEVICE_CLASS(class); c->realize = vmxnet3_pci_realize; c->exit = vmxnet3_pci_uninit; @@ -2489,8 +2478,6 @@ static void vmxnet3_class_init(ObjectClass *class, const void *data) c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE; c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3; - device_class_set_parent_realize(dc, vmxnet3_realize, - &vc->parent_dc_realize); dc->desc = "VMWare Paravirtualized Ethernet v3"; device_class_set_legacy_reset(dc, vmxnet3_qdev_reset); dc->vmsd = &vmstate_vmxnet3;