[PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE

Bernhard Beschow posted 6 patches 1 year, 3 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
hw/i386/pc_piix.c             | 34 ++++++++++++++++--
hw/i386/xen/xen-hvm.c         |  2 +-
hw/isa/piix.c                 | 66 +----------------------------------
include/hw/southbridge/piix.h |  1 -
include/hw/xen/xen.h          |  2 +-
stubs/xen-hw-stub.c           |  2 +-
6 files changed, 35 insertions(+), 72 deletions(-)
[PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 3 months ago
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.

v2:
- xen_piix3_set_irq() is already generic. Just rename it. (Chuck)

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"

Bernhard Beschow (6):
  include/hw/xen/xen: Rename xen_piix3_set_irq() to xen_intx_set_irq()
  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         |  2 +-
 hw/isa/piix.c                 | 66 +----------------------------------
 include/hw/southbridge/piix.h |  1 -
 include/hw/xen/xen.h          |  2 +-
 stubs/xen-hw-stub.c           |  2 +-
 6 files changed, 35 insertions(+), 72 deletions(-)

-- 
2.39.0

Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Michael S. Tsirkin 1 year, 3 months ago
On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.

Looks ok to me.
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Feel free to merge through Xen tree.

> v2:
> - xen_piix3_set_irq() is already generic. Just rename it. (Chuck)
> 
> 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"
> 
> Bernhard Beschow (6):
>   include/hw/xen/xen: Rename xen_piix3_set_irq() to xen_intx_set_irq()
>   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         |  2 +-
>  hw/isa/piix.c                 | 66 +----------------------------------
>  include/hw/southbridge/piix.h |  1 -
>  include/hw/xen/xen.h          |  2 +-
>  stubs/xen-hw-stub.c           |  2 +-
>  6 files changed, 35 insertions(+), 72 deletions(-)
> 
> -- 
> 2.39.0
>
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Anthony PERARD via 1 year, 2 months ago
On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
> 
> Looks ok to me.
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> 
> Feel free to merge through Xen tree.

Hi Bernhard,

The series currently doesn't apply on master. And a quick try at
applying the series it is based on also failed. Could you rebase it , or
maybe you would prefer to wait until the other series "Consolidate
PIIX..." is fully applied?

Thanks.

> > 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"

-- 
Anthony PERARD
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 2 months ago

Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
>> 
>> Looks ok to me.
>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>> 
>> Feel free to merge through Xen tree.
>
>Hi Bernhard,

Hi Anthony,

>The series currently doesn't apply on master. And a quick try at
>applying the series it is based on also failed. Could you rebase it , or
>maybe you would prefer to wait until the other series "Consolidate
>PIIX..." is fully applied?

Thanks for looking into it!

You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.

Thanks,
Bernhard
>
>Thanks.
>
>> > 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"
>
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 2 months ago

Am 24. Januar 2023 17:07:30 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>
>
>Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
>>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
>>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
>>> 
>>> Looks ok to me.
>>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>> 
>>> Feel free to merge through Xen tree.
>>
>>Hi Bernhard,
>
>Hi Anthony,
>
>>The series currently doesn't apply on master. And a quick try at
>>applying the series it is based on also failed. Could you rebase it , or
>>maybe you would prefer to wait until the other series "Consolidate
>>PIIX..." is fully applied?
>
>Thanks for looking into it!
>
>You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.

Ping

>
>Thanks,
>Bernhard
>>
>>Thanks.
>>
>>> > 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"
>>
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 2 months ago

Am 1. Februar 2023 08:11:10 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>
>
>Am 24. Januar 2023 17:07:30 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>>
>>
>>Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
>>>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
>>>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
>>>> 
>>>> Looks ok to me.
>>>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>>> 
>>>> Feel free to merge through Xen tree.
>>>
>>>Hi Bernhard,
>>
>>Hi Anthony,
>>
>>>The series currently doesn't apply on master. And a quick try at
>>>applying the series it is based on also failed. Could you rebase it , or
>>>maybe you would prefer to wait until the other series "Consolidate
>>>PIIX..." is fully applied?
>>
>>Thanks for looking into it!
>>
>>You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.
>
>Ping

Ping^2

>
>>
>>Thanks,
>>Bernhard
>>>
>>>Thanks.
>>>
>>>> > 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"
>>>
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Chuck Zmudzinski 1 year, 1 month ago
On 2/9/2023 4:53 PM, Bernhard Beschow wrote:
> Am 1. Februar 2023 08:11:10 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
> >
> >
> >Am 24. Januar 2023 17:07:30 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
> >>
> >>
> >>Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
> >>>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
> >>>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
> >>>> 
> >>>> Looks ok to me.
> >>>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> >>>> 
> >>>> Feel free to merge through Xen tree.
> >>>
> >>>Hi Bernhard,
> >>
> >>Hi Anthony,
> >>
> >>>The series currently doesn't apply on master. And a quick try at
> >>>applying the series it is based on also failed. Could you rebase it , or
> >>>maybe you would prefer to wait until the other series "Consolidate
> >>>PIIX..." is fully applied?
> >>
> >>Thanks for looking into it!
> >>
> >>You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.
> >
> >Ping
>
> Ping^2

Hi Bernhard,

I took a look at this today to see why it cannot be applied. I can see clearly that
all the prerequisite patches have *not* been applied to master yet, so I can
understand why Anthony cannot pull this up yet. Specifically, the series that
consolidates PIIX3 and PIIX4 south bridges is not yet applied, and that is one of
the prerequisites. I think you said it was reviewed, but it apparently never got
pulled up into master.

For reference, here is the link to the prerequisite patch set I tested with
this patch set:

https://lore.kernel.org/qemu-devel/20221221170003.2929-1-shentey@gmail.com/

The patch set I tested is a 30-patch series, and I don't know if it has
been partially applied. The title of that patch set is:

This series consolidates the implementations of the PIIX3 and PIIX4 south

So before this patch set to resolve the TYPE_PIIX3_XEN_DEVICE can be
applied, the patch set to consolidate the PIIX3 and PIIX4 south bridges
needs to be applied.

I don't know if the feature freeze means these patches that do not add any
new features still need to wait until the next development cycle.

Kind regards,

Chuck

> >
> >>
> >>Thanks,
> >>Bernhard
> >>>
> >>>Thanks.
> >>>
> >>>> > 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"
> >>>
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 1 month ago

Am 11. März 2023 22:20:29 UTC schrieb Chuck Zmudzinski <brchuckz@aol.com>:
>On 2/9/2023 4:53 PM, Bernhard Beschow wrote:
>> Am 1. Februar 2023 08:11:10 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>> >
>> >
>> >Am 24. Januar 2023 17:07:30 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>> >>
>> >>
>> >>Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
>> >>>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
>> >>>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
>> >>>> 
>> >>>> Looks ok to me.
>> >>>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>> >>>> 
>> >>>> Feel free to merge through Xen tree.
>> >>>
>> >>>Hi Bernhard,
>> >>
>> >>Hi Anthony,
>> >>
>> >>>The series currently doesn't apply on master. And a quick try at
>> >>>applying the series it is based on also failed. Could you rebase it , or
>> >>>maybe you would prefer to wait until the other series "Consolidate
>> >>>PIIX..." is fully applied?
>> >>
>> >>Thanks for looking into it!
>> >>
>> >>You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.
>> >
>> >Ping
>>
>> Ping^2
>
>Hi Bernhard,

Hi Chuck,

>I took a look at this today to see why it cannot be applied.

Thanks for looking at it!

>I can see clearly that
>all the prerequisite patches have *not* been applied to master yet, so I can
>understand why Anthony cannot pull this up yet. Specifically, the series that
>consolidates PIIX3 and PIIX4 south bridges is not yet applied, and that is one of
>the prerequisites. I think you said it was reviewed, but it apparently never got
>pulled up into master.

Correct, the PIIX consolidation series isn't merged yet. This series currently depends on it to avoid merge conflicts but doesn't need it otherwise. Back then I anticipated that the consolidation series would land in master soon since it was fully reviewed before this one. But that turned out not to be the case.

This series depends on some necessary refactoring [1] which I did in the context of PIIX consolidation which is already in master. So this series can easily be rebased onto master and it even simplifies the consolidation series a bit. I'll take this route now and I'll post a v3.

Best regards,
Bernhard

[1] https://lore.kernel.org/qemu-devel/20221120150550.63059-1-shentey@gmail.com/

>
>For reference, here is the link to the prerequisite patch set I tested with
>this patch set:
>
>https://lore.kernel.org/qemu-devel/20221221170003.2929-1-shentey@gmail.com/
>
>The patch set I tested is a 30-patch series, and I don't know if it has
>been partially applied. The title of that patch set is:
>
>This series consolidates the implementations of the PIIX3 and PIIX4 south
>
>So before this patch set to resolve the TYPE_PIIX3_XEN_DEVICE can be
>applied, the patch set to consolidate the PIIX3 and PIIX4 south bridges
>needs to be applied.
>
>I don't know if the feature freeze means these patches that do not add any
>new features still need to wait until the next development cycle.
>
>Kind regards,
>
>Chuck
>
>> >
>> >>
>> >>Thanks,
>> >>Bernhard
>> >>>
>> >>>Thanks.
>> >>>
>> >>>> > 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"
>> >>>
>
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Chuck Zmudzinski 1 year, 1 month ago
On 3/12/23 5:22 AM, Bernhard Beschow wrote:
> 
> 
> Am 11. März 2023 22:20:29 UTC schrieb Chuck Zmudzinski <brchuckz@aol.com>:
>>On 2/9/2023 4:53 PM, Bernhard Beschow wrote:
>>> Am 1. Februar 2023 08:11:10 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>>> >
>>> >
>>> >Am 24. Januar 2023 17:07:30 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>>> >>
>>> >>
>>> >>Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
>>> >>>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
>>> >>>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
>>> >>>> 
>>> >>>> Looks ok to me.
>>> >>>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>> >>>> 
>>> >>>> Feel free to merge through Xen tree.
>>> >>>
>>> >>>Hi Bernhard,
>>> >>
>>> >>Hi Anthony,
>>> >>
>>> >>>The series currently doesn't apply on master. And a quick try at
>>> >>>applying the series it is based on also failed. Could you rebase it , or
>>> >>>maybe you would prefer to wait until the other series "Consolidate
>>> >>>PIIX..." is fully applied?
>>> >>
>>> >>Thanks for looking into it!
>>> >>
>>> >>You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.
>>> >
>>> >Ping
>>>
>>> Ping^2
>>
>>Hi Bernhard,
> 
> Hi Chuck,
> 
>>I took a look at this today to see why it cannot be applied.
> 
> Thanks for looking at it!
> 
>>I can see clearly that
>>all the prerequisite patches have *not* been applied to master yet, so I can
>>understand why Anthony cannot pull this up yet. Specifically, the series that
>>consolidates PIIX3 and PIIX4 south bridges is not yet applied, and that is one of
>>the prerequisites. I think you said it was reviewed, but it apparently never got
>>pulled up into master.
> 
> Correct, the PIIX consolidation series isn't merged yet. This series currently depends on it to avoid merge conflicts but doesn't need it otherwise. Back then I anticipated that the consolidation series would land in master soon since it was fully reviewed before this one. But that turned out not to be the case.
> 
> This series depends on some necessary refactoring [1] which I did in the context of PIIX consolidation which is already in master. So this series can easily be rebased onto master and it even simplifies the consolidation series a bit. I'll take this route now and I'll post a v3.

Thanks for posting v3, I was at a loss trying to figure out how to merge the 30-patch piix
consolidation series into the master branch. I just tested your recent v3 (all 6 patches)
on top of the current master branch and it works well on my Xen guests, so you can keep my
Tested-by tag on that patch series!

Kind regards,

Chuck

Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 1 month ago

Am 12. März 2023 21:02:03 UTC schrieb Chuck Zmudzinski <brchuckz@aol.com>:
>On 3/12/23 5:22 AM, Bernhard Beschow wrote:
>> 
>> 
>> Am 11. März 2023 22:20:29 UTC schrieb Chuck Zmudzinski <brchuckz@aol.com>:
>>>On 2/9/2023 4:53 PM, Bernhard Beschow wrote:
>>>> Am 1. Februar 2023 08:11:10 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>>>> >
>>>> >
>>>> >Am 24. Januar 2023 17:07:30 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>>>> >>
>>>> >>
>>>> >>Am 24. Januar 2023 16:11:47 UTC schrieb Anthony PERARD <anthony.perard@citrix.com>:
>>>> >>>On Wed, Jan 18, 2023 at 05:13:03AM -0500, Michael S. Tsirkin wrote:
>>>> >>>> On Wed, Jan 04, 2023 at 03:44:31PM +0100, 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.
>>>> >>>> 
>>>> >>>> Looks ok to me.
>>>> >>>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>>>> >>>> 
>>>> >>>> Feel free to merge through Xen tree.
>>>> >>>
>>>> >>>Hi Bernhard,
>>>> >>
>>>> >>Hi Anthony,
>>>> >>
>>>> >>>The series currently doesn't apply on master. And a quick try at
>>>> >>>applying the series it is based on also failed. Could you rebase it , or
>>>> >>>maybe you would prefer to wait until the other series "Consolidate
>>>> >>>PIIX..." is fully applied?
>>>> >>
>>>> >>Thanks for looking into it!
>>>> >>
>>>> >>You can get the compilable series from https://patchew.org/QEMU/20230104144437.27479-1-shentey@gmail.com/ . If it doesn't work for you let me know, then I can rebase onto master. All necessary dependencies for the series are upstreamed meanwhile.
>>>> >
>>>> >Ping
>>>>
>>>> Ping^2
>>>
>>>Hi Bernhard,
>> 
>> Hi Chuck,
>> 
>>>I took a look at this today to see why it cannot be applied.
>> 
>> Thanks for looking at it!
>> 
>>>I can see clearly that
>>>all the prerequisite patches have *not* been applied to master yet, so I can
>>>understand why Anthony cannot pull this up yet. Specifically, the series that
>>>consolidates PIIX3 and PIIX4 south bridges is not yet applied, and that is one of
>>>the prerequisites. I think you said it was reviewed, but it apparently never got
>>>pulled up into master.
>> 
>> Correct, the PIIX consolidation series isn't merged yet. This series currently depends on it to avoid merge conflicts but doesn't need it otherwise. Back then I anticipated that the consolidation series would land in master soon since it was fully reviewed before this one. But that turned out not to be the case.
>> 
>> This series depends on some necessary refactoring [1] which I did in the context of PIIX consolidation which is already in master. So this series can easily be rebased onto master and it even simplifies the consolidation series a bit. I'll take this route now and I'll post a v3.
>
>Thanks for posting v3, I was at a loss trying to figure out how to merge the 30-patch piix
>consolidation series into the master branch.

Yeah, the code suffered from bit rod...

>I just tested your recent v3 (all 6 patches)
>on top of the current master branch and it works well on my Xen guests, so you can keep my
>Tested-by tag on that patch series!

Thanks!

Best regards,
Bernhard

>
>Kind regards,
>
>Chuck
Re: [PATCH v2 0/6] Resolve TYPE_PIIX3_XEN_DEVICE
Posted by Bernhard Beschow 1 year, 3 months ago

Am 4. Januar 2023 14:44:31 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>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.
>
>
>
>v2:
>
>- xen_piix3_set_irq() is already generic. Just rename it. (Chuck)
>
>
>
>Testing done:
>
>None, because I don't know how to conduct this properly :(

Ping

Successfully tested by Chuck. Patches 2, 4 and 6 still need review.

I can rebase to master if that eases review -- please let me know. Currently this series is based on my "Consolidate PIIX south bridges" series:

>Based-on: <20221221170003.2929-1-shentey@gmail.com>
>
>          "[PATCH v4 00/30] Consolidate PIIX south bridges"
>
>
>
>Bernhard Beschow (6):
>
>  include/hw/xen/xen: Rename xen_piix3_set_irq() to xen_intx_set_irq()
>
>  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         |  2 +-
>
> hw/isa/piix.c                 | 66 +----------------------------------
>
> include/hw/southbridge/piix.h |  1 -
>
> include/hw/xen/xen.h          |  2 +-
>
> stubs/xen-hw-stub.c           |  2 +-
>
> 6 files changed, 35 insertions(+), 72 deletions(-)
>
>
>
>-- >
>2.39.0
>
>
>