| Message ID | 20180607223111.27792-1-ross.zwisler@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [qemu,1/5] gitignore: ignore generated qapi job files | expand |
On Thu, Jun 07, 2018 at 04:31:09PM -0600, Ross Zwisler wrote: > This commit: > > commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0") > > updated the name used to create the q35 machine, which in turn changed the > SSDT table which is generated when we run "make check": > > acpi-test: Warning! SSDT mismatch. Actual [asl:/tmp/asl-QZDWJZ.dsl, > aml:/tmp/aml-T8JYJZ], Expected [asl:/tmp/asl-DTWVJZ.dsl, > aml:tests/acpi-test-data/q35/SSDT.dimmpxm]. > > Here's the only difference, aside from the checksum: > > < Name (MEMA, 0x07FFF000) > --- > > Name (MEMA, 0x07FFE000) Weird. How come the phys address changes just because of machine name? > > Update the binary table that we compare against so it reflects this name > change. > > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Thomas Huth <thuth@redhat.com> > Cc: Eduardo Habkost <ehabkost@redhat.com> > Fixes: commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0") > --- > tests/acpi-test-data/q35/SSDT.dimmpxm | Bin 685 -> 685 bytes > 1 file changed, 0 insertions(+), 0 deletions(-) > > diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/acpi-test-data/q35/SSDT.dimmpxm > index 8ba0e67cb72daa81a65da4906d37a5e0f4af1fd4..2d5b721bcf9c398feb6d005761f898015042e8a4 100644 > GIT binary patch > delta 23 > fcmZ3>x|WqIIM^j*EfWI+qr*n71x(Bz{<8xBPCEwk > > delta 23 > fcmZ3>x|WqIIM^j*EfWI+W57nP1x(Bj{<8xBPMZev > > -- > 2.14.4
On 08.06.2018 00:31, Ross Zwisler wrote: > This commit: > > commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0") > > updated the name used to create the q35 machine, which in turn changed the > SSDT table which is generated when we run "make check": > > acpi-test: Warning! SSDT mismatch. Actual [asl:/tmp/asl-QZDWJZ.dsl, > aml:/tmp/aml-T8JYJZ], Expected [asl:/tmp/asl-DTWVJZ.dsl, > aml:tests/acpi-test-data/q35/SSDT.dimmpxm]. > > Here's the only difference, aside from the checksum: > > < Name (MEMA, 0x07FFF000) > --- > > Name (MEMA, 0x07FFE000) > > Update the binary table that we compare against so it reflects this name > change. > > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Thomas Huth <thuth@redhat.com> > Cc: Eduardo Habkost <ehabkost@redhat.com> > Fixes: commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0") > --- > tests/acpi-test-data/q35/SSDT.dimmpxm | Bin 685 -> 685 bytes > 1 file changed, 0 insertions(+), 0 deletions(-) > > diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/acpi-test-data/q35/SSDT.dimmpxm > index 8ba0e67cb72daa81a65da4906d37a5e0f4af1fd4..2d5b721bcf9c398feb6d005761f898015042e8a4 100644 > GIT binary patch > delta 23 > fcmZ3>x|WqIIM^j*EfWI+qr*n71x(Bz{<8xBPCEwk > > delta 23 > fcmZ3>x|WqIIM^j*EfWI+W57nP1x(Bj{<8xBPMZev > Thanks, that fixes the warning for me. Tested-by: Thomas Huth <thuth@redhat.com>
On 06/07/2018 06:14 PM, Michael S. Tsirkin wrote: > On Thu, Jun 07, 2018 at 04:31:09PM -0600, Ross Zwisler wrote: >> This commit: >> >> commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0") >> >> updated the name used to create the q35 machine, which in turn changed the >> SSDT table which is generated when we run "make check": >> >> acpi-test: Warning! SSDT mismatch. Actual [asl:/tmp/asl-QZDWJZ.dsl, >> aml:/tmp/aml-T8JYJZ], Expected [asl:/tmp/asl-DTWVJZ.dsl, >> aml:tests/acpi-test-data/q35/SSDT.dimmpxm]. >> >> Here's the only difference, aside from the checksum: >> >> < Name (MEMA, 0x07FFF000) >> --- >> > Name (MEMA, 0x07FFE000) > > Weird. How come the phys address changes just because of machine name? "2.13" is a different length than "3.0"; depending on whatever other alignment coincidences or sharing of similar substrings are in place, this obviously shuffled enough data that the one byte change then reflects into an entire page boundary difference.
On 06/07/2018 05:31 PM, Ross Zwisler wrote: > With a fully built QEMU I currently see the following with "git status": > > Untracked files: > (use "git add <file>..." to include in what will be committed) > > qapi/qapi-commands-job.c > qapi/qapi-commands-job.h > qapi/qapi-events-job.c > qapi/qapi-events-job.h > qapi/qapi-types-job.c > qapi/qapi-types-job.h > qapi/qapi-visit-job.c > qapi/qapi-visit-job.h > > These are all generated files. Ignore them. > > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Eric Blake <eblake@redhat.com> > Fixes: commit bf42508f24ee ("job: Introduce qapi/job.json") You're the third to post this: https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg07280.html https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01624.html
On 06/08/2018 09:59 AM, Eric Blake wrote: > On 06/07/2018 05:31 PM, Ross Zwisler wrote: >> With a fully built QEMU I currently see the following with "git status": >> >> Untracked files: >> (use "git add <file>..." to include in what will be committed) >> >> qapi/qapi-commands-job.c >> qapi/qapi-commands-job.h >> qapi/qapi-events-job.c >> qapi/qapi-events-job.h >> qapi/qapi-types-job.c >> qapi/qapi-types-job.h >> qapi/qapi-visit-job.c >> qapi/qapi-visit-job.h >> >> These are all generated files. Ignore them. >> >> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> >> Cc: Kevin Wolf <kwolf@redhat.com> >> Cc: Eric Blake <eblake@redhat.com> >> Fixes: commit bf42508f24ee ("job: Introduce qapi/job.json") > > You're the third to post this: > > https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg07280.html > https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01624.html Also, when sending a series, it's best to include a 0/5 cover letter (the automated CI tooling handles that better, among other reasons). You can use 'git config' to automatically send a cover letter for any patch series > 1. For more tips, https://wiki.qemu.org/Contribute/SubmitAPatch
On Fri, Jun 08, 2018 at 09:59:00AM -0500, Eric Blake wrote: > On 06/07/2018 05:31 PM, Ross Zwisler wrote: > > With a fully built QEMU I currently see the following with "git status": > > > > Untracked files: > > (use "git add <file>..." to include in what will be committed) > > > > qapi/qapi-commands-job.c > > qapi/qapi-commands-job.h > > qapi/qapi-events-job.c > > qapi/qapi-events-job.h > > qapi/qapi-types-job.c > > qapi/qapi-types-job.h > > qapi/qapi-visit-job.c > > qapi/qapi-visit-job.h > > > > These are all generated files. Ignore them. > > > > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> > > Cc: Kevin Wolf <kwolf@redhat.com> > > Cc: Eric Blake <eblake@redhat.com> > > Fixes: commit bf42508f24ee ("job: Introduce qapi/job.json") > > You're the third to post this: > > https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg07280.html > https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01624.html I pulled your master branch yesterday before posting the series. If multiple people are sending fixes to the same issue and the fixes are correct, the easiest way to stop getting those fixes is probably to merge one of the patches.
On Fri, Jun 08, 2018 at 09:24:49AM -0500, Eric Blake wrote: > On 06/07/2018 06:14 PM, Michael S. Tsirkin wrote: > > On Thu, Jun 07, 2018 at 04:31:09PM -0600, Ross Zwisler wrote: > > > This commit: > > > > > > commit aa78a16d8645 ("hw/i386: Rename 2.13 machine types to 3.0") > > > > > > updated the name used to create the q35 machine, which in turn changed the > > > SSDT table which is generated when we run "make check": > > > > > > acpi-test: Warning! SSDT mismatch. Actual [asl:/tmp/asl-QZDWJZ.dsl, > > > aml:/tmp/aml-T8JYJZ], Expected [asl:/tmp/asl-DTWVJZ.dsl, > > > aml:tests/acpi-test-data/q35/SSDT.dimmpxm]. > > > > > > Here's the only difference, aside from the checksum: > > > > > > < Name (MEMA, 0x07FFF000) > > > --- > > > > Name (MEMA, 0x07FFE000) > > > > Weird. How come the phys address changes just because of machine name? > > "2.13" is a different length than "3.0"; depending on whatever other > alignment coincidences or sharing of similar substrings are in place, this > obviously shuffled enough data that the one byte change then reflects into > an entire page boundary difference. I don't think we expose the version number to guests though - do we? > -- > Eric Blake, Principal Software Engineer > Red Hat, Inc. +1-919-301-3266 > Virtualization: qemu.org | libvirt.org
diff --git a/.gitignore b/.gitignore index 81e1f2fb0f..2980090f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -100,6 +100,7 @@ /qapi/qapi-visit-ui.[ch] /qapi/qapi-visit.[ch] /qapi/qapi-doc.texi +/qapi/qapi-*-job.[ch] /qemu-doc.html /qemu-doc.info /qemu-doc.txt
With a fully built QEMU I currently see the following with "git status": Untracked files: (use "git add <file>..." to include in what will be committed) qapi/qapi-commands-job.c qapi/qapi-commands-job.h qapi/qapi-events-job.c qapi/qapi-events-job.h qapi/qapi-types-job.c qapi/qapi-types-job.h qapi/qapi-visit-job.c qapi/qapi-visit-job.h These are all generated files. Ignore them. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Eric Blake <eblake@redhat.com> Fixes: commit bf42508f24ee ("job: Introduce qapi/job.json") --- .gitignore | 1 + 1 file changed, 1 insertion(+)