On Tue, Jul 29, 2014 at 12:25:56PM +0200, Laszlo Ersek wrote:
> On 07/28/14 23:27, Michael S. Tsirkin wrote:
> > On Mon, Jul 28, 2014 at 05:34:13PM +0200, Paolo Bonzini wrote:
> >> v3->v4:
> >> drop all pretense of supporting bridges [me]
> >>
> >> v2->v3:
> >> fix tests/acpi-test-data/pc/DSDT [Peter]
> >> track down "make check" failure, fix it [patch 4, me]
> >> split patch 2 in two parts [mst]
> >> do not make bsel_alloc global [mst]
> >> include Igor's bridge patch [mst, as discussed on IRC]
> >
> > OK, I applied this, and did some tweaks on top that I think
> > make it a bit safer.
> > It's very very late in the release cycle, but also very late in the
> > day so I don't want to risk sending pull request now.
> > I did push it out: tag for_upstream in my tree
> > Will send tomorrow: Paolo, Laszlo, Gerd, could you please take
> > a look and ack?
>
> Any particular reason for reordering the patches from Paolo's v4?
>
> In that series, the order is:
>
> 1 acpi-dsdt: procedurally generate _PRT
> 2 pc: hack for migration compatibility from QEMU 2.0
> 3 pc: future-proof migration-compatibility of ACPI tables
> 4 bios-tables-test: fix ASL normalization false positive
> 5 pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug
> is disabled
>
> In yours,
>
> 1 acpi-dsdt: procedurally generate _PRT
> 2 pc: hack for migration compatibility from QEMU 2.0
> 3 bios-tables-test: fix ASL normalization false positive
> 4 pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug
> is disabled
> 5 acpi-build: minor code cleanup
> 6 pc: future-proof migration-compatibility of ACPI tables
It's because of this patch. It was a bit controversial,
so I deferred applying it for a while.
I implemented an alternative solution just to see how
it would look like.
That patch turned out to be much bigger, so I agreed we
should go ahead with Paolo's one for 2.1 even if it's not pretty,
and will create more work for 2.2.
> 7 acpi-build: tweak acpi migration limits
> 8 piix: set legacy table size for 1.7
>
> 1 -> 1
> 2 -> 2
> 3 -> 6
> 4 -> 3
> 5 -> 4
>
> Patches 1 & 2 are identical between the two sets, and their order is the
> same.
>
> You cut out patch #3, moved up patches #4 and #5, added a new patch
> ("acpi-build: minor code cleanup"), and then reinserted #3.
>
> .. Patches taken from Paolo's v4 seem to be identical.
>
> For patch "acpi-build: minor code cleanup":
> - two typos in the commit message (double space, "for clarify")
> - seems OK otherwise
>
> For patch "acpi-build: tweak acpi migration limits":
>
> len pre-patch post-patch
> message action message action
> ---------------- -------- ------------ ------- --------------------
> [ 0, 64 KB] none set to 64 KB none set to 128KB
> ( 64 KB, 128 KB] error exit warning set to 128KB
> (128 KB, inf) error exit warning round up to multiple
> of 128 KB
>
> I don't object.
>
> For patch "piix: set legacy table size for 1.7": didn't Igor say
> something that such a migration wouldn't work anyway? I could be
> remembering wrong.
>
> Thanks
> Laszlo
I don't recall this, but if there are more bug we could just
fix them too.
--
MST
