From nobody Sun May 5 11:32:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604747599; cv=none; d=zohomail.com; s=zohoarc; b=b81i5K/G794MlygpLxOgnvlGOp751Pisva43nG779is8H2trIGxeyrFjRrGr8igVOAP1Ns4FrEIeRSb5L7bm232AJJbX087EGjVOBvJ0t+g879f/+tneUpqW9MpAzoy3ooHpztLPTWFZXltY88y76fZGygflN5LcQQPV7FJdRFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604747599; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jdMhzZg76PnY9+y/GdSAdPfqjiUTrwxbBgq5YBusWDU=; b=I4j60nvcpu0TuFy0/MvjWyb4twR7xke5TPustJe4PRrfM3REw2MATqX07fB/gADG1qbIUn25Pl3yG1XOUZS752qNrVyeFWVPoW2OCgqG304Tt/H7jtCDj8WkT7hgVB3MUadeg5DnjELKmc91dpfrPoWI/iX59zvjSdyIwq4muNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604747599116701.7787478693346; Sat, 7 Nov 2020 03:13:19 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-1ErxF3_4Mru2Rl9voUSc_w-1; Sat, 07 Nov 2020 06:13:16 -0500 Received: by mail-wm1-f72.google.com with SMTP id g3so998931wmh.9 for ; Sat, 07 Nov 2020 03:13:16 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e6sm5863006wrs.7.2020.11.07.03.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 03:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604747597; 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=jdMhzZg76PnY9+y/GdSAdPfqjiUTrwxbBgq5YBusWDU=; b=jFIcka09uPyIsr42eAy6gtP4nktdEjeuIwLdu4hnD+g+MvG7g/xn9EoeIsMyDxlwy3+abF jNLlWzQMs17A7DRjTJEC1TJzg5U+agSYEs2Se8ONUnoNhXYWXeWM5XHlmp7TDgfbA8BiGz 0Gl6FqbHinUhFXZnQVl366P7+qoFyHA= X-MC-Unique: 1ErxF3_4Mru2Rl9voUSc_w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jdMhzZg76PnY9+y/GdSAdPfqjiUTrwxbBgq5YBusWDU=; b=aUOp4YF3ud1OhCuYGHSX/fZSNOyNMqHiSU1OIIl5XMbMPJuprfOhadu9sFFHbaTZsZ cQxt2z7y0caVayCh30HGb7MZ5ngYiCTBb2nUNGxqPDHmbMTStPL3N9r7oxM81qTcemKI spWzvTY7GYxnHskvs822XPe1IjVFn6rjSFG7a22gNAJ/FJh0V0RkqmHaG55LJFwlfvxN LXuYxu/pbMfSm52RGZS6XBZFhXbUNQHwmAh+6I4RQ2wLzZsvpLkT6ImQi+fDjHJsq0+N 7pI3esHRAU6QDSR7bpvSXudLvRXUMXzOFnNs5HYY1Fcm2xjDjW4Jf6/SFXpa7x3VzD8W /kMQ== X-Gm-Message-State: AOAM5333him7FDnCxQoaiFHs5O37gx/AoRQpgIAPu2vQ26XjBo/8N4/0 pG2QUUUY+23/I3H+fJRc+NFnhmPXZzo5zIJhXfzsLbBVq6GnkQkHT+gUuiXYUFYOpxA2xlV6HG6 hm31xDFp3QXKuuA== X-Received: by 2002:a7b:c937:: with SMTP id h23mr4172033wml.19.1604747595087; Sat, 07 Nov 2020 03:13:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdIsa0Qb4BX9x1+b5iJnNfHBqXMYMlgqVuFAr+UW6+1U+v1i8joiTSD0vl8DlDq+sJxof/0g== X-Received: by 2002:a7b:c937:: with SMTP id h23mr4172025wml.19.1604747594954; Sat, 07 Nov 2020 03:13:14 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Sai Pavan Boddu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Miroslav Rezanina Subject: [PATCH-for-5.2 1/5] hw/usb/hcd-xhci: Make xhci base model abstract Date: Sat, 7 Nov 2020 12:13:03 +0100 Message-Id: <20201107111307.262263-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201107111307.262263-1-philmd@redhat.com> References: <20201107111307.262263-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The TYPE_XHCI model is abstract and can not be used as it. It is meant to be overloaded by children classes. Restore it as abstract type. Fixes: 8ddab8dd3d8 ("usb/hcd-xhci: Split pci wrapper for xhci base model") Reported-by: Miroslav Rezanina Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Sai Pavan Boddu --- hw/usb/hcd-xhci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 79ce5c4be6c..57b692ad849 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3595,6 +3595,7 @@ static const TypeInfo xhci_info =3D { .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(XHCIState), .class_init =3D xhci_class_init, + .abstract =3D true, }; =20 static void xhci_register_types(void) --=20 2.26.2 From nobody Sun May 5 11:32:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604747603; cv=none; d=zohomail.com; s=zohoarc; b=Uz0XXoxDu9GXvhDlCkHlTEyk+hSgoyP+Nk4zsM0EOa+SpWgSOLNPIc6pllEWEt1B+4AJg+8kIZLRzwerM16ga6Vyex4Ed4W5V2lHsj40miHH0y3xKUyp4Gf0QPkSLHjkFG6CJKqXZTFPppcNsE8oeOSCv0qsQnsFEhVhcCo42Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604747603; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=uEc+RfmAYP+OhFOJ5aN77pHj0CJAU6+TLoy2UhjPLRw=; b=QBt2Yc0pSRCnikd+l/hiSRM8AafO3u0uD1OBq5OdcWfHjJK5SpAjVn9T2v9g4ppLLWJ7nAHWjLL7UBUjJ+zThl1vId75Nmk7MRgLYIT+/c9OKY9fcm9fLY4oVyPA6ihxLMJh+TkzgimepNCfYSCyye/B3XxloCvEvGmCA1DzhYI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604747603844200.4429682362371; Sat, 7 Nov 2020 03:13:23 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-tnNx0aNNMU-fs_O5z9JvyQ-1; Sat, 07 Nov 2020 06:13:21 -0500 Received: by mail-wr1-f70.google.com with SMTP id e18so1584650wrs.23 for ; Sat, 07 Nov 2020 03:13:20 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y2sm6096468wrh.0.2020.11.07.03.13.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 03:13:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604747602; 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=uEc+RfmAYP+OhFOJ5aN77pHj0CJAU6+TLoy2UhjPLRw=; b=hm2kZmN7U6m8Fa/R9eZ6LKHJBST9CDUW++xgodkwqjUKrI4acP7MWerNRxIgfRwmCDO1/B rxt8yyh9EtfQXu4VmYIfc4gG9e8FIRl4iQhYmEPrKNbsOQXpHuQS2mnylWm0BG2Isx/AJd IfU7aOOQpmjPl/SQ6gNaW6JxiqZchbk= X-MC-Unique: tnNx0aNNMU-fs_O5z9JvyQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uEc+RfmAYP+OhFOJ5aN77pHj0CJAU6+TLoy2UhjPLRw=; b=mdeiLqfCVFfVnTazTF38x/QfyL6jFAdFRErwE+kXkiedb8DdiygWrZ6gBR+ql0g7bG MuXamYaHrgn8d11IYYsEA8SthYxqdBEVIJxhZzpcNqPHAH1NzK66HPf20WbAgkLonsOo QJ9D3tNIOxV/s2bN8NlWu14ARLbxFVCdRsxNdyive8Xc1Hfw4IQky3QCKhlVd8mt1auX omrYnC+89QIOX0O5mZ9IN7ThEEBAcVYbwMC8jqvxjnTP0t+Ift8rMvUkNQYx46wmtZyv txgKS/MU7CxgL9N0nGNx2Z47bvKMCCtL9gBiR/4zXm7OO18jwhXRbxqBYh5NF/WQDWzf TMoA== X-Gm-Message-State: AOAM531W4wJWAHcOcB1O/+sabiIOu4MFAUJA4ncF+8iO8+1R5/Fk8mmD 1XtH+yy2deH7r7PVslNDHBEn4IZyZJkNBZJiI+FvNTPpBqSRI36NpVpNeXH/qwq/jhDeGKb0CKU ZM45pgTf/XZIFcQ== X-Received: by 2002:adf:9407:: with SMTP id 7mr7867160wrq.182.1604747599775; Sat, 07 Nov 2020 03:13:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVpeC6Xv6gCRGdypwoYxSe7zVaQAbjeHiaM49K2Z6APXIuHn4Aq+FO7cIQpsENG2FeH5nm5g== X-Received: by 2002:adf:9407:: with SMTP id 7mr7867149wrq.182.1604747599649; Sat, 07 Nov 2020 03:13:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Sai Pavan Boddu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 2/5] hw/usb/Kconfig: Fix USB_XHCI_NEC (depends on USB_XHCI_PCI) Date: Sat, 7 Nov 2020 12:13:04 +0100 Message-Id: <20201107111307.262263-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201107111307.262263-1-philmd@redhat.com> References: <20201107111307.262263-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since commit 755fba11fbc and 8ddab8dd3d8 we can not build USB_XHCI_NEC without USB_XHCI_PCI. Correct the Kconfig dependency. Fixes: 755fba11fbc ("usb/hcd-xhci: Move qemu-xhci device to hcd-xhci-pci.c") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Sai Pavan Boddu --- hw/usb/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index a674ce4c542..6a213b04758 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -42,9 +42,7 @@ config USB_XHCI_PCI =20 config USB_XHCI_NEC bool - default y if PCI_DEVICES - depends on PCI - select USB_XHCI + select USB_XHCI_PCI =20 config USB_XHCI_SYSBUS bool --=20 2.26.2 From nobody Sun May 5 11:32:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604747608; cv=none; d=zohomail.com; s=zohoarc; b=LgOvKtTEsLtZaOV8gwHGrHhQzhaIbLlANiWh0D0yQQZInGC2NKJOIDvORkq1fIY2AAUoaP73ybHza5ZWIF8eQcKfcee3Z4yfUba8MDOdOJnbIRaU/JHk7/7MyTfuesrwoIThq9WlyF0L5GaoQrNDjs6qDDNzktU2e6Z9kK6IUrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604747608; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Kb1qV1CBxNvntGcbGLDYf9UbcevkpZpRBrcCPSdDmaA=; b=G59hdUp+2JWwY5JX9iCfdORXbnoYml/OZ7PTOwb+yHsFXU519WNj+jaBMAtXYL+B5HKXSww/jFv5xDAG7J8cJZOr/b6+WUZxd4zRgIADfZLv7WIytJmocSmbn9Edrmjk4e7K+HWYxMB8MchswabJGwjVjNYB/CjGvH7sEtMT/+A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604747608585390.72063839173313; Sat, 7 Nov 2020 03:13:28 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-SNz1FWCeNWev9UsOFFnxRg-1; Sat, 07 Nov 2020 06:13:25 -0500 Received: by mail-wr1-f71.google.com with SMTP id j13so1614645wrn.4 for ; Sat, 07 Nov 2020 03:13:25 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e7sm6330768wrm.6.2020.11.07.03.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 03:13:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604747607; 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=Kb1qV1CBxNvntGcbGLDYf9UbcevkpZpRBrcCPSdDmaA=; b=DCrWFiiZplh5zNMtbYn2DtY4h+R8j94ln9dEXp3qHMLogeLCZqwRFiBDtlggr6Z0VFJhsP tcsSNMnRnHdMul2Ycd1GzVkkNiJ5IMXL7tMcSWWU/kjHf9K8mcDWtOdTXFfzwwRckUlFqL K7xMCaFkr8pxo7xcUGCg+q/cTJqGbPo= X-MC-Unique: SNz1FWCeNWev9UsOFFnxRg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kb1qV1CBxNvntGcbGLDYf9UbcevkpZpRBrcCPSdDmaA=; b=idZqknThlVWhVXLaObA0GFLBz/Ntoq2kfB5f7Fm77tJlAfb3ZyNdK5bREdiAEHwSmP 35MYEnYKrTidaFMeEjreF+/8HHpc1eonhjr985bxmNKheQtfRV4Qb1c9Zgk93Ndp4OGd uKKhLqJqmspJ5s8ANHYADcOGFYJZC24jrT9qUqPr/YEtWnlDCshvxOsZbHkqhlgDoGx0 gPX0VfP3TD11RxHqVCOGugICzMIPwMtY8kL7f6udr8XpMYL0pF4w4vUdaHT7rH8obp6d VqVCc0rdE/BGsK+cE/YUe8QFH7swxYVIOSkJmRuET4XlPLdGSzkfyrnBM7vH+YcIcFQl xxCA== X-Gm-Message-State: AOAM532RwJezfUjwyZTLREfSaDaW0ocWa7ykYeh1RVlvPZ+RAnw1o4kd wllrvWdotvbXAq1tTi4CgINNn0PCMQiVSoVBEaepNT7sYnE5muUk83l4noD6GiykhW3veuE7G/9 A/o4jwZQzfuYeLA== X-Received: by 2002:a1c:a5d8:: with SMTP id o207mr4325135wme.0.1604747604485; Sat, 07 Nov 2020 03:13:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsMPjMwctqQ+jeFdx/Vj9UhL1aJzboky1Ffv7uqtWHi2Dk56uFz6y18gW4L7HPCeogwgexvQ== X-Received: by 2002:a1c:a5d8:: with SMTP id o207mr4325125wme.0.1604747604337; Sat, 07 Nov 2020 03:13:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Sai Pavan Boddu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0 3/5] hw/usb/hcd-xhci: Rename "base-xhci" as TYPE_XHCI_COMMON Date: Sat, 7 Nov 2020 12:13:05 +0100 Message-Id: <20201107111307.262263-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201107111307.262263-1-philmd@redhat.com> References: <20201107111307.262263-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Follow the code base style by using the _COMMON suffix to abstract QOM types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/hcd-xhci.h | 4 +++- include/hw/usb/xhci.h | 1 - hw/usb/hcd-xhci-pci.c | 2 +- hw/usb/hcd-xhci-sysbus.c | 2 +- hw/usb/hcd-xhci.c | 10 +++++----- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index ccf50ae28be..7bd10964f92 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -27,7 +27,9 @@ #include "hw/usb/xhci.h" #include "sysemu/dma.h" =20 -OBJECT_DECLARE_SIMPLE_TYPE(XHCIState, XHCI) +#define TYPE_XHCI_COMMON "base-xhci" /* Common to PCI and Sysbus */ + +OBJECT_DECLARE_SIMPLE_TYPE(XHCIState, XHCI_COMMON) =20 /* Very pessimistic, let's hope it's enough for all cases */ #define EV_QUEUE (((3 * 24) + 16) * XHCI_MAXSLOTS) diff --git a/include/hw/usb/xhci.h b/include/hw/usb/xhci.h index 5c90e1373e5..90b56429199 100644 --- a/include/hw/usb/xhci.h +++ b/include/hw/usb/xhci.h @@ -1,7 +1,6 @@ #ifndef HW_USB_XHCI_H #define HW_USB_XHCI_H =20 -#define TYPE_XHCI "base-xhci" #define TYPE_NEC_XHCI "nec-usb-xhci" #define TYPE_QEMU_XHCI "qemu-xhci" #define TYPE_XHCI_SYSBUS "sysbus-xhci" diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index b78fcd2bb2d..2ca018a4290 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -193,7 +193,7 @@ static void xhci_instance_init(Object *obj) * line, therefore, no need to wait to realize like other devices */ PCI_DEVICE(obj)->cap_present |=3D QEMU_PCI_CAP_EXPRESS; - object_initialize_child(obj, "xhci-core", &s->xhci, TYPE_XHCI); + object_initialize_child(obj, "xhci-core", &s->xhci, TYPE_XHCI_COMMON); qdev_alias_all_properties(DEVICE(&s->xhci), obj); } =20 diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c index 29185d2261f..f2ec08ffa4e 100644 --- a/hw/usb/hcd-xhci-sysbus.c +++ b/hw/usb/hcd-xhci-sysbus.c @@ -58,7 +58,7 @@ static void xhci_sysbus_instance_init(Object *obj) { XHCISysbusState *s =3D XHCI_SYSBUS(obj); =20 - object_initialize_child(obj, "xhci-core", &s->xhci, TYPE_XHCI); + object_initialize_child(obj, "xhci-core", &s->xhci, TYPE_XHCI_COMMON); qdev_alias_all_properties(DEVICE(&s->xhci), obj); =20 object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 57b692ad849..3abe416dfd6 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2637,7 +2637,7 @@ static void xhci_port_reset(XHCIPort *port, bool warm= _reset) =20 static void xhci_reset(DeviceState *dev) { - XHCIState *xhci =3D XHCI(dev); + XHCIState *xhci =3D XHCI_COMMON(dev); int i; =20 trace_usb_xhci_reset(); @@ -2891,7 +2891,7 @@ static uint64_t xhci_oper_read(void *ptr, hwaddr reg,= unsigned size) static void xhci_oper_write(void *ptr, hwaddr reg, uint64_t val, unsigned size) { - XHCIState *xhci =3D XHCI(ptr); + XHCIState *xhci =3D XHCI_COMMON(ptr); =20 trace_usb_xhci_oper_write(reg, val); =20 @@ -3327,7 +3327,7 @@ static void usb_xhci_realize(DeviceState *dev, Error = **errp) { int i; =20 - XHCIState *xhci =3D XHCI(dev); + XHCIState *xhci =3D XHCI_COMMON(dev); =20 if (xhci->numintrs > XHCI_MAXINTRS) { xhci->numintrs =3D XHCI_MAXINTRS; @@ -3381,7 +3381,7 @@ static void usb_xhci_realize(DeviceState *dev, Error = **errp) static void usb_xhci_unrealize(DeviceState *dev) { int i; - XHCIState *xhci =3D XHCI(dev); + XHCIState *xhci =3D XHCI_COMMON(dev); =20 trace_usb_xhci_exit(); =20 @@ -3591,7 +3591,7 @@ static void xhci_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo xhci_info =3D { - .name =3D TYPE_XHCI, + .name =3D TYPE_XHCI_COMMON, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(XHCIState), .class_init =3D xhci_class_init, --=20 2.26.2 From nobody Sun May 5 11:32:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604747613; cv=none; d=zohomail.com; s=zohoarc; b=hvk5/On++UbdGCLRKsQYkVWLUDIN9WDpFpIEXl1mxkdAl9Fk4A2oC2Z60j8x/kGSfGczXfEhrWWLe5ABTrFiB4eqXj0vfuX4FqBYX+K9ThSg5IO9g+M9VLlFyk8nLBL0oDJL5vkFuXncifQ1xkqkR9TgK+Ogo2vsfIzot6/g/Ww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604747613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=qfseJWujaVPa0a8Aenqsf/GWeCPDNQLBt0wn/9+sZ0Q=; b=gbHh1hecfPUyVtctaMkJ8293M6Km6bOA4UoktAc1uPTNlmY1F4Ylm68oeZKuc9HMlLckvJCg8MoFpqFZvvKZ5BDyRPeQxXaRDhZcZBM7K5B4ONUB5XYcmOsVPL9ei+KNvGv6JpO1t1XJ0lJxinFpv4UuhQLpMVuN6ja6Ru+MsRs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 16047476131249.556448634820526; Sat, 7 Nov 2020 03:13:33 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-115-_DX-_f21OFmRZdfYx6bH4Q-1; Sat, 07 Nov 2020 06:13:30 -0500 Received: by mail-wr1-f70.google.com with SMTP id f11so1594233wro.15 for ; Sat, 07 Nov 2020 03:13:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id v9sm6012072wrp.11.2020.11.07.03.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 03:13:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604747612; 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=qfseJWujaVPa0a8Aenqsf/GWeCPDNQLBt0wn/9+sZ0Q=; b=MRq4vcxxTLtsG7L/tcYNa1aLOCmAzjxWPW0VjrhlgN/6ew3ES9oLV8hqPprb6GKToXB2Eu TUmoNzI4oYdokAM5V483UeLL6PWOyIGtM0wfTKcaI6v+E5sUOMpjjOLwKk+FYlY2aIxMMV 6YrvYxv+OM1c9QFktHeWiBQ9/DH0I4w= X-MC-Unique: _DX-_f21OFmRZdfYx6bH4Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qfseJWujaVPa0a8Aenqsf/GWeCPDNQLBt0wn/9+sZ0Q=; b=Jg3c5jXEwvz41L9oiMIrrdNASfEQd1QzUF8d9nuDHbHbBwy38EVMWLQ9kXaK3hLoCZ QCj4lUhCmTR+soEVigs+6rt67PmBIm/wlpi2mwUon0/75uxIWrsfq7Bqd1cnG2Xkfmvm Ws3Hnmq2k18170nIMT/FYGuBTQDSr04Za5Gan/rtJZngSXgZOVnF4F9Hv2x2vTSL0vEl Pya74oL62Jes5h0hDpAaaeAdLfpJVjZsDNu1D2Tk5rZnmOZzwXTvfrfTJ5c2uYweBTwM q4iFmjL+OBsPvUdlXa4fb5SDJbDRAylMgrywhZ8rMxC3Ckem7j//4razlS8q75E8EEIw L7Zw== X-Gm-Message-State: AOAM5313ljIukzIzXkUSgtaLcbusbECFEewcEI16EcXWDuIaLYYM63Dk Ce2K0tzCMX85jNtOEutBTeNMoztes0biE6uZZ7gLnDOxRsaYKbNlBkM03f2fEOiH2OaqLTgLtW4 ge58C2Ec71b0FEA== X-Received: by 2002:adf:f00f:: with SMTP id j15mr3531643wro.102.1604747609282; Sat, 07 Nov 2020 03:13:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQNMxxhARgrbB8iQk7h6BLzmK0BLf4IZWvJh7+aIAiergiLTRpjKEuEOQCUTAW0hfBN1H2SA== X-Received: by 2002:adf:f00f:: with SMTP id j15mr3531630wro.102.1604747609150; Sat, 07 Nov 2020 03:13:29 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Sai Pavan Boddu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org Subject: [PATCH-for-6.0 4/5] hw/usb/hcd-xhci-pci: Use OBJECT_DECLARE_SIMPLE_TYPE() macro Date: Sat, 7 Nov 2020 12:13:06 +0100 Message-Id: <20201107111307.262263-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201107111307.262263-1-philmd@redhat.com> References: <20201107111307.262263-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Eduardo Habkost Cc: qemu-trivial@nongnu.org hw/usb/hcd-xhci-pci.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/usb/hcd-xhci-pci.h b/hw/usb/hcd-xhci-pci.h index aa2e890627c..cf9a180caa4 100644 --- a/hw/usb/hcd-xhci-pci.h +++ b/hw/usb/hcd-xhci-pci.h @@ -28,9 +28,7 @@ #include "hcd-xhci.h" =20 #define TYPE_XHCI_PCI "pci-xhci" -#define XHCI_PCI(obj) \ - OBJECT_CHECK(XHCIPciState, (obj), TYPE_XHCI_PCI) - +OBJECT_DECLARE_SIMPLE_TYPE(XHCIPciState, XHCI_PCI) =20 typedef struct XHCIPciState { /*< private >*/ --=20 2.26.2 From nobody Sun May 5 11:32:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604747620; cv=none; d=zohomail.com; s=zohoarc; b=GJRFzZBlhMpmCb4X3aFJ/5dx9W0BTfmYCj/Ckuchoho72Ba/alGSOpIUZF7MtIHIiELiNK7vIV8r4hbLNaDrZyRpVcOi7LGQRd0eEyJn+iO7Wcz5LD2aqyu4u8T2SpWRf/0/JEGfvuk/VHLvgN4NOzmfDObLuuQj5FpPj4xazXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604747620; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=+rsOTDP4czRCB3IH/wLXFhyThYgQQTJJgr4u4VHvy1U=; b=OOK1AICBEoVyeIq9WG5xsp+v9A4CY2n8bLdsMkUZRdDIWQdaAOMoKx4GDBPllDU87eJK1PTnz2S82+xbhd7e/oa689NmSVE6pQUHtfRXfvBIrld0k+3XMOpmoIeKpDJ8qC8pI4xB2qgPRt3HizUpdjhLSjDXz/nkKdhUl5B0UX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604747620068170.40073721096473; Sat, 7 Nov 2020 03:13:40 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-267-h9HplEL-MNSIQafMhALv-g-1; Sat, 07 Nov 2020 06:13:35 -0500 Received: by mail-wr1-f71.google.com with SMTP id v5so1615446wrr.0 for ; Sat, 07 Nov 2020 03:13:35 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e3sm6094614wrn.32.2020.11.07.03.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 03:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604747617; 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=+rsOTDP4czRCB3IH/wLXFhyThYgQQTJJgr4u4VHvy1U=; b=BCwmiTM+DnV4zCTxEBmBUrygqeqKSOPH9uSesiYjaEQNGjYuBFCefvnqkqOo1MH49E7nRI rNHuCzrJpEoBLnsUGICyLITcJ9og4Diy/gELOd8uJzGhKF5YQDDWNcM91hj3uERamjvBAm YRwcCSScNCHbJmzynpjnGFfvY9rP7oo= X-MC-Unique: h9HplEL-MNSIQafMhALv-g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+rsOTDP4czRCB3IH/wLXFhyThYgQQTJJgr4u4VHvy1U=; b=mil1IuWMj9FuE3rGplbrqQP/3VCzF0EuFuhw97yQGK196eOpUFd8VQ6wnZ+XdXoY3n jpxUI8S1FqXYoyjjIcuuGniV7Y9jSeSlhSS32MdwUTVb+045sKRBmKxv4wA7lqoNqb96 ti5McO6QIXy6BoPgqNWDYs6rG9ZcNSPwaZd8IPVA2yxYVk762joCyQCDElkKzyZJ4A+7 HtG0cdbUY7M3P9KEfCB9C7rEu1/+XzrPpH1SIxBkTZB3DiOtKyXwsdK/bCIAx4F9m8b8 S0BcHL+m+unt5CRTiGwiDZ6ixG3N9MElRDIT5bVhsX0bjHdjZtHmb8NSKFMweoFKJX05 xnOA== X-Gm-Message-State: AOAM531m4EeiiibSmCMiCz5rTVS8902qMaCONcUSViqUcyCggCRVVBaz ZLq/TY4g2j5w26Zoes0QtyPRsQzX0b+C3PjxP6K26edITH5974YKc9V7ELSSYNk0lHrxwD4R5nW HMLB8ByvF7dsHnA== X-Received: by 2002:adf:dc85:: with SMTP id r5mr7895361wrj.66.1604747614101; Sat, 07 Nov 2020 03:13:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbVqzh9ChQ8w8+tideUGSp8JwkNAR5G1+fSYU1aYAF3L9goKk4J+n3jYwzd7ph7LD+PxAAKw== X-Received: by 2002:adf:dc85:: with SMTP id r5mr7895342wrj.66.1604747613903; Sat, 07 Nov 2020 03:13:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Sai Pavan Boddu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0 5/5] hw/usb/hcd-xhci-pci: Rename "pci-xhci" as TYPE_XHCI_PCI_COMMON Date: Sat, 7 Nov 2020 12:13:07 +0100 Message-Id: <20201107111307.262263-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201107111307.262263-1-philmd@redhat.com> References: <20201107111307.262263-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Follow the code base style by using the _COMMON suffix to abstract QOM types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/hcd-xhci-pci.h | 4 ++-- hw/usb/hcd-xhci-nec.c | 2 +- hw/usb/hcd-xhci-pci.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/usb/hcd-xhci-pci.h b/hw/usb/hcd-xhci-pci.h index cf9a180caa4..c862e82d964 100644 --- a/hw/usb/hcd-xhci-pci.h +++ b/hw/usb/hcd-xhci-pci.h @@ -27,8 +27,8 @@ #include "hw/usb.h" #include "hcd-xhci.h" =20 -#define TYPE_XHCI_PCI "pci-xhci" -OBJECT_DECLARE_SIMPLE_TYPE(XHCIPciState, XHCI_PCI) +#define TYPE_XHCI_PCI_COMMON "pci-xhci" +OBJECT_DECLARE_SIMPLE_TYPE(XHCIPciState, XHCI_PCI_COMMON) =20 typedef struct XHCIPciState { /*< private >*/ diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 5707b2cabd1..16b3b46fd59 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -52,7 +52,7 @@ static void nec_xhci_class_init(ObjectClass *klass, void = *data) =20 static const TypeInfo nec_xhci_info =3D { .name =3D TYPE_NEC_XHCI, - .parent =3D TYPE_XHCI_PCI, + .parent =3D TYPE_XHCI_PCI_COMMON, .class_init =3D nec_xhci_class_init, }; =20 diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index 2ca018a4290..9490988b1c9 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -80,14 +80,14 @@ static void xhci_pci_intr_raise(XHCIState *xhci, int n,= bool level) =20 static void xhci_pci_reset(DeviceState *dev) { - XHCIPciState *s =3D XHCI_PCI(dev); + XHCIPciState *s =3D XHCI_PCI_COMMON(dev); =20 device_legacy_reset(DEVICE(&s->xhci)); } =20 static int xhci_pci_vmstate_post_load(void *opaque, int version_id) { - XHCIPciState *s =3D XHCI_PCI(opaque); + XHCIPciState *s =3D XHCI_PCI_COMMON(opaque); PCIDevice *pci_dev =3D PCI_DEVICE(s); int intr; =20 @@ -105,7 +105,7 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev,= Error **errp) { int ret; Error *err =3D NULL; - XHCIPciState *s =3D XHCI_PCI(dev); + XHCIPciState *s =3D XHCI_PCI_COMMON(dev); =20 dev->config[PCI_CLASS_PROG] =3D 0x30; /* xHCI */ dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin 1 */ @@ -165,7 +165,7 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev,= Error **errp) =20 static void usb_xhci_pci_exit(PCIDevice *dev) { - XHCIPciState *s =3D XHCI_PCI(dev); + XHCIPciState *s =3D XHCI_PCI_COMMON(dev); /* destroy msix memory region */ if (dev->msix_table && dev->msix_pba && dev->msix_entry_used) { @@ -187,7 +187,7 @@ static const VMStateDescription vmstate_xhci_pci =3D { =20 static void xhci_instance_init(Object *obj) { - XHCIPciState *s =3D XHCI_PCI(obj); + XHCIPciState *s =3D XHCI_PCI_COMMON(obj); /* * QEMU_PCI_CAP_EXPRESS initialization does not depend on QEMU command * line, therefore, no need to wait to realize like other devices @@ -211,7 +211,7 @@ static void xhci_class_init(ObjectClass *klass, void *d= ata) } =20 static const TypeInfo xhci_pci_info =3D { - .name =3D TYPE_XHCI_PCI, + .name =3D TYPE_XHCI_PCI_COMMON, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(XHCIPciState), .class_init =3D xhci_class_init, @@ -235,7 +235,7 @@ static void qemu_xhci_class_init(ObjectClass *klass, vo= id *data) =20 static void qemu_xhci_instance_init(Object *obj) { - XHCIPciState *s =3D XHCI_PCI(obj); + XHCIPciState *s =3D XHCI_PCI_COMMON(obj); XHCIState *xhci =3D &s->xhci; =20 s->msi =3D ON_OFF_AUTO_OFF; @@ -247,7 +247,7 @@ static void qemu_xhci_instance_init(Object *obj) =20 static const TypeInfo qemu_xhci_info =3D { .name =3D TYPE_QEMU_XHCI, - .parent =3D TYPE_XHCI_PCI, + .parent =3D TYPE_XHCI_PCI_COMMON, .class_init =3D qemu_xhci_class_init, .instance_init =3D qemu_xhci_instance_init, }; --=20 2.26.2