Message ID | 1458824583-15652-1-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
On 24 March 2016 at 13:03, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a: > > Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream My script thinks this isn't a signed tag: e104462:trusty:qemu-for-merges$ apply-pullreq git://github.com/bonzini/qemu.git tags/for-upstream Switched to branch 'master' Your branch is up-to-date with 'origin/master'. Already up-to-date. Switched to branch 'staging' fetching from remote bonzini error: remotes/bonzini/tags/for-upstream: cannot verify a non-tag object of type commit. Does not appear to be a signed tag (use --no-verify-sig to override) thanks -- PMM
On 24/03/2016 19:05, Peter Maydell wrote: > On 24 March 2016 at 13:03, Paolo Bonzini <pbonzini@redhat.com> wrote: >> The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a: >> >> Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git tags/for-upstream > > My script thinks this isn't a signed tag: > > e104462:trusty:qemu-for-merges$ apply-pullreq > git://github.com/bonzini/qemu.git tags/for-upstream > Switched to branch 'master' > Your branch is up-to-date with 'origin/master'. > Already up-to-date. > Switched to branch 'staging' > fetching from remote bonzini > error: remotes/bonzini/tags/for-upstream: cannot verify a non-tag > object of type commit. > Does not appear to be a signed tag > (use --no-verify-sig to override) Your script was right, do I need to send a v4? Paolo
On 24 March 2016 at 20:17, Paolo Bonzini <pbonzini@redhat.com> wrote: > > > On 24/03/2016 19:05, Peter Maydell wrote: >> On 24 March 2016 at 13:03, Paolo Bonzini <pbonzini@redhat.com> wrote: >>> The following changes since commit 4829e0378dfb91d55af9dfd741bd09e8f2c4f91a: >>> >>> Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging (2016-03-18 17:18:41 +0000) >>> >>> are available in the git repository at: >>> >>> git://github.com/bonzini/qemu.git tags/for-upstream >> >> My script thinks this isn't a signed tag: >> >> e104462:trusty:qemu-for-merges$ apply-pullreq >> git://github.com/bonzini/qemu.git tags/for-upstream >> Switched to branch 'master' >> Your branch is up-to-date with 'origin/master'. >> Already up-to-date. >> Switched to branch 'staging' >> fetching from remote bonzini >> error: remotes/bonzini/tags/for-upstream: cannot verify a non-tag >> object of type commit. >> Does not appear to be a signed tag >> (use --no-verify-sig to override) > > Your script was right, do I need to send a v4? Yes, please (as usual you need only resend the cover letter). thanks -- PMM
diff --git a/qemu-char.c b/qemu-char.c index 1944c4e..270819a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3081,8 +3081,6 @@ static int tcp_chr_new_client(CharDriverState *chr, QIOChannelSocket *sioc) s->sioc = sioc; object_ref(OBJECT(sioc)); - qio_channel_set_blocking(s->ioc, false, NULL); - if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); } @@ -3114,6 +3112,7 @@ static int tcp_chr_add_client(CharDriverState *chr, int fd) if (!sioc) { return -1; } + qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); ret = tcp_chr_new_client(chr, sioc); object_unref(OBJECT(sioc)); return ret;