Re: [Qemu-devel] [PULL 0/2] Net patches
On 20 July 2018 at 01:45, Jason Wang wrote: > The following changes since commit 9f2b67e1ca43c84ed37ebd027e7e77a0f2f8ef65: > > Merge remote-tracking branch > 'remotes/alistair/tags/pull-riscv-pull-20180719' into staging (2018-07-19 > 17:21:43 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to 323e7c117754e4d4ce6b4282d74ad01c99d67714: > > tap: fix memory leak on success to create a tap device (2018-07-20 08:30:49 > +0800) > > > > Applied, thanks. -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
On 03/26/2018 11:59 AM, Peter Maydell wrote: On 26 March 2018 at 17:54, Eric Blake wrote: Hmm, on re-reading that, I wonder if shortlog will do the right thing when a .mailmap entry exists. I'm trying to make sure we don't have to go lower-level with use of 'git log --format=%ae' (vs. --format=%aE and/or log --use-mailmap). /me goes and experiments with: +Julia Suvorova < Julia Suvorova via Qemu-devel Your mailmap change above seems to have a stray extra '<' in it -- was that added by the mailing list server, or is it in the original? D'oh, extra < in my playground. Thankfully, removing it, and trying again, finds the same results: 'git shortlog --author=qemu-devel@nongnu.org' finds all Author: entries that were originally spelled with the list address, even if a .mailmap entry would rewrite it during 'git log --use-mailmap'. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PULL 0/2] Net patches
On 26 March 2018 at 17:54, Eric Blake wrote: > Hmm, on re-reading that, I wonder if shortlog will do the right thing when a > .mailmap entry exists. I'm trying to make sure we don't have to go > lower-level with use of 'git log --format=%ae' (vs. --format=%aE and/or log > --use-mailmap). > > /me goes and experiments with: > > diff --git i/.mailmap w/.mailmap > index cf689b9ec99..a90d7deebe6 100644 > --- i/.mailmap > +++ w/.mailmap > @@ -10,6 +10,7 @@ Edgar E. Iglesias edgar_igl > Fabrice Bellard bellard > > James Hogan > Jocelyn Mayer j_mayer > > +Julia Suvorova < Julia Suvorova via Qemu-devel > > Paul Brook pbrook > > Paul Burton > Paul Burton > > Yay - shortlog still lists Julia's commit even with the mailmap in place > (but with a better spelling of her name), so I don't need to try anything > fancier. I'll post a separate patch for mailmap, then leave it up to you > whether to incorporate my shortlog snippet above into your build script. Your mailmap change above seems to have a stray extra '<' in it -- was that added by the mailing list server, or is it in the original? thanks -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
On 03/26/2018 11:12 AM, Peter Maydell wrote: but it would be nice if we can improve our tooling to prevent future instances of the recurring problem. Yuck. (Maybe we should try whatever the other workaround for this SPF vs mailing lists problem is?) If you can suggest a patch to my apply-pullreq script I'm happy to change it to reject these at pull application time. https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/apply-pullreq My first quick attempt: diff --git i/apply-pullreq w/apply-pullreq index a5528e4..9ae4b8f 100755 --- i/apply-pullreq +++ w/apply-pullreq @@ -104,6 +104,12 @@ if git diff master..staging | grep -q 'Subproject commit'; then echo "WARNING: pull appears to include submodule update, please check it!" fi +# Check whether any authors needs to be corrected after SPF rewrites +if git shortlog --author=qemu-devel@nongnu.org master..staging | grep .; then +echo "ERROR: pull request includes commits attributed to list" +exit 1 +fi + # This should exit with an error status if any of the sub-builds fails. parallel-buildtest Hmm, on re-reading that, I wonder if shortlog will do the right thing when a .mailmap entry exists. I'm trying to make sure we don't have to go lower-level with use of 'git log --format=%ae' (vs. --format=%aE and/or log --use-mailmap). /me goes and experiments with: diff --git i/.mailmap w/.mailmap index cf689b9ec99..a90d7deebe6 100644 --- i/.mailmap +++ w/.mailmap @@ -10,6 +10,7 @@ Edgar E. Iglesias edgar_igl Fabrice Bellard bellard James Hogan Jocelyn Mayer j_mayer +Julia Suvorova < Julia Suvorova via Qemu-devel Paul Brook pbrook Paul Burton Paul Burton Yay - shortlog still lists Julia's commit even with the mailmap in place (but with a better spelling of her name), so I don't need to try anything fancier. I'll post a separate patch for mailmap, then leave it up to you whether to incorporate my shortlog snippet above into your build script. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PULL 0/2] Net patches
On 03/26/2018 09:23 AM, Eric Blake wrote: Julia Suvorova via Qemu-devel (1): net/vde: print error on vde_open() failure Applied, thanks. We'll want a followup patch to .mailmap to make the git log attribution look nicer. We currently have the following patches all attributed to the same email address; I have no idea if .mailmap can correctly sort between them: Looks like it can, if we use the four-argument form. Quoting 'git-shortlog --help': Proper Name Commit Name which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address. $ git shortlog origin --author=qemu-devel | grep '^[^ ]' -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PULL 0/2] Net patches
On 26 March 2018 at 15:23, Eric Blake wrote: > We'll want a followup patch to .mailmap to make the git log attribution look > nicer. We currently have the following patches all attributed to the same > email address; I have no idea if .mailmap can correctly sort between them: > > $ git shortlog origin --author=qemu-devel | grep '^[^ ]' > Ed Swierk via Qemu-devel (2): > Ian McKellar via Qemu-devel (1): > Julia Suvorova via Qemu-devel (1): > Justin Terry (VM) via Qemu-devel (8): > Paul Donohue (2): > > but it would be nice if we can improve our tooling to prevent future > instances of the recurring problem. Yuck. (Maybe we should try whatever the other workaround for this SPF vs mailing lists problem is?) If you can suggest a patch to my apply-pullreq script I'm happy to change it to reject these at pull application time. https://git.linaro.org/people/peter.maydell/misc-scripts.git/tree/apply-pullreq thanks -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
On 03/26/2018 08:14 AM, Peter Maydell wrote: On 26 March 2018 at 08:00, Jason Wang wrote: The following changes since commit 7b1db0908d88f0c9cfac24e214ff72a860692e23: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180323' into staging (2018-03-25 13:51:33 +0100) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 7587855cd23755a7a6bd01b026611465f5584ecd: net/vde: print error on vde_open() failure (2018-03-26 14:52:43 +0800) Greg Kurz (1): virtio_net: flush uncompleted TX on reset Julia Suvorova via Qemu-devel (1): net/vde: print error on vde_open() failure Applied, thanks. We'll want a followup patch to .mailmap to make the git log attribution look nicer. We currently have the following patches all attributed to the same email address; I have no idea if .mailmap can correctly sort between them: $ git shortlog origin --author=qemu-devel | grep '^[^ ]' Ed Swierk via Qemu-devel (2): Ian McKellar via Qemu-devel (1): Julia Suvorova via Qemu-devel (1): Justin Terry (VM) via Qemu-devel (8): Paul Donohue (2): but it would be nice if we can improve our tooling to prevent future instances of the recurring problem. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PULL 0/2] Net patches
On 26 March 2018 at 08:00, Jason Wang wrote: > The following changes since commit 7b1db0908d88f0c9cfac24e214ff72a860692e23: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20180323' into staging (2018-03-25 > 13:51:33 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to 7587855cd23755a7a6bd01b026611465f5584ecd: > > net/vde: print error on vde_open() failure (2018-03-26 14:52:43 +0800) > > > > > Greg Kurz (1): > virtio_net: flush uncompleted TX on reset > > Julia Suvorova via Qemu-devel (1): > net/vde: print error on vde_open() failure Applied, thanks. -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
Hi, This series failed docker-quick@centos6 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally. Type: series Message-id: 1522047629-27658-1-git-send-email-jasow...@redhat.com Subject: [Qemu-devel] [PULL 0/2] Net patches === TEST SCRIPT BEGIN === #!/bin/bash set -e git submodule update --init dtc # Let docker tests dump environment info export SHOW_ENV=1 export J=8 time make docker-test-quick@centos6 === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 5550e5c60f net/vde: print error on vde_open() failure bcddfa430e virtio_net: flush uncompleted TX on reset === OUTPUT BEGIN === Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' Cloning into '/var/tmp/patchew-tester-tmp-_5w_20ll/src/dtc'... Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' BUILD centos6 make[1]: Entering directory '/var/tmp/patchew-tester-tmp-_5w_20ll/src' GEN /var/tmp/patchew-tester-tmp-_5w_20ll/src/docker-src.2018-03-26-08.40.27.22090/qemu.tar Cloning into '/var/tmp/patchew-tester-tmp-_5w_20ll/src/docker-src.2018-03-26-08.40.27.22090/qemu.tar.vroot'... done. Checking out files: 50% (3057/6057) Checking out files: 51% (3090/6057) Checking out files: 52% (3150/6057) Checking out files: 53% (3211/6057) Checking out files: 54% (3271/6057) Checking out files: 55% (3332/6057) Checking out files: 56% (3392/6057) Checking out files: 57% (3453/6057) Checking out files: 58% (3514/6057) Checking out files: 59% (3574/6057) Checking out files: 60% (3635/6057) Checking out files: 61% (3695/6057) Checking out files: 62% (3756/6057) Checking out files: 63% (3816/6057) Checking out files: 64% (3877/6057) Checking out files: 65% (3938/6057) Checking out files: 66% (3998/6057) Checking out files: 67% (4059/6057) Checking out files: 68% (4119/6057) Checking out files: 69% (4180/6057) Checking out files: 70% (4240/6057) Checking out files: 71% (4301/6057) Checking out files: 72% (4362/6057) Checking out files: 73% (4422/6057) Checking out files: 74% (4483/6057) Checking out files: 75% (4543/6057) Checking out files: 76% (4604/6057) Checking out files: 77% (4664/6057) Checking out files: 78% (4725/6057) Checking out files: 79% (4786/6057) Checking out files: 80% (4846/6057) Checking out files: 81% (4907/6057) Checking out files: 82% (4967/6057) Checking out files: 83% (5028/6057) Checking out files: 84% (5088/6057) Checking out files: 85% (5149/6057) Checking out files: 86% (5210/6057) Checking out files: 87% (5270/6057) Checking out files: 88% (5331/6057) Checking out files: 89% (5391/6057) Checking out files: 90% (5452/6057) Checking out files: 91% (5512/6057) Checking out files: 92% (5573/6057) Checking out files: 93% (5634/6057) Checking out files: 94% (5694/6057) Checking out files: 95% (5755/6057) Checking out files: 96% (5815/6057) Checking out files: 97% (5876/6057) Checking out files: 98% (5936/6057) Checking out files: 99% (5997/6057) Checking out files: 100% (6057/6057) Checking out files: 100% (6057/6057), done. Your branch is up-to-date with 'origin/test'. Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc' Cloning into '/var/tmp/patchew-tester-tmp-_5w_20ll/src/docker-src.2018-03-26-08.40.27.22090/qemu.tar.vroot/dtc'... Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42' Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered for path 'ui/keycodemapdb' Cloning into '/var/tmp/patchew-tester-tmp-_5w_20ll/src/docker-src.2018-03-26-08.40.27.22090/qemu.tar.vroot/ui/keycodemapdb'... Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce' COPYRUNNER RUN test-quick in qemu:centos6 Packages installed: SDL-devel-1.2.14-7.el6_7.1.x86_64 bison-2.4.1-5.el6.x86_64 bzip2-devel-1.0.5-7.el6_0.x86_64 ccache-3.1.6-2.el6.x86_64 csnappy-devel-0-6.20150729gitd7bc683.el6.x86_64 flex-2.5.35-9.el6.x86_64 gcc-4.4.7-18.el6.x86_64 gettext-0.17-18.el6.x86_64 git-1.7.1-9.el6_9.x86_64 glib2-devel-2.28.8-9.el6.x86_64 libepoxy-devel-1.2-3.el6.x86_64 libfdt-devel-1.4.0-1.el6.x86_64 librdmacm-devel-1.0.21-0.el6.x86_64 lzo-devel-2.03-3.1.el6_5.1.x86_64 make-3.81-23.el6.x86_64 mesa-libEGL-devel-11.0.7-4.el6.x86_64 mesa-libgbm-devel-11.0.7-4.el6.x86_64 package g++ is not installed pixman-devel-0.32.8-1.el6.x86_64 spice-glib-devel-0.26-8.el6.x86_64 spice-server-devel-0.12.4-16.el6.x86_64 tar-1.23-15.el6_8.x86_64 vte-devel-0.25.1-9.el6.x86_64 xen-devel-4.6.6-2.el6.x86_64 zlib-devel-1.2.3-29.el6.x86_64 Environment variables: PACKAGES=bison bzip2-devel ccache csnappy-devel flex g++ gcc gettext git glib2-devel libepoxy-deve
Re: [Qemu-devel] [PULL 0/2] Net patches
On 7 June 2017 at 04:34, Jason Wang wrote: > The following changes since commit 199e19ee538eb61fd08b1c1ee5aa838ebdcc968e: > > Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into > staging (2017-06-05 15:28:12 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to 6701e5514beab7b781a10424a94e9850c707287c: > > Revert "Change net/socket.c to use socket_*() functions" again (2017-06-07 > 10:58:31 +0800) > > > > > Daniel P. Berrange (1): > Revert "Change net/socket.c to use socket_*() functions" again > > Mao Zhongyi (1): > net/rocker: Cleanup the useless return value check > > hw/net/rocker/rocker.c | 9 ++-- > hw/net/rocker/rocker_desc.c | 4 +- > net/socket.c| 127 > +++- > 3 files changed, 60 insertions(+), 80 deletions(-) > Applied, thanks. -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
On 2017年06月07日 12:31, no-re...@patchew.org wrote: Hi, This series seems to have some coding style problems. See output below for more information: Type: series Subject: [Qemu-devel] [PULL 0/2] Net patches Message-id: 1496806444-27910-1-git-send-email-jasow...@redhat.com === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 git config --local diff.renamelimit 0 git config --local diff.renames True commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' a0be159 Revert "Change net/socket.c to use socket_*() functions" again 0e3dcc6 net/rocker: Cleanup the useless return value check === OUTPUT BEGIN === Checking PATCH 1/2: net/rocker: Cleanup the useless return value check... Checking PATCH 2/2: Revert "Change net/socket.c to use socket_*() functions" again... ERROR: braces {} are necessary for all arms of this statement #58: FILE: net/socket.c:495: +if (parse_host_port(&saddr, host_str) < 0) [...] ERROR: braces {} are necessary for all arms of this statement #161: FILE: net/socket.c:540: +if (parse_host_port(&saddr, host_str) < 0) [...] ERROR: space required before the open parenthesis '(' #174: FILE: net/socket.c:551: +for(;;) { ERROR: braces {} are necessary for all arms of this statement #194: FILE: net/socket.c:571: +if (!s) [...] total: 4 errors, 0 warnings, 162 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-de...@freelists.org This patch is a revert, so looks like it was a false positive. Thanks
Re: [Qemu-devel] [PULL 0/2] Net patches
Hi, This series seems to have some coding style problems. See output below for more information: Type: series Subject: [Qemu-devel] [PULL 0/2] Net patches Message-id: 1496806444-27910-1-git-send-email-jasow...@redhat.com === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 git config --local diff.renamelimit 0 git config --local diff.renames True commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' a0be159 Revert "Change net/socket.c to use socket_*() functions" again 0e3dcc6 net/rocker: Cleanup the useless return value check === OUTPUT BEGIN === Checking PATCH 1/2: net/rocker: Cleanup the useless return value check... Checking PATCH 2/2: Revert "Change net/socket.c to use socket_*() functions" again... ERROR: braces {} are necessary for all arms of this statement #58: FILE: net/socket.c:495: +if (parse_host_port(&saddr, host_str) < 0) [...] ERROR: braces {} are necessary for all arms of this statement #161: FILE: net/socket.c:540: +if (parse_host_port(&saddr, host_str) < 0) [...] ERROR: space required before the open parenthesis '(' #174: FILE: net/socket.c:551: +for(;;) { ERROR: braces {} are necessary for all arms of this statement #194: FILE: net/socket.c:571: +if (!s) [...] total: 4 errors, 0 warnings, 162 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-de...@freelists.org
Re: [Qemu-devel] [PULL 0/2] Net patches
On 31 March 2017 at 02:15, Jason Wang wrote: > The following changes since commit ddc2c3a57e0752c0650fdb735a8b8322542d4248: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging > (2017-03-30 18:02:33 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to b4053c64833762f1249b2d704d2da30b5b10c8ff: > > e1000: disable debug by default (2017-03-31 08:48:13 +0800) > > > > > Jason Wang (2): > virtio-net: avoid call tap_enable when there's only one queue > e1000: disable debug by default > > hw/net/e1000.c | 2 +- > hw/net/virtio-net.c | 4 > 2 files changed, 5 insertions(+), 1 deletion(-) Applied, thanks. -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
On 22 August 2016 at 09:09, Jason Wang wrote: > The following changes since commit 5f9f818ea88a013b2464563be354dd2f0f316407: > > test-logging: don't hard-code paths in /tmp (2016-08-19 12:44:11 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to e0af5a0e8b74c674d29be3224b7ec16ba278e99c: > > e1000e: remove internal interrupt flag (2016-08-22 16:06:08 +0800) > > > > Applied, thanks. -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
On 18 August 2016 at 06:40, Jason Wang wrote: > The following changes since commit 5f0e775348082c355769a3df612e055abea61c06: > > Update version for v2.7.0-rc3 release (2016-08-16 17:34:30 +0100) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to e9e0a5854b6dc888f44e7e280a007326714199a6: > > net/net: properly handle multiple packets in net_fill_rstate() (2016-08-18 > 12:20:57 +0800) > > > > Applied, thanks. -- PMM
Re: [Qemu-devel] [PULL 0/2] Net patches
Pulled. Thanks. Regards, Anthony Liguori
Re: [Qemu-devel] [PULL 0/2] Net patches
Pulled. Thanks. Regards, Anthony Liguori