Re: [PATCH 0/6] Resolve TYPE_PIIX3_XEN_DEVICE

[Philippe Mathieu-Daudé]

Hi Chuck,

On 3/1/23 04:15, Chuck Zmudzinski wrote:
> On 1/2/23 4:34 PM, Bernhard Beschow wrote:
> > This series first renders TYPE_PIIX3_XEN_DEVICE redundant and finally removes
> > it. The motivation is to 1/ decouple PIIX from Xen and 2/ to make Xen in the PC
> > machine agnostic to the precise southbridge being used. 2/ will become
> > particularily interesting once PIIX4 becomes usable in the PC machine, avoiding
> > the "Frankenstein" use of PIIX4_ACPI in PIIX3.
> >
> > Testing done:
> > None, because I don't know how to conduct this properly :(
> >
> > Based-on: <20221221170003.2929-1-shentey@gmail.com>
> >            "[PATCH v4 00/30] Consolidate PIIX south bridges"

This series is based on a previous series:
https://lore.kernel.org/qemu-devel/20221221170003.2929-1-shentey@gmail.com/
(which itself also is).

> > Bernhard Beschow (6):
> >    include/hw/xen/xen: Make xen_piix3_set_irq() generic and rename it
> >    hw/isa/piix: Reuse piix3_realize() in piix3_xen_realize()
> >    hw/isa/piix: Wire up Xen PCI IRQ handling outside of PIIX3
> >    hw/isa/piix: Avoid Xen-specific variant of piix_write_config()
> >    hw/isa/piix: Resolve redundant k->config_write assignments
> >    hw/isa/piix: Resolve redundant TYPE_PIIX3_XEN_DEVICE
> >
> >   hw/i386/pc_piix.c             | 34 ++++++++++++++++--
> >   hw/i386/xen/xen-hvm.c         |  9 +++--
> >   hw/isa/piix.c                 | 66 +----------------------------------
>
> This file does not exist on the Qemu master branch.
> But hw/isa/piix3.c and hw/isa/piix4.c do exist.
>
> I tried renaming it from piix.c to piix3.c in the patch, but
> the patch set still does not apply cleanly on my tree.
>
> Is this patch set re-based against something other than
> the current master Qemu branch?
>
> I have a system that is suitable for testing this patch set, but
> I need guidance on how to apply it to the Qemu source tree.

You can ask Bernhard to publish a branch with the full work,
or apply each series locally. I use the b4 tool for that:
https://b4.docs.kernel.org/en/latest/installing.html

i.e.:

$ git checkout -b shentey_work
$ b4 am 20221120150550.63059-1-shentey@gmail.com
$ git am 
./v2_20221120_shentey_decouple_intx_to_lnkx_routing_from_south_bridges.mbx
$ b4 am 20221221170003.2929-1-shentey@gmail.com
$ git am 
./v4_20221221_shentey_this_series_consolidates_the_implementations_of_the_piix3_and_piix4_south.mbx
$ b4 am 20230102213504.14646-1-shentey@gmail.com
$ git am ./20230102_shentey_resolve_type_piix3_xen_device.mbx

Now the branch 'shentey_work' contains all the patches and you can test.

Regards,

Phil.