From nobody Sat May 4 07:37:33 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=1604929991; cv=none; d=zohomail.com; s=zohoarc; b=IS9YWiF/DK1b5ecpnK8cO6xHD0DauMHzMDwCeVtRPPpEHoXxkDqzPuPzYNM87J94tQE4RvJ1Wr6IFX8hihblKHRm/Ris7sgDZlYI5aPgZ38sDCR0EA/jAljm8YJvqCcnQA2pudOdreZZWjdwNfguhqU2rGgJjHBE6DQdk0K5qO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604929991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=bTBnywXLaOQMIyRP1BOGtBwgA4JsTbKiYnIyA3r8z1g=; b=eNAHExU2ixnJQfWNESihjZeValNyQn/jWQ2C6Pm5L8MymF7sKbRvWuIuQdMR01h/JrrIzDQ/qJw+k1D6PVq0TA86C5TgZA5zTwpildgfznDolAAjVIkaJ7DTpmmyq+qoQr7fGri3rwSB7E5riD197+9RDdX21FolIeRqlZ5hFk4= 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 1604929991101875.9995862449158; Mon, 9 Nov 2020 05:53:11 -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-68-GV5U_OHXM_2GGPmasCrqAw-1; Mon, 09 Nov 2020 08:53:08 -0500 Received: by mail-wr1-f71.google.com with SMTP id e11so4370722wrw.14 for ; Mon, 09 Nov 2020 05:53:08 -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 i33sm13707609wri.79.2020.11.09.05.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 05:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604929990; 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=bTBnywXLaOQMIyRP1BOGtBwgA4JsTbKiYnIyA3r8z1g=; b=OQvAtE4iZnZ9oGZv4V3joEpvPTsWhscno1kZTg4+Ta1X0MwvEHE5mzW/zt/4hbx+00YaAO oLZTxLjwp7EvgbHxmgAFwY5K37V5GqYybSzpwtN4QDbfKv9Y2TW8wXlizOOw7ZfaxnnVvF RFUO7WVKKBVqlZj37gEUSMn4a+IA6pE= X-MC-Unique: GV5U_OHXM_2GGPmasCrqAw-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=bTBnywXLaOQMIyRP1BOGtBwgA4JsTbKiYnIyA3r8z1g=; b=QCY+Bu3cClmTlleXw4JdmM6sigZYP9mPE1WxuP1XP4s2GBP/r3U9AzhXC2nj5CmoB3 wWm5jiiYBO3lzFcH7kIpN674BWFAwsmTdY2WMGxORj67hifZuCHildrKlAxHf7Ppo18A EZuF4cyKvFZpwtr1K006BFoJvbOxgiXYgi0Mx67XmqdJc3gVvyoxNarXZf5GZMJfIV3T MFBCxj+W7tBZ/3ucaPsNWcgfe9V4lJzHxACFbAwS+PI6hj2o1roI8/tYw9Mk4RQeGN53 LtYeAn8xPPU7UV6sGEctTuAPMfkFtpgSSak3nqc4fM5s1Lys0/Y7L1D8QX4RmsEtbMFI G+eA== X-Gm-Message-State: AOAM533RJSFg23zgQev7BtHgRKlSjPfZQEkmNTg9zuqZQqqtlyQtC/NJ NK2Hz22FIplr2Fzfa0fJsJ9H07YMKqqcbJdAXU4YvfA+xtcuVbvyzQLrFfiMXrcQ5kayBhMdzHv evJzfRQ5Q85pRdA== X-Received: by 2002:adf:e2c9:: with SMTP id d9mr18009976wrj.11.1604929986981; Mon, 09 Nov 2020 05:53:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1+hmulN5kQ0yjlLUIkXwQDlswViMOf3q0y15jRtb0PISBQWHAykNGp30Q1rBDv/c1UvgN9A== X-Received: by 2002:adf:e2c9:: with SMTP id d9mr18009961wrj.11.1604929986863; Mon, 09 Nov 2020 05:53:06 -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?= , Sai Pavan Boddu Subject: [PATCH-for-5.2 v2 1/4] hw/usb/Kconfig: Fix USB_XHCI_NEC (depends on USB_XHCI_PCI) Date: Mon, 9 Nov 2020 14:52:57 +0100 Message-Id: <20201109135300.2592982-2-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) 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") Reviewed-by: Sai Pavan Boddu Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 Sat May 4 07:37:33 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=1604929995; cv=none; d=zohomail.com; s=zohoarc; b=Vd+ZuIzNbZDMVjftWBWsKi3HKM5bQNj8QjV0fb5sww48uysvk9bN027VeK0+oo6vRFZ5KhcDwqh+BdAHDGuhelL+B/s9KDFJgS66i4nYwtcY8Wn7EuSM14pmkhKOXLnnh96JKYdSS9URunuwaH4gMgpLtiGrtA1+f/8hY7Pi7EU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604929995; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=0AwdT5nD9C6a2wsBgla1NUJAfuZdmUfnrRvAnSbIFbU=; b=lY59q+A9Dde1Pg2lKOCKVS3yhxbFGeosW7fBFnSxJCdLI6KRMHUm26gQI24c+/rhSZIIk+EjLGKu2oEcwKYdZwCX300CHMRHxE9gFXTgrRtOnNAin/nneR42+Qb4uQZrzK20KTrz9jli108lxkIBE22wzZf+o+qRIKovC6Sb9WY= 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 1604929995564985.4056013106726; Mon, 9 Nov 2020 05:53:15 -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-306-09YP5NojNj-9cpRgR2LL7g-1; Mon, 09 Nov 2020 08:53:12 -0500 Received: by mail-wr1-f70.google.com with SMTP id q15so4353843wrw.8 for ; Mon, 09 Nov 2020 05:53:12 -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 d63sm12759895wmd.12.2020.11.09.05.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 05:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604929994; 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=0AwdT5nD9C6a2wsBgla1NUJAfuZdmUfnrRvAnSbIFbU=; b=YDeUVrH+Su3ILu0p8M27M2aRjbHpWiH2SnJ3rz9EOUhp806YjplHHDtrUBnKifEG+iL0bu ylhLMjCwPuZicUTsD4FoEvg7NPD/8qglmAoXqA0+C0fKG9PQNi+uigTSZ76AnEAIe/4Ep1 JtvuNMoun4aMwSO9UrhuwMudWXEIbIg= X-MC-Unique: 09YP5NojNj-9cpRgR2LL7g-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=0AwdT5nD9C6a2wsBgla1NUJAfuZdmUfnrRvAnSbIFbU=; b=C9nIAX5Ai7OFO3Gs1VxBWmKzKKNeRKxJQZWCUbmvufc6za6ReQjfNLtF/77xi1JD/X zws0SIZwvIPi4mxEr0GGJqwgmsmZjSIdrMos4Z4/e2PJA9/FnA+EX1ROVOS8HPcYQDRH jqSXPK5CCTOIhbQRyXUoQR9dM1MSVdNBQgM+WbrHVZrnP5SZCLyocVs2M6ABJr94xpCa V4DPpRT5vMOfN4AbV1vXu473B4iqLkrlbaNeFKnooC9djDKyyYNoEWwYjjEN9rmFpHwr Gvfj6I3DJkWvgeNlMerDxwZWusoeXzM+B1wXVGPHC/ClvfqIYSdrI6IpP+gkyF14SkAr eXDA== X-Gm-Message-State: AOAM5318b9DPZ8+Q5C3QtBZj2V38s91njYrWA0n+KiyEv19i9CS3L1Ej LmafyRlPSDS2vjeuGkg/V2kGwrugW23vhBpyx8q8CymUx6zgz50JvPxpLP36kB+ehFXqUV0aRPE 6Ny2R9YkyBjEuKQ== X-Received: by 2002:adf:f4c9:: with SMTP id h9mr17434012wrp.332.1604929991701; Mon, 09 Nov 2020 05:53:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyS13YtWVGV4xyRVW/8sdcn1Yh9NSAnalNkNNnI7imRHv0kEIVO1b6rNDIHmsB1kLS3hNASvw== X-Received: by 2002:adf:f4c9:: with SMTP id h9mr17433999wrp.332.1604929991583; Mon, 09 Nov 2020 05:53:11 -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 2/4] hw/usb/hcd-xhci: Restrict TYPE_XHCI to hw/usb/ Date: Mon, 9 Nov 2020 14:52:58 +0100 Message-Id: <20201109135300.2592982-3-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) TYPE_XHCI is not a generic device meant to be instantiated by QOM objects outside of hw/usb/. Do not expose the type in public namespace (via include/). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/usb/hcd-xhci.h | 1 + include/hw/usb/xhci.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index ccf50ae28be..f7150a7e12b 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -27,6 +27,7 @@ #include "hw/usb/xhci.h" #include "sysemu/dma.h" =20 +#define TYPE_XHCI "base-xhci" OBJECT_DECLARE_SIMPLE_TYPE(XHCIState, XHCI) =20 /* Very pessimistic, let's hope it's enough for all cases */ 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" --=20 2.26.2 From nobody Sat May 4 07:37:33 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=1604930000; cv=none; d=zohomail.com; s=zohoarc; b=nGJJ0CzmHFjLqqkWKa+dsOV14ZFWXtBylY5bKwZY2Fccd/Z0cQHxHBgeJDhGbggAk9saX4eZwRTbcXgsjSLqnwaxDf31LPqdatWOpphbEu5Bt8OG/y7pPdjd88OPRtL8wkh9A8K022416ycRwQYovz0cB6KWYUUUeV2Zteh/I7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604930000; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=medLDSYusB8YjCm6gdZ83ILtuaQLgway4LfVPfNsVbk=; b=YwQQy+NNHNwTLjMrA2kQBtSv4ohNw9+yUw+INcu3DZG+gCN2I6BaQKkx7J5ia3cec6y01T3aHxkihAqnlaSp1Ylb2ThEt95ysuETMkBqfJEhGzraHdCyNvS/rqqpEMI0yxj50OIXLUU8UVUUUTdcJkqmmzMsqfFTlNSwgZo36nk= 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 1604930000383180.12790265428612; Mon, 9 Nov 2020 05:53:20 -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-566-hDWkayFLN8qrBObwJ2BBYQ-1; Mon, 09 Nov 2020 08:53:17 -0500 Received: by mail-wr1-f70.google.com with SMTP id 67so4382062wra.2 for ; Mon, 09 Nov 2020 05:53:17 -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 o7sm14093693wrp.23.2020.11.09.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 05:53:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604929999; 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=medLDSYusB8YjCm6gdZ83ILtuaQLgway4LfVPfNsVbk=; b=V32yNIziaXUL+hqVnelotKIRgrAC0GfX/VArm9ou8+KLRgzuJpCeWZq0WdiYqw3bCWlKPI cu+Y1g7O4RNRWyGcM1eQd4E7MG33JdFxXW2Cx1aezMliHP+2lRVrsarzOicV8Besn0Pcmi 2E1KUQfcxuZ6FCrfqMwlGwQqfL3o+QY= X-MC-Unique: hDWkayFLN8qrBObwJ2BBYQ-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=medLDSYusB8YjCm6gdZ83ILtuaQLgway4LfVPfNsVbk=; b=kf1RK7aiAOflEpcBLGXit1S0XwIea3y07ssezmqtApTVXtO4uPjpG07baPCX1j5dXp f9MzvXcc2mgIkva5sCxzA9pQlyQ3h3JC4FOfKv+psZKgyWh/4X8S+Elrr8lHXuaKiim2 Pqvm8fIlVLt13qsp5VBk1FNibTa9Zg5h9HmqnXNAY8LR0D9VexrJn81NcYzJPXc6G6q2 w+QpI59/2rBJuZSo+im6RLQLcshVqEJCyMe81UZ+DfmMNtkEdXFp8z8PCDCu6nOzxwef G6xJ3V96veEuNNRbb3QiyXkgNLJTXPsN3jaIb4VYXh/GuuUFukXrG0KO7NFLIKbNHdHh Ar0A== X-Gm-Message-State: AOAM530dMmdVPPdIusFLtUm760OkZPw8RjEqYL2FvTohyEV6QDY9nVEz aUWhLS29aUEJP9+NfXrcfS8RUQwDbHE6Z2XWz80qTyI2B3K5SBkKsTkykK69xBcTIQ36zsdVHES YSHAkt+FBAsxgKg== X-Received: by 2002:a1c:a185:: with SMTP id k127mr11595269wme.23.1604929996468; Mon, 09 Nov 2020 05:53:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzwZRPeg9uhlkjNJxEkEkU67k7KaxGBk8Tcn3XXTmhuV1WZZSRBFxC7lRp34edvMwYipRdrBg== X-Received: by 2002:a1c:a185:: with SMTP id k127mr11595254wme.23.1604929996287; Mon, 09 Nov 2020 05:53:16 -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 3/4] hw/usb/hcd-xhci-pci: Use OBJECT_DECLARE_SIMPLE_TYPE() macro Date: Mon, 9 Nov 2020 14:52:59 +0100 Message-Id: <20201109135300.2592982-4-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 Sat May 4 07:37:33 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=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