Let's drop -s from the "Moves" in the subject:
hw/usb/hcd-xhci-pci: Move msi/msix properties from NEC to superclass
It is a more popular patch style and makes consistent with other patches.
On 2024/12/09 4:16, Phil Dennis-Jordan wrote:
> The NEC XHCI controller exposes the underlying PCI device's msi and
> msix properties, but the superclass and thus the qemu-xhci device do
> not. There does not seem to be any obvious reason for this limitation.
> This change moves these properties to the superclass so they are
> exposed by both PCI XHCI device variants.
>
> Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
> ---
> hw/usb/hcd-xhci-nec.c | 2 --
> hw/usb/hcd-xhci-pci.c | 7 +++++++
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c
> index 0c063b3697d..408bf065e5a 100644
> --- a/hw/usb/hcd-xhci-nec.c
> +++ b/hw/usb/hcd-xhci-nec.c
> @@ -39,8 +39,6 @@ struct XHCINecState {
> };
>
> static Property nec_xhci_properties[] = {
> - DEFINE_PROP_ON_OFF_AUTO("msi", XHCIPciState, msi, ON_OFF_AUTO_AUTO),
> - DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO),
> DEFINE_PROP_UINT32("intrs", XHCINecState, intrs, XHCI_MAXINTRS),
> DEFINE_PROP_UINT32("slots", XHCINecState, slots, XHCI_MAXSLOTS),
> DEFINE_PROP_END_OF_LIST(),
> diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c
> index 376635e889b..0278b0fbce2 100644
> --- a/hw/usb/hcd-xhci-pci.c
> +++ b/hw/usb/hcd-xhci-pci.c
> @@ -197,6 +197,12 @@ static void xhci_instance_init(Object *obj)
> qdev_alias_all_properties(DEVICE(&s->xhci), obj);
> }
>
> +static Property xhci_pci_properties[] = {
> + DEFINE_PROP_ON_OFF_AUTO("msi", XHCIPciState, msi, ON_OFF_AUTO_AUTO),
> + DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> static void xhci_class_init(ObjectClass *klass, void *data)
> {
> PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> @@ -208,6 +214,7 @@ static void xhci_class_init(ObjectClass *klass, void *data)
> k->realize = usb_xhci_pci_realize;
> k->exit = usb_xhci_pci_exit;
> k->class_id = PCI_CLASS_SERIAL_USB;
> + device_class_set_props(dc, xhci_pci_properties);
> }
>
> static const TypeInfo xhci_pci_info = {