From: Peter Maydell Date: Tue, 4 May 2021 09:58:55 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/bsdimp/tags/pull-bsd-user-20210430' into staging X-Git-Tag: v6.1.0-rc0~142 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e13d8e34b53d8f9a3421a816ccfbdc5fa874e98;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/bsdimp/tags/pull-bsd-user-20210430' into staging bsd-user: start to cleanup the mess A number of small cleanups to get started. All the checkpatch.pl warnings for bsdload.c have been fixed, as well as a warning from qemu.h (though more remain and this patch series fails the format check still). I've also fixed a compile-time warning about a missing break. # gpg: Signature made Fri 30 Apr 2021 16:40:08 BST # gpg: using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100 # gpg: Good signature from "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: aka "Warner Losh " [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 2035 F894 B00A A3CF 7CCD E1B7 6C1C D128 7DB0 1100 * remotes/bsdimp/tags/pull-bsd-user-20210430: bsd-user: style tweak: Put {} around all if/else/for statements bsd-user: put back a break; that had gone missing... bsd-user: style tweak: return is not a function, eliminate () bsd-user: style tweak: keyword space ( bsd-user: whitespace changes Signed-off-by: Peter Maydell --- 3e13d8e34b53d8f9a3421a816ccfbdc5fa874e98