From nobody Tue Feb 10 03:44:29 2026 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