hw/arm/virt-acpi-build.c | 25 ++++++------------------- tests/data/acpi/virt/DSDT | Bin 18462 -> 5307 bytes tests/data/acpi/virt/DSDT.memhp | Bin 19799 -> 6644 bytes tests/data/acpi/virt/DSDT.numamem | Bin 18462 -> 5307 bytes 4 files changed, 6 insertions(+), 19 deletions(-)
Remove conflict _ADR objects, and fix and refine PCI device definition in ACPI/DSDT. Cc: Peter Maydell <peter.maydell@linaro.org> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Cc: Shannon Zhao <shannon.zhaosl@gmail.com> Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org v1 -> v2: - flow the work flow in tests/qtest/bios-table-test.c to post ACPI related patches. - update commit messages for removing "RP0" and "_ADR". - add 3 more cleanup patches. Heyi Guo (7): bios-tables-test: prepare to change ARM virt ACPI DSDT arm/virt/acpi: remove meaningless sub device "PR0" from PCI0 arm/virt/acpi: remove _ADR from devices identified by _HID arm/acpi: fix PCI _PRT definition arm/acpi: fix duplicated _UID of PCI interrupt link devices arm/acpi: simplify the description of PCI _CRS virt/acpi: update golden masters for DSDT update hw/arm/virt-acpi-build.c | 25 ++++++------------------- tests/data/acpi/virt/DSDT | Bin 18462 -> 5307 bytes tests/data/acpi/virt/DSDT.memhp | Bin 19799 -> 6644 bytes tests/data/acpi/virt/DSDT.numamem | Bin 18462 -> 5307 bytes 4 files changed, 6 insertions(+), 19 deletions(-) -- 2.19.1
On Mon, Feb 03, 2020 at 08:14:58AM +0800, Heyi Guo wrote: > Remove conflict _ADR objects, and fix and refine PCI device definition in > ACPI/DSDT. > > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Cc: Shannon Zhao <shannon.zhaosl@gmail.com> > Cc: qemu-arm@nongnu.org > Cc: qemu-devel@nongnu.org Series Reviewed-by: Michael S. Tsirkin <mst@redhat.com> merge through ARM tree pls. > v1 -> v2: > - flow the work flow in tests/qtest/bios-table-test.c to post ACPI related > patches. > - update commit messages for removing "RP0" and "_ADR". > - add 3 more cleanup patches. > > Heyi Guo (7): > bios-tables-test: prepare to change ARM virt ACPI DSDT > arm/virt/acpi: remove meaningless sub device "PR0" from PCI0 > arm/virt/acpi: remove _ADR from devices identified by _HID > arm/acpi: fix PCI _PRT definition > arm/acpi: fix duplicated _UID of PCI interrupt link devices > arm/acpi: simplify the description of PCI _CRS > virt/acpi: update golden masters for DSDT update > > hw/arm/virt-acpi-build.c | 25 ++++++------------------- > tests/data/acpi/virt/DSDT | Bin 18462 -> 5307 bytes > tests/data/acpi/virt/DSDT.memhp | Bin 19799 -> 6644 bytes > tests/data/acpi/virt/DSDT.numamem | Bin 18462 -> 5307 bytes > 4 files changed, 6 insertions(+), 19 deletions(-) > > -- > 2.19.1
在 2020/2/3 14:43, Michael S. Tsirkin 写道: > On Mon, Feb 03, 2020 at 08:14:58AM +0800, Heyi Guo wrote: >> Remove conflict _ADR objects, and fix and refine PCI device definition in >> ACPI/DSDT. >> >> Cc: Peter Maydell <peter.maydell@linaro.org> >> Cc: "Michael S. Tsirkin" <mst@redhat.com> >> Cc: Igor Mammedov <imammedo@redhat.com> >> Cc: Shannon Zhao <shannon.zhaosl@gmail.com> >> Cc: qemu-arm@nongnu.org >> Cc: qemu-devel@nongnu.org > > Series > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > merge through ARM tree pls. Thanks, Michael :) Hi Peter, Do I need to send v3 to update the commit message of patch 4/7 as Michael suggested? Thanks, Heyi > >> v1 -> v2: >> - flow the work flow in tests/qtest/bios-table-test.c to post ACPI related >> patches. >> - update commit messages for removing "RP0" and "_ADR". >> - add 3 more cleanup patches. >> >> Heyi Guo (7): >> bios-tables-test: prepare to change ARM virt ACPI DSDT >> arm/virt/acpi: remove meaningless sub device "PR0" from PCI0 >> arm/virt/acpi: remove _ADR from devices identified by _HID >> arm/acpi: fix PCI _PRT definition >> arm/acpi: fix duplicated _UID of PCI interrupt link devices >> arm/acpi: simplify the description of PCI _CRS >> virt/acpi: update golden masters for DSDT update >> >> hw/arm/virt-acpi-build.c | 25 ++++++------------------- >> tests/data/acpi/virt/DSDT | Bin 18462 -> 5307 bytes >> tests/data/acpi/virt/DSDT.memhp | Bin 19799 -> 6644 bytes >> tests/data/acpi/virt/DSDT.numamem | Bin 18462 -> 5307 bytes >> 4 files changed, 6 insertions(+), 19 deletions(-) >> >> -- >> 2.19.1 >
On Mon, 3 Feb 2020 at 13:33, Heyi Guo <guoheyi@huawei.com> wrote: > > > 在 2020/2/3 14:43, Michael S. Tsirkin 写道: > > On Mon, Feb 03, 2020 at 08:14:58AM +0800, Heyi Guo wrote: > >> Remove conflict _ADR objects, and fix and refine PCI device definition in > >> ACPI/DSDT. > >> > >> Cc: Peter Maydell <peter.maydell@linaro.org> > >> Cc: "Michael S. Tsirkin" <mst@redhat.com> > >> Cc: Igor Mammedov <imammedo@redhat.com> > >> Cc: Shannon Zhao <shannon.zhaosl@gmail.com> > >> Cc: qemu-arm@nongnu.org > >> Cc: qemu-devel@nongnu.org > > > > Series > > > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > > > merge through ARM tree pls. > > Thanks, Michael :) > > > Hi Peter, > > Do I need to send v3 to update the commit message of patch 4/7 as > Michael suggested? This patchset seems to be corrupt somehow: e104462:bionic:qemu$ patches apply -s id:20200203001505.52573-1-guoheyi@huawei.com Applying: bios-tables-test: prepare to change ARM virt ACPI DSDT Applying: arm/virt/acpi: remove meaningless sub device "RP0" from PCI0 Applying: arm/virt/acpi: remove _ADR from devices identified by _HID Applying: arm/acpi: fix PCI _PRT definition Applying: arm/acpi: fix duplicated _UID of PCI interrupt link devices Applying: arm/acpi: simplify the description of PCI _CRS Applying: virt/acpi: update golden masters for DSDT update error: corrupt patch at line 68 error: could not build fake ancestor hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0007 virt/acpi: update golden masters for DSDT update When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Patchew didn't like it either: https://patchew.org/QEMU/20200203001505.52573-1-guoheyi@huawei.com/ I think the problem here is the quoting of the diff in the commit message of patch 7: git am and friends think that is part of the actual patch body and get confused. You might be able to avoid that by not putting the diff --git a/DSDT.dsl.orig b/DSDT.dsl index ed3e5f0fa9..10cf70c886 100644 --- a/DSDT.dsl.orig +++ b/DSDT.dsl part in the commit message, but I haven't tested that. So resending a v4 would probably be a good idea anyway. thanks -- PMM
在 2020/2/3 22:03, Peter Maydell 写道: > On Mon, 3 Feb 2020 at 13:33, Heyi Guo <guoheyi@huawei.com> wrote: >> >> 在 2020/2/3 14:43, Michael S. Tsirkin 写道: >>> On Mon, Feb 03, 2020 at 08:14:58AM +0800, Heyi Guo wrote: >>>> Remove conflict _ADR objects, and fix and refine PCI device definition in >>>> ACPI/DSDT. >>>> >>>> Cc: Peter Maydell <peter.maydell@linaro.org> >>>> Cc: "Michael S. Tsirkin" <mst@redhat.com> >>>> Cc: Igor Mammedov <imammedo@redhat.com> >>>> Cc: Shannon Zhao <shannon.zhaosl@gmail.com> >>>> Cc: qemu-arm@nongnu.org >>>> Cc: qemu-devel@nongnu.org >>> Series >>> >>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> >>> >>> merge through ARM tree pls. >> Thanks, Michael :) >> >> >> Hi Peter, >> >> Do I need to send v3 to update the commit message of patch 4/7 as >> Michael suggested? > This patchset seems to be corrupt somehow: > > e104462:bionic:qemu$ patches apply -s > id:20200203001505.52573-1-guoheyi@huawei.com > Applying: bios-tables-test: prepare to change ARM virt ACPI DSDT > Applying: arm/virt/acpi: remove meaningless sub device "RP0" from PCI0 > Applying: arm/virt/acpi: remove _ADR from devices identified by _HID > Applying: arm/acpi: fix PCI _PRT definition > Applying: arm/acpi: fix duplicated _UID of PCI interrupt link devices > Applying: arm/acpi: simplify the description of PCI _CRS > Applying: virt/acpi: update golden masters for DSDT update > error: corrupt patch at line 68 > error: could not build fake ancestor > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0007 virt/acpi: update golden masters for DSDT update > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > Patchew didn't like it either: > https://patchew.org/QEMU/20200203001505.52573-1-guoheyi@huawei.com/ > > I think the problem here is the quoting of the diff in > the commit message of patch 7: git am and friends think > that is part of the actual patch body and get confused. > You might be able to avoid that by not putting the > diff --git a/DSDT.dsl.orig b/DSDT.dsl > index ed3e5f0fa9..10cf70c886 100644 > --- a/DSDT.dsl.orig > +++ b/DSDT.dsl > > part in the commit message, but I haven't tested that. > > So resending a v4 would probably be a good idea anyway. Sorry for trouble. I should have tried locally before sending the patch. Yes, removing the above 4 lines help git am success. I'll send a v3. Thanks, Heyi > > thanks > -- PMM > > .
© 2016 - 2024 Red Hat, Inc.