Message ID | 1450336833-27710-1-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On 17/12/2015 08:20, Markus Armbruster wrote: > In my testing, Coverity reported two more CHECKED_RETURN: > > * qemu-char.c:1248: fixed in commit c1f2448: "qemu-char: retry g_poll > on EINTR". > > * migration/qemu-file-unix.c:75: harmless, cleaned up in commit > 4e39f57 "migration: Clean up use of g_poll() in > socket_writev_buffer() > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > v2: Commit message body rewritten, because fixes have been committed > meanwhile. Applied, thanks! Paolo > scripts/coverity-model.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c > index e1d5f45..ee5bf9d 100644 > --- a/scripts/coverity-model.c > +++ b/scripts/coverity-model.c > @@ -342,6 +342,15 @@ char *g_strconcat(const char *s, ...) > > /* Other glib functions */ > > +typedef struct pollfd GPollFD; > + > +int poll(); > + > +int g_poll (GPollFD *fds, unsigned nfds, int timeout) > +{ > + return poll(fds, nfds, timeout); > +} > + > typedef struct _GIOChannel GIOChannel; > GIOChannel *g_io_channel_unix_new(int fd) > { >
Paolo Bonzini <pbonzini@redhat.com> writes: > On 17/12/2015 08:20, Markus Armbruster wrote: >> In my testing, Coverity reported two more CHECKED_RETURN: >> >> * qemu-char.c:1248: fixed in commit c1f2448: "qemu-char: retry g_poll >> on EINTR". >> >> * migration/qemu-file-unix.c:75: harmless, cleaned up in commit >> 4e39f57 "migration: Clean up use of g_poll() in >> socket_writev_buffer() >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> v2: Commit message body rewritten, because fixes have been committed >> meanwhile. > > Applied, thanks! There's also Subject: [PATCH] coverity: Model g_memdup() Date: Mon, 30 Nov 2015 17:32:32 +0100 Message-Id: <1448901152-11716-1-git-send-email-armbru@redhat.com> I can post a pull request for both, but I'm of course happy to let them flow through your tree.
diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c index e1d5f45..ee5bf9d 100644 --- a/scripts/coverity-model.c +++ b/scripts/coverity-model.c @@ -342,6 +342,15 @@ char *g_strconcat(const char *s, ...) /* Other glib functions */ +typedef struct pollfd GPollFD; + +int poll(); + +int g_poll (GPollFD *fds, unsigned nfds, int timeout) +{ + return poll(fds, nfds, timeout); +} + typedef struct _GIOChannel GIOChannel; GIOChannel *g_io_channel_unix_new(int fd) {
In my testing, Coverity reported two more CHECKED_RETURN: * qemu-char.c:1248: fixed in commit c1f2448: "qemu-char: retry g_poll on EINTR". * migration/qemu-file-unix.c:75: harmless, cleaned up in commit 4e39f57 "migration: Clean up use of g_poll() in socket_writev_buffer() Signed-off-by: Markus Armbruster <armbru@redhat.com> --- v2: Commit message body rewritten, because fixes have been committed meanwhile. scripts/coverity-model.c | 9 +++++++++ 1 file changed, 9 insertions(+)