From: Guoheyi <guoheyi@huawei.com>
To: Peter Maydell <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>
Cc: Corey Minyard <cminyard@mvista.com>,
QEMU Developers <qemu-devel@nongnu.org>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
qemu-arm <qemu-arm@nongnu.org>,
Igor Mammedov <imammedo@redhat.com>,
wanghaibin.wang@huawei.com
Subject: Re: [PATCH 2/2] arm/virt/acpi: remove _ADR from devices identified by _HID
Date: Fri, 17 Jan 2020 10:08:31 +0800 [thread overview]
Message-ID: <be48c9ab-6a6a-928a-37b8-e52999a329ca@huawei.com> (raw)
In-Reply-To: <CAFEAcA9AZS=aNBYNntTDNB0k4kORjMFJ6qOimASVV9JWs4VzTA@mail.gmail.com>
在 2020/1/16 20:24, Peter Maydell 写道:
> On Wed, 15 Jan 2020 at 10:55, Michael S. Tsirkin <mst@redhat.com> wrote:
>> Here's a hopefully better patch. Peter does this address the issue?
>>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>
>>
>> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
>> index f1ac2d7e96..3ab4872bd7 100644
>> --- a/tests/qtest/bios-tables-test.c
>> +++ b/tests/qtest/bios-tables-test.c
>> @@ -16,7 +16,10 @@
>> * 1. add empty files for new tables, if any, under tests/data/acpi
>> * 2. list any changed files in tests/bios-tables-test-allowed-diff.h
>> * 3. commit the above *before* making changes that affect the tables
>> - * Maintainer:
>> + *
>> + * Contributor or ACPI Maintainer (steps 4-7 need to be redone to resolve conflicts
>> + * in binary commit created in step 6):
>> + *
>> * After 1-3 above tests will pass but ignore differences with the expected files.
>> * You will also notice that tests/bios-tables-test-allowed-diff.h lists
>> * a bunch of files. This is your hint that you need to do the below:
>> @@ -28,13 +31,23 @@
>> * output. If not - disassemble them yourself in any way you like.
>> * Look at the differences - make sure they make sense and match what the
>> * changes you are merging are supposed to do.
>> + * Save the changes, preferably in form of ASL diff for the commit log in
>> + * step 6.
>> *
>> * 5. From build directory, run:
>> * $(SRC_PATH)/tests/data/acpi/rebuild-expected-aml.sh
>> - * 6. Now commit any changes.
>> - * 7. Before doing a pull request, make sure tests/bios-tables-test-allowed-diff.h
>> - * is empty - this will ensure following changes to ACPI tables will
>> - * be noticed.
>> + * 6. Now commit any changes to the expected binary, include diff from step 4
>> + * in commit log.
>> + * 7. Before sending patches to the list (Contributor)
>> + * or before doing a pull request (Maintainer), make sure
>> + * tests/bios-tables-test-allowed-diff.h is empty - this will ensure
>> + * following changes to ACPI tables will be noticed.
>> + *
>> + * The resulting patchset/pull request then looks like this:
>> + * - patch 1: list changed files in tests/bios-tables-test-allowed-diff.h.
>> + * - patches 2 - n: real changes, may contain multiple patches.
>> + * - patch n + 1: update golden master binaries and empty
Though I drafted the inital text, "2 - n" seems like a expression "2
minus n" for myself after a second glance, especially when we have a "n
+1" just below. Maybe we can use a different notation :)
>> + * tests/bios-tables-test-allowed-diff.h
>> */
> I think that seems reasonable, but you're the ACPI expert.
> As long as the patches on list:
> * can be reviewed by somebody for whether their ACPI changes
> are correct, including whether the golden-master changes are right
> * can be applied by a maintainer without having to do anything
> special
> * don't break bisection
>
> then I'm happy. It sounds like those steps will work for that.
>
>> diff --git a/roms/seabios b/roms/seabios
>> index f21b5a4aeb..c9ba5276e3 160000
>> --- a/roms/seabios
>> +++ b/roms/seabios
>> @@ -1 +1 @@
>> -Subproject commit f21b5a4aeb020f2a5e2c6503f906a9349dd2f069
>> +Subproject commit c9ba5276e3217ac6a1ec772dbebf568ba3a8a55d
> You have a stray submodule update in your patch, though :-)
A file config.mak will be generated in roms/seabios after building qemu,
and we may probably add it in our commit by "git commit -a" :)
Thanks,
Heyi
>
> thanks
> -- PMM
>
> .
next prev parent reply other threads:[~2020-01-17 2:09 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 6:47 [PATCH 0/2] Some cleanup in arm/virt/acpi Heyi Guo
2019-12-19 6:47 ` [PATCH 1/2] arm/virt/acpi: remove meaningless sub device "PR0" from PCI0 Heyi Guo
2020-01-13 12:37 ` Igor Mammedov
2020-01-16 12:36 ` Guoheyi
2020-01-21 3:48 ` Guoheyi
2020-01-21 6:35 ` Michael S. Tsirkin
2020-01-22 5:39 ` Michael S. Tsirkin
2020-01-22 6:38 ` Guoheyi
2019-12-19 6:47 ` [PATCH 2/2] arm/virt/acpi: remove _ADR from devices identified by _HID Heyi Guo
2020-01-05 12:33 ` Michael S. Tsirkin
2020-01-05 12:53 ` Michael S. Tsirkin
2020-01-06 2:10 ` Guoheyi
2020-01-13 8:46 ` Guoheyi
2020-01-16 11:56 ` Guoheyi
2020-01-16 13:25 ` Igor Mammedov
2020-01-17 1:54 ` Guoheyi
2020-01-05 22:54 ` Corey Minyard
2020-01-06 9:39 ` Michael S. Tsirkin
2020-01-06 13:07 ` Corey Minyard
2020-01-06 15:51 ` Peter Maydell
2020-01-15 2:03 ` Guoheyi
2020-01-15 6:30 ` Michael S. Tsirkin
2020-01-15 9:25 ` Guoheyi
2020-01-15 10:53 ` Michael S. Tsirkin
2020-01-15 10:55 ` Michael S. Tsirkin
2020-01-16 12:24 ` Peter Maydell
2020-01-17 2:08 ` Guoheyi [this message]
2020-01-13 12:08 ` Igor Mammedov
2020-01-13 13:57 ` Guoheyi
2020-01-13 15:26 ` Andrew Jones
2020-01-15 1:25 ` Guoheyi
2020-01-15 12:08 ` Igor Mammedov
2019-12-19 12:34 ` [PATCH 0/2] Some cleanup in arm/virt/acpi Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=be48c9ab-6a6a-928a-37b8-e52999a329ca@huawei.com \
--to=guoheyi@huawei.com \
--cc=cminyard@mvista.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
--cc=wanghaibin.wang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).