From nobody Mon Feb 9 16:44:56 2026 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=1604930004; cv=none; d=zohomail.com; s=zohoarc; b=mOzObkKk+P0ZpxlFN07tljNBaJ8/6hl4zNq8WfzY/W0qI5lHDYh5JBMClsGw8zi5mb7+AkpYMvehdE6kIjKDCrIj83yUs9NRQh/osKVCHqmINA8j53wqtVXmWuWJrJLyUC+untebTgI5fLCuZwPfJENd/8ox0WTvU14ruAAVCQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604930004; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hJ9MpIv/7kmX06xCIU09e2TXqLlDymC3w5zG23mwJEU=; b=kWRbdvWxacxy0avTsNqyEuGJ7sb3uzqFAtBT5rEGJW/GBqunLKTzn7cSamaL5s+Kj0ODgSQsOxB6Hp8O88CfL7mzlmhWIZeR1BleYNKGvgfEKpxub1EeDZ3BS6yL4tXS5QmoSI6ld30zsU9IWXhMKeHnJr36d1/pGbh84M2/ixI= 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 1604930004872325.00660515501954; Mon, 9 Nov 2020 05:53:24 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-TJAdkCHkMZCcUlQtLoJyiA-1; Mon, 09 Nov 2020 08:53:22 -0500 Received: by mail-wr1-f69.google.com with SMTP id b6so4328127wrn.17 for ; Mon, 09 Nov 2020 05:53:22 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id s8sm9315798wrn.33.2020.11.09.05.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 05:53:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604930003; 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=hJ9MpIv/7kmX06xCIU09e2TXqLlDymC3w5zG23mwJEU=; b=Nc5mPdgsMLeDY9YejvthcCpCkmPIUFWm1LD48wZZKBahRXbIORiRSXuZEQyvh+tn7QjizG m3POF+TOhZEVYqeomfuLqn7MBCDsQvkb/MJNo/KwvDeUnjTlV1EvDcAKB6vrg1An/oXn8v Nhz+SYVUkI98oTlpNe06CQTpOpmHfAM= X-MC-Unique: TJAdkCHkMZCcUlQtLoJyiA-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=hJ9MpIv/7kmX06xCIU09e2TXqLlDymC3w5zG23mwJEU=; b=GGMGZMTrHlmwnzrZ9iQHs9Cm333Mm9ttfjufduW4yJvuKyO1amVHOj4nZx7FjV1hTE 50c5akufp5zczQazViTz4KfV5/TgdBffgD9HWh2xiQJY3lqHssrYmp1gqIhu53BitSXo 187XpPFGHteRJwZ5qtq8TFmFyw4PXEzgC/1gaJGWvVx5iBKemaSprLt7+nsy2SeGLmRO ez4P+gPmA9I3ocFArNIKwNohQ4oS7ZbtjkPXhn5/b3uy9a3kAfHxckQwm7ZRvXH4mm0o SmxRMtaosDKX7XGNDh5LMFw9rKS5L+XXOJVQY7z++sZN2cU906cPlsTR69q2f8ymKjMG 3p2A== X-Gm-Message-State: AOAM531ZNP7Yh8z8S5Q8IMnos9gmrHIF2gqAK66/oac+Ss6dbLZtPQFA k49k1rERcvnB9NZiiMZPmdJ6VfhIQuP028+7jbH8Lf+y3gmN9ZiuV7oCQDxabflaNhG/fDDmncT cZ2a8AhdQ1HhnyA== X-Received: by 2002:adf:fd03:: with SMTP id e3mr12519468wrr.303.1604930001115; Mon, 09 Nov 2020 05:53:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxi5nMKAbfvzEMk9GcbBEY9y64Mv+3OOCdx00CrnBNGfDTw/hRZcCDIUQ5EP5S8IlnuTFfnDQ== X-Received: by 2002:adf:fd03:: with SMTP id e3mr12519448wrr.303.1604930000927; Mon, 09 Nov 2020 05:53:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0 v2 4/4] hw/usb/hcd-xhci-pci: Rename "pci-xhci" as TYPE_XHCI_PCI_COMMON Date: Mon, 9 Nov 2020 14:53:00 +0100 Message-Id: <20201109135300.2592982-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201109135300.2592982-1-philmd@redhat.com> References: <20201109135300.2592982-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 Reviewed-by: Richard Henderson --- 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 b78fcd2bb2d..b4487cce4ba 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