On Thu, Dec 03, 2015 at 04:19:19PM +0100, Igor Mammedov wrote: > On Wed, 2 Dec 2015 20:22:45 -0200 > Eduardo Habkost <ehabk...@redhat.com> wrote: > > > This series removes piix-specific and q35-specific code from > > acpi-build.c, making it generic and without direct dependencies > > to piix and q35 code. > we are conflicting reshuffling acpi-build.c at the same time > could be cleanup done on top of my refactoring > drop_ASL_support_v1 branch: > > https://github.com/imammedo/qemu/commits/drop_ASL_support_v1
Do you plan to submit it soon? It looks like my series and yours go in opposite directions. I am trying to remove piix4-specific code from acpi-build, and you are addding a is_piix4 field to AcpiMiscInfo. Your series makes much more difficult to remove piix4-specific code from acpi-build.c, but this sounds like a reasonable price for moving the dsdt.dsl logic to C. Maybe I should change my goal from "removing piix4-specific code" to just simplifying the code. I will redo this series on top of yours, taking that into account. There are a few conflicts with the other series, but they are very easy to solve: > > This series needs to be applied after the following: > > * [PATCH v3 0/6] pc: Initialization and compat function cleanup No conflicts. > > * [PATCH V3 0/3] hw/pcie: Multi-root support for Q35 Trivial conflict at crs_range_merge(). > > * [PATCH 00/16] pc: Eliminate struct PcGuestInfo Simple conflict at build_ssdt(). -- Eduardo
