Message ID | CADyday1ZbVN2WM2WLoZoD3=X9ZD3Au5Duh=gMa2Buj3tV3auBw@mail.gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 12/04/2016 20:17, Nutan Shinde wrote: > > -static int console_exit(SCLPEvent *event) > +static console_exit(SCLPEvent *event) > { > - return 0; This patch doesn't even compile: CC hw/char/sclpconsole.o /home/pbonzini/work/upstream/qemu/hw/char/sclpconsole.c:245:8: error: return type defaults to ‘int’ [-Werror=implicit-int] static console_exit(SCLPEvent *event) ^ cc1: all warnings being treated as errors Paolo
Paolo Bonzini <pbonzini@redhat.com> writes: > On 12/04/2016 20:17, Nutan Shinde wrote: >> >> -static int console_exit(SCLPEvent *event) >> +static console_exit(SCLPEvent *event) >> { >> - return 0; > > This patch doesn't even compile: > > CC hw/char/sclpconsole.o > /home/pbonzini/work/upstream/qemu/hw/char/sclpconsole.c:245:8: error: return type defaults to ‘int’ [-Werror=implicit-int] > static console_exit(SCLPEvent *event) > ^ > cc1: all warnings being treated as errors It wouldn't compile even with the missing void inserted: hw/char/sclpconsole-lm.c:361:14: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] ec->exit = console_exit; ^ I gather you're doing this for BiteSizedTasks items * Look for functions that are named *_exit or *_exitfn in hw/ and that return int. They should all return zero. Make them return void, and remove the checks for the callers. * Once the above change is done, remove the "Error **" argument from functions named *_unrealize in hw/ Added by Paolo on 2014-12-03. These tasks don't make sense to me. Paolo, can you explain? Additionally, the commit message titles aren't quite right, the series isn't threaded, and its parts can't be applied with git-am (some MIME crap gets in the way). Your title lacks a subsystem: prefix and is too long. Better: hw/char: Change return type of *_exit(), *_exitfn() to void Please study http://wiki.qemu-project.org/Contribute/SubmitAPatch once more, particularly sections "Write a meaningful commit message", "Use git format-patch", and "Include a meaningful cover letter". In theory, it is possible to consistently send well-formed patches by hand. In practice, you either use git-send-email or you screw it up. Use git-send-email.
On 13/04/2016 08:33, Markus Armbruster wrote: > * Look for functions that are named *_exit or *_exitfn in hw/ and that > return int. They should all return zero. Make them return void, and > remove the checks for the callers. ... and change the exit method to "void fn(void)" > * Once the above change is done, remove the "Error **" argument from > functions named *_unrealize in hw/ ... same for the unrealize method. > Added by Paolo on 2014-12-03. These tasks don't make sense to me. > Paolo, can you explain? The exit functions always return zero, the unrealize functions never touch the Error** argument. So make both of them "void fn(void)" and remove the difference between exit and unrealize. Paolo
Paolo Bonzini <pbonzini@redhat.com> writes: > On 13/04/2016 08:33, Markus Armbruster wrote: >> * Look for functions that are named *_exit or *_exitfn in hw/ and that >> return int. They should all return zero. Make them return void, and >> remove the checks for the callers. > > ... and change the exit method to "void fn(void)" > >> * Once the above change is done, remove the "Error **" argument from >> functions named *_unrealize in hw/ > > ... same for the unrealize method. > >> Added by Paolo on 2014-12-03. These tasks don't make sense to me. >> Paolo, can you explain? > > The exit functions always return zero, the unrealize functions never > touch the Error** argument. So make both of them "void fn(void)" and > remove the difference between exit and unrealize. Got it now, thanks!
diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 7d4ff81..a9a9703 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -328,9 +328,8 @@ static int console_init(SCLPEvent *event) return 0; } -static int console_exit(SCLPEvent *event) +static console_exit(SCLPEvent *event) { - return 0; } static void console_reset(DeviceState *dev) diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 45997ff..d179404 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -242,9 +242,8 @@ static void console_reset(DeviceState *dev) scon->notify = false; } -static int console_exit(SCLPEvent *event) +static console_exit(SCLPEvent *event) { - return 0; } static Property console_properties[] = {
This change is required because the return type of exit(error) function is not used. This patch only has changes for files in hw/char package. Signed-off-by: Nutan Shinde <nutanshinde1992@gmail.com> --- hw/char/sclpconsole-lm.c | 3 +-- hw/char/sclpconsole.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) -- 1.9.1